Merge pull request #3773 from Diegator04/patch-2

Complete bundle_it

.github/ISSUE_TEMPLATE/bug_report.md

@@ -17,11 +17,14 @@ assignees: ''
 
 **Link(s) to mod(s) used**: *The mod repositories or zip files that are related to the issue, if applicable.*
 
-**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME.*
+**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME.*
 
-**Crash report**: *The contents of relevant crash report files. REQUIRED if you are reporting a crash.*
+If you remove the line above without reading it properly and understanding what it means, I will reap your soul. Even if you're playing on someone's server, you can still save the game to a slot.
+
+**(Crash) logs**: *Either crash reports from the crash folder, or the file you get when you go into Settings -> Game Data -> Export Crash logs. REQUIRED if you are reporting a crash.*
 
 ---
 
 *Place an X (no spaces) between the brackets to confirm that you have read the line below.*  
+- [ ] **I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.**
 - [ ] **I have searched the closed and open issues to make sure that this problem has not already been reported.**

.github/workflows/deployment.yml

@@ -0,0 +1,63 @@
+name: Deployment
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  buildJava14:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 14
+      uses: actions/setup-java@v1
+      with:
+        java-version: 14
+    - name: Set env
+      run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+    - name: Create artifacts
+      run: |
+        ./gradlew desktop:dist server:dist core:javadoc -Pbuildversion=${RELEASE_VERSION:1}
+    - name: Update docs
+      run: |
+        cd ../
+        git config --global user.email "cli@github.com"
+        git config --global user.name "Github Actions"
+        git clone --depth=1 https://github.com/MindustryGame/docs.git
+        cp -a Mindustry/core/build/docs/javadoc/. docs/
+        cd docs
+        git add .
+        git commit -m "Update ${RELEASE_VERSION:1}"
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs
+        cd ../Mindustry
+    - name: Add Arc release
+      run: |
+        git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
+        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
+        git add .
+        git commit -m "Updating to build ${RELEASE_VERSION:1}"
+        cd ../Mindustry
+    - name: Upload client artifacts
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: desktop/build/libs/Mindustry.jar
+        tag: ${{ github.ref }}
+    - name: Upload server artifacts
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: server/build/libs/server-release.jar
+        tag: ${{ github.ref }}
+

.github/workflows/gradle.yml

@@ -1,27 +0,0 @@
-name: Java CI
-
-on: [push]
-
-jobs:
-  buildJava14:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 14
-      uses: actions/setup-java@v1
-      with:
-        java-version: 14
-    - name: Run unit tests with gradle and Java 14
-      run: ./gradlew compileJava
-  buildJava15:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 15
-      uses: actions/setup-java@v1
-      with:
-        java-version: 15
-    - name: Run unit tests with gradle and Java 15
-      run: ./gradlew compileJava

.github/workflows/pr.yml

@@ -0,0 +1,21 @@
+name: Pull Request Tests
+
+on: [pull_request]
+
+jobs:
+  buildJava14:
+    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 and build JAR
+      run: ./gradlew test desktop:dist
+    - name: Upload desktop JAR for testing
+      uses: actions/upload-artifact@v2
+      with:
+        name: Desktop JAR (zipped)
+        path: desktop/build/libs/Mindustry.jar

.github/workflows/push.yml

@@ -0,0 +1,25 @@
+name: Tests
+
+on: [push, workflow_dispatch]
+
+jobs:
+  buildJava14:
+    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: |
+        git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
+        cd ../MindustryBuilds
+        BNUM=$(($GITHUB_RUN_NUMBER + 20000))
+        git tag ${BNUM}
+        git config --global user.name "Build Uploader"
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds ${BNUM}

.gitignore

@@ -19,12 +19,13 @@ logs/
 /annotations/out/
 /net/build/
 /tools/build/
-/core/build/
 /tests/build/
 /server/build/
 changelog
 saves/
 /core/assets-raw/fontgen/out/
+/core/assets-raw/fontgen/icons/
+/core/assets-raw/fontgen/icon_parts/
 core/assets/saves/
 /core/assets/saves/
 steam_appid.txt
@@ -35,6 +36,7 @@ steam_appid.txt
 /annotations/src/main/resources/META-INF/services
 /core/assets/version.properties
 /core/assets/locales
+/core/assets/cache/
 /ios/src/mindustry/gen/
 /core/src/mindustry/gen/
 ios/robovm.properties
@@ -143,13 +145,6 @@ nb-configuration.xml
 /local.properties
 .gradle/
 gradle-app.setting
-/build/
-/android/build/
-/core/build/
-/desktop/build/
-/html/build/
-/ios/build/
-/ios-moe/build/
 
 ## OS Specific
 .DS_Store

.travis.yml

@@ -1,50 +0,0 @@
-jdk:
-- openjdk14
-dist: xenial
-android:
-  components:
-  - android-29
-  - build-tools-29.0.3
-
-script:
-- git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
-- cd ../MindustryBuilds
-- echo ${TRAVIS_TAG}
-- if [ -n "$TRAVIS_TAG" ]; then echo versionName=6-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; fi
-- git tag ${TRAVIS_BUILD_NUMBER}
-- git config --global user.name "Build Uploader"
-- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds ${TRAVIS_BUILD_NUMBER}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds; fi
-- cd ../Mindustry
-- git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
-- if [ -n "$TRAVIS_TAG" ]; then cd ../Arc; git tag ${TRAVIS_TAG}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/Arc ${TRAVIS_TAG}; cd ../Mindustry; fi
-- "./gradlew test"
-- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
-- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
-- "./gradlew core:javadoc"
-- cd ../
-- git clone --depth=1 https://github.com/MindustryGame/docs.git
-- cp -a Mindustry/core/build/docs/javadoc/. docs/
-- cd docs
-- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git add .; git commit -m "Update ${TRAVIS_BUILD_NUMBER}"; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/MindustryGame/docs; fi
-- cd ../Mindustry
-deploy:
-- provider: releases
-  skip_cleanup: true
-  draft: false
-  api_key:
-    secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
-  file:
-  - desktop/build/libs/Mindustry.jar
-  - server/build/libs/server-release.jar
-  on:
-    repo: Anuken/Mindustry
-    tags: true
-#- provider: script
-#  script: bash update_wiki.sh
-#  on:
-#    repo: Anuken/Mindustry
-#    tags: true
-env:
-  global:
-  - secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=
-  - secure: VEskj/0TVX2o7iUVXuVPysj/VSWmPhDl57SrT7/nBNN/P/8N5jFAvx8PMzG7qT0S5FzKxuV20psE4WylUGRKdeRtK7/QNBV7T3YqYYM6BUB1VeRpxe5hLxTeuBK3izglFO8DkdDqjUtzQSjzkoYT75ilROjhBrBUPhVek7UlbBHbaklPWYFXHnJmYS1FpZTdzqIj+Y0Gd1PSL2MzK4X74aAHl0qaDgsTwYwtKs7IAz+kFaTZBRpi9VjQHAFhDlkDR3jo9wQjH8/F6x0lCgV/FulSc37Okdb40sLFG98xcEA6gWh1NPMkz8CulUdVE7mj7SJNxLbNvoMNrWOVRjmEsn59p/9LiNC1F9ncFz9vjQjAmi7rMFFGHGxe5nn8cIAkpTvHQQkZoWHAA9SNJTDMMf09m2pRy/vvzx+a6NVxyC9iNrhLlnBg4gxAqRh0S6NU0uL+fuygKixn7rqlnb7KMT7bAbfcuV+dng6c8V7hYKDCh7sJbH8iJump1xkwoM7ecnU8fxJF/oKOr/fbk0Bfxu+Q9qYLrV1+DEdm93Vl2Thq+DBKmI66jRGSva6HeCLFo81PEiEjP1nLv75+kvVfOqVqJrZD1BrvoG2eWT/3hVLrN2kEIWWlpvQVC7FL11yWmYtAuOBh/vfhI76zKr+YTS6ccG9rqW4XeYjJytshe8M=

CONTRIBUTING.md

