Merge remote-tracking branch 'upstream/master' into unit-stats

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

@@ -123,8 +123,7 @@ public class AssetsProcess extends BaseProcessor{
             if(SourceVersion.isKeyword(name)) name += "s";           
 
             String filepath = path.substring(path.lastIndexOf("/") + 1) + "/" + fname;
-
+            String filename = "\"" + filepath + "\"";
-            String filename = "arc.Core.app.getType() != arc.Application.ApplicationType.iOS ? \"" + filepath + "\" : \"" + filepath.replace(".ogg", ".mp3") + "\"";
 
             loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3"));
 

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/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/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/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/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/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/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/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}]}

build.gradle

@@ -172,11 +172,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
     }
 }
 

core/assets-raw/fontgen/config.json

@@ -114,12 +114,6 @@
       "code": 59411,
       "src": "typicons"
     },
-    {
-      "uid": "k7sao112253txym1egnte7822irbyphe",
-      "css": "eye",
-      "code": 59412,
-      "src": "typicons"
-    },
     {
       "uid": "jqzwo6i8oicjbn049sh2856d8anrqoli",
       "css": "edit",
@@ -315,7 +309,7 @@
     {
       "uid": "4bad23bc52aaddaac37da019e46b6f6b",
       "css": "discord_",
-      "code": 59485,
+      "code": 59406,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -365,7 +359,7 @@
     {
       "uid": "dd1e5d774d1ced68cb7c439d8ed102f5",
       "css": "logic",
-      "code": 59517,
+      "code": 59412,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -379,7 +373,7 @@
     {
       "uid": "d0ff49daa25603348abe7e3f7c70be56",
       "css": "distribution",
-      "code": 59475,
+      "code": 59415,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -393,7 +387,7 @@
     {
       "uid": "47efe0c5ca937e0def7264347af501ed",
       "css": "hammer",
-      "code": 59483,
+      "code": 59419,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -407,7 +401,7 @@
     {
       "uid": "b41aaf351112113e5f50cb8b977d6293",
       "css": "save",
-      "code": 59495,
+      "code": 59434,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -421,7 +415,7 @@
     {
       "uid": "e67fcdbfc21c4f395a4f78e2a56c5060",
       "css": "link",
-      "code": 59496,
+      "code": 59435,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -435,7 +429,7 @@
     {
       "uid": "3679836be9338f58f8a74e4352dc0bdd",
       "css": "itchio",
-      "code": 59497,
+      "code": 59436,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -449,7 +443,7 @@
     {
       "uid": "a3f0c795c6e6506c0bf33e4d344676d5",
       "css": "line",
-      "code": 59498,
+      "code": 59437,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -463,7 +457,7 @@
     {
       "uid": "f54e291de7ca06c5101bdeb7e81d6b7f",
       "css": "admin",
-      "code": 59484,
+      "code": 59440,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -477,7 +471,7 @@
     {
       "uid": "53efee2384cbefdc94210fb1b4972ed6",
       "css": "spray-1",
-      "code": 59499,
+      "code": 59468,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -491,7 +485,7 @@
     {
       "uid": "98cdb7c2e72493434efd910db1f62b29",
       "css": "crafting",
-      "code": 59486,
+      "code": 59469,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -505,7 +499,7 @@
     {
       "uid": "dc6530e8b375575b7df2040d108e5368",
       "css": "fill",
-      "code": 59500,
+      "code": 59474,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -519,7 +513,7 @@
     {
       "uid": "06281408f2d30c261c9129e3f167204f",
       "css": "defense",
-      "code": 59487,
+      "code": 59475,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -533,7 +527,7 @@
     {
       "uid": "88103366af75e17d8a3921ee1fb8616c",
       "css": "paste",
-      "code": 59501,
+      "code": 59483,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -547,7 +541,7 @@
     {
       "uid": "c0d81c71f616c8324a78c54d994af313",
       "css": "effect",
-      "code": 59489,
+      "code": 59484,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -561,7 +555,7 @@
     {
       "uid": "65c4e52c12c9bed7754878f76c4a0acd",
       "css": "book",
-      "code": 59502,
+      "code": 59485,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -575,7 +569,7 @@
     {
       "uid": "cee021b830261625d59e49c48a86102c",
       "css": "liquid",
-      "code": 59490,
+      "code": 59486,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -589,7 +583,7 @@
     {
       "uid": "afcfe6416bfdb70c40ede7bf666667d9",
       "css": "host",
-      "code": 59503,
+      "code": 59487,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -603,7 +597,7 @@
     {
       "uid": "060ea30307b6e6ab4706682853ec9d21",
       "css": "production",
-      "code": 59491,
+      "code": 59489,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -617,7 +611,7 @@
     {
       "uid": "32084a9ecd9e7693002b13e274a84240",
       "css": "exit",
-      "code": 59504,
+      "code": 59405,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -631,7 +625,7 @@
     {
       "uid": "7ee2f2d80faaf4bce9af14bbb6cf1f07",
       "css": "mode-pvp",
-      "code": 59509,
+      "code": 59420,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -645,7 +639,7 @@
     {
       "uid": "bc0f646b936f7dc761ce8efe1201d450",
       "css": "terrain",
-      "code": 59505,
+      "code": 59495,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -659,7 +653,7 @@
     {
       "uid": "fca174e630aceac2289d86197d04ac6d",
       "css": "mode-attack",
-      "code": 59510,
+      "code": 59496,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -673,7 +667,7 @@
     {
       "uid": "d2dae093c8eaeecb8b86b9b3137d5e59",
       "css": "refresh-1",
-      "code": 59507,
+      "code": 59497,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -687,7 +681,7 @@
     {
       "uid": "279c989fcea20393a5b83eb9e598d59a",
       "css": "none",
-      "code": 59567,
+      "code": 59498,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -701,7 +695,7 @@
     {
       "uid": "e3b561a775bcb150f6b8ea719a465345",
       "css": "pencil_",
-      "code": 59508,
+      "code": 59499,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -715,7 +709,7 @@
     {
       "uid": "8b4d5e8da6aa68188b631aaf252a9e14",
       "css": "refresh",
-      "code": 59568,
+      "code": 59500,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -729,7 +723,7 @@
     {
       "uid": "44e902e72564bc6d9a9eb1d174208d35",
       "css": "mode-survival",
-      "code": 59511,
+      "code": 59501,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -743,7 +737,7 @@
     {
       "uid": "9e23184b166b551c5fb0bd5ee3a4dc2c",
       "css": "command-rally",
-      "code": 59512,
+      "code": 59502,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -757,7 +751,7 @@
     {
       "uid": "5b2609713ca347b272beb0bc5f49c42e",
       "css": "units",
-      "code": 59493,
+      "code": 59503,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -771,7 +765,7 @@
     {
       "uid": "de2b09bde33670e3502e3e07b936e098",
       "css": "command-attack",
-      "code": 59513,
+      "code": 59504,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -785,7 +779,7 @@
     {
       "uid": "343b1d6c67d1c2bdc279b8df809fb3bf",
       "css": "trash",
-      "code": 59506,
+      "code": 59505,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -799,7 +793,7 @@
     {
       "uid": "f82a79ee879412f7ddf7c517c6958d45",
       "css": "chat",
-      "code": 59515,
+      "code": 59506,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -813,7 +807,7 @@
     {
       "uid": "1a406c75ee5adac112504cd1baf6d482",
       "css": "turret",
-      "code": 59492,
+      "code": 59507,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -827,7 +821,7 @@
     {
       "uid": "559d541ead67649a9658f22b36bc48fc",
       "css": "players",
-      "code": 59516,
+      "code": 59508,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -841,7 +835,7 @@
     {
       "uid": "2e574f2316b8b4f840d5680dcad8088b",
       "css": "editor",
-      "code": 59573,
+      "code": 59509,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -855,7 +849,7 @@
     {
       "uid": "6e16d3f823a60ce0e9db3a9768668132",
       "css": "copy",
-      "code": 59574,
+      "code": 59510,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -869,7 +863,7 @@
     {
       "uid": "295e9560f763400dae5f29abd75c4e39",
       "css": "tree",
-      "code": 59474,
+      "code": 59511,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -883,7 +877,7 @@
     {
       "uid": "0581bbd4c54547d8d6721cc122ffe0fa",
       "css": "lock-open",
-      "code": 59468,
+      "code": 59512,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -897,7 +891,7 @@
     {
       "uid": "d0203434b5e4cea53499b112743fd675",
       "css": "pick",
-      "code": 59434,
+      "code": 59513,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -911,7 +905,7 @@
     {
       "uid": "b04d1002bf24f642a026b8844f0ab4af",
       "css": "export",
-      "code": 59435,
+      "code": 59515,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -925,7 +919,7 @@
     {
       "uid": "6636e2512996fa2c2b37b8d9e111d4fe",
       "css": "download",
-      "code": 59436,
+      "code": 59516,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -939,7 +933,7 @@
     {
       "uid": "f9895cd70db81922fbd2aa1882f04a03",
       "css": "upload",
-      "code": 59437,
+      "code": 59517,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -953,7 +947,7 @@
     {
       "uid": "e8191eedaa10260cef458a2385925cb0",
       "css": "settings",
-      "code": 59406,
+      "code": 59530,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -967,7 +961,7 @@
     {
       "uid": "ea0128855a25fc520b78658acfe68693",
       "css": "spray",
-      "code": 59569,
+      "code": 59531,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -981,7 +975,7 @@
     {
       "uid": "32b0960726db55c7f26620e15f83acd9",
       "css": "zoom",
-      "code": 59415,
+      "code": 59532,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -995,7 +989,7 @@
     {
       "uid": "22856e2f42e364e7e363348542b46062",
       "css": "power_old",
-      "code": 59419,
+      "code": 59533,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -1015,7 +1009,7 @@
     {
       "uid": "844ca62d81744d1ca4b59a4763aeca86",
       "css": "menu",
-      "code": 59440,
+      "code": 59534,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -1029,7 +1023,7 @@
     {
       "uid": "4b4d5e5ee8884c2f545869496dcb525b",
       "css": "lock",
-      "code": 59469,
+      "code": 59535,
       "src": "custom_icons",
       "selected": true,
       "svg": {
@@ -1039,6 +1033,34 @@
       "search": [
         "lock"
       ]
+    },
+    {
+      "uid": "9515bb59fd462b77f0d088978c339778",
+      "css": "eye",
+      "code": 59492,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M450 0L400 50 350 100 300 150 250 200 200 250 150 300 100 350 50 400 0 450V550L50 600 100 650 150 700 200 750 250 800 300 850 350 900 400 950 450 1000H550 650 750 850 950 1050 1150L1200 950 1250 900 1300 850 1350 800 1400 750 1450 700 1500 650 1550 600 1600 550V450L1550 400 1500 350 1450 300 1400 250 1350 200 1300 150 1250 100 1200 50 1150 0H1050 950 850 750 650 550ZM650 200H750 850 950L1000 250 1050 300 1100 350 1150 400 1200 450V550L1150 600 1100 650 1050 700 1000 750 950 800H850 750 650L600 750 550 700 500 650 450 600 400 550V450L450 400 500 350 550 300 600 250ZM750 400L700 450V550L750 600H850L900 550V450L850 400Z",
+        "width": 1600
+      },
+      "search": [
+        "eye"
+      ]
+    },
+    {
+      "uid": "fdd7088d0019bb1033df645f01981429",
+      "css": "eye-off",
+      "code": 59493,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M1041.7 0L1000 41.7 958.3 83.3 916.7 125 875 166.7 833.3 208.3 791.7 250 750 291.7 708.3 333.3 666.7 375 625 416.7 583.3 458.3 541.7 500 500 541.7 458.3 583.3 416.7 625 375 666.7 333.3 708.3 291.7 750 250 791.7 208.3 833.3 166.7 875V958.3L208.3 1000H291.7L333.3 958.3 375 916.7 416.7 875 458.3 833.3 500 791.7 541.7 750 583.3 708.3 625 666.7 666.7 625 708.3 583.3 750 541.7 791.7 500 833.3 458.3 875 416.7 916.7 375 958.3 333.3 1000 291.7 1041.7 250 1083.3 208.3 1125 166.7 1166.7 125V41.7L1125 0ZM375 83.3L333.3 125 291.7 166.7 250 208.3 208.3 250 166.7 291.7 125 333.3 83.3 375 41.7 416.7 0 458.3V541.7L41.7 583.3 83.3 625 125 666.7H208.3L250 625 291.7 583.3 333.3 541.7V458.3L375 416.7 416.7 375 458.3 333.3 500 291.7 541.7 250H625L666.7 208.3 708.3 166.7 750 125 708.3 83.3H625 541.7 458.3ZM1125 333.3L1083.3 375 1041.7 416.7 1000 458.3V541.7L958.3 583.3 916.7 625 875 666.7 833.3 708.3 791.7 750H708.3L666.7 791.7 625 833.3 583.3 875 625 916.7H708.3 791.7 875 958.3L1000 875 1041.7 833.3 1083.3 791.7 1125 750 1166.7 708.3 1208.3 666.7 1250 625 1291.7 583.3 1333.3 541.7V458.3L1291.7 416.7 1250 375 1208.3 333.3Z",
+        "width": 1333
+      },
+      "search": [
+        "eye-off"
+      ]
     }
   ]
 }

core/assets/bundles/bundle.properties

@@ -189,6 +189,10 @@ servers.local = Local Servers
 servers.remote = Remote Servers
 servers.global = Community Servers
 
+servers.showhidden = Show Hidden Servers
+server.shown = Shown
+server.hidden = Hidden
+
 trace = Trace Player
 trace.playername = Player name: [accent]{0}
 trace.ip = IP: [accent]{0}
@@ -503,7 +507,7 @@ zone.objective = [lightgray]Objective: [accent]{0}
 zone.objective.survival = Survive
 zone.objective.attack = Destroy Enemy Core
 add = Add...
-boss.health = Boss Health
+boss.health = Guardian Health
 
 connectfail = [scarlet]Connection error:\n\n[accent]{0}
 error.unreachable = Server unreachable.\nIs the address spelled correctly?
@@ -667,6 +671,7 @@ ability.repairfield = Repair Field
 ability.statusfield = Status Field
 ability.unitspawn = {0} Factory
 ability.shieldregenfield = Shield Regen Field
+ability.movelightning = Movement Lightning
 
 bar.drilltierreq = Better Drill Required
 bar.noresources = Missing Resources
@@ -1306,8 +1311,8 @@ block.inverted-sorter.description = Similar to a standard sorter, but outputs se
 block.router.description = Distributes input items to 3 output directions equally.
 block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
 block.distributor.description = Distributes input items to 7 output directions equally.
-block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked.
+block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked. Cannot be used next to other gates.
-block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked.
+block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked. Cannot be used next to other gates.
 block.mass-driver.description = Long-range item transport structure. Collects batches of items and shoots them to other mass drivers.
 block.mechanical-pump.description = Pumps and outputs liquids. Does not require power.
 block.rotary-pump.description = Pumps and outputs liquids. Requires power.