@@ -30,7 +30,7 @@ This means:
 - No underscores for anything. (Yes, I know `Bindings` violates this principle, but that's for legacy reasons and really should be cleaned up some day)
 - Do not use braceless `if/else` statements. `if(x) statement else statement2` should **never** be done. In very specific situations, having braceless if-statements on one line is allowed: `if(cond) return;` would be valid.
 - Prefer single-line javadoc `/** @return for example */` instead of multiline javadoc whenver possible
-- Short method/variable names (multipleLongWords should be avoided if it's possible to so reasonably, especially for variables)
+- 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.
 
 Import [this style file](.github/Mindustry-CodeStyle-IJ.xml) into IntelliJ to get correct formatting when developing Mindustry.

ISSUES.md

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

README.md

@@ -1,7 +1,7 @@
 ![Logo](core/assets-raw/sprites/ui/logo.png)
 
 [![Build Status](https://travis-ci.org/Anuken/Mindustry.svg?branch=master)](https://travis-ci.org/Anuken/Mindustry) 
-[![Discord](https://img.shields.io/discord/391020510269669376.svg)](https://discord.gg/mindustry)  
+[![Discord](https://img.shields.io/discord/391020510269669376.svg?logo=discord&logoColor=white&logoWidth=20&labelColor=7289DA&label=Discord)](https://discord.gg/mindustry)  
 
 A sandbox tower defense game written in Java.
 
@@ -61,18 +61,5 @@ Post feature requests and feedback [here](https://github.com/Anuken/Mindustry-Su
 
 ## Downloads
 
-[<img src="https://static.itch.io/images/badge.svg"
+| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry)    |    [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry)   |    [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry)	| [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry)  
-     alt="Get it on Itch.io"
+|---	|---	|---	|---	|
-     height="60">](https://anuke.itch.io/mindustry)
-
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
-     alt="Get it on Google Play"
-     height="80">](https://play.google.com/store/apps/details?id=io.anuke.mindustry)
-
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-     alt="Get it on F-Droid"
-     height="80">](https://f-droid.org/packages/io.anuke.mindustry/)
-
-[<img src="https://flathub.org/assets/badges/flathub-badge-en.svg"
-     alt="Download On Flathub"
-     height="60">](https://flathub.org/apps/details/com.github.Anuken.Mindustry)

android/build.gradle

@@ -35,7 +35,8 @@ dependencies{
     natives "com.github.Anuken.Arc:natives-box2d-android:${getArcHash()}"
 
     //android dependencies magically disappear during compilation, thanks gradle!
-    if(new File(projectDir.parent, '../Arc').exists()) compileOnly fileTree(dir: '../../Arc/backends/backend-android/libs', include: ['*.jar'])
+    def sdkFile = new File((String)findSdkDir(), "/platforms/android-29/android.jar")
+    if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
 }
 
 task deploy(type: Copy){

android/src/mindustry/android/AndroidLauncher.java

@@ -27,7 +27,6 @@ import java.util.*;
 
 import static mindustry.Vars.*;
 
-
 public class AndroidLauncher extends AndroidApplication{
     public static final int PERMISSION_REQUEST_CODE = 1;
     boolean doubleScaleTablets = true;
@@ -78,11 +77,11 @@ public class AndroidLauncher extends AndroidApplication{
             }
 
             @Override
-            public void showFileChooser(boolean open, String extension, Cons<Fi> cons){
+            public void showFileChooser(boolean open, String title, String extension, Cons<Fi> cons){
-                showFileChooser(open, cons, extension);
+                showFileChooser(open, title, cons, extension);
             }
 
-            void showFileChooser(boolean open, Cons<Fi> cons, String... extensions){
+            void showFileChooser(boolean open, String title, Cons<Fi> cons, String... extensions){
                 String extension = extensions[0];
 
                 if(VERSION.SDK_INT >= VERSION_CODES.Q){
@@ -119,7 +118,7 @@ public class AndroidLauncher extends AndroidApplication{
                     });
                 }else if(VERSION.SDK_INT >= VERSION_CODES.M && !(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
                     checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
-                    chooser = new FileChooser(open ? "@open" : "@save", file -> Structs.contains(extensions, file.extension().toLowerCase()), open, 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{
@@ -137,16 +136,16 @@ public class AndroidLauncher extends AndroidApplication{
                     requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
                 }else{
                     if(open){
-                        new FileChooser("@open", file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
+                        new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
                     }else{
-                        super.showFileChooser(open, extension, cons);
+                        super.showFileChooser(open, "@open", extension, cons);
                     }
                 }
             }
 
             @Override
             public void showMultiFileChooser(Cons<Fi> cons, String... extensions){
-                showFileChooser(true, cons, extensions);
+                showFileChooser(true, "@open", cons, extensions);
             }
 
             @Override

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

@@ -98,6 +98,8 @@ public class Annotations{
         boolean serialize() default true;
         /** Whether to generate IO code. This is for advanced usage only. */
         boolean genio() default true;
+        /** Whether I made a massive mistake by merging two different class branches */
+        boolean legacy() default false;
     }
 
     /** Indicates an internal interface for entity components. */

annotations/src/main/java/mindustry/annotations/BaseProcessor.java

@@ -115,12 +115,12 @@ public abstract class BaseProcessor extends AbstractProcessor{
         return ClassName.get(c).box();
     }
 
-    public static TypeVariableName getTVN(TypeParameterElement element) {
+    public static TypeVariableName getTVN(TypeParameterElement element){
         String name = element.getSimpleName().toString();
         List<? extends TypeMirror> boundsMirrors = element.getBounds();
 
         List<TypeName> boundsTypeNames = new ArrayList<>();
-        for (TypeMirror typeMirror : boundsMirrors) {
+        for(TypeMirror typeMirror : boundsMirrors){
             boundsTypeNames.add(TypeName.get(typeMirror));
         }
 
@@ -137,11 +137,11 @@ public abstract class BaseProcessor extends AbstractProcessor{
         if(imports != null){
             String rawSource = file.toString();
             Seq<String> result = new Seq<>();
-            for (String s : rawSource.split("\n", -1)) {
+            for(String s : rawSource.split("\n", -1)){
                 result.add(s);
-                if (s.startsWith("package ")) {
+                if (s.startsWith("package ")){
                     result.add("");
-                    for (String i : imports) {
+                    for (String i : imports){
                         result.add(i);
                     }
                 }
@@ -229,7 +229,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
         try{
             process(roundEnv);
         }catch(Throwable e){
-            e.printStackTrace();
+            Log.err(e);
             throw new RuntimeException(e);
         }
         return true;

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

@@ -240,7 +240,6 @@ public class EntityProcess extends BaseProcessor{
             //look at each definition
             for(Selement<?> type : allDefs){
                 EntityDef ann = type.annotation(EntityDef.class);
-                boolean isFinal = ann.isFinal();
 
                 //all component classes (not interfaces)
                 Seq<Stype> components = allComponents(type);
@@ -274,6 +273,10 @@ public class EntityProcess extends BaseProcessor{
                     name += "Entity";
                 }
 
+                if(ann.legacy()){
+                    name += "Legacy" + Strings.capitalize(type.name());
+                }
+
                 //skip double classes
                 if(usedNames.containsKey(name)){
                     extraNames.get(usedNames.get(name), ObjectSet::new).add(type.name());

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

@@ -32,27 +32,40 @@ public class AssetsProcess extends BaseProcessor{
         MethodSpec.Builder load = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
         MethodSpec.Builder loadStyles = MethodSpec.methodBuilder("loadStyles").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
         MethodSpec.Builder icload = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        CodeBlock.Builder ichinit = CodeBlock.builder();
         String resources = rootDirectory + "/core/assets-raw/sprites/ui";
         Jval icons = Jval.read(Fi.get(rootDirectory + "/core/assets-raw/fontgen/config.json").readString());
 
         ObjectMap<String, String> texIcons = new OrderedMap<>();
         PropertiesUtils.load(texIcons, Fi.get(rootDirectory + "/core/assets/icons/icons.properties").reader());
 
+        StringBuilder iconcAll = new StringBuilder();
+
         texIcons.each((key, val) -> {
             String[] split = val.split("\\|");
             String name = Strings.kebabToCamel(split[1]).replace("Medium", "").replace("Icon", "");
-            if(SourceVersion.isKeyword(name) || name.equals("char")) name = name + "i";
+            if(SourceVersion.isKeyword(name) || name.equals("char")) name += "i";
 
-            ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("(char)" + key).build());
+            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());
         });
 
         ictype.addField(FieldSpec.builder(ParameterizedTypeName.get(ObjectMap.class, String.class, TextureRegionDrawable.class),
                 "icons", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("new ObjectMap<>()").build());
 
+        ichtype.addField(FieldSpec.builder(ParameterizedTypeName.get(ObjectIntMap.class, String.class),
+            "codes", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("new ObjectIntMap<>()").build());
+
+        ObjectSet<String> used = new ObjectSet<>();
+
         for(Jval val : icons.get("glyphs").asArray()){
             String name = capitalize(val.getString("css", ""));
+
+            if(!val.getBool("selected", true) || !used.add(name)) continue;
+
             int code = val.getInt("code", 0);
-            ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("(char)" + code).build());
+            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);
 
             ictype.addField(TextureRegionDrawable.class, name + "Small", Modifier.PUBLIC, Modifier.STATIC);
             icload.addStatement(name + "Small = mindustry.ui.Fonts.getGlyph(mindustry.ui.Fonts.def, (char)" + code + ")");
@@ -64,6 +77,9 @@ public class AssetsProcess extends BaseProcessor{
             icload.addStatement("icons.put($S, " + name + "Small)", name + "Small");
         }
 
+        ichtype.addField(FieldSpec.builder(String.class, "all", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("$S", iconcAll.toString()).build());
+        ichtype.addStaticBlock(ichinit.build());
+
         Fi.get(resources).walk(p -> {
             if(!p.extEquals("png")) return;
 
@@ -78,7 +94,7 @@ public class AssetsProcess extends BaseProcessor{
             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 + " = (" + dtype + ")arc.Core.atlas.drawable($S)", sfilen);
         });
 
         for(Element elem : elements){
@@ -106,7 +122,6 @@ public class AssetsProcess extends BaseProcessor{
 
         HashSet<String> names = new HashSet<>();
         Fi.get(path).walk(p -> {
-            String fname = p.name();
             String name = p.nameWithoutExtension();
 
             if(names.contains(name)){
@@ -115,23 +130,20 @@ public class AssetsProcess extends BaseProcessor{
                 names.add(name);
             }
 
-            if(SourceVersion.isKeyword(name)){
+            if(SourceVersion.isKeyword(name)) name += "s";
-                name = name + "s";
-            }
 
-            String filepath = path.substring(path.lastIndexOf("/") + 1) + "/" + fname;
+            String filepath =  path.substring(path.lastIndexOf("/") + 1) + p.path().substring(p.path().lastIndexOf(path) + path.length());
 
-            String filename = "arc.Core.app.getType() != arc.Application.ApplicationType.iOS ? \"" + filepath + "\" : \"" + filepath.replace(".ogg", ".mp3")+"\"";
+            String filename = "\"" + filepath + "\"";
-
+            loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3"));
-            loadBegin.addStatement("arc.Core.assets.load("+filename +", "+rtype+".class).loaded = a -> " + name + " = ("+rtype+")a", filepath, filepath.replace(".ogg", ".mp3"));
 
             dispose.addStatement("arc.Core.assets.unload(" + filename + ")");
             dispose.addStatement(name + " = null");
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build());
         });
 
         if(classname.equals("Sounds")){
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build());
         }
 
         type.addMethod(loadBegin.build());

annotations/src/main/resources/classids.properties

@@ -1,10 +1,13 @@
 #Maps entity names to IDs. Autogenerated.
 
 alpha=0
+arkyid=29
 atrax=1
+beta=30
 block=2
 corvus=24
 flare=3
+gamma=31
 mace=4
 mega=5
 mindustry.entities.comp.BuildingComp=6
@@ -26,6 +29,8 @@ oct=26
 poly=18
 pulsar=19
 quad=23
+quasar=32
 risso=20
 spiroct=21
+toxopid=33
 vela=25

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

@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name: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:x,type:float},{name:y,type:float}]}

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

@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name: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:x,type:float},{name:y,type:float}]}

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

@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name: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:x,type:float},{name:y,type:float}]}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name: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:x,type:float},{name:y,type:float}]}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name: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:x,type:float},{name:y,type:float}]}

build.gradle

@@ -17,7 +17,7 @@ buildscript{
     }
 
     dependencies{
-        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8'
+        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"
@@ -32,11 +32,11 @@ allprojects{
 
     ext{
         versionNumber = '6'
-        if(!project.hasProperty("versionModifier")) versionModifier = 'beta'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'release'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256'
-        rhinoVersion = '8437435dab9993769d72739608580d40c5343285'
+        rhinoVersion = '2617981f706e50b8753155d8e15e326308be3b22'
 
         loadVersionProps = {
             return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
@@ -99,6 +99,17 @@ allprojects{
             return project.ext.mainClassName.substring(0, project.ext.mainClassName.indexOf("desktop") - 1)
         }
 
+        findSdkDir = {
+            //null because IntelliJ doesn't get env variables
+            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 props = new Properties().with{p -> p.load(file.newReader()); return p }
+            return props.get("sdk.dir")
+        }
+
         generateLocales = {
             def output = 'en\n'
             def bundles = new File(project(':core').projectDir, 'assets/bundles/')
@@ -172,11 +183,20 @@ allprojects{
         jcenter()
     }
 
+    task clearCache{
+        doFirst{
+            delete{
+                delete "$rootDir/core/assets/cache"
+            }
+        }
+    }
+
     tasks.withType(JavaCompile){
         targetCompatibility = 8
         sourceCompatibility = 14
         options.encoding = "UTF-8"
         options.compilerArgs += ["-Xlint:deprecation"]
+        dependsOn clearCache
     }
 }
 
@@ -233,18 +253,22 @@ project(":ios"){
 
     task incrementConfig{
         def vfile = file('robovm.properties')
+        def bversion = getBuildVersion()
         def props = new Properties()
         if(vfile.exists()){
             props.load(new FileInputStream(vfile))
         }else{
             props['app.id'] = 'io.anuke.mindustry'
-            props['app.version'] = '5.0'
+            props['app.version'] = '6.0'
             props['app.mainclass'] = 'mindustry.IOSLauncher'
             props['app.executable'] = 'IOSLauncher'
             props['app.name'] = 'Mindustry'
         }
         
         props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + ""
+        if(bversion != "custom build"){
+            props['app.version'] = versionNumber + "." + bversion + (bversion.contains(".") ? "" : ".0")
+        }
         props.store(vfile.newWriter(), null)
     }
 
@@ -277,9 +301,10 @@ project(":core"){
             def props = loadVersionProps()
             def androidVersion = props['androidBuildCode'].toInteger() - 2
             def loglines = file("../changelog").text.split("\n")
+            def notice = "[This is a truncated changelog, see Github for full notes]"
             def maxLength = 460
 
-            def androidLogList = loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]")}
+            def androidLogList = [notice] + loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]")}
             def result = ""
             androidLogList.forEach{line ->
                 if(result.length() + line.length() + 1 < maxLength){

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

@@ -0,0 +1,54 @@
+<?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)">
+  <metadata
+     id="metadata386">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs384" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1316"
+     id="namedview382"
+     showgrid="false"
+     inkscape:zoom="64.285714"
+     inkscape:cx="6"
+     inkscape:cy="6"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg380" />
+  <path
+     id="polygon2"
+     style="fill:#ffffff"
+     d="M 2.5,0 2,0.5 1.5,1 1,1.5 0.5,2 0,2.5 v 1 1 1 1 L 0.5,7 1,7.5 v 1 1 L 1.5,10 2,10.5 2.5,11 3,11.5 3.5,12 h 1 1 1 1 1 L 9,11.5 9.5,11 10,10.5 10.5,10 11,9.5 v -1 -1 L 11.5,7 12,6.5 v -1 -1 -1 -1 L 11.5,2 11,1.5 10.5,1 10,0.5 9.5,0 h -1 -1 -1 -1 -1 -1 z m 2,3 h 1 1 1 L 8,3.5 8.5,4 9,4.5 v 1 L 8.5,6 8,6.5 7.5,7 h -1 -1 -1 L 4,6.5 3.5,6 3,5.5 v -1 L 3.5,4 4,3.5 Z M 5.5,4 5,4.5 v 1 L 5.5,6 h 1 L 7,5.5 v -1 L 6.5,4 Z m -1,4 h 1 1 1 L 8,8.5 7.5,9 h -1 -1 -1 L 4,8.5 Z" />
+</svg>

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

@@ -0,0 +1,55 @@
+<?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)">
+  <metadata
+     id="metadata198">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs196" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1316"
+     id="namedview194"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="90"
+     inkscape:cx="5"
+     inkscape:cy="5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg192" />
+  <path
+     id="polygon2"
+     style="fill:#ffffff"
+     d="M 0.5,0 0,0.5 v 1 1 1 1 1 1 1 1 1 L 0.5,10 1,9.5 v -1 -1 -1 -1 -1 -1 -1 -1 -1 z M 9.5,0 9,0.5 v 1 1 1 1 1 1 1 1 1 L 9.5,10 10,9.5 v -1 -1 -1 -1 -1 -1 -1 -1 -1 z M 4.5,1 4,1.5 3.5,2 3,2.5 3.5,3 h 1 1 1 L 7,2.5 6.5,2 6,1.5 5.5,1 Z M 4.5,4 4,4.5 3.5,5 3,5.5 3.5,6 h 1 1 1 L 7,5.5 6.5,5 6,4.5 5.5,4 Z M 4.5,7 4,7.5 3.5,8 3,8.5 3.5,9 h 1 1 1 L 7,8.5 6.5,8 6,7.5 5.5,7 Z" />
+</svg>

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

@@ -0,0 +1,53 @@
+<?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)">
+  <metadata
+     id="metadata258">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs256" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1316"
+     id="namedview254"
+     showgrid="false"
+     inkscape:zoom="90"
+     inkscape:cx="5"
+     inkscape:cy="5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg252" />
+  <path
+     id="polygon2"
+     style="fill:#ffffff"
+     d="M 1.5,0 1,0.5 0.5,1 0,1.5 v 1 1 1 1 1 1 1 L 0.5,9 1,9.5 1.5,10 h 1 1 1 1 1 1 1 L 9,9.5 9.5,9 10,8.5 v -1 -1 -1 -1 -1 -1 -1 L 9.5,1 9,0.5 8.5,0 h -1 -1 -1 -1 -1 -1 z m 1,1 h 1 1 1 1 1 L 8,1.5 8.5,2 9,2.5 v 1 1 1 1 1 L 8.5,8 8,8.5 7.5,9 h -1 -1 -1 -1 -1 L 2,8.5 1.5,8 1,7.5 v -1 -1 -1 -1 -1 L 1.5,2 2,1.5 Z M 4.5,3 4,3.5 3.5,4 3,4.5 v 1 L 3.5,6 4,6.5 4.5,7 h 1 L 6,6.5 6.5,6 7,5.5 v -1 L 6.5,4 6,3.5 5.5,3 Z" />
+</svg>

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

@@ -0,0 +1,55 @@
+<?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)">
+  <metadata
+     id="metadata316">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs314" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1316"
+     id="namedview312"
+     showgrid="false"
+     inkscape:zoom="79.549513"
+     inkscape:cx="1.5476722"
+     inkscape:cy="6.573236"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg310"
+     inkscape:pagecheckerboard="true" />
+  <path
+     id="polygon2"
+     style="fill:#ffffff"
+     d="M 0.5,0 0,0.5 v 1 1 1 1 1 1 1 1 1 1 1 1 L 0.5,13 h 1 1 1 1 1 1 1 1 1 L 10,12.5 v -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 L 9.5,2 9,1.5 8.5,1 8,0.5 7.5,0 h -1 -1 -1 -1 -1 -1 z m 1,1 h 1 1 1 L 5,1.5 v 1 1 1 L 5.5,5 h 1 1 1 L 9,5.5 v 1 1 1 1 1 1 L 8.5,12 h -1 -1 -1 -1 -1 -1 -1 L 1,11.5 v -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 z m 5,0 h 1 L 8,1.5 8.5,2 9,2.5 v 1 L 8.5,4 h -1 -1 L 6,3.5 v -1 -1 z M 6.5,6 6,6.5 v 1 L 6.5,8 h 1 L 8,7.5 v -1 L 7.5,6 Z M 4.5,7 4,7.5 3.5,8 3,8.5 v 1 L 2.5,10 2,10.5 2.5,11 h 1 1 1 1 L 7,10.5 6.5,10 6,9.5 5.5,9 5,8.5 v -1 z" />
+</svg>

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

@@ -0,0 +1,53 @@
+<?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)">
+  <metadata
+     id="metadata306">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs304" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1316"
+     id="namedview302"
+     showgrid="false"
+     inkscape:zoom="64.285714"
+     inkscape:cx="6"
+     inkscape:cy="6"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg300" />
+  <path
+     id="polygon2"
+     style="fill:#ffffff"
+     d="M 0.5,0 0,0.5 v 1 1 1 1 1 1 1 1 1 1 1 L 0.5,12 h 1 1 1 1 1 1 1 1 1 1 1 L 12,11.5 v -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 L 11.5,0 h -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 z m 2,2 h 1 1 1 1 1 1 1 L 10,2.5 v 1 1 1 1 1 1 1 L 9.5,10 h -1 -1 -1 -1 -1 -1 -1 L 2,9.5 v -1 -1 -1 -1 -1 -1 -1 z M 5.5,3 5,3.5 v 1 L 5.5,5 h 1 L 7,4.5 v -1 L 6.5,3 Z M 5.5,6 5,6.5 v 1 1 L 5.5,9 h 1 L 7,8.5 v -1 -1 L 6.5,6 Z" />
+</svg>

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

@@ -0,0 +1,55 @@
+<?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)">
+  <metadata
+     id="metadata548">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs546" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1316"
+     id="namedview544"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="15.75"
+     inkscape:cx="-16.385458"
+     inkscape:cy="16.16535"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg542" />
+  <path
+     id="polygon2"
+     style="fill:#ffffff"
+     d="M 5.5 0 L 5 0.5 L 4.5 1 L 3.5 1 L 3 1.5 L 2.5 2 L 2 2.5 L 1.5 3 L 1 3.5 L 1 4.5 L 0.5 5 L 0 5.5 L 0 6.5 L 0 7.5 L 0 8.5 L 0 9.5 L 0 10.5 L 0.5 11 L 1 11.5 L 1 12.5 L 1.5 13 L 2 13.5 L 2.5 14 L 3 14.5 L 3.5 15 L 4.5 15 L 5 15.5 L 5.5 16 L 6.5 16 L 7.5 16 L 8.5 16 L 9.5 16 L 10.5 16 L 11 15.5 L 11.5 15 L 12.5 15 L 13 14.5 L 13.5 14 L 14 13.5 L 14.5 13 L 15 12.5 L 15 11.5 L 15.5 11 L 16 10.5 L 16 9.5 L 16 8.5 L 16 7.5 L 16 6.5 L 16 5.5 L 15.5 5 L 15 4.5 L 15 3.5 L 14.5 3 L 14 2.5 L 13.5 2 L 13 1.5 L 12.5 1 L 11.5 1 L 11 0.5 L 10.5 0 L 9.5 0 L 8.5 0 L 7.5 0 L 6.5 0 L 5.5 0 z M 6.5 1 L 7 1.5 L 7.5 2 L 8.5 2 L 9 2.5 L 9 3.5 L 9.5 4 L 10 4.5 L 10.5 5 L 11 5.5 L 11.5 6 L 12.5 6 L 13.5 6 L 14.5 6 L 15 6.5 L 15 7.5 L 15 8.5 L 15 9.5 L 14.5 10 L 14 10.5 L 14 11.5 L 13.5 12 L 13 12.5 L 12.5 13 L 12 13.5 L 11.5 14 L 10.5 14 L 10 14.5 L 9.5 15 L 8.5 15 L 8 14.5 L 7.5 14 L 7 13.5 L 7 12.5 L 7.5 12 L 8 11.5 L 8.5 11 L 9 10.5 L 9 9.5 L 9 8.5 L 8.5 8 L 8 7.5 L 7.5 7 L 6.5 7 L 5.5 7 L 4.5 7 L 4 7.5 L 3.5 8 L 3 8.5 L 2.5 9 L 2 9.5 L 1.5 10 L 1 9.5 L 1 8.5 L 1 7.5 L 1 6.5 L 1.5 6 L 2 5.5 L 2 4.5 L 2.5 4 L 3 3.5 L 3.5 3 L 4 2.5 L 4.5 2 L 5.5 2 L 6 1.5 L 6.5 1 z M 11.5 9 L 11 9.5 L 11 10.5 L 11.5 11 L 12.5 11 L 13 10.5 L 13 9.5 L 12.5 9 L 11.5 9 z " />
+</svg>

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

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="12"
-   height="12"
-   viewBox="0 0 12 12"
-   sodipodi:docname="admin.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="52.678571"
-     inkscape:cx="7.760678"
-     inkscape:cy="6.4128813"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g827" />
-  <g
-     id="g827"
-     transform="translate(-1,-1)">
-    <path
-       id="path823"
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 6.125,5.625 Q 6.25,5.25 6.625,5.125 7,5 7.375,5.125 7.75,5.25 7.875,5.625 8,6 7.875,6.375 7.75,6.75 7.375,6.875 7,7 6.625,6.875 6.25,6.75 6.125,6.375 6,6 6.125,5.625 M 3,1.5 Q 3.25,1.25 3.625,1.125 4,1 4.5,1 5,1 5.5,1 6,1 6.5,1 7,1 7.5,1 8,1 8.5,1 9,1 9.5,1 10,1 10.375,1.125 10.75,1.25 11,1.5 11.25,1.75 11.5,2 11.75,2.25 12,2.5 12.25,2.75 12.5,3 12.75,3.25 12.875,3.625 13,4 13,4.5 13,5 13,5.5 13,6 13,6.5 13,7 12.875,7.375 12.75,7.75 12.5,8 12.25,8.25 12.125,8.625 12,9 12,9.5 12,10 11.875,10.375 11.75,10.75 11.5,11 11.25,11.25 11,11.5 10.75,11.75 10.5,12 10.25,12.25 10,12.5 9.75,12.75 9.375,12.875 9,13 8.5,13 8,13 7.5,13 7,13 6.5,13 6,13 5.5,13 5,13 4.625,12.875 4.25,12.75 4,12.5 3.75,12.25 3.5,12 3.25,11.75 3,11.5 2.75,11.25 2.5,11 2.25,10.75 2.125,10.375 2,10 2,9.5 2,9 1.875,8.625 1.75,8.25 1.5,8 1.25,7.75 1.125,7.375 1,7 1,6.5 1,6 1,5.5 1,5 1,4.5 1,4 1.125,3.625 1.25,3.25 1.5,3 1.75,2.75 2,2.5 2.25,2.25 2.5,2 2.75,1.75 3,1.5 M 7.5,10 Q 8,10 8.375,9.875 8.75,9.75 8.75,9.5 8.75,9.25 8.375,9.125 8,9 7.5,9 7,9 6.5,9 6,9 5.625,9.125 5.25,9.25 5.25,9.5 5.25,9.75 5.625,9.875 6,10 6.5,10 q 0.5,0 1,0 m 0,-2 Q 8,8 8.375,7.875 8.75,7.75 9,7.5 9.25,7.25 9.5,7 9.75,6.75 9.875,6.375 10,6 9.875,5.625 9.75,5.25 9.5,5 9.25,4.75 9,4.5 8.75,4.25 8.375,4.125 8,4 7.5,4 7,4 6.5,4 6,4 5.625,4.125 5.25,4.25 5,4.5 4.75,4.75 4.5,5 4.25,5.25 4.125,5.625 4,6 4.125,6.375 4.25,6.75 4.5,7 4.75,7.25 5,7.5 5.25,7.75 5.625,7.875 6,8 6.5,8 7,8 7.5,8"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/book.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="10"
-   height="11"
-   viewBox="0 0 10 11"
-   sodipodi:docname="book.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="18.624687"
-     inkscape:cx="-15.26171"
-     inkscape:cy="11.56781"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g24" />
-  <g
-     id="g24"
-     transform="translate(-2,-2)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 4.5,2 C 4.1666667,2 3.875,2.0416667 3.625,2.125 3.375,2.2083333 3.1666667,2.3333333 3,2.5 L 2.5,3 C 2.3333333,3.1666667 2.2083333,3.375 2.125,3.625 2.0416667,3.875 2,4.1666667 2,4.5 v 1 1 1 1 1 1 1 c 0,0.333333 0.041667,0.625 0.125,0.875 0.083333,0.25 0.25,0.416667 0.5,0.5 C 2.875,12.958333 3.1666667,13 3.5,13 h 1 1 1 1 1 1 c 0.3333333,0 0.625,-0.04167 0.875,-0.125 C 10.625,12.79167 10.833333,12.666667 11,12.5 L 11.5,12 c 0.166667,-0.166667 0.291667,-0.375 0.375,-0.625 C 11.958333,11.125 12,10.833333 12,10.5 v -1 -1 -1 -1 -1 -1 -1 C 12,3.1666667 11.95833,2.875 11.875,2.625 11.79167,2.375 11.625,2.2083333 11.375,2.125 11.125,2.0416667 10.833333,2 10.5,2 h -1 -1 -1 -1 -1 z m 1,1 h 1 1 1 1 c 0.3333333,0 0.625,0.041667 0.875,0.125 0.25,0.083333 0.416667,0.25 0.5,0.5 C 10.958333,3.875 11,4.1666667 11,4.5 v 1 1 1 1 1 c 0,0.3333333 -0.04167,0.625 -0.125,0.875 -0.08333,0.25 -0.25,0.416667 -0.5,0.5 C 10.125,10.958333 9.8333333,11 9.5,11 h -1 -1 -1 -1 C 5.1666667,11 4.875,10.95833 4.625,10.875 4.375,10.79167 4.2083333,10.625 4.125,10.375 4.0416667,10.125 4,9.8333333 4,9.5 v -1 -1 -1 -1 -1 C 4,4.1666667 4.0416667,3.875 4.125,3.625 4.2083333,3.375 4.375,3.2083333 4.625,3.125 4.875,3.0416667 5.1666667,3 5.5,3 Z m 1,1 C 6.1666667,4 5.875,4.041667 5.625,4.125 c -0.25,0.083333 -0.4166667,0.25 -0.5,0.5 -0.083333,0.25 -0.083333,0.5 0,0.75 0.083333,0.25 0.25,0.4166667 0.5,0.5 C 5.875,5.9583333 6.1666667,6 6.5,6 h 1 1 c 0.3333333,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.4166667,-0.25 0.5,-0.5 0.083333,-0.25 0.083333,-0.5 0,-0.75 C 9.791667,4.375 9.625,4.2083333 9.375,4.125 9.125,4.0416667 8.8333333,4 8.5,4 h -1 z m 0,3 C 6.1666667,7 5.875,7.0416667 5.625,7.125 5.375,7.2083333 5.25,7.3333333 5.25,7.5 5.25,7.6666667 5.375,7.7916667 5.625,7.875 5.875,7.9583333 6.1666667,8 6.5,8 h 1 1 C 8.8333333,8 9.125,7.9583333 9.375,7.875 9.625,7.7916667 9.75,7.6666667 9.75,7.5 9.75,7.3333333 9.625,7.2083333 9.375,7.125 9.125,7.0416667 8.8333333,7 8.5,7 h -1 z m 0,2 C 6.1666667,9 5.875,9.0416667 5.625,9.125 5.375,9.2083333 5.25,9.3333333 5.25,9.5 5.25,9.6666667 5.375,9.7916667 5.625,9.875 5.875,9.9583333 6.1666667,10 6.5,10 h 1 1 C 8.8333333,10 9.125,9.9583333 9.375,9.875 9.625,9.7916667 9.75,9.6666667 9.75,9.5 9.75,9.3333333 9.625,9.2083333 9.375,9.125 9.125,9.0416667 8.8333333,9 8.5,9 h -1 z"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/chat.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="8"
-   height="7.75"
-   viewBox="0 0 8 7.75"
-   sodipodi:docname="chat.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="23.6"
-     inkscape:cx="-8.033898"
-     inkscape:cy="4.0042373"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g16" />
-  <g
-     id="g16"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 2,1.5 Q 2.25,1.25 2.625,1.125 3,1 3.5,1 4,1 4.5,1 5,1 5.5,1 6,1 6.5,1 7,1 7.375,1.125 7.75,1.25 8,1.5 8.25,1.75 8.5,2 8.75,2.25 8.875,2.625 9,3 9,3.5 9,4 9,4.5 9,5 8.875,5.375 8.75,5.75 8.5,6 8.25,6.25 8,6.5 7.75,6.75 7.375,6.875 7,7 6.5,7 6,7 5.5,7 5,7 4.5,7 4,7 3.625,7.125 3.25,7.25 3.125,7.625 3,8 2.875,8.375 2.75,8.75 2.5,8.75 2.25,8.75 2,8.5 1.75,8.25 1.5,8 1.25,7.75 1.125,7.375 1,7 1,6.5 1,6 1,5.5 1,5 1,4.5 1,4 1,3.5 1,3 1.125,2.625 1.25,2.25 1.5,2 1.75,1.75 2,1.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/command-attack.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg12"
-   width="5.875"
-   height="5.875"
-   viewBox="0 0 5.875 5.875"
-   sodipodi:docname="command-attack.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs16" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="29.5"
-     inkscape:cx="-7.706568"
-     inkscape:cy="1.5137712"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g61" />
-  <g
-     id="g61"
-     transform="translate(-1.0625,-1.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 5,1.5 Q 5.25,1.25 5.625,1.125 6,1 6.375,1.125 6.75,1.25 6.875,1.625 7,2 6.875,2.375 6.75,2.75 6.5,3 6.25,3.25 6,3.5 5.75,3.75 5.5,4 5.25,4.25 5,4.5 4.75,4.75 4.5,5 4.25,5.25 4.25,5.5 4.25,5.75 4.5,6 4.75,6.25 4.75,6.5 4.75,6.75 4.5,6.75 4.25,6.75 4,6.5 3.75,6.25 3.5,6.25 3.25,6.25 3,6.5 2.75,6.75 2.375,6.875 2,7 1.625,6.875 1.25,6.75 1.125,6.375 1,6 1.125,5.625 1.25,5.25 1.5,5 1.75,4.75 1.75,4.5 1.75,4.25 1.5,4 1.25,3.75 1.25,3.5 1.25,3.25 1.5,3.25 1.75,3.25 2,3.5 2.25,3.75 2.5,3.75 2.75,3.75 3,3.5 3.25,3.25 3.5,3 3.75,2.75 4,2.5 4.25,2.25 4.5,2 4.75,1.75 5,1.5"
-       id="path59"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/command-rally.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="6"
-   height="6"
-   viewBox="0 0 6 6"
-   sodipodi:docname="command-rally.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="29.5"
-     inkscape:cx="-12.118644"
-     inkscape:cy="2.7966102"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g88" />
-  <g
-     id="g88"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 2,1.5 Q 2.25,1.25 2.625,1.125 3,1 3.5,1 4,1 4.5,1 5,1 5.375,1.125 5.75,1.25 6,1.5 6.25,1.75 6.5,2 6.75,2.25 6.875,2.625 7,3 7,3.5 7,4 7,4.5 7,5 6.875,5.375 6.75,5.75 6.5,6 6.25,6.25 6,6.5 5.75,6.75 5.375,6.875 5,7 4.5,7 4,7 3.5,7 3,7 2.625,6.875 2.25,6.75 2,6.5 1.75,6.25 1.5,6 1.25,5.75 1.125,5.375 1,5 1,4.5 1,4 1,3.5 1,3 1.125,2.625 1.25,2.25 1.5,2 1.75,1.75 2,1.5 M 3.625,5.875 Q 4,6 4.375,5.875 4.75,5.75 5,5.5 5.25,5.25 5.5,5 5.75,4.75 5.875,4.375 6,4 5.875,3.625 5.75,3.25 5.5,3 5.25,2.75 5,2.5 4.75,2.25 4.375,2.125 4,2 3.625,2.125 3.25,2.25 3,2.5 2.75,2.75 2.5,3 2.25,3.25 2.125,3.625 2,4 2.125,4.375 2.25,4.75 2.5,5 2.75,5.25 3,5.5 3.25,5.75 3.625,5.875"
-       id="path84"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/command-retreat.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg22"
-   width="5.875"
-   height="5.5"
-   viewBox="0 0 5.875 5.5"
-   sodipodi:docname="command-retreat.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata28">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs26" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview24"
-     showgrid="false"
-     inkscape:zoom="29.5"
-     inkscape:cx="-14.520127"
-     inkscape:cy="1.4618644"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g36" />
-  <g
-     id="g36"
-     transform="translate(-1.0625,-1.25)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 3,1.5 Q 3.25,1.25 3.5,1.25 3.75,1.25 3.875,1.625 4,2 4.125,2.375 4.25,2.75 4.625,2.875 5,3 5.5,3 6,3 6.375,3.125 6.75,3.25 6.875,3.625 7,4 6.875,4.375 6.75,4.75 6.375,4.875 6,5 5.5,5 5,5 4.625,5.125 4.25,5.25 4.125,5.625 4,6 3.875,6.375 3.75,6.75 3.5,6.75 3.25,6.75 3,6.5 2.75,6.25 2.5,6 2.25,5.75 2,5.5 1.75,5.25 1.5,5 1.25,4.75 1.125,4.375 1,4 1.125,3.625 1.25,3.25 1.5,3 1.75,2.75 2,2.5 2.25,2.25 2.5,2 2.75,1.75 3,1.5"
-       id="path34"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/crafting.svg

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="10"
-   height="8.9375"
-   viewBox="0 0 10 8.9375"
-   sodipodi:docname="crafting.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="61.458335"
-     inkscape:cx="3.677966"
-     inkscape:cy="5.0935595"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <g
-     id="g5253"
-     transform="translate(-1,-2.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 9.125,2.625 Q 9.25,2.25 9.625,2.125 10,2 10.375,2.125 10.75,2.25 10.875,2.625 11,3 11,3.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 -0.125,0.375 -0.5,0.5 Q 10,11 9.5,11 9,11 8.5,11 8,11 7.5,11 7,11 6.5,11 6,11 5.5,11 5,11 4.5,11 4,11 3.5,11 3,11 2.5,11 2,11 1.625,10.875 1.25,10.75 1.125,10.375 1,10 1,9.5 1,9 1,8.5 1,8 1,7.5 1,7 1,6.5 1,6 1,5.5 1,5 1,4.5 1,4 1.125,3.625 1.25,3.25 1.5,3.25 1.75,3.25 2,3.5 2.25,3.75 2.5,4 2.75,4.25 3,4.5 3.25,4.75 3.5,5 3.75,5.25 4,5.5 4.25,5.75 4.5,5.75 4.75,5.75 4.875,5.375 5,5 5,4.5 5,4 5.125,3.625 5.25,3.25 5.5,3.25 5.75,3.25 6,3.5 6.25,3.75 6.5,4 6.75,4.25 7,4.5 7.25,4.75 7.5,5 7.75,5.25 8,5.5 8.25,5.75 8.5,5.75 8.75,5.75 8.875,5.375 9,5 9,4.5 9,4 9,3.5 9,3 9.125,2.625 M 8.5,10 Q 9,10 9.375,9.875 9.75,9.75 9.875,9.375 10,9 10,8.5 10,8 9.875,7.625 9.75,7.25 9.375,7.125 9,7 8.625,6.875 8.25,6.75 8,6.5 7.75,6.25 7.5,6 7.25,5.75 7,5.5 6.75,5.25 6.5,5.25 6.25,5.25 6.125,5.625 6,6 5.875,6.375 5.75,6.75 5.375,6.875 5,7 4.625,6.875 4.25,6.75 4,6.5 3.75,6.25 3.5,6 3.25,5.75 3,5.5 2.75,5.25 2.5,5.25 2.25,5.25 2.125,5.625 2,6 2,6.5 2,7 2,7.5 2,8 2,8.5 2,9 2.125,9.375 2.25,9.75 2.625,9.875 3,10 3.5,10 q 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0"
-       id="path5243"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 3.25,8.5 q 0,-0.25 0.25,-0.25 0.25,0 0.25,0.25 0,0.25 -0.25,0.25 -0.25,0 -0.25,-0.25"
-       id="path5247"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 5.25,8.5 q 0,-0.25 0.25,-0.25 0.25,0 0.25,0.25 0,0.25 -0.25,0.25 -0.25,0 -0.25,-0.25"
-       id="path5249"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 7.25,8.5 q 0,-0.25 0.25,-0.25 0.25,0 0.25,0.25 0,0.25 -0.25,0.25 -0.25,0 -0.25,-0.25"
-       id="path5251"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/defense.svg

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg817"
-   width="10"
-   height="9.875"
-   viewBox="0 0 10 9.875"
-   sodipodi:docname="defense.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata823">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs821" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview819"
-     showgrid="false"
-     inkscape:zoom="43.457605"
-     inkscape:cx="10.243339"
-     inkscape:cy="4.6479408"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g5280" />
-  <g
-     transform="translate(-0.999269,-1.0631022)"
-     id="g5280">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m -10.472656,-2.8027344 c -0.125,0 -0.25,0.020833 -0.375,0.0625 -0.25,0.083333 -0.416667,0.25 -0.5,0.5 -0.08333,0.25 -0.125,0.5416667 -0.125,0.875 v 1.00000002 1 0.99999998 c 0,0.3333334 0.04167,0.625 0.125,0.875 0.08333,0.25 0.208333,0.4583334 0.375,0.625 l 0.5,0.5 0.4999998,0.5 0.5,0.5 0.5,0.5 0.5,0.5 0.5,0.5 0.5,0.5 c 0.1666666,0.1666667 0.3749999,0.2916667 0.625,0.375 0.25,0.083333 0.4999999,0.083333 0.75,0 0.2499999,-0.083333 0.4583333,-0.2083333 0.625,-0.375 l 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 c 0.1666666,-0.1666666 0.2916666,-0.375 0.375,-0.625 0.083333,-0.25 0.125,-0.5416666 0.125,-0.875 v -0.99999998 -1 -1.00000002 c 0,-0.3333333 -0.041667,-0.625 -0.125,-0.875 -0.083333,-0.25 -0.25,-0.4166666 -0.5,-0.5 -0.25,-0.083333 -0.5,-0.083333 -0.75,0 -0.2500001,0.083333 -0.4583334,0.2083334 -0.625,0.375 l -0.5,0.5 -0.5,0.5 c -0.1666667,0.1666667 -0.375,0.2916667 -0.625,0.37500002 -0.2500001,0.0833333 -0.5416667,0.125 -0.875,0.125 h -1 c -0.3333334,10e-9 -0.6250001,-0.0416667 -0.875,-0.125 -0.25,-0.0833333 -0.4583334,-0.20833332 -0.625,-0.37500002 l -0.5,-0.5 -0.5,-0.5 c -0.1666667,-0.1666666 -0.375,-0.2916666 -0.6249998,-0.375 -0.125,-0.041667 -0.25,-0.0625 -0.375,-0.0625 z m 0.4999998,1.1875 c 0.1666666,0 0.3333333,0.083333 0.5,0.25 l 0.5,0.50000002 0.5,0.5 c 0.1666666,0.16666667 0.375,0.29166667 0.625,0.37500001 0.2499999,0.08333333 0.5416666,0.12499999 0.875,0.12499999 h 1 c 0.3333333,0 0.6249999,-0.04166666 0.875,-0.12499999 0.25,-0.08333334 0.4583333,-0.20833334 0.625,-0.37500001 l 0.5,-0.5 0.5,-0.50000002 c 0.1666666,-0.1666666 0.3333333,-0.25 0.5,-0.25 0.1666666,0 0.2916666,0.125 0.375,0.375 0.083333,0.25000002 0.125,0.54166669 0.125,0.87500002 v 1 0.99999998 c 0,0.3333334 -0.041667,0.625 -0.125,0.875 -0.083333,0.25 -0.2083334,0.4583334 -0.375,0.625 l -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 c -0.1666667,0.1666667 -0.3750001,0.2916667 -0.625,0.375 -0.25,0.083333 -0.5000001,0.083333 -0.75,0 -0.2500001,-0.083333 -0.4583334,-0.2083333 -0.625,-0.375 l -0.5,-0.5 -0.5,-0.5 -0.5,-0.5 -0.5,-0.5 -0.5,-0.5 c -0.1666668,-0.1666666 -0.2916668,-0.375 -0.3749998,-0.625 -0.08333,-0.25 -0.125,-0.5416666 -0.125,-0.875 v -0.99999998 -1 c 0,-0.33333333 0.04167,-0.625 0.125,-0.87500002 0.08333,-0.25 0.208333,-0.375 0.3749998,-0.375 z"
-       transform="translate(12.471925,3.8658366)"
-       id="path5276"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

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

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg3799"
-   width="256"
-   height="256"
-   viewBox="0 0 10 10"
-   sodipodi:docname="icon-distribution-transparent.png.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata3805">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3803" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="1318"
-     id="namedview3801"
-     showgrid="false"
-     inkscape:zoom="45.254834"
-     inkscape:cx="6.2899407"
-     inkscape:cy="4.0348889"
-     inkscape:window-x="1280"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g3829" />
-  <g
-     id="g3829">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 0 0 L 0 0.5 L 0 1 L 0 1.5 L 0 2 L 0 2.5 L 0 3 L 0 3.5 L 0 4 L 0 4.5 L 0 5 L 0 5.5 L 0 6 L 0 6.5 L 0 7 L 0 7.5 L 0 8 L 0 8.5 L 0 9 L 0 9.5 L 0 10 L 0.5 10 L 1 10 L 1 9.5 L 1 8.5 L 1 7.5 L 1 6.5 L 1 5.5 L 1 4.5 L 1 3.5 L 1 2.5 L 1 1.5 L 1 0.5 L 1 0 L 0.5 0 L 0 0 z M 9 0 L 9 0.5 L 9 1.5 L 9 2.5 L 9 3.5 L 9 4.5 L 9 5.5 L 9 6.5 L 9 7.5 L 9 8.5 L 9 9.5 L 9 10 L 9.5 10 L 10 10 L 10 9.5 L 10 9 L 10 8.5 L 10 8 L 10 7.5 L 10 7 L 10 6.5 L 10 6 L 10 5.5 L 10 5 L 10 4.5 L 10 4 L 10 3.5 L 10 3 L 10 2.5 L 10 2 L 10 1.5 L 10 1 L 10 0.5 L 10 0 L 9.5 0 L 9 0 z M 5 1.0625 C 4.875 1.0625 4.75 1.0833335 4.625 1.125 C 4.375 1.2083333 4.1666667 1.3333333 4 1.5 L 3.5 2 C 3.3333333 2.1666667 3.25 2.3333333 3.25 2.5 C 3.25 2.6666667 3.375 2.7916667 3.625 2.875 C 3.875 2.9583333 4.1666667 3 4.5 3 L 5.5 3 C 5.9760929 2.9389882 6.4908205 3.0048105 6.75 2.5 C 6.75 2.3333333 6.6666667 2.1666667 6.5 2 L 6 1.5 C 5.8333333 1.3333333 5.625 1.2083333 5.375 1.125 C 5.25 1.0833335 5.125 1.0625 5 1.0625 z M 5 4.0625 C 4.875 4.0625 4.75 4.0833333 4.625 4.125 C 4.375 4.2083333 4.1666667 4.3333333 4 4.5 L 3.5 5 C 3.3333333 5.1666667 3.25 5.3333333 3.25 5.5 C 3.25 5.6666667 3.375 5.7916667 3.625 5.875 C 3.875 5.9583333 4.1666667 6 4.5 6 L 5.5 6 C 5.8333333 6 6.125 5.9583333 6.375 5.875 C 6.625 5.7916667 6.75 5.6666667 6.75 5.5 C 6.75 5.3333333 6.6666667 5.1666667 6.5 5 L 6 4.5 C 5.8333333 4.3333333 5.625 4.2083333 5.375 4.125 C 5.25 4.0833333 5.125 4.0625 5 4.0625 z M 5 7.0625 C 4.875 7.0625 4.75 7.0833333 4.625 7.125 C 4.375 7.2083333 4.1666667 7.3333333 4 7.5 L 3.5 8 C 3.3333333 8.1666667 3.25 8.3333333 3.25 8.5 C 3.25 8.6666667 3.375 8.7916667 3.625 8.875 C 3.875 8.9583333 4.1666667 9 4.5 9 L 5.5 9 C 5.8333333 9 6.125 8.9583333 6.375 8.875 C 6.625 8.7916667 6.75 8.6666667 6.75 8.5 C 6.75 8.3333333 6.6666667 8.1666667 6.5 8 L 6 7.5 C 5.8333333 7.3333333 5.625 7.2083333 5.375 7.125 C 5.25 7.0833333 5.125 7.0625 5 7.0625 z "
-       id="path3817" />
-  </g>
-</svg>

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

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg1370"
-   width="10"
-   height="10"
-   viewBox="0 0 10 10"
-   sodipodi:docname="effect.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata1376">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs1374" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview1372"
-     showgrid="false"
-     inkscape:zoom="61.458335"
-     inkscape:cx="3.4444574"
-     inkscape:cy="5.2674622"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g5329" />
-  <g
-     id="g5329"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 3.5,1 C 3.1666667,1 2.875,1.0416667 2.625,1.125 2.375,1.2083333 2.1666667,1.3333333 2,1.5 L 1.5,2 C 1.3333333,2.1666667 1.2083333,2.375 1.125,2.625 1.0416667,2.875 1,3.1666667 1,3.5 v 1 1 1 1 1 C 1,8.8333333 1.0416667,9.125 1.125,9.375 1.2083333,9.625 1.3333333,9.8333333 1.5,10 L 2,10.5 c 0.1666667,0.166667 0.375,0.291667 0.625,0.375 C 2.875,10.958333 3.1666667,11 3.5,11 h 1 1 1 1 1 C 8.8333333,11 9.125,10.958333 9.375,10.875 9.625,10.791667 9.8333333,10.666667 10,10.5 L 10.5,10 C 10.666667,9.8333333 10.791667,9.625 10.875,9.375 10.958333,9.125 11,8.8333333 11,8.5 v -1 -1 -1 -1 -1 C 11,3.1666667 10.958333,2.875 10.875,2.625 10.791667,2.375 10.666667,2.1666667 10.5,2 L 10,1.5 C 9.8333333,1.3333333 9.625,1.2083333 9.375,1.125 9.125,1.0416667 8.8333333,1 8.5,1 h -1 -1 -1 -1 z m 1,1 h 1 1 1 C 7.8333333,2 8.125,2.0416667 8.375,2.125 8.625,2.2083333 8.8333333,2.3333333 9,2.5 L 9.5,3 C 9.6666667,3.1666667 9.7916667,3.375 9.875,3.625 9.9583333,3.875 10,4.1666667 10,4.5 v 1 1 1 C 10,7.8333333 9.9583333,8.125 9.875,8.375 9.7916667,8.625 9.6666667,8.8333333 9.5,9 L 9,9.5 C 8.8333333,9.6666667 8.625,9.7916667 8.375,9.875 8.125,9.9583333 7.8333333,10 7.5,10 h -1 -1 -1 C 4.1666667,10 3.875,9.9583333 3.625,9.875 3.375,9.7916667 3.1666667,9.6666667 3,9.5 L 2.5,9 C 2.3333333,8.8333333 2.2083333,8.625 2.125,8.375 2.0416667,8.125 2,7.8333333 2,7.5 v -1 -1 -1 C 2,4.1666667 2.0416667,3.875 2.125,3.625 2.2083333,3.375 2.3333333,3.1666667 2.5,3 L 3,2.5 C 3.1666667,2.3333333 3.375,2.2083333 3.625,2.125 3.875,2.0416667 4.1666667,2 4.5,2 Z M 6,4.0625 C 5.875,4.0625 5.75,4.0833333 5.625,4.125 5.375,4.2083333 5.1666667,4.3333333 5,4.5 L 4.5,5 C 4.3333333,5.1666667 4.2083333,5.375 4.125,5.625 c -0.083333,0.25 -0.083333,0.5 0,0.75 C 4.2083333,6.625 4.3333333,6.8333333 4.5,7 L 5,7.5 c 0.1666667,0.1666667 0.375,0.2916667 0.625,0.375 0.25,0.083333 0.5,0.083333 0.75,0 C 6.625,7.7916667 6.8333333,7.6666667 7,7.5 L 7.5,7 C 7.6666667,6.8333333 7.7916667,6.625 7.875,6.375 c 0.083333,-0.25 0.083333,-0.5 0,-0.75 C 7.7916667,5.375 7.6666667,5.1666667 7.5,5 L 7,4.5 C 6.8333333,4.3333333 6.625,4.2083333 6.375,4.125 6.25,4.0833333 6.125,4.0625 6,4.0625 Z"
-       id="path5323"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/exit.svg

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="11.9375"
-   height="12"
-   viewBox="0 0 11.9375 12"
-   sodipodi:docname="exit.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="24.210938"
-     inkscape:cy="4.160156"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1.000926,-0.99913925)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m -14.710938,-0.83984375 c -0.333333,0 -0.625,0.0416667 -0.875,0.125 -0.25,0.0833333 -0.458333,0.20833333 -0.625,0.375 l -0.5,0.5 c -0.166666,0.16666667 -0.291666,0.375 -0.375,0.625 -0.08333,0.24999995 -0.125,0.54166665 -0.125,0.87499995 v 1 1 1 1 1 1 1 c 0,0.3333334 0.04167,0.625 0.125,0.875 0.08333,0.25 0.208334,0.4583334 0.375,0.6249998 l 0.5,0.5 c 0.166667,0.166667 0.375,0.291667 0.625,0.375 0.25,0.08333 0.541667,0.125 0.875,0.125 h 1 1 1 1 1.0000005 1 c 0.3333333,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.4583333,-0.208333 0.625,-0.375 l 0.5,-0.5 c 0.1666667,-0.1666664 0.25,-0.3333331 0.25,-0.4999998 0,-0.1666666 -0.125,-0.2916666 -0.375,-0.375 -0.25,-0.083333 -0.5416667,-0.125 -0.875,-0.125 h -1 -1 -1.0000005 -1 -1 -1 c -0.333333,0 -0.625,-0.041667 -0.875,-0.125 -0.249999,-0.083333 -0.416666,-0.25 -0.5,-0.5 -0.08333,-0.2499999 -0.125,-0.5416666 -0.125,-0.875 v -1 -1 -1 -1 -1 c 0,-0.3333333 0.04167,-0.625 0.125,-0.875 0.08333,-0.2499999 0.25,-0.4166666 0.5,-0.5 0.25,-0.083333 0.541667,-0.125 0.875,-0.125 h 1 1 1 1.0000005 1 1 c 0.3333333,0 0.625,-0.041667 0.875,-0.125 0.25,-0.0833333 0.375,-0.20833328 0.375,-0.37499995 0,-0.16666667 -0.083333,-0.33333333 -0.25,-0.5 l -0.5,-0.5 c -0.1666667,-0.16666667 -0.375,-0.29166667 -0.625,-0.375 -0.25,-0.0833333 -0.5416667,-0.125 -0.875,-0.125 h -1 -1.0000005 -1 -1 -1 z m 7.0000005,3.24999995 c -0.1666667,0 -0.2916667,0.125 -0.375,0.375 l -0.25,0.75 c -0.083333,0.25 -0.25,0.4166667 -0.5,0.5 -0.25,0.083333 -0.5416667,0.125 -0.875,0.125 h -1.0000005 -1 c -0.333333,0 -0.625,0.041667 -0.875,0.125 -0.249999,0.083333 -0.416666,0.25 -0.5,0.5 -0.08333,0.25 -0.08333,0.5 0,0.75 0.08333,0.25 0.25,0.4166667 0.5,0.5 0.25,0.083333 0.541667,0.125 0.875,0.125 h 1 1.0000005 c 0.3333333,0 0.625,0.041667 0.875,0.125 0.25,0.083333 0.4166667,0.25 0.5,0.5 l 0.25,0.75 c 0.083333,0.25 0.2083333,0.375 0.375,0.375 0.1666667,0 0.3333333,-0.083333 0.5,-0.25 l 0.5,-0.5 0.5,-0.5 0.5,-0.5 c 0.1666667,-0.1666666 0.2916667,-0.375 0.375,-0.625 0.083333,-0.25 0.083333,-0.5 0,-0.75 -0.083333,-0.25 -0.2083333,-0.4583333 -0.375,-0.625 l -0.5,-0.5 -0.5,-0.5 -0.5,-0.5 c -0.1666667,-0.1666666 -0.3333333,-0.25 -0.5,-0.25 z"
-       transform="translate(18.211864,1.838983)"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/fill.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="13.9375"
-   height="13.9375"
-   viewBox="0 0 13.9375 13.9375"
-   sodipodi:docname="fill.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-19.842161"
-     inkscape:cy="5.1069915"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g16" />
-  <g
-     id="g16"
-     transform="translate(-1.0625,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 7,1.5 Q 7.25,1.25 7.625,1.125 8,1 8.5,1 9,1 9.375,1.125 9.75,1.25 10,1.5 10.25,1.75 10.5,2 10.75,2.25 10.875,2.625 11,3 11,3.5 11,4 10.875,4.375 10.75,4.75 10.5,5 q -0.25,0.25 -0.25,0.5 0,0.25 0.375,0.375 Q 11,6 11.5,6 12,6 12.375,6.125 12.75,6.25 13,6.5 13.25,6.75 13.5,7 13.75,7.25 14,7.5 14.25,7.75 14.5,8 14.75,8.25 14.875,8.625 15,9 15,9.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 -0.125,0.375 -0.375,0.375 -0.25,0 -0.375,-0.375 Q 14,13 14,12.5 14,12 13.875,11.625 13.75,11.25 13.5,11 13.25,10.75 13.125,10.375 13,10 12.875,9.625 12.75,9.25 12.5,9.25 12.25,9.25 12,9.5 11.75,9.75 11.5,10 11.25,10.25 11,10.5 10.75,10.75 10.5,11 10.25,11.25 10,11.5 9.75,11.75 9.5,12 9.25,12.25 9,12.5 8.75,12.75 8.5,13 8.25,13.25 8,13.5 7.75,13.75 7.5,14 7.25,14.25 7,14.5 6.75,14.75 6.375,14.875 6,15 5.625,14.875 5.25,14.75 5,14.5 4.75,14.25 4.5,14 4.25,13.75 4,13.5 3.75,13.25 3.5,13 3.25,12.75 3,12.5 2.75,12.25 2.5,12 2.25,11.75 2,11.5 1.75,11.25 1.5,11 1.25,10.75 1.125,10.375 1,10 1.125,9.625 1.25,9.25 1.5,9 1.75,8.75 2,8.5 2.25,8.25 2.5,8 2.75,7.75 3,7.5 3.25,7.25 3.5,7 3.75,6.75 4,6.5 4.25,6.25 4.5,6.25 4.75,6.25 4.875,6.625 5,7 4.875,7.375 4.75,7.75 4.5,8 4.25,8.25 4,8.5 3.75,8.75 3.5,9 3.25,9.25 3.125,9.625 3,10 3.125,10.375 3.25,10.75 3.5,11 3.75,11.25 4,11.5 4.25,11.75 4.5,12 4.75,12.25 5,12.5 5.25,12.75 5.625,12.875 6,13 6.375,12.875 6.75,12.75 7,12.5 7.25,12.25 7.5,12 7.75,11.75 8,11.5 8.25,11.25 8.5,11 8.75,10.75 9,10.5 9.25,10.25 9.5,10 9.75,9.75 10,9.5 10.25,9.25 10.5,9 10.75,8.75 10.75,8.5 10.75,8.25 10.5,8 10.25,7.75 10,7.5 9.75,7.25 9.5,7 9.25,6.75 9,6.5 8.75,6.25 8.5,6 8.25,5.75 8.125,5.375 8,5 8.125,4.625 8.25,4.25 8.5,4.25 8.75,4.25 9,4.5 9.25,4.75 9.5,4.75 9.75,4.75 9.875,4.375 10,4 10,3.5 10,3 9.875,2.625 9.75,2.25 9.375,2.125 9,2 8.5,2 8,2 7.625,2.125 7.25,2.25 7.125,2.625 7,3 7,3.5 7,4 7,4.5 7,5 7,5.5 7,6 7,6.5 7,7 6.875,7.375 6.75,7.75 6.5,7.75 6.25,7.75 6.125,7.375 6,7 6,6.5 6,6 6,5.5 6,5 6,4.5 6,4 6,3.5 6,3 6.125,2.625 6.25,2.25 6.5,2 6.75,1.75 7,1.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/hammer.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="13.6875"
-   height="13.687497"
-   viewBox="0 0 13.6875 13.687497"
-   sodipodi:docname="hammer.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="41.7193"
-     inkscape:cx="4.0229218"
-     inkscape:cy="7.3618256"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g821" />
-  <g
-     id="g821"
-     transform="translate(-1.0625002,-1.25)">
-    <path
-       id="path819"
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 7.5,1.25 C 7.3333333,1.25 7.1666667,1.3333333 7,1.5 L 6.5,2 6,2.5 5.5,3 5,3.5 4.5,4 4,4.5 3.5,5 C 3.3333333,5.1666667 3.25,5.3333333 3.25,5.5 3.25,5.6666667 3.3333333,5.8333333 3.5,6 L 4,6.5 4.5,7 5,7.5 5.5,8 C 5.6666667,8.1666667 5.75,8.3333333 5.75,8.5 5.75,8.6666667 5.6666667,8.8333333 5.5,9 L 5,9.5 4.5,10 4,10.5 3.5,11 3,11.5 2.5,12 2,12.5 1.5,13 c -0.1666667,0.166667 -0.2916667,0.375 -0.375,0.625 -0.083333,0.25 -0.083333,0.5 0,0.75 0.083333,0.25 0.25,0.416667 0.5,0.5 0.25,0.08333 0.5,0.08333 0.75,0 C 2.625,14.791667 2.8333333,14.666667 3,14.5 L 3.5,14 4,13.5 4.5,13 5,12.5 5.5,12 6,11.5 6.5,11 7,10.5 c 0.1666667,-0.166667 0.3333333,-0.25 0.5,-0.25 0.1666667,0 0.3333333,0.08333 0.5,0.25 L 8.5,11 9,11.5 9.5,12 10,12.5 c 0.166667,0.166667 0.333333,0.25 0.5,0.25 0.166667,0 0.333333,-0.08333 0.5,-0.25 L 11.5,12 12,11.5 12.5,11 13,10.5 13.5,10 14,9.5 14.5,9 C 14.666667,8.8333333 14.75,8.6666667 14.75,8.5 14.75,8.3333333 14.666667,8.1666667 14.5,8 L 14,7.5 13.5,7 13,6.5 12.5,6 12,5.5 11.5,5 11,4.5 10.5,4 10,3.5 9.5,3 9,2.5 8.5,2 8,1.5 C 7.8333333,1.3333333 7.6666667,1.25 7.5,1.25 Z"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/host.svg

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="12"
-   height="11"
-   viewBox="0 0 12 11"
-   sodipodi:docname="host.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="-19.567797"
-     inkscape:cy="4.1610169"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <g
-     id="g32"
-     transform="translate(-1,-2)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 1.125,2.625 Q 1.25,2.25 1.625,2.125 2,2 2.5,2 q 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 0.875,0.125 0.375,0.125 0.5,0.5 Q 13,3 13,3.5 13,4 12.875,4.375 12.75,4.75 12.375,4.875 12,5 11.5,5 11,5 10.5,5 10,5 9.5,5 9,5 8.5,5 8,5 7.5,5 7,5 6.5,5 6,5 5.5,5 5,5 4.5,5 4,5 3.5,5 3,5 2.5,5 2,5 1.625,4.875 1.25,4.75 1.125,4.375 1,4 1,3.5 1,3 1.125,2.625 M 5.5,4 Q 6,4 6.375,3.875 6.75,3.75 6.75,3.5 6.75,3.25 6.375,3.125 6,3 5.5,3 5,3 4.5,3 4,3 3.5,3 3,3 2.625,3.125 2.25,3.25 2.25,3.5 2.25,3.75 2.625,3.875 3,4 3.5,4 4,4 4.5,4 5,4 5.5,4 m 4.75,-0.5 q 0,0.25 0.25,0.25 0.25,0 0.25,-0.25 0,-0.25 -0.25,-0.25 -0.25,0 -0.25,0.25"
-       id="path14"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 1.125,6.625 Q 1.25,6.25 1.625,6.125 2,6 2.5,6 q 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 0.875,0.125 0.375,0.125 0.5,0.5 Q 13,7 13,7.5 13,8 12.875,8.375 12.75,8.75 12.375,8.875 12,9 11.5,9 11,9 10.5,9 10,9 9.5,9 9,9 8.5,9 8,9 7.5,9 7,9 6.5,9 6,9 5.5,9 5,9 4.5,9 4,9 3.5,9 3,9 2.5,9 2,9 1.625,8.875 1.25,8.75 1.125,8.375 1,8 1,7.5 1,7 1.125,6.625 M 5.5,8 Q 6,8 6.375,7.875 6.75,7.75 6.75,7.5 6.75,7.25 6.375,7.125 6,7 5.5,7 5,7 4.5,7 4,7 3.5,7 3,7 2.625,7.125 2.25,7.25 2.25,7.5 2.25,7.75 2.625,7.875 3,8 3.5,8 4,8 4.5,8 5,8 5.5,8 m 4.75,-0.5 q 0,0.25 0.25,0.25 0.25,0 0.25,-0.25 0,-0.25 -0.25,-0.25 -0.25,0 -0.25,0.25"
-       id="path20"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 1.125,10.625 Q 1.25,10.25 1.625,10.125 2,10 2.5,10 q 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 0.875,0.125 0.375,0.125 0.5,0.5 Q 13,11 13,11.5 q 0,0.5 -0.125,0.875 -0.125,0.375 -0.5,0.5 Q 12,13 11.5,13 11,13 10.5,13 10,13 9.5,13 9,13 8.5,13 8,13 7.5,13 7,13 6.5,13 6,13 5.5,13 5,13 4.5,13 4,13 3.5,13 3,13 2.5,13 2,13 1.625,12.875 1.25,12.75 1.125,12.375 1,12 1,11.5 1,11 1.125,10.625 M 5.5,12 Q 6,12 6.375,11.875 6.75,11.75 6.75,11.5 6.75,11.25 6.375,11.125 6,11 5.5,11 5,11 4.5,11 4,11 3.5,11 3,11 2.625,11.125 2.25,11.25 2.25,11.5 q 0,0.25 0.375,0.375 Q 3,12 3.5,12 q 0.5,0 1,0 0.5,0 1,0 m 4.75,-0.5 q 0,0.25 0.25,0.25 0.25,0 0.25,-0.25 0,-0.25 -0.25,-0.25 -0.25,0 -0.25,0.25"
-       id="path26"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/itchio.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="14"
-   height="9.875"
-   viewBox="0 0 14 9.875"
-   sodipodi:docname="itchio.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="46.093751"
-     inkscape:cx="1.5599999"
-     inkscape:cy="10.3775"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1,-3.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 4,3.5 Q 4.25,3.25 4.625,3.125 5,3 5.375,3.125 5.75,3.25 6,3.5 6.25,3.75 6.625,3.875 7,4 7.5,4 8,4 8.5,4 9,4 9.375,3.875 9.75,3.75 10,3.5 10.25,3.25 10.625,3.125 11,3 11.375,3.125 11.75,3.25 12,3.5 12.25,3.75 12.5,4 12.75,4.25 12.875,4.625 13,5 13,5.5 13,6 13.125,6.375 13.25,6.75 13.5,7 13.75,7.25 14,7.5 14.25,7.75 14.5,8 14.75,8.25 14.875,8.625 15,9 15,9.5 q 0,0.5 0,1 0,0.5 -0.125,0.875 Q 14.75,11.75 14.5,12 14.25,12.25 14,12.5 13.75,12.75 13.375,12.875 13,13 12.625,12.875 12.25,12.75 12,12.5 11.75,12.25 11.5,12 11.25,11.75 11,11.5 10.75,11.25 10.375,11.125 10,11 9.5,11 9,11 8.5,11 8,11 7.5,11 7,11 6.5,11 6,11 5.625,11.125 5.25,11.25 5,11.5 4.75,11.75 4.5,12 4.25,12.25 4,12.5 3.75,12.75 3.375,12.875 3,13 2.625,12.875 2.25,12.75 2,12.5 1.75,12.25 1.5,12 1.25,11.75 1.125,11.375 1,11 1,10.5 1,10 1,9.5 1,9 1.125,8.625 1.25,8.25 1.5,8 1.75,7.75 2,7.5 2.25,7.25 2.5,7 2.75,6.75 2.875,6.375 3,6 3,5.5 3,5 3.125,4.625 3.25,4.25 3.5,4 3.75,3.75 4,3.5 M 7.625,9.875 Q 8,10 8.375,9.875 8.75,9.75 8.875,9.375 9,9 9.125,8.625 9.25,8.25 9.625,8.125 10,8 10.375,7.875 10.75,7.75 10.75,7.5 10.75,7.25 10.5,7 10.25,6.75 10,6.5 9.75,6.25 9.5,6 9.25,5.75 9,5.5 8.75,5.25 8.375,5.125 8,5 7.625,5.125 7.25,5.25 7,5.5 6.75,5.75 6.5,6 6.25,6.25 6,6.5 5.75,6.75 5.5,7 5.25,7.25 5.25,7.5 5.25,7.75 5.625,7.875 6,8 6.375,8.125 6.75,8.25 6.875,8.625 7,9 7.125,9.375 q 0.125,0.375 0.5,0.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/line.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="11.875"
-   height="11.875"
-   viewBox="0 0 11.875 11.875"
-   sodipodi:docname="line.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-19.350636"
-     inkscape:cy="7.9036017"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g16" />
-  <g
-     id="g16"
-     transform="translate(-2.0625,-2.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 12,2.5 Q 12.25,2.25 12.625,2.125 13,2 13.375,2.125 13.75,2.25 13.875,2.625 14,3 13.875,3.375 13.75,3.75 13.5,4 13.25,4.25 13,4.5 12.75,4.75 12.5,5 12.25,5.25 12,5.5 11.75,5.75 11.5,6 11.25,6.25 11,6.5 10.75,6.75 10.5,7 10.25,7.25 10,7.5 9.75,7.75 9.5,8 9.25,8.25 9,8.5 8.75,8.75 8.5,9 8.25,9.25 8,9.5 7.75,9.75 7.5,10 7.25,10.25 7,10.5 6.75,10.75 6.5,11 6.25,11.25 6,11.5 5.75,11.75 5.5,12 5.25,12.25 5,12.5 4.75,12.75 4.5,13 4.25,13.25 4,13.5 3.75,13.75 3.375,13.875 3,14 2.625,13.875 2.25,13.75 2.125,13.375 2,13 2.125,12.625 2.25,12.25 2.5,12 2.75,11.75 3,11.5 3.25,11.25 3.5,11 3.75,10.75 4,10.5 4.25,10.25 4.5,10 4.75,9.75 5,9.5 5.25,9.25 5.5,9 5.75,8.75 6,8.5 6.25,8.25 6.5,8 6.75,7.75 7,7.5 7.25,7.25 7.5,7 7.75,6.75 8,6.5 8.25,6.25 8.5,6 8.75,5.75 9,5.5 9.25,5.25 9.5,5 9.75,4.75 10,4.5 10.25,4.25 10.5,4 10.75,3.75 11,3.5 11.25,3.25 11.5,3 11.75,2.75 12,2.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/link.svg

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="12"
-   height="12"
-   viewBox="0 0 12 12"
-   sodipodi:docname="link.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="-18.558594"
-     inkscape:cy="2.203125"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-0.999272,-0.9997352)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 28.058594,-2.796875 c -0.333334,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.458334,0.2083333 -0.625,0.375 l -0.5,0.5 c -0.166667,0.1666667 -0.291667,0.375 -0.375,0.625 -0.08333,0.25 -0.125,0.54166667 -0.125,0.875 v 1 1 1 1 1 1 1 c 0,0.3333333 0.04167,0.625 0.125,0.875 0.08333,0.25 0.208333,0.4583333 0.375,0.625 l 0.5,0.5 c 0.166666,0.1666667 0.375,0.2916667 0.625,0.375 0.25,0.083333 0.541666,0.125 0.875,0.125 h 1 1 1 1 1 1 1 c 0.333333,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.458333,-0.2083333 0.625,-0.375 l 0.5,-0.5 c 0.166666,-0.1666667 0.291666,-0.375 0.375,-0.625 0.08333,-0.25 0.125,-0.5416667 0.125,-0.875 0,-0.3333333 -0.04167,-0.625 -0.125,-0.875 -0.08333,-0.25 -0.208334,-0.4583333 -0.375,-0.625 l -0.5,-0.5 c -0.166667,-0.1666667 -0.333334,-0.25 -0.5,-0.25 -0.166667,0 -0.291667,0.125 -0.375,0.375 -0.08333,0.25 -0.125,0.5416667 -0.125,0.875 0,0.3333333 -0.04167,0.625 -0.125,0.875 -0.08333,0.25 -0.25,0.4166667 -0.5,0.5 -0.25,0.083333 -0.541667,0.125 -0.875,0.125 h -1 -1 -1 -1 -1 c -0.333334,0 -0.625,-0.041667 -0.875,-0.125 -0.25,-0.083333 -0.416667,-0.25 -0.5,-0.5 -0.08333,-0.25 -0.125,-0.5416667 -0.125,-0.875 v -1 -1 -1 -1 -1 c 0,-0.33333333 0.04167,-0.625 0.125,-0.875 0.08333,-0.25 0.25,-0.41666667 0.5,-0.5 0.25,-0.0833333 0.541666,-0.125 0.875,-0.125 0.333333,0 0.625,-0.0416667 0.875,-0.125 0.25,-0.0833333 0.375,-0.2083333 0.375,-0.375 0,-0.1666667 -0.08333,-0.3333333 -0.25,-0.5 l -0.5,-0.5 c -0.166667,-0.1666667 -0.375,-0.2916667 -0.625,-0.375 -0.25,-0.083333 -0.541667,-0.125 -0.875,-0.125 z m 5,0 c -0.333334,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.375,0.2083333 -0.375,0.375 0,0.1666667 0.08333,0.3333333 0.25,0.5 l 0.5,0.5 0.5,0.5 c 0.166666,0.16666667 0.25,0.33333333 0.25,0.5 0,0.16666667 -0.08333,0.33333333 -0.25,0.5 l -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 c -0.166667,0.1666667 -0.291667,0.375 -0.375,0.625 -0.08333,0.25 -0.08333,0.5 0,0.75 0.08333,0.25 0.25,0.4166667 0.5,0.5 0.25,0.083333 0.5,0.083333 0.75,0 0.25,-0.083333 0.458333,-0.2083333 0.625,-0.375 l 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 0.5,-0.5 c 0.166666,-0.1666667 0.333333,-0.25 0.5,-0.25 0.166666,0 0.333333,0.083333 0.5,0.25 l 0.5,0.5 0.5,0.5 c 0.166666,0.1666667 0.333333,0.25 0.5,0.25 0.166666,0 0.291666,-0.125 0.375,-0.375 0.08333,-0.25 0.125,-0.5416667 0.125,-0.875 v -1 -1 -1 c 0,-0.3333333 -0.04167,-0.625 -0.125,-0.875 -0.08333,-0.25 -0.25,-0.4166667 -0.5,-0.5 -0.25,-0.083333 -0.541667,-0.125 -0.875,-0.125 h -1 -1 z"
-       transform="translate(-24.559322,3.7966102)"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/liquid.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="8.75"
-   height="8.75"
-   viewBox="0 0 8.75 8.75"
-   sodipodi:docname="liquid.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="30.729167"
-     inkscape:cx="-5.7555702"
-     inkscape:cy="11.13662"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1.25,-2)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 1.25,2.5 Q 1.25,2.25 1.625,2.125 2,2 2.5,2 3,2 3.5,2 4,2 4.5,2 5,2 5.5,2 6,2 6.5,2 7,2 7.375,2.125 7.75,2.25 7.75,2.5 7.75,2.75 7.5,3 7.25,3.25 7.125,3.625 7,4 7.125,4.375 7.25,4.75 7.625,4.875 8,5 8.375,4.875 8.75,4.75 9,4.5 9.25,4.25 9.5,4.25 9.75,4.25 9.875,4.625 10,5 10,5.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 Q 10,10 9.875,10.375 9.75,10.75 9.5,10.75 9.25,10.75 9,10.5 8.75,10.25 8.375,10.125 8,10 7.5,10 7,10 6.5,10 6,10 5.5,10 5,10 4.625,9.875 4.25,9.75 4,9.5 3.75,9.25 3.5,9 3.25,8.75 3,8.5 2.75,8.25 2.5,8 2.25,7.75 2.125,7.375 2,7 2,6.5 2,6 2,5.5 2,5 2,4.5 2,4 1.875,3.625 1.75,3.25 1.5,3 1.25,2.75 1.25,2.5 M 7.5,9 Q 8,9 8.375,8.875 8.75,8.75 8.875,8.375 9,8 9,7.5 9,7 8.875,6.625 8.75,6.25 8.375,6.125 8,6 7.625,5.875 7.25,5.75 7,5.5 6.75,5.25 6.5,5 6.25,4.75 6.125,4.375 6,4 5.875,3.625 5.75,3.25 5.375,3.125 5,3 4.5,3 4,3 3.625,3.125 3.25,3.25 3.125,3.625 3,4 3,4.5 3,5 3,5.5 3,6 3,6.5 3,7 3.125,7.375 3.25,7.75 3.5,8 3.75,8.25 4,8.5 4.25,8.75 4.625,8.875 5,9 5.5,9 6,9 6.5,9 7,9 7.5,9"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/mode-attack.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg12"
-   width="12.875"
-   height="12.875"
-   viewBox="0 0 12.875 12.875"
-   sodipodi:docname="mode-attack.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs16" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="46.093751"
-     inkscape:cx="1.4974999"
-     inkscape:cy="12.3775"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g869" />
-  <g
-     id="g869"
-     transform="translate(-1.0625,-2.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 12,2.5 Q 12.25,2.25 12.625,2.125 13,2 13.375,2.125 13.75,2.25 13.875,2.625 14,3 13.875,3.375 13.75,3.75 13.5,4 13.25,4.25 13,4.5 12.75,4.75 12.5,5 12.25,5.25 12,5.5 11.75,5.75 11.5,6 11.25,6.25 11,6.5 10.75,6.75 10.5,7 10.25,7.25 10,7.5 9.75,7.75 9.5,8 9.25,8.25 9,8.5 8.75,8.75 8.5,9 8.25,9.25 8,9.5 7.75,9.75 7.5,10 7.25,10.25 7.125,10.625 7,11 7.125,11.375 7.25,11.75 7.5,12 7.75,12.25 7.875,12.625 8,13 7.875,13.375 7.75,13.75 7.375,13.875 7,14 6.625,13.875 6.25,13.75 6,13.5 5.75,13.25 5.375,13.125 5,13 4.625,13.125 4.25,13.25 4,13.5 3.75,13.75 3.5,14 3.25,14.25 3,14.5 2.75,14.75 2.375,14.875 2,15 1.625,14.875 1.25,14.75 1.125,14.375 1,14 1.125,13.625 1.25,13.25 1.5,13 1.75,12.75 2,12.5 2.25,12.25 2.5,12 2.75,11.75 2.875,11.375 3,11 2.875,10.625 2.75,10.25 2.5,10 2.25,9.75 2.125,9.375 2,9 2.125,8.625 2.25,8.25 2.625,8.125 3,8 3.375,8.125 3.75,8.25 4,8.5 4.25,8.75 4.625,8.875 5,9 5.375,8.875 5.75,8.75 6,8.5 6.25,8.25 6.5,8 6.75,7.75 7,7.5 7.25,7.25 7.5,7 7.75,6.75 8,6.5 8.25,6.25 8.5,6 8.75,5.75 9,5.5 9.25,5.25 9.5,5 9.75,4.75 10,4.5 10.25,4.25 10.5,4 10.75,3.75 11,3.5 11.25,3.25 11.5,3 11.75,2.75 12,2.5"
-       id="path867"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/mode-pvp.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="15.874997"
-   height="12.874997"
-   viewBox="0 0 15.874997 12.874997"
-   sodipodi:docname="mode-pvp.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="40.972221"
-     inkscape:cx="-1.9533477"
-     inkscape:cy="12.95987"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g20" />
-  <g
-     id="g20"
-     transform="translate(-1.0625002,-3.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 5,3.0625 c -0.125,0 -0.25,0.020833 -0.375,0.0625 -0.25,0.083333 -0.4166667,0.25 -0.5,0.5 -0.083333,0.25 -0.083333,0.5 0,0.75 C 4.2083333,4.625 4.3333333,4.8333333 4.5,5 L 5,5.5 5.5,6 6,6.5 C 6.1666667,6.6666667 6.3333333,6.75 6.5,6.75 6.6666667,6.75 6.8333333,6.6666667 7,6.5 L 7.5,6 C 7.6666667,5.8333333 7.75,5.6666667 7.75,5.5 7.75,5.3333333 7.6666667,5.1666667 7.5,5 L 7,4.5 6.5,4 6,3.5 C 5.8333333,3.3333333 5.625,3.2083333 5.375,3.125 5.25,3.0833333 5.125,3.0625 5,3.0625 Z m 8,0 c -0.125,0 -0.25,0.020833 -0.375,0.0625 C 12.375,3.2083333 12.166667,3.3333333 12,3.5 L 11.5,4 11,4.5 10.5,5 10,5.5 9.5,6 9,6.5 8.5,7 8,7.5 7.5,8 7,8.5 6.5,9 6,9.5 C 5.8333333,9.6666667 5.625,9.7916667 5.375,9.875 c -0.25,0.083333 -0.5,0.083333 -0.75,0 C 4.375,9.7916667 4.1666667,9.6666667 4,9.5 3.8333333,9.3333333 3.625,9.2083333 3.375,9.125 c -0.25,-0.083333 -0.5,-0.083333 -0.75,0 -0.25,0.083333 -0.4166667,0.25 -0.5,0.5 -0.083333,0.25 -0.083333,0.5 0,0.75 0.083333,0.25 0.2083333,0.458333 0.375,0.625 0.1666667,0.166667 0.2916667,0.375 0.375,0.625 0.083333,0.25 0.083333,0.5 0,0.75 C 2.7916667,12.625 2.6666667,12.833333 2.5,13 L 2,13.5 1.5,14 c -0.1666667,0.166667 -0.2916667,0.375 -0.375,0.625 -0.083333,0.25 -0.083333,0.5 0,0.75 0.083333,0.25 0.25,0.416667 0.5,0.5 0.25,0.08333 0.5,0.08333 0.75,0 C 2.625,15.791667 2.8333333,15.666667 3,15.5 L 3.5,15 4,14.5 c 0.1666667,-0.166667 0.375,-0.291667 0.625,-0.375 0.25,-0.08333 0.5,-0.08333 0.75,0 0.25,0.08333 0.4583333,0.208333 0.625,0.375 0.1666667,0.166667 0.375,0.291667 0.625,0.375 0.25,0.08333 0.5,0.08333 0.75,0 0.25,-0.08333 0.4166667,-0.25 0.5,-0.5 0.083333,-0.25 0.083333,-0.5 0,-0.75 C 7.7916667,13.375 7.6666667,13.166667 7.5,13 7.3333333,12.833333 7.2083333,12.625 7.125,12.375 c -0.083333,-0.25 -0.083333,-0.5 0,-0.75 C 7.2083333,11.375 7.3333333,11.166667 7.5,11 L 8,10.5 8.5,10 9,9.5 9.5,9 10,8.5 10.5,8 11,7.5 11.5,7 12,6.5 12.5,6 13,5.5 13.5,5 c 0.166667,-0.1666667 0.291667,-0.375 0.375,-0.625 0.08333,-0.25 0.08333,-0.5 0,-0.75 -0.08333,-0.25 -0.25,-0.4166667 -0.5,-0.5 C 13.25,3.0833333 13.125,3.0625 13,3.0625 Z m 2,6 c -0.125,0 -0.25,0.020833 -0.375,0.0625 C 14.375,9.208333 14.166667,9.3333333 14,9.5 c -0.166667,0.1666667 -0.375,0.2916667 -0.625,0.375 -0.25,0.083333 -0.5,0.083333 -0.75,0 C 12.375,9.7916667 12.166667,9.6666667 12,9.5 11.833333,9.3333333 11.666667,9.25 11.5,9.25 11.333333,9.25 11.166667,9.3333333 11,9.5 L 10.5,10 c -0.166667,0.166667 -0.25,0.333333 -0.25,0.5 0,0.166667 0.08333,0.333333 0.25,0.5 0.166667,0.166667 0.291667,0.375 0.375,0.625 0.08333,0.25 0.08333,0.5 0,0.75 -0.08333,0.25 -0.208333,0.458333 -0.375,0.625 -0.166667,0.166667 -0.291667,0.375 -0.375,0.625 -0.08333,0.25 -0.08333,0.5 0,0.75 0.08333,0.25 0.25,0.416667 0.5,0.5 0.25,0.08333 0.5,0.08333 0.75,0 0.25,-0.08333 0.458333,-0.208333 0.625,-0.375 0.166667,-0.166667 0.375,-0.291667 0.625,-0.375 0.25,-0.08333 0.5,-0.08333 0.75,0 0.25,0.08333 0.458333,0.208333 0.625,0.375 l 0.5,0.5 0.5,0.5 c 0.166667,0.166667 0.375,0.291667 0.625,0.375 0.25,0.08333 0.5,0.08333 0.75,0 0.25,-0.08333 0.416667,-0.25 0.5,-0.5 0.08333,-0.25 0.08333,-0.5 0,-0.75 C 16.791667,14.375 16.666667,14.166667 16.5,14 L 16,13.5 15.5,13 c -0.166667,-0.166667 -0.291667,-0.375 -0.375,-0.625 -0.08333,-0.25 -0.08333,-0.5 0,-0.75 0.08333,-0.25 0.208333,-0.458333 0.375,-0.625 0.166667,-0.166667 0.291667,-0.375 0.375,-0.625 0.08333,-0.25 0.08333,-0.5 0,-0.75 -0.08333,-0.25 -0.25,-0.4166667 -0.5,-0.5 C 15.25,9.0833333 15.125,9.0625 15,9.0625 Z"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/mode-survival.svg

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg22"
-   width="12"
-   height="12.9375"
-   viewBox="0 0 12 12.9375"
-   sodipodi:docname="mode-survival.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata28">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs26" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview24"
-     showgrid="false"
-     inkscape:zoom="46.093751"
-     inkscape:cx="0.55999994"
-     inkscape:cy="12.44"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g844" />
-  <g
-     id="g844"
-     inkscape:label="g844"
-     transform="translate(-2,-2.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 2.125,2.625 Q 2.25,2.25 2.625,2.125 3,2 3.375,2.125 3.75,2.25 4,2.5 4.25,2.75 4.5,3 4.75,3.25 5,3.5 5.25,3.75 5.625,3.875 6,4 6.5,4 7,4 7.5,4 8,4 8.5,4 9,4 9.5,4 10,4 10.375,3.875 10.75,3.75 11,3.5 11.25,3.25 11.5,3 11.75,2.75 12,2.5 12.25,2.25 12.625,2.125 13,2 13.375,2.125 13.75,2.25 13.875,2.625 14,3 14,3.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 Q 13.75,10.75 13.5,11 13.25,11.25 13,11.5 12.75,11.75 12.5,12 12.25,12.25 12,12.5 11.75,12.75 11.5,13 11.25,13.25 11,13.5 10.75,13.75 10.5,14 10.25,14.25 10,14.5 9.75,14.75 9.375,14.875 9,15 8.5,15 8,15 7.5,15 7,15 6.625,14.875 6.25,14.75 6,14.5 5.75,14.25 5.5,14 5.25,13.75 5,13.5 4.75,13.25 4.5,13 4.25,12.75 4,12.5 3.75,12.25 3.5,12 3.25,11.75 3,11.5 2.75,11.25 2.5,11 2.25,10.75 2.125,10.375 2,10 2,9.5 2,9 2,8.5 2,8 2,7.5 2,7 2,6.5 2,6 2,5.5 2,5 2,4.5 2,4 2,3.5 2,3 2.125,2.625"
-       id="path842"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/paste.svg

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="12"
-   height="14"
-   viewBox="0 0 12 14"
-   sodipodi:docname="paste.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-21.253906"
-     inkscape:cy="8.220703"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g26" />
-  <g
-     id="g26"
-     transform="translate(-1.999669,-1.0003641)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 34.753906,2.2207031 c -0.333333,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.458333,0.2083334 -0.625,0.375 -0.166666,0.1666667 -0.375,0.2916667 -0.625,0.375 -0.25,0.083333 -0.541666,0.125 -0.875,0.125 -0.333333,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.458333,0.2083334 -0.625,0.375 l -0.5,0.5 c -0.166666,0.1666667 -0.291666,0.375 -0.375,0.625 -0.08333,0.25 -0.125,0.5416667 -0.125,0.875 v 1 1 1 1 0.9999999 1 1 1 c 0,0.333333 0.04167,0.625 0.125,0.875 0.08333,0.25 0.208334,0.458333 0.375,0.625 l 0.5,0.5 c 0.166667,0.166667 0.375,0.291667 0.625,0.375 0.25,0.08333 0.541667,0.125 0.875,0.125 h 1 1 1 1 1 1 1 c 0.333334,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.458334,-0.208333 0.625,-0.375 l 0.5,-0.5 c 0.166667,-0.166667 0.291667,-0.375 0.375,-0.625 0.08333,-0.25 0.125,-0.541667 0.125,-0.875 v -1 -1 -1 -0.9999999 -1 -1 -1 -1 c 0,-0.3333333 -0.04167,-0.625 -0.125,-0.875 -0.08333,-0.25 -0.208333,-0.4583333 -0.375,-0.625 l -0.5,-0.5 c -0.166666,-0.1666666 -0.375,-0.2916666 -0.625,-0.375 -0.25,-0.083333 -0.541666,-0.125 -0.875,-0.125 -0.333333,0 -0.625,-0.041667 -0.875,-0.125 -0.25,-0.083333 -0.458333,-0.2083333 -0.625,-0.375 -0.166666,-0.1666666 -0.375,-0.2916666 -0.625,-0.375 -0.25,-0.083333 -0.541666,-0.125 -0.875,-0.125 z m 0.5,1.0625 c 0.125,0 0.25,0.020833 0.375,0.0625 0.25,0.083333 0.375,0.2083334 0.375,0.375 0,0.1666667 -0.125,0.2916667 -0.375,0.375 -0.25,0.083333 -0.5,0.083333 -0.75,0 -0.25,-0.083333 -0.375,-0.2083333 -0.375,-0.375 0,-0.1666666 0.125,-0.2916666 0.375,-0.375 0.125,-0.041667 0.25,-0.0625 0.375,-0.0625 z m -3,2 c 0.125,0 0.25,0.020833 0.375,0.0625 0.25,0.083333 0.458334,0.2083334 0.625,0.375 0.166667,0.1666667 0.375,0.2916667 0.625,0.375 0.25,0.083333 0.541667,0.125 0.875,0.125 h 1 c 0.333334,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.458334,-0.2083333 0.625,-0.375 0.166667,-0.1666666 0.375,-0.2916666 0.625,-0.375 0.25,-0.083333 0.5,-0.083333 0.75,0 0.25,0.083333 0.416667,0.25 0.5,0.5 0.08333,0.25 0.125,0.5416667 0.125,0.875 v 1 1 1 0.9999999 1 1 c 0,0.333333 -0.04167,0.625 -0.125,0.875 -0.08333,0.25 -0.25,0.416667 -0.5,0.5 -0.25,0.08333 -0.541666,0.125 -0.875,0.125 h -1 -1 -1 -1 -1 c -0.333333,0 -0.625,-0.04167 -0.875,-0.125 -0.25,-0.08333 -0.416666,-0.25 -0.5,-0.5 -0.08333,-0.25 -0.125,-0.541667 -0.125,-0.875 v -1 -1 -0.9999999 -1 -1 -1 c 0,-0.3333333 0.04167,-0.625 0.125,-0.875 0.08333,-0.25 0.25,-0.4166666 0.5,-0.5 0.125,-0.041667 0.25,-0.0625 0.375,-0.0625 z m 1.5,2.9375 c -0.333333,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.375,0.2083334 -0.375,0.375 0,0.1666667 0.125,0.2916667 0.375,0.375 0.25,0.083333 0.541667,0.125 0.875,0.125 h 1 1 1 c 0.333334,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.375,-0.2083333 0.375,-0.375 0,-0.1666666 -0.125,-0.2916666 -0.375,-0.375 -0.25,-0.083333 -0.541666,-0.125 -0.875,-0.125 h -1 -1 z m 0,1.9999999 c -0.333333,0 -0.625,0.04167 -0.875,0.125 -0.25,0.08333 -0.375,0.208333 -0.375,0.375 0,0.166667 0.125,0.291667 0.375,0.375 0.25,0.08333 0.541667,0.125 0.875,0.125 h 1 1 1 c 0.333334,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.375,-0.208333 0.375,-0.375 0,-0.166667 -0.125,-0.291667 -0.375,-0.375 -0.25,-0.08333 -0.541666,-0.125 -0.875,-0.125 h -1 -1 z m 0,2 c -0.333333,0 -0.625,0.04167 -0.875,0.125 -0.25,0.08333 -0.375,0.208333 -0.375,0.375 0,0.166667 0.125,0.291667 0.375,0.375 0.25,0.08333 0.541667,0.125 0.875,0.125 h 1 1 1 c 0.333334,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.375,-0.208333 0.375,-0.375 0,-0.166667 -0.125,-0.291667 -0.375,-0.375 -0.25,-0.08333 -0.541666,-0.125 -0.875,-0.125 h -1 -1 z"
-       transform="translate(-27.254237,-1.220339)"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/pencil.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="13.75"
-   height="13.75"
-   viewBox="0 0 13.75 13.75"
-   sodipodi:docname="pencil.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="46.093751"
-     inkscape:cx="1.5599999"
-     inkscape:cy="12.44"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g20" />
-  <g
-     id="g20"
-     transform="translate(-1,-1.25)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 12.5,1.25 C 12.333333,1.25 12.166667,1.333333 12,1.5 L 11.5,2 11,2.5 10.5,3 c -0.166667,0.1666667 -0.25,0.3333333 -0.25,0.5 0,0.1666667 0.08333,0.3333333 0.25,0.5 L 11,4.5 11.5,5 12,5.5 c 0.166667,0.1666667 0.333333,0.25 0.5,0.25 0.166667,0 0.333333,-0.083333 0.5,-0.25 L 13.5,5 14,4.5 14.5,4 C 14.666667,3.8333333 14.75,3.6666667 14.75,3.5 14.75,3.3333333 14.666667,3.1666667 14.5,3 L 14,2.5 13.5,2 13,1.5 C 12.833333,1.3333333 12.666667,1.25 12.5,1.25 Z m -4,4 C 8.3333333,5.25 8.1666667,5.3333333 8,5.5 L 7.5,6 7,6.5 6.5,7 6,7.5 5.5,8 5,8.5 4.5,9 4,9.5 3.5,10 3,10.5 2.5,11 2,11.5 1.5,12 C 1.3333333,12.166667 1.2083333,12.375 1.125,12.625 1.0416667,12.875 1,13.166667 1,13.5 c 0,0.333333 0.041667,0.625 0.125,0.875 0.083333,0.25 0.25,0.416667 0.5,0.5 C 1.875,14.958333 2.1666667,15 2.5,15 2.8333333,15 3.125,14.958333 3.375,14.875 3.625,14.791667 3.8333333,14.666667 4,14.5 L 4.5,14 5,13.5 5.5,13 6,12.5 6.5,12 7,11.5 7.5,11 8,10.5 8.5,10 9,9.5 9.5,9 10,8.5 10.5,8 C 10.666667,7.8333333 10.75,7.6666667 10.75,7.5 10.75,7.3333333 10.666667,7.1666667 10.5,7 L 10,6.5 9.5,6 9,5.5 C 8.8333333,5.3333333 8.6666667,5.25 8.5,5.25 Z m -4,5 c 0.1666667,0 0.3333333,0.08333 0.5,0.25 L 5.5,11 c 0.1666667,0.166667 0.25,0.333333 0.25,0.5 0,0.166667 -0.083333,0.333333 -0.25,0.5 L 5,12.5 4.5,13 4,13.5 c -0.1666667,0.166667 -0.375,0.291667 -0.625,0.375 -0.25,0.08333 -0.5,0.08333 -0.75,0 -0.25,-0.08333 -0.4166667,-0.25 -0.5,-0.5 -0.083333,-0.25 -0.083333,-0.5 0,-0.75 C 2.2083333,12.375 2.3333333,12.166667 2.5,12 L 3,11.5 3.5,11 4,10.5 c 0.1666667,-0.166667 0.3333333,-0.25 0.5,-0.25 z"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/players.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="7.875"
-   height="7.9375"
-   viewBox="0 0 7.875 7.9375"
-   sodipodi:docname="players.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="23.6"
-     inkscape:cx="-14.960805"
-     inkscape:cy="3.4067797"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g16" />
-  <g
-     id="g16"
-     transform="translate(-1.0625,-1.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 4,1.5 Q 4.25,1.25 4.625,1.125 5,1 5.375,1.125 5.75,1.25 6,1.5 6.25,1.75 6.5,2 6.75,2.25 6.875,2.625 7,3 6.875,3.375 6.75,3.75 6.5,4 6.25,4.25 6.25,4.5 6.25,4.75 6.5,5 6.75,5.25 7,5.5 7.25,5.75 7.5,6 7.75,6.25 8,6.5 8.25,6.75 8.5,7 8.75,7.25 8.875,7.625 9,8 8.875,8.375 8.75,8.75 8.375,8.875 8,9 7.5,9 7,9 6.5,9 6,9 5.5,9 5,9 4.5,9 4,9 3.5,9 3,9 2.5,9 2,9 1.625,8.875 1.25,8.75 1.125,8.375 1,8 1.125,7.625 1.25,7.25 1.5,7 1.75,6.75 2,6.5 2.25,6.25 2.5,6 2.75,5.75 3,5.5 3.25,5.25 3.5,5 3.75,4.75 3.75,4.5 3.75,4.25 3.5,4 3.25,3.75 3.125,3.375 3,3 3.125,2.625 3.25,2.25 3.5,2 3.75,1.75 4,1.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/power.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="7.875"
-   height="5.5"
-   viewBox="0 0 7.875 5.5"
-   sodipodi:docname="power.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="61.458335"
-     inkscape:cx="-0.14250004"
-     inkscape:cy="6.83"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g16" />
-  <g
-     id="g16"
-     transform="translate(-2.0625,-3.25)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 9,3.5 Q 9.25,3.25 9.5,3.25 9.75,3.25 9.875,3.625 10,4 9.875,4.375 9.75,4.75 9.5,5 9.25,5.25 9.125,5.625 9,6 8.875,6.375 8.75,6.75 8.5,7 8.25,7.25 8,7.5 7.75,7.75 7.5,8 7.25,8.25 7,8.5 6.75,8.75 6.5,8.75 6.25,8.75 6,8.5 5.75,8.25 5.5,8 5.25,7.75 5,7.5 4.75,7.25 4.5,7.25 4.25,7.25 4,7.5 3.75,7.75 3.5,8 3.25,8.25 3,8.5 2.75,8.75 2.5,8.75 2.25,8.75 2.125,8.375 2,8 2.125,7.625 2.25,7.25 2.5,7 2.75,6.75 2.875,6.375 3,6 3.125,5.625 3.25,5.25 3.5,5 3.75,4.75 4,4.5 4.25,4.25 4.5,4.25 4.75,4.25 5,4.5 5.25,4.75 5.5,5 5.75,5.25 6,5.5 6.25,5.75 6.5,5.75 6.75,5.75 7,5.5 7.25,5.25 7.5,5 7.75,4.75 8,4.5 8.25,4.25 8.5,4 8.75,3.75 9,3.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/production.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="7.875"
-   height="8.9375"
-   viewBox="0 0 7.875 8.9375"
-   sodipodi:docname="production.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="43.457605"
-     inkscape:cx="-3.23046"
-     inkscape:cy="8.3742276"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g20" />
-  <g
-     id="g20"
-     transform="translate(-2.0625,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 2.125,1.625 Q 2.25,1.25 2.625,1.125 3,1 3.5,1 4,1 4.5,1 5,1 5.5,1 6,1 6.5,1 7,1 7.5,1 8,1 8.5,1 9,1 9.375,1.125 9.75,1.25 9.875,1.625 10,2 9.875,2.375 9.75,2.75 9.5,3 9.25,3.25 9,3.5 8.75,3.75 8.5,4 8.25,4.25 8.125,4.625 8,5 8,5.5 8,6 8,6.5 8,7 8,7.5 8,8 7.875,8.375 7.75,8.75 7.5,9 7.25,9.25 7,9.5 6.75,9.75 6.375,9.875 6,10 5.625,9.875 5.25,9.75 5,9.5 4.75,9.25 4.5,9 4.25,8.75 4.125,8.375 4,8 4,7.5 4,7 4,6.5 4,6 4,5.5 4,5 3.875,4.625 3.75,4.25 3.5,4 3.25,3.75 3,3.5 2.75,3.25 2.5,3 2.25,2.75 2.125,2.375 2,2 2.125,1.625 m 3,6.75 Q 5.25,8.75 5.5,8.75 5.75,8.75 6,8.5 6.25,8.25 6.5,8 6.75,7.75 6.75,7.5 6.75,7.25 6.5,7 6.25,6.75 6.25,6.5 6.25,6.25 6.5,6 6.75,5.75 6.75,5.5 6.75,5.25 6.5,5 6.25,4.75 6,4.5 5.75,4.25 5.5,4.25 5.25,4.25 5.125,4.625 5,5 5,5.5 5,6 5,6.5 5,7 5,7.5 5,8 5.125,8.375 M 7.5,3 Q 8,3 8.375,2.875 8.75,2.75 8.75,2.5 8.75,2.25 8.375,2.125 8,2 7.5,2 7,2 6.5,2 6,2 5.5,2 5,2 4.5,2 4,2 3.625,2.125 3.25,2.25 3.25,2.5 3.25,2.75 3.625,2.875 4,3 4.5,3 5,3 5.5,3 6,3 6.5,3 7,3 7.5,3"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/refresh.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="14"
-   height="14"
-   viewBox="0 0 14 14"
-   sodipodi:docname="refresh.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="46.093751"
-     inkscape:cx="1.5599999"
-     inkscape:cy="12.44"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 3.5,1 C 3.1666667,1 2.875,1.0416667 2.625,1.125 2.375,1.2083333 2.1666667,1.3333333 2,1.5 L 1.5,2 C 1.3333333,2.1666667 1.2083333,2.375 1.125,2.625 1.0416667,2.875 1,3.1666667 1,3.5 v 1 1 1 1 c 0,0.3333333 0.041667,0.625 0.125,0.875 0.083333,0.25 0.25,0.4166667 0.5,0.5 0.25,0.083333 0.5,0.083333 0.75,0 0.25,-0.083333 0.4166667,-0.25 0.5,-0.5 C 2.9583333,8.125 3,7.8333333 3,7.5 v -1 -1 -1 C 3,4.1666667 3.0416667,3.875 3.125,3.625 3.2083333,3.375 3.375,3.2083333 3.625,3.125 3.875,3.0416667 4.1666667,3 4.5,3 h 1 1 1 1 1 c 0.3333333,0 0.625,0.041667 0.875,0.125 0.25,0.083333 0.375,0.2083333 0.375,0.375 0,0.1666667 -0.08333,0.3333333 -0.25,0.5 -0.166667,0.1666667 -0.25,0.3333333 -0.25,0.5 0,0.1666667 0.125,0.2916667 0.375,0.375 C 10.875,4.9583333 11.166667,5 11.5,5 h 1 c 0.333333,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.416667,-0.25 0.5,-0.5 C 13.958333,4.125 14,3.8333333 14,3.5 v -1 C 14,2.1666667 13.958333,1.875 13.875,1.625 13.791667,1.375 13.666667,1.25 13.5,1.25 13.333333,1.25 13.166667,1.3333333 13,1.5 12.833333,1.6666667 12.666667,1.75 12.5,1.75 12.333333,1.75 12.166667,1.6666667 12,1.5 11.833333,1.3333333 11.625,1.2083333 11.375,1.125 11.125,1.0416667 10.833333,1 10.5,1 h -1 -1 -1 -1 -1 -1 z M 14,7.0625 c -0.125,0 -0.25,0.020833 -0.375,0.0625 -0.25,0.083333 -0.416667,0.25 -0.5,0.5 C 13.041667,7.875 13,8.1666667 13,8.5 v 1 1 1 c 0,0.333333 -0.04167,0.625 -0.125,0.875 -0.08333,0.25 -0.25,0.416667 -0.5,0.5 C 12.125,12.958333 11.833333,13 11.5,13 h -1 -1 -1 -1 -1 C 6.1666667,13 5.875,12.958333 5.625,12.875 5.375,12.791667 5.25,12.666667 5.25,12.5 5.25,12.333333 5.3333333,12.166667 5.5,12 5.6666667,11.833333 5.75,11.666667 5.75,11.5 5.75,11.333333 5.625,11.208333 5.375,11.125 5.125,11.041667 4.8333333,11 4.5,11 h -1 c -0.3333333,0 -0.625,0.04167 -0.875,0.125 -0.25,0.08333 -0.4166667,0.25 -0.5,0.5 C 2.0416667,11.875 2,12.166667 2,12.5 v 1 c 0,0.333333 0.041667,0.625 0.125,0.875 0.083333,0.25 0.2083333,0.375 0.375,0.375 0.1666667,0 0.3333333,-0.08333 0.5,-0.25 0.1666667,-0.166667 0.3333333,-0.25 0.5,-0.25 0.1666667,0 0.3333333,0.08333 0.5,0.25 0.1666667,0.166667 0.375,0.291667 0.625,0.375 C 4.875,14.958333 5.1666667,15 5.5,15 h 1 1 1 1 1 1 1 c 0.333333,0 0.625,-0.04167 0.875,-0.125 C 13.625,14.79167 13.833333,14.666667 14,14.5 L 14.5,14 c 0.166667,-0.166667 0.291667,-0.375 0.375,-0.625 C 14.958333,13.125 15,12.833333 15,12.5 v -1 -1 -1 -1 C 15,8.1666667 14.95833,7.875 14.875,7.625 14.79167,7.375 14.625,7.2083333 14.375,7.125 14.25,7.0833333 14.125,7.0625 14,7.0625 Z"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/save.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="10"
-   height="11"
-   viewBox="0 0 10 11"
-   sodipodi:docname="save.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="16.857143"
-     inkscape:cx="5"
-     inkscape:cy="1.2542373"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g22" />
-  <g
-     id="g22"
-     transform="translate(-2,-2)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 2.125,2.625 Q 2.25,2.25 2.625,2.125 3,2 3.5,2 4,2 4.5,2 5,2 5.5,2 6,2 6.5,2 7,2 7.5,2 8,2 8.5,2 9,2 9.5,2 10,2 10.375,2.125 10.75,2.25 11,2.5 11.25,2.75 11.5,3 11.75,3.25 11.875,3.625 12,4 12,4.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 -0.125,0.375 -0.5,0.5 Q 11,13 10.5,13 10,13 9.5,13 9,13 8.5,13 8,13 7.5,13 7,13 6.5,13 6,13 5.5,13 5,13 4.5,13 4,13 3.5,13 3,13 2.625,12.875 2.25,12.75 2.125,12.375 2,12 2,11.5 2,11 2,10.5 2,10 2,9.5 2,9 2,8.5 2,8 2,7.5 2,7 2,6.5 2,6 2,5.5 2,5 2,4.5 2,4 2,3.5 2,3 2.125,2.625 M 7.5,12 Q 8,12 8.375,11.875 8.75,11.75 8.875,11.375 9,11 9,10.5 9,10 8.875,9.625 8.75,9.25 8.375,9.125 8,9 7.5,9 7,9 6.5,9 6,9 5.625,9.125 5.25,9.25 5.125,9.625 5,10 5,10.5 5,11 5.125,11.375 5.25,11.75 5.625,11.875 6,12 6.5,12 q 0.5,0 1,0 m 2.625,-0.625 q 0.125,0.375 0.375,0.375 0.25,0 0.375,-0.375 Q 11,11 11,10.5 11,10 11,9.5 11,9 11,8.5 11,8 11,7.5 11,7 11,6.5 11,6 11,5.5 11,5 11,4.5 11,4 10.875,3.625 10.75,3.25 10.375,3.125 10,3 9.625,3.125 9.25,3.25 9.125,3.625 9,4 9,4.5 9,5 8.875,5.375 8.75,5.75 8.375,5.875 8,6 7.5,6 7,6 6.5,6 6,6 5.625,5.875 5.25,5.75 5.125,5.375 5,5 5,4.5 5,4 4.875,3.625 4.75,3.25 4.375,3.125 4,3 3.625,3.125 3.25,3.25 3.125,3.625 3,4 3,4.5 3,5 3,5.5 3,6 3,6.5 3,7 3,7.5 3,8 3,8.5 3,9 3,9.5 3,10 3,10.5 3,11 3.125,11.375 3.25,11.75 3.5,11.75 3.75,11.75 3.875,11.375 4,11 4,10.5 4,10 4,9.5 4,9 4.125,8.625 4.25,8.25 4.625,8.125 5,8 5.5,8 6,8 6.5,8 7,8 7.5,8 8,8 8.5,8 9,8 9.375,8.125 9.75,8.25 9.875,8.625 10,9 10,9.5 q 0,0.5 0,1 0,0.5 0.125,0.875 m -3.5,-6.5 Q 7,5 7.375,4.875 7.75,4.75 7.875,4.375 8,4 7.875,3.625 7.75,3.25 7.375,3.125 7,3 6.625,3.125 6.25,3.25 6.125,3.625 6,4 6.125,4.375 q 0.125,0.375 0.5,0.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/spray.svg

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="10.75"
-   height="13.75"
-   viewBox="0 0 10.75 13.75"
-   sodipodi:docname="spray.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="14.75"
-     inkscape:cx="-15.554688"
-     inkscape:cy="6.796875"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g833" />
-  <g
-     id="g833"
-     transform="translate(-1.249603,-1.2502648)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="m 23.804688,1.046875 c -0.166667,0 -0.25,0.083333 -0.25,0.25 0,0.1666667 0.08333,0.25 0.25,0.25 0.166666,0 0.25,-0.083333 0.25,-0.25 0,-0.1666667 -0.08333,-0.25 -0.25,-0.25 z m 6,0.75 c -0.333334,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.375,0.2083333 -0.375,0.375 0,0.1666667 0.08333,0.3333333 0.25,0.5 0.166666,0.1666667 0.25,0.3333333 0.25,0.5 0,0.1666667 -0.08333,0.3333333 -0.25,0.5 l -0.5,0.5 -0.5,0.5 -0.5,0.5 -0.5,0.5 c -0.166667,0.1666667 -0.25,0.3333333 -0.25,0.5 0,0.1666667 0.125,0.2916667 0.375,0.375 0.25,0.083333 0.541666,0.125 0.875,0.125 h 1 1 1 1 1 c 0.333333,0 0.625,-0.041667 0.875,-0.125 0.25,-0.083333 0.375,-0.2083333 0.375,-0.375 0,-0.1666667 -0.08333,-0.3333333 -0.25,-0.5 l -0.5,-0.5 -0.5,-0.5 c -0.166667,-0.1666667 -0.291667,-0.375 -0.375,-0.625 -0.08333,-0.25 -0.125,-0.5416667 -0.125,-0.875 0,-0.3333333 -0.04167,-0.625 -0.125,-0.875 -0.08333,-0.25 -0.25,-0.4166667 -0.5,-0.5 -0.25,-0.083333 -0.541667,-0.125 -0.875,-0.125 z m -4,0.25 c -0.166667,0 -0.25,0.083333 -0.25,0.25 0,0.1666667 0.08333,0.3333333 0.25,0.5 0.166666,0.1666667 0.25,0.3333333 0.25,0.5 0,0.1666667 -0.08333,0.3333333 -0.25,0.5 -0.166667,0.1666667 -0.25,0.3333333 -0.25,0.5 0,0.1666667 0.08333,0.25 0.25,0.25 0.166666,0 0.333333,-0.083333 0.5,-0.25 l 0.5,-0.5 c 0.166666,-0.1666667 0.25,-0.3333333 0.25,-0.5 0,-0.1666667 -0.08333,-0.3333333 -0.25,-0.5 l -0.5,-0.5 c -0.166667,-0.1666667 -0.333334,-0.25 -0.5,-0.25 z m -2,1 c -0.166667,0 -0.25,0.083333 -0.25,0.25 0,0.1666667 0.08333,0.25 0.25,0.25 0.166666,0 0.25,-0.083333 0.25,-0.25 0,-0.1666667 -0.08333,-0.25 -0.25,-0.25 z m 0,2 c -0.166667,0 -0.25,0.083333 -0.25,0.25 0,0.1666667 0.08333,0.25 0.25,0.25 0.166666,0 0.25,-0.083333 0.25,-0.25 0,-0.1666667 -0.08333,-0.25 -0.25,-0.25 z m 4,2.75 c -0.333334,0 -0.625,0.041667 -0.875,0.125 -0.25,0.083333 -0.416667,0.25 -0.5,0.5 -0.08333,0.25 -0.125,0.5416667 -0.125,0.875 v 1 1 c 0,0.333333 0.04167,0.625 0.125,0.875 0.08333,0.25 0.25,0.416667 0.5,0.5 0.25,0.08333 0.541666,0.125 0.875,0.125 h 1 1 1 1 1 c 0.333333,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.416666,-0.25 0.5,-0.5 0.08333,-0.25 0.125,-0.541667 0.125,-0.875 v -1 -1 c 0,-0.3333333 -0.04167,-0.625 -0.125,-0.875 -0.08333,-0.25 -0.25,-0.4166667 -0.5,-0.5 -0.25,-0.083333 -0.541667,-0.125 -0.875,-0.125 h -1 -1 -1 -1 z m 0,6 c -0.333334,0 -0.625,0.04167 -0.875,0.125 -0.25,0.08333 -0.375,0.208333 -0.375,0.375 0,0.166667 0.125,0.291667 0.375,0.375 0.25,0.08333 0.541666,0.125 0.875,0.125 h 1 1 1 1 1 c 0.333333,0 0.625,-0.04167 0.875,-0.125 0.25,-0.08333 0.375,-0.208333 0.375,-0.375 0,-0.166667 -0.125,-0.291667 -0.375,-0.375 -0.25,-0.08333 -0.541667,-0.125 -0.875,-0.125 h -1 -1 -1 -1 z"
-       transform="translate(-22.305085,0.20338983)"
-       id="path819"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/terrain.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="12"
-   height="11.75"
-   viewBox="0 0 12 11.75"
-   sodipodi:docname="terrain.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="37.249375"
-     inkscape:cx="-0.42986742"
-     inkscape:cy="6.6173436"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1,-1.25)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 5,1.5 Q 5.25,1.25 5.5,1.25 5.75,1.25 6,1.5 6.25,1.75 6.5,2 6.75,2.25 7,2.5 7.25,2.75 7.5,3 7.75,3.25 8,3.5 8.25,3.75 8.5,3.75 8.75,3.75 9,3.5 9.25,3.25 9.5,3.25 9.75,3.25 10,3.5 10.25,3.75 10.5,4 10.75,4.25 11,4.5 11.25,4.75 11.5,5 11.75,5.25 12,5.5 12.25,5.75 12.5,6 12.75,6.25 12.875,6.625 13,7 13,7.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 -0.125,0.375 -0.5,0.5 Q 12,13 11.5,13 11,13 10.5,13 10,13 9.5,13 9,13 8.5,13 8,13 7.5,13 7,13 6.5,13 6,13 5.5,13 5,13 4.5,13 4,13 3.5,13 3,13 2.5,13 2,13 1.625,12.875 1.25,12.75 1.125,12.375 1,12 1,11.5 1,11 1,10.5 1,10 1,9.5 1,9 1,8.5 1,8 1,7.5 1,7 1,6.5 1,6 1.125,5.625 1.25,5.25 1.5,5 1.75,4.75 2,4.5 2.25,4.25 2.5,4 2.75,3.75 3,3.5 3.25,3.25 3.5,3 3.75,2.75 4,2.5 4.25,2.25 4.5,2 4.75,1.75 5,1.5 M 10.5,12 q 0.5,0 0.875,-0.125 0.375,-0.125 0.5,-0.5 Q 12,11 12,10.5 12,10 12,9.5 12,9 12,8.5 12,8 11.875,7.625 11.75,7.25 11.5,7 11.25,6.75 11,6.5 10.75,6.25 10.5,6 10.25,5.75 10,5.5 9.75,5.25 9.5,5.25 9.25,5.25 9,5.5 8.75,5.75 8.5,5.75 8.25,5.75 8,5.5 7.75,5.25 7.5,5 7.25,4.75 7,4.5 6.75,4.25 6.5,4 6.25,3.75 6,3.5 5.75,3.25 5.5,3.25 5.25,3.25 5,3.5 4.75,3.75 4.5,4 4.25,4.25 4,4.5 3.75,4.75 3.5,5 3.25,5.25 3,5.5 2.75,5.75 2.5,6 2.25,6.25 2.125,6.625 2,7 2,7.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 0.125,0.875 0.125,0.375 0.5,0.5 Q 3,12 3.5,12 q 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0 0.5,0 1,0"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/trash.svg

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="10"
-   height="12"
-   viewBox="0 0 10 12"
-   sodipodi:docname="trash.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:pagecheckerboard="true"
-     inkscape:zoom="16.857143"
-     inkscape:cx="-18.372881"
-     inkscape:cy="5.7627119"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g26" />
-  <g
-     id="g26"
-     transform="translate(-2,-1)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 5.125,1.625 Q 5.25,1.25 5.625,1.125 6,1 6.5,1 7,1 7.5,1 8,1 8.375,1.125 8.75,1.25 8.875,1.625 9,2 9.125,2.375 9.25,2.75 9.625,2.875 10,3 10.5,3 11,3 11.375,3.125 11.75,3.25 11.875,3.625 12,4 12,4.5 12,5 12,5.5 12,6 11.875,6.375 11.75,6.75 11.5,7 11.25,7.25 11.125,7.625 11,8 11,8.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0,1 0,0.5 -0.125,0.875 -0.125,0.375 -0.5,0.5 Q 10,13 9.5,13 9,13 8.5,13 8,13 7.5,13 7,13 6.5,13 6,13 5.5,13 5,13 4.5,13 4,13 3.625,12.875 3.25,12.75 3.125,12.375 3,12 3,11.5 3,11 3,10.5 3,10 3,9.5 3,9 3,8.5 3,8 2.875,7.625 2.75,7.25 2.5,7 2.25,6.75 2.125,6.375 2,6 2,5.5 2,5 2,4.5 2,4 2.125,3.625 2.25,3.25 2.625,3.125 3,3 3.5,3 4,3 4.375,2.875 4.75,2.75 4.875,2.375 5,2 5.125,1.625 m -1,9.75 Q 4.25,11.75 4.5,11.75 4.75,11.75 4.875,11.375 5,11 5,10.5 5,10 5,9.5 5,9 5,8.5 5,8 4.875,7.625 4.75,7.25 4.5,7.25 4.25,7.25 4.125,7.625 4,8 4,8.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0.125,0.875 m 2.5,0.5 Q 7,12 7.375,11.875 7.75,11.75 7.875,11.375 8,11 8,10.5 8,10 8,9.5 8,9 8,8.5 8,8 7.875,7.625 7.75,7.25 7.375,7.125 7,7 6.625,7.125 6.25,7.25 6.125,7.625 6,8 6,8.5 q 0,0.5 0,1 0,0.5 0,1 0,0.5 0.125,0.875 0.125,0.375 0.5,0.5 m 2.5,-0.5 Q 9.25,11.75 9.5,11.75 9.75,11.75 9.875,11.375 10,11 10,10.5 10,10 10,9.5 10,9 10,8.5 10,8 9.875,7.625 9.75,7.25 9.5,7.25 9.25,7.25 9.125,7.625 9,8 9,8.5 9,9 9,9.5 9,10 9,10.5 9,11 9.125,11.375 M 9.5,6 Q 10,6 10.375,5.875 10.75,5.75 10.875,5.375 11,5 10.875,4.625 10.75,4.25 10.375,4.125 10,4 9.5,4 9,4 8.5,4 8,4 7.5,4 7,4 6.5,4 6,4 5.5,4 5,4 4.5,4 4,4 3.625,4.125 3.25,4.25 3.125,4.625 3,5 3.125,5.375 3.25,5.75 3.625,5.875 4,6 4.5,6 5,6 5.5,6 6,6 6.5,6 7,6 7.5,6 8,6 8.5,6 9,6 9.5,6 M 6.625,2.875 Q 7,3 7.375,2.875 7.75,2.75 7.75,2.5 7.75,2.25 7.375,2.125 7,2 6.625,2.125 6.25,2.25 6.25,2.5 q 0,0.25 0.375,0.375"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/turret.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="8"
-   height="8.9375"
-   viewBox="0 0 8 8.9375"
-   sodipodi:docname="turret.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="61.458335"
-     inkscape:cx="-0.047457671"
-     inkscape:cy="7.9986441"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-2,-1.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 3.125,1.625 Q 3.25,1.25 3.625,1.125 4,1 4.375,1.125 4.75,1.25 4.875,1.625 5,2 5.125,2.375 5.25,2.75 5.625,2.875 6,3 6.375,2.875 6.75,2.75 6.875,2.375 7,2 7.125,1.625 7.25,1.25 7.625,1.125 8,1 8.375,1.125 8.75,1.25 8.875,1.625 9,2 9,2.5 9,3 9,3.5 9,4 9.125,4.375 9.25,4.75 9.5,5 9.75,5.25 9.875,5.625 10,6 10,6.5 10,7 10,7.5 10,8 10,8.5 10,9 9.875,9.375 9.75,9.75 9.375,9.875 9,10 8.5,10 8,10 7.625,9.875 7.25,9.75 7,9.5 6.75,9.25 6.375,9.125 6,9 5.625,9.125 5.25,9.25 5,9.5 4.75,9.75 4.375,9.875 4,10 3.5,10 3,10 2.625,9.875 2.25,9.75 2.125,9.375 2,9 2,8.5 2,8 2,7.5 2,7 2,6.5 2,6 2.125,5.625 2.25,5.25 2.5,5 2.75,4.75 2.875,4.375 3,4 3,3.5 3,3 3,2.5 3,2 3.125,1.625 m 4.5,7.25 Q 8,9 8.375,8.875 8.75,8.75 8.875,8.375 9,8 9,7.5 9,7 9,6.5 9,6 8.875,5.625 8.75,5.25 8.5,5 8.25,4.75 8,4.5 7.75,4.25 7.375,4.125 7,4 6.5,4 6,4 5.5,4 5,4 4.625,4.125 4.25,4.25 4,4.5 3.75,4.75 3.5,5 3.25,5.25 3.125,5.625 3,6 3,6.5 3,7 3,7.5 3,8 3.125,8.375 3.25,8.75 3.625,8.875 4,9 4.375,8.875 4.75,8.75 5,8.5 5.25,8.25 5.625,8.125 6,8 6.375,8.125 6.75,8.25 7,8.5 7.25,8.75 7.625,8.875"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/units.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg32"
-   width="10"
-   height="7.9374995"
-   viewBox="0 0 10 7.9374995"
-   sodipodi:docname="units.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata38">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs36" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview34"
-     showgrid="false"
-     inkscape:zoom="43.457605"
-     inkscape:cx="-7.4980789"
-     inkscape:cy="8.8012544"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g60" />
-  <g
-     id="g60"
-     transform="translate(-1,-2)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 5.5,2 C 5.1666667,2 4.875,2.0416667 4.625,2.125 4.375,2.2083333 4.1666667,2.3333333 4,2.5 L 3.5,3 3,3.5 2.5,4 2,4.5 1.5,5 C 1.3333333,5.1666667 1.2083333,5.375 1.125,5.625 1.0416667,5.875 1,6.1666667 1,6.5 1,6.8333333 1.0416667,7.125 1.125,7.375 1.2083333,7.625 1.3333333,7.75 1.5,7.75 1.6666667,7.75 1.8333333,7.6666667 2,7.5 2.1666667,7.3333333 2.3333333,7.25 2.5,7.25 2.6666667,7.25 2.7916667,7.375 2.875,7.625 2.9583333,7.875 3,8.1666667 3,8.5 c 0,0.3333333 0.041667,0.625 0.125,0.875 0.083333,0.25 0.25,0.4166667 0.5,0.5 0.25,0.083333 0.5,0.083333 0.75,0 0.25,-0.083333 0.4166667,-0.25 0.5,-0.5 l 0.25,-0.75 c 0.083333,-0.25 0.25,-0.4166667 0.5,-0.5 0.25,-0.083333 0.5,-0.083333 0.75,0 0.25,0.083333 0.4166667,0.25 0.5,0.5 l 0.25,0.75 c 0.083333,0.25 0.25,0.4166667 0.5,0.5 0.25,0.083333 0.5,0.083333 0.75,0 0.25,-0.083333 0.4166667,-0.25 0.5,-0.5 C 8.9583333,9.125 9,8.8333333 9,8.5 9,8.1666667 9.0416667,7.875 9.125,7.625 9.2083333,7.375 9.3333333,7.25 9.5,7.25 c 0.1666667,0 0.3333333,0.083333 0.5,0.25 0.166667,0.1666667 0.333333,0.25 0.5,0.25 0.166667,0 0.291667,-0.125 0.375,-0.375 C 10.958333,7.125 11,6.8333333 11,6.5 11,6.1666667 10.958333,5.875 10.875,5.625 10.791667,5.375 10.666667,5.1666667 10.5,5 L 10,4.5 9.5,4 9,3.5 8.5,3 8,2.5 C 7.8333333,2.3333333 7.625,2.2083333 7.375,2.125 7.125,2.0416667 6.8333333,2 6.5,2 Z m 0,1 h 1 C 6.8333333,3 7.125,3.0416667 7.375,3.125 7.625,3.2083333 7.8333333,3.3333333 8,3.5 L 8.5,4 9,4.5 9.5,5 c 0.1666667,0.1666667 0.25,0.3333333 0.25,0.5 0,0.1666667 -0.125,0.2916667 -0.375,0.375 l -0.75,0.25 C 8.375,6.2083333 8.1666667,6.3333333 8,6.5 7.8333333,6.6666667 7.625,6.7916667 7.375,6.875 7.125,6.9583333 6.8333333,7 6.5,7 h -1 C 5.1666667,7 4.875,6.9583333 4.625,6.875 4.375,6.7916667 4.1666667,6.6666667 4,6.5 3.8333333,6.3333333 3.625,6.2083333 3.375,6.125 L 2.625,5.875 C 2.375,5.7916667 2.25,5.6666667 2.25,5.5 2.25,5.3333333 2.3333333,5.1666667 2.5,5 L 3,4.5 3.5,4 4,3.5 C 4.1666667,3.3333333 4.375,3.2083333 4.625,3.125 4.875,3.0416667 5.1666667,3 5.5,3 Z M 6,4.0625 C 5.875,4.0625 5.75,4.0833333 5.625,4.125 5.375,4.2083333 5.25,4.3333333 5.25,4.5 c 0,0.1666667 0.125,0.2916667 0.375,0.375 0.25,0.083333 0.5,0.083333 0.75,0 C 6.625,4.7916667 6.75,4.6666667 6.75,4.5 6.75,4.3333333 6.625,4.2083333 6.375,4.125 6.25,4.0833333 6.125,4.0625 6,4.0625 Z"
-       id="path54"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/icons/upgrade.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
-   version="1.1"
-   id="svg2"
-   width="9.875"
-   height="9.9375"
-   viewBox="0 0 9.875 9.9375"
-   sodipodi:docname="upgrade.svg"
-   inkscape:version="0.92.4 (f8dce91, 2019-08-02)">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1318"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="61.458335"
-     inkscape:cx="0.89004233"
-     inkscape:cy="7.6969492"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g18" />
-  <g
-     id="g18"
-     transform="translate(-1.0625,-1.0625)">
-    <path
-       style="fill:#ffffff;fill-opacity:1"
-       d="M 5,1.5 Q 5.25,1.25 5.625,1.125 6,1 6.375,1.125 6.75,1.25 7,1.5 7.25,1.75 7.5,2 7.75,2.25 8,2.5 8.25,2.75 8.5,3 8.75,3.25 9,3.5 9.25,3.75 9.5,4 9.75,4.25 10,4.5 10.25,4.75 10.5,5 10.75,5.25 10.875,5.625 11,6 10.875,6.375 10.75,6.75 10.375,6.875 10,7 9.5,7 9,7 8.625,7.125 8.25,7.25 8.125,7.625 8,8 8,8.5 8,9 8,9.5 8,10 7.875,10.375 7.75,10.75 7.375,10.875 7,11 6.5,11 6,11 5.5,11 5,11 4.625,10.875 4.25,10.75 4.125,10.375 4,10 4,9.5 4,9 4,8.5 4,8 3.875,7.625 3.75,7.25 3.375,7.125 3,7 2.5,7 2,7 1.625,6.875 1.25,6.75 1.125,6.375 1,6 1.125,5.625 1.25,5.25 1.5,5 1.75,4.75 2,4.5 2.25,4.25 2.5,4 2.75,3.75 3,3.5 3.25,3.25 3.5,3 3.75,2.75 4,2.5 4.25,2.25 4.5,2 4.75,1.75 5,1.5 M 5.625,9.875 Q 6,10 6.375,9.875 6.75,9.75 6.875,9.375 7,9 7,8.5 7,8 7,7.5 7,7 7.125,6.625 7.25,6.25 7.625,6.125 8,6 8.375,5.875 8.75,5.75 8.75,5.5 8.75,5.25 8.5,5 8.25,4.75 8,4.5 7.75,4.25 7.5,4 7.25,3.75 7,3.5 6.75,3.25 6.375,3.125 6,3 5.625,3.125 5.25,3.25 5,3.5 4.75,3.75 4.5,4 4.25,4.25 4,4.5 3.75,4.75 3.5,5 3.25,5.25 3.25,5.5 3.25,5.75 3.625,5.875 4,6 4.375,6.125 4.75,6.25 4.875,6.625 5,7 5,7.5 5,8 5,8.5 5,9 5.125,9.375 q 0.125,0.375 0.5,0.5"
-       id="path14"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

core/assets-raw/fontgen/merge.pe

@@ -1,3 +1,3 @@
-Open("core/assets/fonts/font.ttf")
+Open($2)
-MergeFonts("core/assets-raw/fontgen/out/font.ttf")
+MergeFonts($1)
-Generate("core/assets/fonts/font.ttf")
+Generate($1)