From 6dff68e7d90c63e494beb732d8e3f64cd13e76d7 Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Tue, 7 Nov 2023 22:42:42 +0300
Subject: [PATCH 001/369] Texture marker implementation

---
 core/assets/bundles/bundle.properties        |  4 ++
 core/src/mindustry/game/MapObjectives.java   | 66 +++++++++++++++++++-
 core/src/mindustry/logic/LExecutor.java      | 17 ++++-
 core/src/mindustry/logic/LMarkerControl.java |  5 +-
 core/src/mindustry/logic/LStatements.java    |  2 +-
 5 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 044d48dcaf..62c906fa56 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2458,3 +2458,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building, floor and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nSecond and third arguments are additional suffixes added using "-" separator.\nIf additional arguments are not strings, nothing is added to first string.
+lenum.textureWidth = Width of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.textureHeight = Height of texture in tiles. Zero value scales marker height to original texture's size.
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index cef72e7971..c648aecc6f 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -64,7 +64,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             MinimapMarker::new,
             ShapeMarker::new,
             TextMarker::new,
-            LineMarker::new
+            LineMarker::new,
+            TextureMarker::new
         );
     }
 
@@ -612,7 +613,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     public static abstract class ObjectiveMarker{
         /** Makes sure markers are only added once. */
         public transient boolean wasAdded;
-        //** Hides the marker, used by world processors */
+        /** Hides the marker, used by world processors */
         public boolean hidden = false;
 
         /** Called in the overlay draw layer.*/
@@ -632,6 +633,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         }
         public void setText(String text, boolean fetch){}
 
+        public void setTexture(String textureName){}
+
         /** @return The localized type-name of this objective, defaulting to the class simple name without the "Marker" prefix. */
         public String typeName(){
             String className = getClass().getSimpleName().replace("Marker", "");
@@ -1001,6 +1004,65 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         }
     }
 
+    /** Displays a texture with specified name. */
+    public static class TextureMarker extends ObjectiveMarker{
+        public @TilePos Vec2 pos = new Vec2();
+        public float rotation = 0f, width = 0f, height = 0f; // Zero width/height scales marker to original texture's size
+        public String textureName = "";
+        public Color color = Color.white.cpy();
+
+        private transient TextureRegion fetchedRegion;
+
+        public TextureMarker(String textureName, float x, float y){
+            this.textureName = textureName;
+            this.pos.set(x, y);
+        }
+
+        public TextureMarker(){}
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            switch(type){
+                case x -> pos.x = (float)p1 * tilesize;
+                case y -> pos.y = (float)p1 * tilesize;
+                case pos -> pos.set((float)p1 * tilesize, (float)p2 * tilesize);
+                case rotation -> rotation = (float)p1;
+                case textureWidth -> width = (float)p1 * tilesize;
+                case textureHeight -> height = (float)p1 * tilesize;
+                case color -> {
+                    Log.info("test");
+                    color.set(Tmp.c1.fromDouble(p1));
+                }
+                default -> super.control(type, p1, p2, p3);
+            }
+        }
+
+        @Override
+        public void draw(){
+            if(hidden || textureName.isEmpty()) return;
+
+            if(fetchedRegion == null) fetchedRegion = Core.atlas.find(textureName);
+
+            // Zero width/height scales marker to original texture's size
+            if(width < 1e-5) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
+            if(height < 1e-5) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
+
+            if(fetchedRegion.found()){
+                Draw.color(color);
+                Draw.rect(fetchedRegion, pos.x, pos.y, width, height, rotation);
+            }else{
+                Draw.color(Color.white);
+                Draw.rect("error", pos.x, pos.y, width, height, rotation);
+            }
+        }
+
+        @Override
+        public void setTexture(String textureName){
+            this.textureName = textureName;
+            fetchedRegion = Core.atlas.find(textureName);
+        }
+    }
+
     /** For arrays or {@link Seq}s; does not create element rearrangement buttons. */
     @Target(FIELD)
     @Retention(RUNTIME)
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index bd06b9eefd..840dd3d394 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1555,7 +1555,7 @@ public class LExecutor{
 
         @Override
         public void run(LExecutor exec){
-            //set default to succes
+            //set default to success
             exec.setnum(outSuccess, 1);
             if(headless && type != MessageType.mission) {
                 exec.textBuffer.setLength(0);
@@ -1879,6 +1879,13 @@ public class LExecutor{
                 }else if(type == LMarkerControl.flushText){
                     marker.setText(exec.textBuffer.toString(), true);
                     exec.textBuffer.setLength(0);
+                }else if(type == LMarkerControl.texture){
+                    if(exec.obj(p1) != null){
+                        StringBuilder res = new StringBuilder(exec.obj(p1).toString());
+                        if(exec.obj(p2) != null) res.append("-").append(exec.obj(p2).toString());
+                        if(exec.obj(p3) != null) res.append("-").append(exec.obj(p3).toString());
+                        marker.setTexture(res.toString());
+                    }
                 }else{
                     marker.control(type, exec.num(p1), exec.num(p2), exec.num(p3));
                 }
@@ -1944,5 +1951,13 @@ public class LExecutor{
         }
     }
 
+    @Remote(called = Loc.server, variants = Variant.both, unreliable = true)
+    public static void updateMarkerTexture(int id, String textureName){
+        var marker = state.markers.get(id);
+        if(marker != null){
+            marker.setTexture(textureName);
+        }
+    }
+
     //endregion
 }
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
index f0ae6ae6b1..3865727f60 100644
--- a/core/src/mindustry/logic/LMarkerControl.java
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -24,7 +24,10 @@ public enum LMarkerControl{
     shapeFill("true/false"),
     shapeOutline("true/false"),
     setShape("sides", "fill", "outline"),
-    color("color");
+    color("color"),
+    texture("name", "-", "-"),
+    textureWidth("width"),
+    textureHeight("height");
 
     public final String[] params;
 
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 3806254550..384c70faab 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -1943,7 +1943,7 @@ public class LStatements{
                 b.clicked(() -> showSelect(b, LMarkerControl.all, type, t -> {
                     type = t;
                     rebuild(table);
-                }, 2, cell -> cell.size(140, 50)));
+                }, 3, cell -> cell.size(140, 50)));
             }, Styles.logict, () -> {}).size(190, 40).color(table.color).left().padLeft(2);
 
             row(table);

From c434e18f8f39803dbfeca4b9a8b590042d8f1248 Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Mon, 13 Nov 2023 23:25:44 +0300
Subject: [PATCH 002/369] Add drawing layers to markers

---
 core/assets/bundles/bundle.properties         |  4 +-
 core/src/mindustry/core/Renderer.java         |  9 ++++
 core/src/mindustry/game/MapObjectives.java    | 28 ++++++++---
 .../mindustry/graphics/OverlayRenderer.java   |  9 ----
 core/src/mindustry/logic/LMarkerControl.java  | 21 ++++----
 core/src/mindustry/logic/LStatement.java      | 20 ++++++++
 core/src/mindustry/logic/LStatements.java     | 48 ++++++++++++-------
 7 files changed, 95 insertions(+), 44 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 62c906fa56..9a2b49311f 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2460,5 +2460,5 @@ lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
 
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nSecond and third arguments are additional suffixes added using "-" separator.\nIf additional arguments are not strings, nothing is added to first string.
-lenum.textureWidth = Width of texture in tiles. Zero value scales marker width to original texture's size.
-lenum.textureHeight = Height of texture in tiles. Zero value scales marker height to original texture's size.
+lenum.texturewidth = Width of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.textureheight = Height of texture in tiles. Zero value scales marker height to original texture's size.
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index f78a9da907..ba935f438d 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -371,6 +371,15 @@ public class Renderer implements ApplicationListener{
             });
         }
 
+        //draw objective markers
+        state.rules.objectives.eachRunning(obj -> {
+            for(var marker : obj.markers) marker.draw();
+        });
+
+        for(var marker : state.markers.values()){
+            if(marker != null) marker.draw();
+        }
+
         Draw.draw(Layer.overlayUI, overlays::drawTop);
         if(state.rules.fog) Draw.draw(Layer.fogOfWar, fog::drawFog);
         Draw.draw(Layer.space, this::drawLanding);
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index c648aecc6f..afc4608e9a 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -609,12 +609,14 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         }
     }
 
-    /** Marker used for drawing UI to indicate something along with an objective. */
+    /** Marker used for drawing various content to indicate something along with an objective. Mostly used as UI overlay.  */
     public static abstract class ObjectiveMarker{
         /** Makes sure markers are only added once. */
         public transient boolean wasAdded;
-        /** Hides the marker, used by world processors */
-        public boolean hidden = false;
+        /** Hides the marker, used by world processors. */
+        protected boolean hidden = false;
+        /** On which z-sorting layer is marker drawn. */
+        protected float drawLayer = Layer.overlayUI;
 
         /** Called in the overlay draw layer.*/
         public void draw(){}
@@ -628,7 +630,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public void control(LMarkerControl type, double p1, double p2, double p3){
             switch(type){
                 case toggleVisibility -> hidden = !hidden;
-                case setVisibility -> hidden = ((Math.abs(p1) < 1e-5));
+                case visibility -> hidden = ((Math.abs(p1) < 1e-5));
+                case drawLayer -> drawLayer = (float)p1;
             }
         }
         public void setText(String text, boolean fetch){}
@@ -700,10 +703,12 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             //in case some idiot decides to make 9999999 sides and freeze the game
             int sides = Math.min(this.sides, 200);
 
+            Draw.z(drawLayer);
             Lines.stroke(3f, Pal.gray);
             Lines.poly(pos.x, pos.y, sides, radius + 1f, rotation);
             Lines.stroke(1f, color);
             Lines.poly(pos.x, pos.y, sides, radius + 1f, rotation);
+            Draw.z(Layer.overlayUI);
             Draw.reset();
 
             if(fetchedText == null){
@@ -713,7 +718,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             // font size cannot be 0
             if(Math.abs(fontSize) < 1e-5) return;
 
-            WorldLabel.drawAt(fetchedText, pos.x, pos.y + radius + textHeight, Draw.z(), flags, fontSize);
+            WorldLabel.drawAt(fetchedText, pos.x, pos.y + radius + textHeight, drawLayer, flags, fontSize);
         }
 
         @Override
@@ -794,8 +799,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             float rad = minimap.scale(radius * tilesize);
             float fin = Interp.pow2Out.apply((Time.globalTime / 100f) % 1f);
 
+            Draw.z(drawLayer);
             Lines.stroke(Scl.scl((1f - fin) * stroke + 0.1f), color);
             Lines.circle(Tmp.v1.x, Tmp.v1.y, rad * fin);
+
+            Draw.z(Layer.overlayUI);
             Draw.reset();
         }
 
@@ -840,6 +848,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             //in case some idiot decides to make 9999999 sides and freeze the game
             int sides = Math.min(this.sides, 200);
 
+            Draw.z(drawLayer);
             if(!fill){
                 if(outline){
                     Lines.stroke(stroke + 2f, Pal.gray);
@@ -853,6 +862,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 Fill.poly(pos.x, pos.y, sides, radius, rotation);
             }
 
+            Draw.z(Layer.overlayUI);
             Draw.reset();
         }
 
@@ -868,7 +878,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 case shapeSides -> sides = (int)p1;
                 case shapeFill -> fill = (Math.abs(p1) >= 1e-5);
                 case shapeOutline -> outline = (Math.abs(p1) >= 1e-5);
-                case setShape -> {
+                case shape -> {
                     sides = (int)p1;
                     fill = (Math.abs(p2) >= 1e-5);
                     outline = (Math.abs(p3) >= 1e-5);
@@ -911,7 +921,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 fetchedText = fetchText(text);
             }
 
-            WorldLabel.drawAt(fetchedText, pos.x, pos.y, Draw.z(), flags, fontSize);
+            WorldLabel.drawAt(fetchedText, pos.x, pos.y, drawLayer, flags, fontSize);
         }
 
         @Override
@@ -994,6 +1004,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public void draw(){
             if(hidden) return;
 
+            Draw.z(drawLayer);
             if(outline){
                 Lines.stroke(stroke + 2f, Pal.gray);
                 Lines.line(pos1.x, pos1.y, pos2.x, pos2.y);
@@ -1047,6 +1058,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             if(width < 1e-5) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
             if(height < 1e-5) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
 
+            Draw.z(drawLayer);
             if(fetchedRegion.found()){
                 Draw.color(color);
                 Draw.rect(fetchedRegion, pos.x, pos.y, width, height, rotation);
@@ -1054,6 +1066,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 Draw.color(Color.white);
                 Draw.rect("error", pos.x, pos.y, width, height, rotation);
             }
+
+            Draw.z(Layer.overlayUI);
         }
 
         @Override
diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java
index be2b47db93..853304e7b2 100644
--- a/core/src/mindustry/graphics/OverlayRenderer.java
+++ b/core/src/mindustry/graphics/OverlayRenderer.java
@@ -113,15 +113,6 @@ public class OverlayRenderer{
             }
         }
 
-        //draw objective markers
-        state.rules.objectives.eachRunning(obj -> {
-            for(var marker : obj.markers) marker.draw();
-        });
-
-        for(var marker : state.markers.values()){
-            if(marker != null) marker.draw();
-        }
-
         if(player.dead()) return; //dead players don't draw
 
         InputHandler input = control.input;
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
index 3865727f60..e7bbec9b5a 100644
--- a/core/src/mindustry/logic/LMarkerControl.java
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -2,29 +2,30 @@ package mindustry.logic;
 
 public enum LMarkerControl{
     remove,
-    setVisibility("true/false"),
+    visibility("true/false"),
     toggleVisibility,
-    text("text"),
-    flushText,
     x("x"),
     y("y"),
     pos("x", "y"),
     endX("x"),
     endY("y"),
     endPos("x", "y"),
-    fontSize("size"),
-    textHeight("height"),
-    labelBackground("true/false"),
-    labelOutline("true/false"),
-    labelFlags("background", "outline"),
+    drawLayer("layer"),
+    color("color"),
     radius("radius"),
     stroke("stroke"),
     rotation("rotation"),
     shapeSides("sides"),
     shapeFill("true/false"),
     shapeOutline("true/false"),
-    setShape("sides", "fill", "outline"),
-    color("color"),
+    shape("sides", "fill", "outline"),
+    text("text"),
+    flushText,
+    fontSize("size"),
+    textHeight("height"),
+    labelBackground("true/false"),
+    labelOutline("true/false"),
+    labelFlags("background", "outline"),
     texture("name", "-", "-"),
     textureWidth("width"),
     textureHeight("height");
diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java
index 418987f59f..939114cc89 100644
--- a/core/src/mindustry/logic/LStatement.java
+++ b/core/src/mindustry/logic/LStatement.java
@@ -2,6 +2,7 @@ package mindustry.logic;
 
 import arc.*;
 import arc.func.*;
+import arc.graphics.*;
 import arc.math.*;
 import arc.scene.*;
 import arc.scene.actions.*;
@@ -10,10 +11,12 @@ import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.logic.LCanvas.*;
 import mindustry.logic.LExecutor.*;
 import mindustry.ui.*;
 
+import static mindustry.Vars.ui;
 import static mindustry.logic.LCanvas.*;
 
 /**
@@ -120,6 +123,23 @@ public abstract class LStatement{
         return result[0];
     }
 
+    /** Adds color edit button */
+    protected Cell<Button> col(Table table, String value, Cons<Color> setter){
+        return table.button(b -> {
+            b.image(Icon.pencilSmall);
+            b.clicked(() -> {
+                Color current = Pal.accent.cpy();
+                if(value.startsWith("%")){
+                    try{
+                        current = Color.valueOf(value.substring(1));
+                    }catch(Exception ignored){}
+                }
+
+                ui.picker.show(current, setter);
+            });
+        }, Styles.logict, () -> {}).size(40f).padLeft(-11).color(table.color);
+    }
+
     protected Cell<TextField> fields(Table table, String value, Cons<String> setter){
         return field(table, value, setter).width(85f);
     }
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 384c70faab..93a950c120 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -174,6 +174,10 @@ public class LStatements{
                     }
                     case col -> {
                         fields(s, "color", x, v -> x = v).width(144f);
+                        col(s, x, res -> {
+                            x = "%" + res.toString().substring(0, res.a >= 1f ? 6 : 8);
+                            build(table);
+                        });
                     }
                     case stroke -> {
                         s.add().width(4);
@@ -1554,22 +1558,10 @@ public class LStatements{
                 if(entry.color){
                     fields(table, "color", color, str -> color = str).width(120f);
 
-                    table.button(b -> {
-                        b.image(Icon.pencilSmall);
-                        b.clicked(() -> {
-                            Color current = Pal.accent.cpy();
-                            if(color.startsWith("%")){
-                                try{
-                                    current = Color.valueOf(color.substring(1));
-                                }catch(Exception ignored){}
-                            }
-
-                            ui.picker.show(current, result -> {
-                                color = "%" + result.toString().substring(0, result.a >= 1f ? 6 : 8);
-                                build(table);
-                            });
-                        });
-                    }, Styles.logict, () -> {}).size(40f).padLeft(-11).color(table.color);
+                    col(table, color, res -> {
+                        color = "%" + res.toString().substring(0, res.a >= 1f ? 6 : 8);
+                        build(table);
+                    });
                 }
 
                 row(table);
@@ -1959,6 +1951,30 @@ public class LStatements{
                     t.setColor(table.color);
 
                     fields(t, type.params[i], i == 0 ? p1 : i == 1 ? p2 : p3, i == 0 ? v -> p1 = v : i == 1 ? v -> p2 = v : v -> p3 = v).width(100f);
+                    if(type == LMarkerControl.color){
+                        col(t, p1, res -> {
+                            p1 = "%" + res.toString().substring(0, res.a >= 1f ? 6 : 8);
+                            build(table);
+                        });
+                    }else if(type == LMarkerControl.drawLayer){
+                        t.button(b -> {
+                            b.image(Icon.pencilSmall);
+                            b.clicked(() -> showSelectTable(b, (o, hide) -> {
+                                o.row();
+                                o.table(s -> {
+                                    s.left();
+                                    for(var layer : Layer.class.getFields()){
+                                        float value = Reflect.get(Layer.class, layer.getName());
+                                        s.button(layer.getName() + " = " + value, Styles.logicTogglet, () -> {
+                                            p1 = Float.toString(value);
+                                            rebuild(table);
+                                            hide.run();
+                                        }).size(240f, 40f).row();
+                                    }
+                                }).width(240f).left();
+                            }));
+                        }, Styles.logict, () -> {}).size(40f).padLeft(-2).color(table.color);
+                    }
                 });
 
                 if(i == 0) row(table);

From b189bfdf44b0ebd23e9fc9b317ba40929863e95b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 19 Nov 2023 19:09:15 -0500
Subject: [PATCH 003/369] Closes Anuken/Mindustry-Suggestions/issues/4780
 (dumping neoplasm from tanks)

---
 core/src/mindustry/content/Liquids.java               |  2 +-
 core/src/mindustry/entities/comp/BuildingComp.java    |  9 +++++++++
 core/src/mindustry/world/Block.java                   |  2 ++
 core/src/mindustry/world/Build.java                   |  5 ++++-
 .../world/blocks/payloads/PayloadDeconstructor.java   | 11 +++++++++++
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java
index 0f95a02685..432b4463cc 100644
--- a/core/src/mindustry/content/Liquids.java
+++ b/core/src/mindustry/content/Liquids.java
@@ -54,7 +54,7 @@ public class Liquids{
             capPuddles = false;
             spreadTarget = Liquids.water;
             moveThroughBlocks = true;
-            incinerable = true;
+            incinerable = false;
             blockReactive = false;
             canStayOn.addAll(water, oil, cryofluid);
 
diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index 7eb9288c3b..a8d027cf1e 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -1344,6 +1344,15 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return block.itemCapacity;
     }
 
+    /** Called when a block begins (not finishes!) deconstruction. The building is still present at this point. */
+    public void onDeconstructed(@Nullable Unit builder){
+        //deposit non-incinerable liquid on ground
+        if(liquids != null && liquids.currentAmount() > 0 && (!liquids.current().incinerable || block.deconstructDropAllLiquid)){
+            float perCell = liquids.currentAmount() / (block.size * block.size) * 2f;
+            tile.getLinkedTiles(other -> Puddles.deposit(other, liquids.current(), perCell));
+        }
+    }
+
     /** Called when the block is destroyed. The tile is still intact at this stage. */
     public void onDestroyed(){
         float explosiveness = block.baseExplosiveness;
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 619a9fe209..f4f50c2fc1 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -154,6 +154,8 @@ public class Block extends UnlockableContent implements Senseable{
     public boolean updateInUnits = true;
     /** if true, this block updates in payloads in units regardless of the experimental game rule */
     public boolean alwaysUpdateInUnits = false;
+    /** if false, only incinerable liquids are dropped when deconstructing; otherwise, all liquids are dropped. */
+    public boolean deconstructDropAllLiquid = false;
     /** Whether to use this block's color in the minimap. Only used for overlays. */
     public boolean useColor = true;
     /** item that drops from this block, used for drills */
diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java
index 95664f71f4..4377eb521a 100644
--- a/core/src/mindustry/world/Build.java
+++ b/core/src/mindustry/world/Build.java
@@ -47,7 +47,10 @@ public class Build{
         Block sub = ConstructBlock.get(previous.size);
 
         Seq<Building> prevBuild = new Seq<>(1);
-        if(tile.build != null) prevBuild.add(tile.build);
+        if(tile.build != null){
+            prevBuild.add(tile.build);
+            tile.build.onDeconstructed(unit);
+        }
 
         tile.setBlock(sub, team, rotation);
         var build = (ConstructBuild)tile.build;
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java b/core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java
index ee66fcdfd4..d2586a4e22 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java
@@ -5,6 +5,7 @@ import arc.math.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.content.*;
+import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.logic.*;
@@ -140,6 +141,16 @@ public class PayloadDeconstructor extends PayloadBlock{
                     float shift = edelta() * deconstructSpeed / deconstructing.buildTime();
                     float realShift = Math.min(shift, 1f - progress);
 
+                    //if began deconstruction...
+                    if(progress == 0f && shift > 0f && deconstructing instanceof BuildPayload pay){
+                        var build = pay.build;
+                        //dump liquid on floor (does not respect block configuration with respect to dumping liquids on floor)
+                        if(build.liquids != null && build.liquids.currentAmount() > 0){
+                            float perCell = build.liquids.currentAmount() / (block.size * block.size) * 2f;
+                            tile.getLinkedTiles(other -> Puddles.deposit(other, build.liquids.current(), perCell));
+                        }
+                    }
+
                     progress += shift;
                     time += edelta();
 

From 8bb6acfacbb4b5e3c0cec2110d026dbd89ff4d8b Mon Sep 17 00:00:00 2001
From: 112Hack <144626073+112Hack@users.noreply.github.com>
Date: Wed, 22 Nov 2023 16:24:45 +0300
Subject: [PATCH 004/369] Update servers_v7.json (#9303)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index e7f13e6ca7..da967afbfd 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -9,7 +9,7 @@
   },
   {
     "name": "CMS",
-    "address": ["195.2.84.144"]
+    "address": ["195.2.84.144","23.88.73.88:25617"]
   },
   {
     "name": "ShardDustry Eventos",

From aa018b314d24f8e3b67ba057f5f9a019d5fa57c4 Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Wed, 22 Nov 2023 22:33:05 +0300
Subject: [PATCH 005/369] World processor markers: remove toggleVisibility,
 swap makemarker's type and id arguments for instruction consistency

---
 core/src/mindustry/game/MapObjectives.java   | 1 -
 core/src/mindustry/logic/LMarkerControl.java | 1 -
 core/src/mindustry/logic/LStatements.java    | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index afc4608e9a..8e6bf5e65d 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -629,7 +629,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         /** Control marker with world processor code*/
         public void control(LMarkerControl type, double p1, double p2, double p3){
             switch(type){
-                case toggleVisibility -> hidden = !hidden;
                 case visibility -> hidden = ((Math.abs(p1) < 1e-5));
                 case drawLayer -> drawLayer = (float)p1;
             }
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
index e7bbec9b5a..70e06e6aed 100644
--- a/core/src/mindustry/logic/LMarkerControl.java
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -3,7 +3,6 @@ package mindustry.logic;
 public enum LMarkerControl{
     remove,
     visibility("true/false"),
-    toggleVisibility,
     x("x"),
     y("y"),
     pos("x", "y"),
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 93a950c120..febcee4450 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -2000,7 +2000,7 @@ public class LStatements{
 
     @RegisterStatement("makemarker")
     public static class MakeMarkerStatement extends LStatement{
-        public String id = "0", type = "shape", x = "0", y = "0", replace = "true";
+        public String type = "shape", id = "0", x = "0", y = "0", replace = "true";
 
         @Override
         public void build(Table table){

From 726ba2af31dc8c11888b3ac65a563d1b0b635622 Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Thu, 23 Nov 2023 05:06:05 +0700
Subject: [PATCH 006/369] Update servers_v7.json (#9304)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index da967afbfd..59ca9db35e 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -222,7 +222,7 @@
   },
   {
     "name": "ABCXYZ Community",
-    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "5.9.8.124:17775"]
+    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113"]
   },
   {
     "name": "CroCraft Network",

From 3fcaf8f916668f945e34c60963864e7af820c63e Mon Sep 17 00:00:00 2001
From: Electron <135461023+Electron215@users.noreply.github.com>
Date: Thu, 23 Nov 2023 04:59:32 -0500
Subject: [PATCH 007/369] Update servers_v7.json (#9294)

Co-authored-by: Electron <135461023+Electorn215@users.noreply.github.com>
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index 59ca9db35e..1c275376cf 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -51,6 +51,10 @@
     "name": "SynapseOS",
     "address": ["0nera.ru:7777"]
   },
+  {
+    "name": "Parallax Network",
+    "address": ["138.2.177.166","138.2.177.166:3000","138.2.177.166:3001","138.2.177.166:3002","138.2.177.166:3003","138.2.177.166:3004","138.2.177.166:3005"]
+  },
   {
     "name": "Untitled Mindustry Servers",
     "address": ["45.144.66.250:6567", "45.144.66.250:6601", "45.144.66.250:6611"]

From f4741e0e59988273df025524837bbe2c056fa4ee Mon Sep 17 00:00:00 2001
From: Hahaa13 <108379326+Hahaa13@users.noreply.github.com>
Date: Thu, 23 Nov 2023 11:25:36 +0000
Subject: [PATCH 008/369] Back back vndustry (#9297)

* Update servers_v7.json

* Update servers_v7.json

* Back :))
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index 1c275376cf..66360e8167 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -1,4 +1,8 @@
 [
+  {
+    "name": "Vndustry",
+    "address": ["140.238.246.78:7000"]
+  },
   {
     "name": "meiqiuMDT",
     "address": ["cn1.plush.run:10001","211.101.236.94:10000","bj-1.lcf.icu:10240","play.simpfun.cn:14523"]

From 4076a146b1dd7ab85d68b6c135e8e78e23e17108 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 23 Nov 2023 06:28:57 -0500
Subject: [PATCH 009/369] Reject invalid tile configs

---
 core/src/mindustry/input/InputHandler.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 73be92ad0d..90ac947c52 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -615,7 +615,9 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
     @Remote(targets = Loc.both, called = Loc.both, forward = true)
     public static void tileConfig(@Nullable Player player, Building build, @Nullable Object value){
+        if(build == null && net.server()) throw new ValidateException(player, "building is null");
         if(build == null) return;
+
         if(net.server() && (!Units.canInteract(player, build) ||
             !netServer.admins.allowAction(player, ActionType.configure, build.tile, action -> action.config = value))){
 

From 1feeef7aef9780655aaabb8ccfa2d1bde5aa5294 Mon Sep 17 00:00:00 2001
From: karlo292 <64750254+karlo292@users.noreply.github.com>
Date: Thu, 23 Nov 2023 19:35:26 +0100
Subject: [PATCH 010/369] Update servers_v7.json (#9307)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 66360e8167..e91a506b66 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -234,7 +234,7 @@
   },
   {
     "name": "CroCraft Network",
-    "address": ["193.122.53.98:6567", "41.216.188.223:5001"]
+    "address": ["193.122.53.98:6567", "193.122.53.98:20130"]
   },
   {
     "name": "Extra Utilities",

From d2956d1f2c3496da098dea09f71111cbbef009a0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 23 Nov 2023 14:24:59 -0500
Subject: [PATCH 011/369] ConnectFilter API now public

---
 core/src/mindustry/net/ArcNetProvider.java |  6 ++++++
 core/src/mindustry/net/Net.java            | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java
index 87a16f6a52..20715ecd4c 100644
--- a/core/src/mindustry/net/ArcNetProvider.java
+++ b/core/src/mindustry/net/ArcNetProvider.java
@@ -5,6 +5,7 @@ import arc.func.*;
 import arc.math.*;
 import arc.net.*;
 import arc.net.FrameworkMessage.*;
+import arc.net.Server.*;
 import arc.net.dns.*;
 import arc.struct.*;
 import arc.util.*;
@@ -161,6 +162,11 @@ public class ArcNetProvider implements NetProvider{
         server.setConnectFilter(connectFilter);
     }
 
+    @Override
+    public ServerConnectFilter getConnectFilter(){
+        return server.getConnectFilter();
+    }
+
     private static boolean isLocal(InetAddress addr){
         if(addr.isAnyLocalAddress() || addr.isLoopbackAddress()) return true;
 
diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java
index ef69c392b0..17822d55ab 100644
--- a/core/src/mindustry/net/Net.java
+++ b/core/src/mindustry/net/Net.java
@@ -3,6 +3,7 @@ package mindustry.net;
 import arc.*;
 import arc.func.*;
 import arc.net.*;
+import arc.net.Server.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.game.EventType.*;
@@ -325,6 +326,15 @@ public class Net{
         }
     }
 
+    /** Sets a connection filter by IP address. If the filter returns {@code false}, the connection will be closed. Server only. */
+    public void setConnectFilter(ServerConnectFilter filter){
+        provider.setConnectFilter(filter);
+    }
+
+    public ServerConnectFilter getConnectFilter(){
+        return provider.getConnectFilter();
+    }
+
     /**
      * Pings a host in a pooled thread. If an error occurred, failed() should be called with the exception.
      * If the port is the default mindustry port, SRV records are checked too.
@@ -401,5 +411,9 @@ public class Net{
 
         /** Sets a connection filter by IP address. If the filter returns {@code false}, the connection will be closed. */
         default void setConnectFilter(Server.ServerConnectFilter connectFilter){}
+
+        default ServerConnectFilter getConnectFilter(){
+            return null;
+        }
     }
 }

From 9af7a864bdb12f2b7b9383b551be5277d7e22441 Mon Sep 17 00:00:00 2001
From: Elixias <61173114+BlueWolf3682@users.noreply.github.com>
Date: Thu, 23 Nov 2023 16:59:14 -0700
Subject: [PATCH 012/369] f (#9309)

---
 core/assets/maps/frozenForest.msav | Bin 10538 -> 10604 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/core/assets/maps/frozenForest.msav b/core/assets/maps/frozenForest.msav
index 09f7e2a54640f5851ff14c1bf02f25b30a6cc148..e29d7199cd55249d643bdb98e78c65733e43d912 100644
GIT binary patch
literal 10604
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
b+pqa8enY9tbnT9$i}TNI`!BxC<6<NL0=yNs

literal 10538
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


From 130336bff0d496fd541da89f4f783b0cf39f4a64 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 23 Nov 2023 19:04:17 -0500
Subject: [PATCH 013/369] arc

---
 core/src/mindustry/net/ArcNetProvider.java | 2 +-
 core/src/mindustry/net/Net.java            | 6 +++---
 gradle.properties                          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java
index 20715ecd4c..26b160526e 100644
--- a/core/src/mindustry/net/ArcNetProvider.java
+++ b/core/src/mindustry/net/ArcNetProvider.java
@@ -163,7 +163,7 @@ public class ArcNetProvider implements NetProvider{
     }
 
     @Override
-    public ServerConnectFilter getConnectFilter(){
+    public @Nullable ServerConnectFilter getConnectFilter(){
         return server.getConnectFilter();
     }
 
diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java
index 17822d55ab..145238bf88 100644
--- a/core/src/mindustry/net/Net.java
+++ b/core/src/mindustry/net/Net.java
@@ -327,11 +327,11 @@ public class Net{
     }
 
     /** Sets a connection filter by IP address. If the filter returns {@code false}, the connection will be closed. Server only. */
-    public void setConnectFilter(ServerConnectFilter filter){
+    public void setConnectFilter(@Nullable ServerConnectFilter filter){
         provider.setConnectFilter(filter);
     }
 
-    public ServerConnectFilter getConnectFilter(){
+    public @Nullable ServerConnectFilter getConnectFilter(){
         return provider.getConnectFilter();
     }
 
@@ -412,7 +412,7 @@ public class Net{
         /** Sets a connection filter by IP address. If the filter returns {@code false}, the connection will be closed. */
         default void setConnectFilter(Server.ServerConnectFilter connectFilter){}
 
-        default ServerConnectFilter getConnectFilter(){
+        default @Nullable ServerConnectFilter getConnectFilter(){
             return null;
         }
     }
diff --git a/gradle.properties b/gradle.properties
index da998b39a0..5965736f20 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=96dd703d5d
+archash=34775c79250cab391499fac8f4747365984c6923

From 589b8d9d3755933b658d626c8df980bc52cda94f Mon Sep 17 00:00:00 2001
From: TheRadioactiveBanana
 <89061718+TheRadioactiveBanana@users.noreply.github.com>
Date: Fri, 24 Nov 2023 13:16:19 +0530
Subject: [PATCH 014/369] Eradication Mindustry Merge (#9310)

Anuke finally gave the go ahead
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index e91a506b66..277809e80e 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -133,7 +133,7 @@
   },
   {
     "name": "Eradication Mindustry",
-    "address": ["eradicationmindustry.mindustry.me:6569", "eradicationmindustry.mindustry.me:9547", "eradicationmindustry.mindustry.me:6572", "eradicationmindustry.mindustry.me:6570", "eradicationmindustry.mindustry.me:6571", "eradicationmindustry.mindustry.me:6574", "eradicationmindustry.mindustry.me:6573", "eradicationmindustry.mindustry.me:6568", "eradicationmindustry.mindustry.me:6677", "eradicationmindustry.mindustry.me:6678", "eradicationmindustry.mindustry.me:6675"]
+    "address": ["140.238.246.78:6569", "140.238.246.78:9547", "140.238.246.78:6572", "140.238.246.78:6570", "140.238.246.78:6571", "140.238.246.78:6574", "140.238.246.78:6573", "140.238.246.78:6568", "140.238.246.78:6677", "140.238.246.78:6678", "140.238.246.78:6675", "130.61.22.183:6573", "130.61.22.183:6599", "130.61.22.183:6774", "130.61.22.183:6777"]
   },
   {
     "name": "Conservatory",

From f9d39ad31a96e6ff4f2ad2c9d134f098636be0a7 Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Sun, 26 Nov 2023 00:54:05 +0700
Subject: [PATCH 015/369] Update servers_v7.json (#9315)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 277809e80e..05fb116b2f 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -230,7 +230,7 @@
   },
   {
     "name": "ABCXYZ Community",
-    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113"]
+    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269"]
   },
   {
     "name": "CroCraft Network",

From 8d04a6820d07481f26dd5a86827b29a3b1ee9367 Mon Sep 17 00:00:00 2001
From: OSP <76648940+osp54@users.noreply.github.com>
Date: Mon, 27 Nov 2023 12:51:47 +0300
Subject: [PATCH 016/369] Update servers_v7.json (#9318)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 05fb116b2f..acdd3f3b11 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -85,7 +85,7 @@
   },
   {
     "name": "XCore",
-    "address": ["130.61.52.25", "130.61.52.25:6568", "130.61.52.25:6569", "130.61.52.25:6570", "130.61.52.25:6571", "130.61.52.25:6572", "130.61.52.25:6573", "130.61.52.25:6888"]
+    "address": ["128.140.88.66", "128.140.88.66:6568", "128.140.88.66:6569", "128.140.88.66:6570", "128.140.88.66:6571", "128.140.88.66:6572", "128.140.88.66:6573", "128.140.88.66:6574", "128.140.88.66:6575"]
   },
   {
     "name": "Chaotic Neutral",

From 44f7c726b524e312d5e080bbfa0624ccbe0c129b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 27 Nov 2023 06:05:57 -0500
Subject: [PATCH 017/369] Revert #9294

---
 servers_v7.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index acdd3f3b11..53d0e4d9b4 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -55,10 +55,6 @@
     "name": "SynapseOS",
     "address": ["0nera.ru:7777"]
   },
-  {
-    "name": "Parallax Network",
-    "address": ["138.2.177.166","138.2.177.166:3000","138.2.177.166:3001","138.2.177.166:3002","138.2.177.166:3003","138.2.177.166:3004","138.2.177.166:3005"]
-  },
   {
     "name": "Untitled Mindustry Servers",
     "address": ["45.144.66.250:6567", "45.144.66.250:6601", "45.144.66.250:6611"]

From d759e71edc9b6bc6043f157cd7dac368ae1ea3ef Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 27 Nov 2023 06:55:40 -0500
Subject: [PATCH 018/369] Fixed bombers stopping when patrolling

---
 core/src/mindustry/ai/types/CommandAI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/ai/types/CommandAI.java b/core/src/mindustry/ai/types/CommandAI.java
index 120360534f..0cf650ccc2 100644
--- a/core/src/mindustry/ai/types/CommandAI.java
+++ b/core/src/mindustry/ai/types/CommandAI.java
@@ -214,7 +214,7 @@ public class CommandAI extends AIController{
             }
 
             //TODO: should the unit stop when it finds a target?
-            if(stance == UnitStance.patrol && target != null && unit.within(target, unit.type.range - 2f)){
+            if(stance == UnitStance.patrol && target != null && unit.within(target, unit.type.range - 2f) && !unit.type.circleTarget){
                 move = false;
             }
 

From a0c4b0e4314f086269109ed0b29c5aae5e81885d Mon Sep 17 00:00:00 2001
From: alex <67626131+alexpvpmindustry@users.noreply.github.com>
Date: Mon, 27 Nov 2023 22:06:29 +0800
Subject: [PATCH 019/369] Update servers_v7.json (#9319)

add more servers
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 53d0e4d9b4..01f0e15fe2 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -238,7 +238,7 @@
   },
   {
     "name": "Alex Multiverse",
-    "address": ["alexmindustryv7.servegame.com:25588", "173.255.208.38:41962", "alexmindustrypvp.ddns.net:6767", "172.104.188.197:6768"]
+    "address": ["alexmindustryv7.servegame.com:25588", "173.255.208.38:41962", "alexmindustrypvp.ddns.net:6767", "172.104.188.197:6768", "172.234.80.96:6768", "139.162.41.78:6767"]
   },
   {
     "name": "Open PVP",

From 6ea2188beeb4ae83800237416fc90ec4b4076903 Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Mon, 27 Nov 2023 22:56:26 +0300
Subject: [PATCH 020/369] Add minimap mode to other objective markers

---
 core/assets/bundles/bundle.properties         |   1 +
 core/src/mindustry/game/MapObjectives.java    | 141 ++++++++++++++++--
 .../mindustry/graphics/MinimapRenderer.java   |   9 +-
 core/src/mindustry/logic/LMarkerControl.java  |   5 +-
 4 files changed, 141 insertions(+), 15 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 9a2b49311f..48b132a762 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2462,3 +2462,4 @@ lenum.boost = Start/stop boosting.
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nSecond and third arguments are additional suffixes added using "-" separator.\nIf additional arguments are not strings, nothing is added to first string.
 lenum.texturewidth = Width of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.textureheight = Height of texture in tiles. Zero value scales marker height to original texture's size.
+lenum.minimapautoscale = Whether to scale marker in minimap mode corresponding to player's zoom level.
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index 8e6bf5e65d..a1c78e2516 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -613,6 +613,10 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     public static abstract class ObjectiveMarker{
         /** Makes sure markers are only added once. */
         public transient boolean wasAdded;
+        /** Whether to display marker on minimap instead of world. {@link MinimapMarker} ignores this value. */
+        public boolean minimap = false;
+        /** Whether to scale marker in minimap mode corresponding to player's zoom level. {@link MinimapMarker} ignores this value. */
+        public boolean minimapAutoscale = false;
         /** Hides the marker, used by world processors. */
         protected boolean hidden = false;
         /** On which z-sorting layer is marker drawn. */
@@ -629,8 +633,10 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         /** Control marker with world processor code*/
         public void control(LMarkerControl type, double p1, double p2, double p3){
             switch(type){
-                case visibility -> hidden = ((Math.abs(p1) < 1e-5));
+                case visibility -> hidden = (Math.abs(p1) < 1e-5);
                 case drawLayer -> drawLayer = (float)p1;
+                case minimap -> minimap = (Math.abs(p1) >= 1e-5);
+                case minimapAutoscale -> minimapAutoscale = (Math.abs(p1) >= 1e-5);
             }
         }
         public void setText(String text, boolean fetch){}
@@ -697,7 +703,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void draw(){
-            if(hidden) return;
+            if(hidden || minimap) return;
 
             //in case some idiot decides to make 9999999 sides and freeze the game
             int sides = Math.min(this.sides, 200);
@@ -707,7 +713,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             Lines.poly(pos.x, pos.y, sides, radius + 1f, rotation);
             Lines.stroke(1f, color);
             Lines.poly(pos.x, pos.y, sides, radius + 1f, rotation);
-            Draw.z(Layer.overlayUI);
             Draw.reset();
 
             if(fetchedText == null){
@@ -720,6 +725,34 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             WorldLabel.drawAt(fetchedText, pos.x, pos.y + radius + textHeight, drawLayer, flags, fontSize);
         }
 
+        @Override
+        public void drawMinimap(MinimapRenderer minimap){
+            if(hidden || !this.minimap) return;
+
+            //in case some idiot decides to make 9999999 sides and freeze the game
+            int sides = Math.min(this.sides, 200);
+
+            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
+
+            float rad = minimap.scale(radius, minimapAutoscale);
+
+            Draw.z(drawLayer);
+            Lines.stroke(minimap.scale(3f, minimapAutoscale), Pal.gray);
+            Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, rad + 1f, rotation);
+            Lines.stroke(minimap.scale(1f, minimapAutoscale), color);
+            Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, rad + 1f, rotation);
+            Draw.reset();
+
+            if(fetchedText == null){
+                fetchedText = fetchText(text);
+            }
+
+            // font size cannot be 0
+            if(Math.abs(fontSize) < 1e-5) return;
+
+            WorldLabel.drawAt(fetchedText, Tmp.v1.x, Tmp.v1.y + rad + minimap.scale(textHeight, minimapAutoscale), drawLayer, flags, minimap.scale(fontSize, minimapAutoscale));
+        }
+
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
             switch(type){
@@ -802,7 +835,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             Lines.stroke(Scl.scl((1f - fin) * stroke + 0.1f), color);
             Lines.circle(Tmp.v1.x, Tmp.v1.y, rad * fin);
 
-            Draw.z(Layer.overlayUI);
             Draw.reset();
         }
 
@@ -842,7 +874,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void draw(){
-            if(hidden) return;
+            if(hidden || minimap) return;
 
             //in case some idiot decides to make 9999999 sides and freeze the game
             int sides = Math.min(this.sides, 200);
@@ -861,7 +893,34 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 Fill.poly(pos.x, pos.y, sides, radius, rotation);
             }
 
-            Draw.z(Layer.overlayUI);
+            Draw.reset();
+        }
+
+        @Override
+        public void drawMinimap(MinimapRenderer minimap){
+            if(hidden || !this.minimap) return;
+
+            //in case some idiot decides to make 9999999 sides and freeze the game
+            int sides = Math.min(this.sides, 200);
+
+            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
+
+            float rad = minimap.scale(radius, minimapAutoscale);
+
+            Draw.z(drawLayer);
+            if(!fill){
+                if(outline){
+                    Lines.stroke(minimap.scale(stroke + 2f, minimapAutoscale), Pal.gray);
+                    Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius + 1f, minimapAutoscale), rotation);
+                }
+
+                Lines.stroke(stroke, color);
+                Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius + 1f, minimapAutoscale), rotation);
+            }else{
+                Draw.color(color);
+                Fill.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius, minimapAutoscale), rotation);
+            }
+
             Draw.reset();
         }
 
@@ -914,7 +973,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         @Override
         public void draw(){
             // font size cannot be 0
-            if(hidden || Math.abs(fontSize) < 1e-5) return;
+            if(hidden || Math.abs(fontSize) < 1e-5 || minimap) return;
 
             if(fetchedText == null){
                 fetchedText = fetchText(text);
@@ -923,6 +982,24 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             WorldLabel.drawAt(fetchedText, pos.x, pos.y, drawLayer, flags, fontSize);
         }
 
+        @Override
+        public void drawMinimap(MinimapRenderer minimap){
+            if(hidden || !this.minimap) return;
+
+            float size = minimap.scale(fontSize, minimapAutoscale);
+
+            // font size cannot be 0
+            if(Math.abs(fontSize) < 1e-5) return;
+
+            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
+
+            if(fetchedText == null){
+                fetchedText = fetchText(text);
+            }
+
+            WorldLabel.drawAt(fetchedText, Tmp.v1.x, Tmp.v1.y, drawLayer, flags, size);
+        }
+
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
             switch(type){
@@ -1001,7 +1078,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void draw(){
-            if(hidden) return;
+            if(hidden || minimap) return;
 
             Draw.z(drawLayer);
             if(outline){
@@ -1012,6 +1089,23 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             Lines.stroke(stroke, color);
             Lines.line(pos1.x, pos1.y, pos2.x, pos2.y);
         }
+
+        @Override
+        public void drawMinimap(MinimapRenderer minimap){
+            if(hidden || !this.minimap) return;
+
+            minimap.transform(Tmp.v1.set(pos1.x + 4f, pos1.y + 4f));
+            minimap.transform(Tmp.v2.set(pos2.x + 4f, pos2.y + 4f));
+
+            Draw.z(drawLayer);
+            if(outline){
+                Lines.stroke(minimap.scale(stroke + 2f, minimapAutoscale), Pal.gray);
+                Lines.line(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
+            }
+
+            Lines.stroke(minimap.scale(stroke, minimapAutoscale), color);
+            Lines.line(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
+        }
     }
 
     /** Displays a texture with specified name. */
@@ -1039,17 +1133,18 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 case rotation -> rotation = (float)p1;
                 case textureWidth -> width = (float)p1 * tilesize;
                 case textureHeight -> height = (float)p1 * tilesize;
-                case color -> {
-                    Log.info("test");
-                    color.set(Tmp.c1.fromDouble(p1));
+                case textureSize -> {
+                    width = (float)p1 * tilesize;
+                    height = (float)p2 * tilesize;
                 }
+                case color -> color.set(Tmp.c1.fromDouble(p1));
                 default -> super.control(type, p1, p2, p3);
             }
         }
 
         @Override
         public void draw(){
-            if(hidden || textureName.isEmpty()) return;
+            if(hidden || textureName.isEmpty() || minimap) return;
 
             if(fetchedRegion == null) fetchedRegion = Core.atlas.find(textureName);
 
@@ -1065,8 +1160,28 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 Draw.color(Color.white);
                 Draw.rect("error", pos.x, pos.y, width, height, rotation);
             }
+        }
 
-            Draw.z(Layer.overlayUI);
+        @Override
+        public void drawMinimap(MinimapRenderer minimap){
+            if(hidden || textureName.isEmpty() || !this.minimap) return;
+
+            if(fetchedRegion == null) fetchedRegion = Core.atlas.find(textureName);
+
+            // Zero width/height scales marker to original texture's size
+            if(width < 1e-5) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
+            if(height < 1e-5) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
+
+            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
+
+            Draw.z(drawLayer);
+            if(fetchedRegion.found()){
+                Draw.color(color);
+                Draw.rect(fetchedRegion, Tmp.v1.x, Tmp.v1.y, minimap.scale(width, minimapAutoscale), minimap.scale(height, minimapAutoscale), rotation);
+            }else{
+                Draw.color(Color.white);
+                Draw.rect("error", Tmp.v1.x, Tmp.v1.y, minimap.scale(width, minimapAutoscale), minimap.scale(height, minimapAutoscale), rotation);
+            }
         }
 
         @Override
diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java
index 6ae9b26b77..74d038e87f 100644
--- a/core/src/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/mindustry/graphics/MinimapRenderer.java
@@ -300,7 +300,14 @@ public class MinimapRenderer{
     }
 
     public float scale(float radius){
-        return worldSpace ? (radius / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width * radius;
+        return scale(radius, false);
+    }
+    public float scale(float radius, boolean zoomAutoScale){
+        if(!zoomAutoScale){
+            return worldSpace ? (radius / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width * radius;
+        }else{
+            return worldSpace ? (radius / (baseSize / 2f)) * 5f : lastW / 256f * radius;
+        }
     }
 
     public @Nullable TextureRegion getRegion(){
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
index 70e06e6aed..f9d826003d 100644
--- a/core/src/mindustry/logic/LMarkerControl.java
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -3,6 +3,8 @@ package mindustry.logic;
 public enum LMarkerControl{
     remove,
     visibility("true/false"),
+    minimap("true/false"),
+    minimapAutoscale("true/false"),
     x("x"),
     y("y"),
     pos("x", "y"),
@@ -27,7 +29,8 @@ public enum LMarkerControl{
     labelFlags("background", "outline"),
     texture("name", "-", "-"),
     textureWidth("width"),
-    textureHeight("height");
+    textureHeight("height"),
+    textureSize("width", "height");
 
     public final String[] params;
 

From 0469bb5ce5e660d5db1a10c78942ce4979026bd7 Mon Sep 17 00:00:00 2001
From: The1Crux <134880334+The1Crux@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:40:13 -0400
Subject: [PATCH 021/369] Update servers_v7.json (#9321)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

last servers exploded 💀
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 01f0e15fe2..c655bdd02b 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -9,7 +9,7 @@
   },
   {
     "name": "Crux's Revelations",
-    "address": ["fsn1.bbn.one:52397","fsn1.bbn.one:58375","de-free-01.hosts.optikservers.com:32212","fsn1.bbn.one:49840","de-free-01.hosts.optikservers.com:30449"]
+    "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35160"]
   },
   {
     "name": "CMS",

From 8db6ca8b593c692b704f5110fab5c130969a1d53 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az564-880.umv0eqcl5qku3cwf2dcfspuvdc.ex.internal.cloudapp.net>
Date: Tue, 28 Nov 2023 01:35:56 +0000
Subject: [PATCH 022/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 4 +---
 core/assets/bundles/bundle_bg.properties    | 4 +---
 core/assets/bundles/bundle_ca.properties    | 4 +---
 core/assets/bundles/bundle_cs.properties    | 4 +---
 core/assets/bundles/bundle_da.properties    | 4 +---
 core/assets/bundles/bundle_de.properties    | 4 +---
 core/assets/bundles/bundle_es.properties    | 4 +---
 core/assets/bundles/bundle_et.properties    | 4 +---
 core/assets/bundles/bundle_eu.properties    | 4 +---
 core/assets/bundles/bundle_fi.properties    | 4 +---
 core/assets/bundles/bundle_fil.properties   | 4 +---
 core/assets/bundles/bundle_fr.properties    | 4 +---
 core/assets/bundles/bundle_hu.properties    | 4 +---
 core/assets/bundles/bundle_id_ID.properties | 4 +---
 core/assets/bundles/bundle_it.properties    | 4 +---
 core/assets/bundles/bundle_ja.properties    | 4 +---
 core/assets/bundles/bundle_ko.properties    | 4 +---
 core/assets/bundles/bundle_lt.properties    | 4 +---
 core/assets/bundles/bundle_nl.properties    | 4 +---
 core/assets/bundles/bundle_nl_BE.properties | 4 +---
 core/assets/bundles/bundle_pl.properties    | 4 +---
 core/assets/bundles/bundle_pt_BR.properties | 4 +---
 core/assets/bundles/bundle_pt_PT.properties | 4 +---
 core/assets/bundles/bundle_ro.properties    | 4 +---
 core/assets/bundles/bundle_ru.properties    | 4 +---
 core/assets/bundles/bundle_sr.properties    | 4 +---
 core/assets/bundles/bundle_sv.properties    | 4 +---
 core/assets/bundles/bundle_th.properties    | 4 +---
 core/assets/bundles/bundle_tk.properties    | 4 +---
 core/assets/bundles/bundle_tr.properties    | 4 +---
 core/assets/bundles/bundle_uk_UA.properties | 4 +---
 core/assets/bundles/bundle_vi.properties    | 4 +---
 core/assets/bundles/bundle_zh_CN.properties | 4 +---
 core/assets/bundles/bundle_zh_TW.properties | 4 +---
 34 files changed, 34 insertions(+), 102 deletions(-)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index 344fadea63..bb595100d0 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -1749,7 +1749,6 @@ block.disperse.name = Разыход
 block.afflict.name = Пакута
 block.lustre.name = Блеск
 block.scathe.name = Паражэнне
-block.fabricator.name = Фабрыкатар
 block.tank-refabricator.name = Рэфабрыкатар Танкаў
 block.mech-refabricator.name = Рэфабрыкатар Мяхоў
 block.ship-refabricator.name = Рэфабрыкатар Суднаў
@@ -2066,7 +2065,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2102,7 +2100,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2294,6 +2291,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 83acf8215c..e4c21ee198 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -1761,7 +1761,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2079,7 +2078,6 @@ block.logic-display.description = Позволява изобразяванет
 block.large-logic-display.description = Позволява изобразяването на графика чрез процесор.
 block.interplanetary-accelerator.description = Масивна електромагнитна релсова кула. Ускорява ядрата до необходимата скорост за междупланетно изстрелване.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2115,7 +2113,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2313,6 +2310,7 @@ graphicstype.poly = Запълва правилен многоъгълник.
 graphicstype.linepoly = Очертава правилен многоъгълник.
 graphicstype.triangle = Запълва триъгълник.
 graphicstype.image = Рисува изображение.\nНапример: [accent]@router[] или [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Винаги вярно
 lenum.idiv = Деление с цели числа.
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index 98a4fc40ef..d334a07bb2 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -1770,7 +1770,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricadora
 block.tank-refabricator.name = Milloradora de tancs
 block.mech-refabricator.name = Milloradora de meques
 block.ship-refabricator.name = Milloradora de naus
@@ -2089,7 +2088,6 @@ block.logic-display.description = Mostra un gràfic des d’un processador lògi
 block.large-logic-display.description = Mostra un gràfic des d’un processador lògic.
 block.interplanetary-accelerator.description = Una torreta amb un canó electromagnètic enorme. Accelera els nuclis fins aconseguir la velocitat d’escapament per a fer llançaments interplanetaris.
 block.repair-turret.description = Repara contínuament la unitat danyada que tingui més a prop al seu voltant. També se li pot subministrar refrigerant perquè funcioni més ràpid.
-block.payload-propulsion-tower.description = Estructura de transport de recursos a distància. Dispara paquets de càrrega a altres torres de transport a distància enllaçades.
 block.core-bastion.description = Nucli de la base. Blindat. Quan es destrueix, es perd el sector.
 block.core-citadel.description = Nucli de la base. Molt ben blindat. Emmagatzema més recursos que un nucli Bastió.
 block.core-acropolis.description = Nucli de la base. Excepcionalment ben blindat. Emmagatzema més recursos que un nucli Ciutadella.
@@ -2125,7 +2123,6 @@ block.impact-drill.description = Quan es posa a sobre de minerals, n’extrau in
 block.eruption-drill.description = Una perforadora d’impacte millorada. Pot extraure tori. Necessita hidrogen.
 block.reinforced-conduit.description = Impulsa i fa circular els fluids. No accepta entrades des dels laterals si no és a través de conductes.
 block.reinforced-liquid-router.description = Distribueix fluids a tots els seus costats.
-block.reinforced-junction.description = Actua com a dues canonades independents que es creuen.
 block.reinforced-liquid-tank.description = Emmagatzema una gran quantitat de fluid.
 block.reinforced-liquid-container.description = Emmagatzema fluids.
 block.reinforced-bridge-conduit.description = Transporta fluids per sota de les estructures i del terreny.
@@ -2323,6 +2320,7 @@ graphicstype.poly = Omple un polígon regular.
 graphicstype.linepoly = Dibuixa els costats d’un polígon regular.
 graphicstype.triangle = Omple un triangle.
 graphicstype.image = Dibuixa una imatge d’algun element del joc.\nPer exemple: [accent]@router[] o [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Sempre cert.
 lenum.idiv = Divisió entera.
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index b6b77cb5de..573074df31 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -1764,7 +1764,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabrikátor
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2083,7 +2082,6 @@ block.logic-display.description = Zobrazuje libovolnou grafiku z logického proc
 block.large-logic-display.description = Zobrazuje libovolnou grafiku z logického procesoru.
 block.interplanetary-accelerator.description = Masivní elektromagnetická věž. Urychlí jádro na únikovou rychlost pro meziplanetární vyslání.
 block.repair-turret.description = Nepřetržitě opravuje nejblížší poškozenou jednotku v jeho blízkosti. Lze volitelně dodávat chlazení pro jeho posílení.
-block.payload-propulsion-tower.description = Dálková nákladní transportní věž. Střílí náklad do dalších propojených nákladních transportních věží.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2119,7 +2117,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2317,6 +2314,7 @@ graphicstype.poly = Vyplní pravidelný mnohoúhelník.
 graphicstype.linepoly = Nakreslí obrys pravidelného mnohoúhelníku.
 graphicstype.triangle = Vyplní trojúhelník.
 graphicstype.image = Vykreslí obrázek nějakého obsahu.\nnapř.: [accent]@router[] nebo [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Vždy pravda.
 lenum.idiv = Číselné dělení.
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 2bdc8da595..433f80e1a0 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -1751,7 +1751,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2066,7 +2065,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2102,7 +2100,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2294,6 +2291,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index e87333434a..ec44d25f83 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -1780,7 +1780,6 @@ block.disperse.name = Streu
 block.afflict.name = Afflikt
 block.lustre.name = Lustre
 block.scathe.name = Skate
-block.fabricator.name = Hersteller
 block.tank-refabricator.name = Panzerverbesserer
 block.mech-refabricator.name = Mechverbesserer
 block.ship-refabricator.name = Schiffverbesserer
@@ -2110,7 +2109,6 @@ block.logic-display.description = Zeigt mithilfe eines Prozessors Beliebiges an.
 block.large-logic-display.description = Zeigt mithilfe eines Prozessors Beliebiges an.
 block.interplanetary-accelerator.description = Ein Riesen-Railgun-Turm, der mithilfe des Elektromagnetismus Kerne auf die nötige Geschwindigkeit bringt, um interplanetarisches Reisen zu ermöglichen.
 block.repair-turret.description = Heilt durchgehend die nächste befreundete, beschädigte Einheit in der Umgebung. Verwendet optional Kühlung.
-block.payload-propulsion-tower.description = Frachttransportationsturm mit hoher Reichweite. Schießt Fracht zu verbundenen Türmen.
 
 #Erekir
 block.core-bastion.description = Kern der Basis. Gepanzert. Einmal zerstört, ist jeglicher Kontakt zum Sektor verloren.
@@ -2148,7 +2146,6 @@ block.impact-drill.description = Baut unbefristet Erze in Schüben aus dem Boden
 block.eruption-drill.description = Ein verbesserter Schlagbohrer. Kann Thorium abbauen. Benötigt Wasserstoff.
 block.reinforced-conduit.description = Transportiert Flüssigkeiten. Nimmt von nicht-Kanälen nur von hinten an.
 block.reinforced-liquid-router.description = Verteilt Flüssigkeiten gleichmäßig auf bis zu drei Richtungen.
-block.reinforced-junction.description = Kann als Brücke für zwei sich kreuzende Kanäle verwendet werden.
 block.reinforced-liquid-tank.description = Lagert eine große Menge an Flüssigkeiten.
 block.reinforced-liquid-container.description = Lagert eine beträchtliche Menge an Flüssigkeiten.
 block.reinforced-bridge-conduit.description = Transportiert Flüssigkeiten über Blöcke und Terrain.
@@ -2349,6 +2346,7 @@ graphicstype.poly = Füllt ein gleichmäßiges Polygon.
 graphicstype.linepoly = Zeichnet den Umriss eines gleichmäßigen Polygons.
 graphicstype.triangle = Zeichnet ein Dreieck.
 graphicstype.image = Zeichnet ein Bild von einem englischen Namen.\nz.B. [accent]@router[] oder [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Immer.
 lenum.idiv = Division mit ganzen Zahlen.
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 4c34ddbde4..d0f31317af 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -1776,7 +1776,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricador
 block.tank-refabricator.name = Refabricador de tanques
 block.mech-refabricator.name = Refabricador de mechs
 block.ship-refabricator.name = Refabricador de aeronaves
@@ -2102,7 +2101,6 @@ block.logic-display.description = Muestra gráficos arbitrarios dibujados desde
 block.large-logic-display.description = Muestra gráficos arbitrarios dibujados desde un procesador lógico.
 block.interplanetary-accelerator.description = Una torre de proyección electromagnética masiva. Acelera núcleos hasta la velocidad necesaria para escapar del campo gravitatorio del planeta, habilitando el despliegue interplanetario.
 block.repair-turret.description = Repara continuamente la unidad dañada más cercana dentro de su alcance. Opcionalmente acepta refrigerante.
-block.payload-propulsion-tower.description = Estructura que permite transportar otras estructuras a largo alcance. Dispara cargas, tales como unidades o bloques hasta otras torres de propulsión elazadas.
 
 # Erekir
 block.core-bastion.description = Núcleo de la base. Blindado. Una vez destruido, se pierde toda comunicación con el sector.
@@ -2140,7 +2138,6 @@ block.impact-drill.description = Si se coloca sobre un mineral, extraerá ráfag
 block.eruption-drill.description = Un taladro de impacto mejorado, capaz de extraer torio. Requiere hidrógeno.
 block.reinforced-conduit.description = Mueve fluidos en una dirección. Sus lados no se conectarán con otros tipos de bloques, salvo que también sean tuberías.
 block.reinforced-liquid-router.description = Distribuye fluidos equitativamente en todas direcciones.
-block.reinforced-junction.description = Funciona como un puente para dos tuberías que se cruzan.
 block.reinforced-liquid-tank.description = Almacena una gran cantidad de fluidos.
 block.reinforced-liquid-container.description = Almacena una cantidad considerable de fluidos.
 block.reinforced-bridge-conduit.description = Transporta fluidos sobre el terreno o estructuras.
@@ -2342,6 +2339,7 @@ graphicstype.poly = Rellena un polígono regular.
 graphicstype.linepoly = Dibuja las aristas de un polígono regular.
 graphicstype.triangle = Rellena un triángulo.
 graphicstype.image = Dibuja una imagen de algún contenido.\nEjemplo: [accent]@router[] o [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Siempre "true".
 lenum.idiv = División de un número entero.
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 3b9c3781fb..e315dfc24d 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -1751,7 +1751,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2068,7 +2067,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2104,7 +2102,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2296,6 +2293,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index e8d9787f85..2db4ff04d5 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -1753,7 +1753,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2070,7 +2069,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2106,7 +2104,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2298,6 +2295,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index f8dc7f471d..9962837363 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -1753,7 +1753,6 @@ block.disperse.name = Hälvennys
 block.afflict.name = Aiheuttaja
 block.lustre.name = Kiilto
 block.scathe.name = Vahinko
-block.fabricator.name = Valmistaja
 block.tank-refabricator.name = Tankkijälleenrakentaja
 block.mech-refabricator.name = Robottijälleenrakentaja
 block.ship-refabricator.name = Ilma-alusjälleenrakentaja
@@ -2071,7 +2070,6 @@ block.logic-display.description = Näyttää mielivaltaista ggrafiikkaa prosesso
 block.large-logic-display.description = Näyttää mielivaltaista ggrafiikkaa prosessorista.
 block.interplanetary-accelerator.description = Massiivinen sähkömagneettinen raidetykkitorni. Kiihdyttää ytimiä pakonopeuteen interplanetaarista leviämistä varten.
 block.repair-turret.description = Korjaa jatkuvasti lähintä vahingoittunutta yksikköä lähellään. Käyttää vaihtoehtoisesti jäähdytysnestettä.
-block.payload-propulsion-tower.description = Pitkän kantaman lastinsiirtorakennus. Ampuu lastia muihin yhdistettyihin massakiihdytystorneihin.
 block.core-bastion.description = Tukikohdan ydin. Panssaroitu. Mikäli tuhottu, sektori on menetetty.
 block.core-citadel.description = Tukikohdan ydin. Tosi hyvin panssaroitu. Varastoi enemmän tavaraa kuin Linnaydin.
 block.core-acropolis.description = Tukikohdan ydin. Hemmetin hyvin panssaroitu. Varastoi enemmän tavaraa kuin Sitadelliydin.
@@ -2107,7 +2105,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2299,6 +2296,7 @@ graphicstype.poly = Piirrä säännöllinen monikulmio.
 graphicstype.linepoly = Piirrä säännöllisen monikulmion ääriviivat.
 graphicstype.triangle = Piirrä täytetty kolmio.
 graphicstype.image = Piirrä kuva jostain sisällöstä.\nEsim: [accent]@router[] tai [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Aina tosi.
 lenum.idiv = Kokonaislukujen osamäärä.
 lenum.div = Osamäärä.\nPalauttaa arvon [accent]null[] jaettaessa nollalla.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 0920a69b5e..01780b4db8 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -1750,7 +1750,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2067,7 +2066,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2103,7 +2101,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2295,6 +2292,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 6c4629d828..fb44cebe88 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -1785,7 +1785,6 @@ block.disperse.name = Propagateur
 block.afflict.name = Éclateur
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricateur
 block.tank-refabricator.name = Refabricateur de Tanks
 block.mech-refabricator.name = Refabricateur de Mécas
 block.ship-refabricator.name = Refabricateur de Vaisseaux
@@ -2111,7 +2110,6 @@ block.logic-display.description = Affiche des images à partir des instructions
 block.large-logic-display.description = Affiche des images à partir des instructions d'un processeur logique. Possède une plus grande résolution qu'un écran.
 block.interplanetary-accelerator.description = Un énorme canon électromagnétique à rails. Accélère les Noyaux pour qu'ils échappent à la gravité de leur planète et leur permettent un déploiement interplanétaire.
 block.repair-turret.description = Répare en continu l'unité endommagée la plus proche dans son périmètre. Accepte le liquide de refroidissement en option.
-block.payload-propulsion-tower.description = Structure de transport de charges utiles à longue portée. Projette des charges utiles vers d'autres tours de propulsion de charges utiles reliées.
 
 #Erekir
 block.core-bastion.description = Le cœur de votre base. Blindé. Une fois détruit, le secteur est perdu.
@@ -2149,7 +2147,6 @@ block.impact-drill.description = Lorsqu'il est placé sur du minerai, il produit
 block.eruption-drill.description = Une foreuse à impact améliorée. Capable d'extraire du thorium. Requiert de l'hydrogène.
 block.reinforced-conduit.description = Déplace les fluides. N'accepte pas les entrées sans conduit sur les côtés.
 block.reinforced-liquid-router.description = Accepte les fluides depuis une direction et les distribue jusqu'à 3 directions équitablement.
-block.reinforced-junction.description = Agit comme un pont entre deux conduits qui se croisent.
 block.reinforced-liquid-tank.description = Stocke une grande quantité de fluides.
 block.reinforced-liquid-container.description = Stocke une quantité importante de fluides.
 block.reinforced-bridge-conduit.description = Transporte les fluides par-dessus les structures et le terrain.
@@ -2350,6 +2347,7 @@ graphicstype.poly = Dessine un polygone régulier.
 graphicstype.linepoly = Dessine le contour d'un polygone régulier.
 graphicstype.triangle = Dessine un triangle.
 graphicstype.image = Dessine une image provenant du contenu du jeu.\nexemple: [accent]@router[] ou [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Toujours [accent]true[].
 lenum.idiv = Division entière.
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 3aa426f974..b1af857920 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1785,7 +1785,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabrikátor
 block.tank-refabricator.name = Tank Újratervező
 block.mech-refabricator.name = Mech Újratervező
 block.ship-refabricator.name = Repülőgép Újratervező
@@ -2111,7 +2110,6 @@ block.logic-display.description = Ábrák rajzolhatók rá processzorral.
 block.large-logic-display.description = Ábrák rajzolhatók rá processzorral.
 block.interplanetary-accelerator.description = Hatalmas elektromágneses gyorsítótorony. Képes Magokat szökési sebességre gyorsítani bolygóközi bevetéshez.
 block.repair-turret.description = Folyamatosan javítja a környezetében lévő legközelebbi sérült egységet. Opcionálisan elfogadja a Hűtőfolyadékot.
-block.payload-propulsion-tower.description = Nagy hatótávolságú rakományszállító szerkezet. Kilövi a rakományt a vele összekapcsolt tornyokba.
 
 #Erekir
 block.core-bastion.description = Mag. Páncélozott. Ha elpusztul, a szektor elveszett.
@@ -2149,7 +2147,6 @@ block.impact-drill.description = Ha ércre helyezik, korlátlan ideig, sorozatba
 block.eruption-drill.description = Továbbfejlesztett ütvefúró. Képes Tóriumot bányászni. Hidrogént igényel.
 block.reinforced-conduit.description = Előre szállítja a folyadékokat. Nem fogadja el a nem csővezetékes bemeneteket oldalról.
 block.reinforced-liquid-router.description = Egyenletesen osztja el a folyadékokat minden oldalra.
-block.reinforced-junction.description = Hídként működik két egymást keresztező csővezeték között.
 block.reinforced-liquid-tank.description = Nagy mennyiségű folyadékot tárol.
 block.reinforced-liquid-container.description = Jelentős mennyiségű folyadékot tárol.
 block.reinforced-bridge-conduit.description = Folyadékok szállítása szerkezeteken és terepen keresztül.
@@ -2350,6 +2347,7 @@ graphicstype.poly = Egy szabályos sokszög kitöltése.
 graphicstype.linepoly = Rajzolj egy szabályos sokszög körvonalat.
 graphicstype.triangle = Töltsön ki egy háromszöget.
 graphicstype.image = Rajzolj egy képet valamilyen tartalomról.\nex: [accent]@router[] vagy [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Mindig igaz.
 lenum.idiv = Egész számok osztása.
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index e30ba5a9dd..b43bfac379 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -1776,7 +1776,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabrikator
 block.tank-refabricator.name = Refabrikator Tank
 block.mech-refabricator.name = Refabrikator Mech
 block.ship-refabricator.name = Refabrikator Kapal
@@ -2101,7 +2100,6 @@ block.logic-display.description = Menampilkan grafik sembarang dari prosesor.
 block.large-logic-display.description = Menampilkan grafik sembarang dari prosesor. Lebih besar.
 block.interplanetary-accelerator.description = Sebuah menara railgun elektromagnetik raksasa. Meluncurkan Inti dengan kecepatan tinggi untuk peluncuran antarplanet.
 block.repair-turret.description = Memperbaiki unit terdekat yang sekarat dalam jangkauan secara terus-menerus. Dapat menerima pendingin.
-block.payload-propulsion-tower.description = Bangunan transportasi muatan jarak jauh. Menembakkan muatan pada menara penggerak muatan lainnya yang terhubung.
 
 #Erekir
 block.core-bastion.description = Inti markas. Terlindungi. Jika hancur, sektor jatuh ke tangan musuh.
@@ -2139,7 +2137,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2340,6 +2337,7 @@ graphicstype.poly = Mengisi sebuah poligon beraturan.
 graphicstype.linepoly = Menggambar sebuah garis poligon beraturan.
 graphicstype.triangle = Mengisi sebuah segitiga.
 graphicstype.image = Membentuk sebuah gambar dari suatu konten.\nMisal: [accent]@router[] atau [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Selalu benar.
 lenum.idiv = Pembagian integer.
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 9d2723d67b..65cc5f965c 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -1762,7 +1762,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2080,7 +2079,6 @@ block.logic-display.description = Visualizza la grafica arbitraria  elaborata da
 block.large-logic-display.description = Visualizza la grafica arbitraria elaborata dal processore.
 block.interplanetary-accelerator.description = Una massiccia torre che utilizza potenti campi elettromagnetici. Accelera nuclei fino alla velocità di fuga per un impiego interplanetario.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2116,7 +2114,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2309,6 +2306,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 8f89ae608d..47f5fa4d70 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -1765,7 +1765,6 @@ block.disperse.name = ディスパーズ
 block.afflict.name = アフリクト
 block.lustre.name = ラストル
 block.scathe.name = スケース
-block.fabricator.name = ファブリケーター
 block.tank-refabricator.name = 戦車再加工工場
 block.mech-refabricator.name = メカ再加工工場
 block.ship-refabricator.name = 戦艦再加工工場
@@ -2084,7 +2083,6 @@ block.logic-display.description = プロセッサからの任意のグラフィ
 block.large-logic-display.description = プロセッサからの任意のグラフィックを表示します。
 block.interplanetary-accelerator.description = 巨大な電磁レールガンタワーです。別惑星への展開のためにコアを重力圏脱出可能速度まで加速します。
 block.repair-turret.description = 範囲内の損傷したブロックを近い順に継続的に修復します。オプションで冷却液を活用できます。
-block.payload-propulsion-tower.description = 長距離ペイロード輸送構造です。他の接続されたペイロード推進タワーにペイロードを発射します。
 block.core-bastion.description = 基本的な堅いコアです。一度破壊されると、セクターを失います。破壊されないようにしましょう。
 block.core-citadel.description = バージョンアップしたコアです。 より優れた耐久を持っています。 バスティオンコアよりも多くの資源を格納します。
 block.core-acropolis.description = さらにバージョンアップしたコアです。 非常に優れた耐久を持っています。 シタデルコアよりも多くの資源を格納します。
@@ -2120,7 +2118,6 @@ block.impact-drill.description = 鉱石の上に置くと、一定の間隔で
 block.eruption-drill.description = 改良されたインパクトドリルです。 トリウムの採掘が可能。 電力と水素が必要です。
 block.reinforced-conduit.description = 液体または気体を輸送します。 側面からの搬入を受け入れません。
 block.reinforced-liquid-router.description = 液体をすべての向きに均等に分配します。
-block.reinforced-junction.description = 交差する 2 つのパイプのブリッジとして機能します。
 block.reinforced-liquid-tank.description = 大量の液体を蓄えることができます。
 block.reinforced-liquid-container.description = 中量の液体を蓄えることができます。
 block.reinforced-bridge-conduit.description = 構造物や地形の上に液体を輸送させることができます。
@@ -2313,6 +2310,7 @@ graphicstype.poly = 塗りつぶされた多角形を描きます。
 graphicstype.linepoly = 輪郭だけの多角形を描きます。
 graphicstype.triangle = 塗りつぶされた三角形を描きます。
 graphicstype.image = 何らかのコンテンツのイメージを描画します。\n例: [accent]@router[] や [accent]@dagger[]など。
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = 常にtrueを返します。
 lenum.idiv = 整数の割り算をします。
 lenum.div = 割り算をします。\nゼロ除算で [accent]null[] を返します。
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index ad67c57a15..9843f25f70 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -1764,7 +1764,6 @@ block.disperse.name = 디스퍼스
 block.afflict.name = 어플릭트
 block.lustre.name = 러스터
 block.scathe.name = 스캐드
-block.fabricator.name = 조립기
 block.tank-refabricator.name = 전차 재조립기
 block.mech-refabricator.name = 기계 재조립기
 block.ship-refabricator.name = 함선 재조립기
@@ -2082,7 +2081,6 @@ block.logic-display.description = 프로세서를 이용해 임의로 그래픽
 block.large-logic-display.description = 프로세서를 이용해 임의로 그래픽을 출력할 수 있습니다.
 block.interplanetary-accelerator.description = 거대한 전자기 레일건 타워. 행성 간 이동을 위한 탈출 속도까지 코어를 가속합니다.
 block.repair-turret.description = 피해를 입은 가장 가까운 기체를 지속적으로 수리합니다. 선택적으로 냉각수를 넣을 수 있습니다.
-block.payload-propulsion-tower.description = 장거리 화물 운송 구조물. 화물을 연결된 다른 화물 드라이버로 발사합니다.
 block.core-bastion.description = 기지의 핵심입니다. 튼튼합니다. 한번 파괴되면, 구역을 잃습니다.
 block.core-citadel.description = 기지의 핵심입니다. 더 튼튼합니다. 코어: 요새보다 더 많은 양의 자원을 저장합니다.
 block.core-acropolis.description = 기지의 핵심입니다. 매우 튼튼합니다. 코어: 성채보다 더 많은 양의 자원을 저장합니다.
@@ -2118,7 +2116,6 @@ block.impact-drill.description = 광석에 배치하면 자원을 한번에 몰
 block.eruption-drill.description = 개선된 충격 드릴. 토륨을 채굴할 수 있습니다. 수소가 필요합니다.
 block.reinforced-conduit.description = 유체를 앞으로 이동합니다. 측면에서 파이프가 아닌 입력을 허용하지 않습니다.
 block.reinforced-liquid-router.description = 유체를 모든 면에 균등하게 분배합니다.
-block.reinforced-junction.description = 두 개의 교차 파이프를 위한 다리 역할을 합니다.
 block.reinforced-liquid-tank.description = 대량의 유체를 저장합니다.
 block.reinforced-liquid-container.description = 상당량의 유체를 저장합니다.
 block.reinforced-bridge-conduit.description = 구조물 및 지형 위로 유체를 운반합니다.
@@ -2316,6 +2313,7 @@ graphicstype.poly = 정다각형 채우기
 graphicstype.linepoly = 정다각형 외곽선 그리기
 graphicstype.triangle = 삼각형 채우기
 graphicstype.image = 일부 콘텐츠의 이미지 그리기\n예: [accent]@router[] 또는 [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = 항상 참
 lenum.idiv = 정수 나누기
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 6a3f6578de..c419d033ef 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -1751,7 +1751,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2068,7 +2067,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2104,7 +2102,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2296,6 +2293,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 5907749572..096b01124c 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -1764,7 +1764,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2081,7 +2080,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2117,7 +2115,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2309,6 +2306,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 2be8645e35..74caec860a 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -1751,7 +1751,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2068,7 +2067,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2104,7 +2102,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2296,6 +2293,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index b5623f6987..c618f1421a 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -1772,7 +1772,6 @@ block.disperse.name = Burza
 block.afflict.name = Cios
 block.lustre.name = Błysk
 block.scathe.name = Zamęt
-block.fabricator.name = Fabrykator
 block.tank-refabricator.name = Konstruktor Czołgów
 block.mech-refabricator.name = Konstruktor Mechów
 block.ship-refabricator.name = Konstruktor Statków
@@ -2090,7 +2089,6 @@ block.logic-display.description = Wyświetla obraz z procesora.
 block.large-logic-display.description = Wyświetla obraz z procesora.
 block.interplanetary-accelerator.description = Masywna elektromagnetyczna wieża. Przyspiesza rdzeń do prędkości ucieczki by wylądować na innych planetach.
 block.repair-turret.description = Na bieżąco naprawia najbliższą uszkodzoną jednostkę w jej sąsiedztwie. Opcjonalnie akceptuje chłodziwo.
-block.payload-propulsion-tower.description = Konstrukcja o dużym zasięgu do transportu ładunków. Strzela ładunkami do innych podłączonych wież napędowych ładunku.
 block.core-bastion.description = Rdzeń bazy. Uzbrojony. Po zniszczeniu tracisz sektor.
 block.core-citadel.description = Rdzeń bazy. Bardzo dobrze uzbrojony. Składuje wiecej zasobów niż rdzeń Bastion.
 block.core-acropolis.description = Rdzeń bazy. Wyjątkowo dobrze uzbrojony. Składuje wiecej zasobów niż rdzeń Cytadela.
@@ -2126,7 +2124,6 @@ block.impact-drill.description = Kiedy stoi na rudzie, wydobywa surowce seriami.
 block.eruption-drill.description = Ulepszona wersja wiertła wybuchowego. Zdolne do wydobycia toru. Potrzebuje wodoru do działania.
 block.reinforced-conduit.description = Służy do przemieszczania płynów i gazów. Od boku można podłączyć tylko inne rury.
 block.reinforced-liquid-router.description = Równo rozdziela płyn do wszystkich podłączonych rur.
-block.reinforced-junction.description = Pozwala na przecięcie się dwóch rur, bez mieszania ich zawartości.
 block.reinforced-liquid-tank.description = Przechowuje duże ilości płynów.
 block.reinforced-liquid-container.description = Przechowuje umiarkowane ilości płynów.
 block.reinforced-bridge-conduit.description = Transportuje płyny nad rozmaitymi przeszkodami.
@@ -2336,6 +2333,7 @@ graphicstype.poly = Wypełnia wielokąt foremny.
 graphicstype.linepoly = Rysuje obwód wielokąta foremnego.
 graphicstype.triangle = Wypełnia trójkąt.
 graphicstype.image = Rysuje ikonę jakiejś treści.\nnp. [accent]@router[] lub [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Zawsze prawda.
 lenum.idiv = Dzielenie liczb całkowitych.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 3ebb454423..e304212ffd 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -1771,7 +1771,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricador
 block.tank-refabricator.name = Refabricador de Tanque
 block.mech-refabricator.name = Refabricador de Mech
 block.ship-refabricator.name = Refrabricador de Nave
@@ -2098,7 +2097,6 @@ block.logic-display.description = Exibe gráficos arbitrários de um processador
 block.large-logic-display.description = Exibe gráficos arbitrários de um processador lógico.
 block.interplanetary-accelerator.description = Uma enorme torre eletromagnética. Acelera a velocidade de fuga dos núcleos para o desdobramento interplanetário.
 block.repair-turret.description = Conserta continuamente a unidade danificada mais próxima a ela. Opcionalmente, aceita líquido refrigerante.
-block.payload-propulsion-tower.description = Estrutura de transporte de carga de longo alcance. Atira cargas para outras torres de propulsão de carga interligadas.
 
 #Erekir
 block.core-bastion.description = O núcleo da base. Blindado. Uma vez destruído, o setor é perdido.
@@ -2136,7 +2134,6 @@ block.impact-drill.description = Quando colocados sobre minério, os itens saem
 block.eruption-drill.description = Uma Broca de Impacto melhorada. Capaz de minerar Tório. Requer Hidrogênio.
 block.reinforced-conduit.description = Movimenta fluidos para frente. Não aceita entradas de outros blocos, a não ser canos, dos lados.
 block.reinforced-liquid-router.description = Distribui fluidos igualmente para todos os lados.
-block.reinforced-junction.description = Funciona como uma ponte para dois canos se cruzando.
 block.reinforced-liquid-tank.description = Armazena uma grande quantidade de fluidos.
 block.reinforced-liquid-container.description = Armazena uma quantidade considerável de fluidos.
 block.reinforced-bridge-conduit.description = Transporta fluidos sobre estruturas e terrenos.
@@ -2335,6 +2332,7 @@ graphicstype.poly = Preenche um polígono regular.
 graphicstype.linepoly = Desenha um contorno de polígono regular.
 graphicstype.triangle = Preenche um triângulo.
 graphicstype.image = Desenha uma imagem de algum conteúdo.\nex: [accent]@router[] ou [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Sempre verdade.
 lenum.idiv = Divisão inteira.
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 39af5a41ae..9872b289e5 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -1751,7 +1751,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2068,7 +2067,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2104,7 +2102,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2296,6 +2293,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index 4f5cdae374..7eb9475b2d 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -1765,7 +1765,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2084,7 +2083,6 @@ block.logic-display.description = Afișează grafica transmisă de un procesor l
 block.large-logic-display.description = Afișează grafica transmisă de un procesor logic.
 block.interplanetary-accelerator.description = Un turn masiv cu o armă railgun electromagnetică. Accelerează nucleele la viteză cosmică pt lansare interplanetară.
 block.repair-turret.description = Repară încontinuu cea mai deteriorată unitate din vecinătate. Poate accepta răcitor.
-block.payload-propulsion-tower.description = Structură de transport al încărcăturii pe distanțe mari. Lansează încărcătura către un alt turn propulsor conectat.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2120,7 +2118,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2318,6 +2315,7 @@ graphicstype.poly = Desenează un poligon regulat.
 graphicstype.linepoly = Desenează conturul unui poligon regulat.
 graphicstype.triangle = Desenează un triunghi.
 graphicstype.image = Desenează imaginea unui obiect din joc.\nde ex.: [accent]@router[] sau [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Mereu adevărat.
 lenum.idiv = Împărțirea naturală a numerelor (int).
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 4485a18f9a..35858bc73c 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -1765,7 +1765,6 @@ block.disperse.name = Диапазон
 block.afflict.name = Бедствие
 block.lustre.name = Сияние
 block.scathe.name = Погибель
-block.fabricator.name = Фабрикатор
 block.tank-refabricator.name = Рефабрикатор танков
 block.mech-refabricator.name = Рефабрикатор мехов
 block.ship-refabricator.name = Рефабрикатор кораблей
@@ -2086,7 +2085,6 @@ block.logic-display.description = Отображает произвольную
 block.large-logic-display.description = Отображает произвольную графику из логического процессора.
 block.interplanetary-accelerator.description = Массивная электромагнитная башня-рельсотрон. Ускоряет ядро, позволяя преодолеть гравитацию для межпланетного развёртывания.
 block.repair-turret.description = Непрерывно ремонтирует ближайшую поврежденную единицу в своем радиусе. Опционально использует охлаждающую жидкость.
-block.payload-propulsion-tower.description = Конструкция для транспортировки больших грузов на большое расстояние. Стреляет грузом в другие грузовые катапульты.
 block.core-bastion.description = Ядро базы. Бронировано. После уничтожения, весь контакт с регионом теряется.
 block.core-citadel.description = Ядро базы. Очень хорошо бронировано. Хранит больше ресурсов, чем ядро Бастион.
 block.core-acropolis.description = Ядро базы. Исключительно хорошо бронировано. Хранит больше ресурсов, чем ядро Цитадель.
@@ -2122,7 +2120,6 @@ block.impact-drill.description = При размещении на соответ
 block.eruption-drill.description = Усовершенствованная ударная дрель. Способна добывать торий. Требует водород для работы.
 block.reinforced-conduit.description = Перемещает жидкости вперед. Не принимает ввод по бокам.
 block.reinforced-liquid-router.description = Равномерно распределяет жидкости во все стороны.
-block.reinforced-junction.description = Действует как мост для двух пересекающихся трубопроводов.
 block.reinforced-liquid-tank.description = Хранит большое количество жидкости.
 block.reinforced-liquid-container.description = Хранит небольшое количество жидкости.
 block.reinforced-bridge-conduit.description = Перемещает жидкости над любой местностью или зданиями.
@@ -2320,6 +2317,7 @@ graphicstype.poly = Отрисовка закрашенного правильн
 graphicstype.linepoly = Отрисовка контура правильного многоугольника.
 graphicstype.triangle = Отрисовка закрашенного треугольника.
 graphicstype.image = Отрисовка внутриигровых спрайтов.\nНапример: [accent]@router[] или [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Всегда истина.
 lenum.idiv = Целочисленное деление.
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 06dd54f0ba..8f9dcb248c 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -1767,7 +1767,6 @@ block.disperse.name = Raspršivač
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabrikator
 block.tank-refabricator.name = Refabrikator Tenkova
 block.mech-refabricator.name = Refabrikator Mečana
 block.ship-refabricator.name = Refabrikator Brodova
@@ -2087,7 +2086,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Jezgro baze. Oklopljeno. Jednom uništeno gubi se sektor.
 block.core-citadel.description = Jezgro baze. Izuzetno dobro oklopljeno. Skladišti više resursa od Bastilje jezgra.
 block.core-acropolis.description = Jezgro baze. Izvrsno dobro oklopljeno. Skladišti više resursa od Citadele jezgra.
@@ -2123,7 +2121,6 @@ block.impact-drill.description = Kada je postavljeno na rudi, beskonačno ispuš
 block.eruption-drill.description = Poboljšana udarna drobilica. Može iskopavati torijum. Zahteva vodonik.
 block.reinforced-conduit.description = Usmerava tečnosti napred. Ne prihvata unos sa strane od blokova koje nisu cevi.
 block.reinforced-liquid-router.description = Jednako distribuiše tečnosti u svim pravcima.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Skladišti veliku količinu tečnosti.
 block.reinforced-liquid-container.description = Skladišti dobru količinu tečnosti.
 block.reinforced-bridge-conduit.description = Prenosi tečnosti preko terena i građevina.
@@ -2321,6 +2318,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Uvek Tačno.
 lenum.idiv = Integer division.
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 4691464208..2cad751f7d 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -1751,7 +1751,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2068,7 +2067,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2104,7 +2102,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2296,6 +2293,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 84c75c6585..44bf5b9c64 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -1772,7 +1772,6 @@ block.disperse.name = ดิสเพิร์ส
 block.afflict.name = อัฟฟลิกต์
 block.lustre.name = ลัสเตอร์
 block.scathe.name = สเกซส์
-block.fabricator.name = เครื่องสรรค์สร้าง
 block.tank-refabricator.name = เครื่องแปลงสภาพรถถัง
 block.mech-refabricator.name = เครื่องแปลงสภาพจักรกล
 block.ship-refabricator.name = เครื่องแปลงสภาพยานบิน
@@ -2100,7 +2099,6 @@ block.logic-display.description = แสดงกราฟิกโดยคว
 block.large-logic-display.description = แสดงกราฟิกโดยควบคุมจากตัวประมวลผลลอจิก มีขนาดใหญ่กว่า
 block.interplanetary-accelerator.description = หอคอยเรลกันแม่เหล็กไฟฟ้าขนาดมหึมา เร่งความเร็วแกนกลางเพื่อบินสู่อวกาศไปยังดาวเคราะห์อื่นๆ
 block.repair-turret.description = ซ่อมแซมยูนิตที่อยู่ในรัศมีของมันอย่างต่อเนื่อง สามารถใช้ของเหลวมาหล่อเย็นเพื่อเพิ่มประสิทธิภาพได้
-block.payload-propulsion-tower.description = บล็อกขนส่งสิ่งบรรทุกทางไกล\nยิงสิ่งบรรทุกไปยังหอเคลื่อนย้ายสิ่งบรรทุกอีกเครื่องที่เชื่อมต่อไว้
 
 #Erekir
 block.core-bastion.description = ใจกลางของฐานทัพ เสริมเกราะมาอย่างดี เมื่อถูกทำลาย การติดต่อกับพื้นที่นั้นทั้งหมดจะหายไป อย่าให้มันเกิดขึ้น
@@ -2138,7 +2136,6 @@ block.impact-drill.description = เมื่อวางบนพื้นแ
 block.eruption-drill.description = เครื่องขุดแรงกระแทกที่ได้รับการปรับปรุง สามารถขุดทอเรี่ยมได้ จำเป็นต้องใช้ไฮโดรเจน
 block.reinforced-conduit.description = เคลื่อนย้ายของเหลวไปข้างหน้า ไม่รับของเหลวจากด้านข้างยกเว้นว่าจะเป็นท่อน้ำด้วยกันเอง
 block.reinforced-liquid-router.description = รับของเหลวจากทางเดียวแล้วส่งออกไปสามทางเท่าๆกัน สามารถเก็บของเหลวได้จำนวนหนึ่ง\nมีประโยชน์สำหรับการส่งของเหลวจากปั้มไปยังหลายที่
-block.reinforced-junction.description = มีหน้าที่เป็นสะพานสำหรับท่อสูญญากาศสองท่อข้ามกัน มีประโยชน์สำหรับเวลาท่อสูญญากาศสองท่อ\nขนไอเท็มสองชนิดไปยังสองสถานที่
 block.reinforced-liquid-tank.description = เก็บของเหลวจำนวนมาก ส่งออกไปรอบด้านคล้ายกับเร้าเตอร์ของเหลว\nเหมาะในการใช้เพื่อสร้างกันชนในเวลาที่ของเหลวไม่คงที่\nหรือเวลาที่ใช้ของเหลวเป็นจำนวนมาก
 block.reinforced-liquid-container.description = เก็บของเหลวจำนวนปานกลาง ส่งออกไปรอบด้านคล้ายกับ\nเร้าเตอร์ของเหลว เหมาะในการใช้กับเครื่องโหลดและถ่ายสิ่งบรรทุกสำหรับ\nการขนส่งของเหลวทางไกล
 block.reinforced-bridge-conduit.description = เคลื่อนย้ายของเหลวข้ามสิ่งก่อสร้างหรือกำแพง
@@ -2339,6 +2336,7 @@ graphicstype.poly = เติมรูปหลายเหลี่ยมปก
 graphicstype.linepoly = วาดโครงร่างรูปหลายเหลี่ยมปกติ
 graphicstype.triangle = เติมสามเหลี่ยม
 graphicstype.image = วาดรูปสิ่งต่างๆ \nตัวอย่างเช่น: [accent]@router[] หรือ [accent]@dagger[]
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = เป็นจริงเสมอ
 lenum.idiv = หารจำนวนเต็ม
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index cbeed1ebb2..e195095e3e 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -1751,7 +1751,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2068,7 +2067,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2104,7 +2102,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2296,6 +2293,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 lenum.always = Always true.
 lenum.idiv = Integer division.
 lenum.div = Division.\nReturns [accent]null[] on divide-by-zero.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index baa14ac99e..ad6a0cfa2f 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -1764,7 +1764,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabrikatör
 block.tank-refabricator.name = Tank Yeniden Yapılandırıcı
 block.mech-refabricator.name = Robot Yeniden Yapılandırıcı
 block.ship-refabricator.name = Gemi Yeniden Yapılandırıcı
@@ -2084,7 +2083,6 @@ block.logic-display.description = Bir işlemciden bilgi alarak grafik gösteriri
 block.large-logic-display.description = Bir işlemciden bilgi alarak grafik gösteririr.
 block.interplanetary-accelerator.description = Gezegenler Arası ulaşım şimdi parmaklarının ucunda...
 block.repair-turret.description = Sürekli en yakın birimi tamir eder. Soğutucu kullanabilir.
-block.payload-propulsion-tower.description = Kütle sürücü gibi bir yerden başka bir yere fırlatır, ancak malzeme yerine yük fırlatmakta kullanılır.
 block.core-bastion.description = Ana Merkez. Güçlendirilmiş. Yok edildiğinde sektör kaybedilir.
 block.core-citadel.description = Ana Merkez. Yüksek Seviyede Güçlendirilmiş. Yok edildiğinde sektör kaybedilir. Daha fazla malzeme depolar.
 block.core-acropolis.description = Ana Merkez. Aşırı Yüksek Seviyede Güçlendirilmiş. Yok edildiğinde sektör kaybedilir. Daha da fazla malzeme depolar.
@@ -2120,7 +2118,6 @@ block.impact-drill.description = Bir madenin üstüne konduğu zaman ara ara mad
 block.eruption-drill.description = Gelişmiş bir Matkap. Toryum kazabilir. Hidrojen gerektirir.
 block.reinforced-conduit.description = Sıvıları iletir. Yandan başka borular dışında sıvı almaz.
 block.reinforced-liquid-router.description = Tüm sıvıları eşit dağıtır.
-block.reinforced-junction.description = Kesişen iki sıvı için bir kavşak.
 block.reinforced-liquid-tank.description = Daha Bol miktarda sıvı depolar.
 block.reinforced-liquid-container.description = Bol miktarda sıvı depolar.
 block.reinforced-bridge-conduit.description = Sıvıları bina ve duvarların üzerinden geçirmek için bir köprü.
@@ -2318,6 +2315,7 @@ graphicstype.poly = İçi Dolu Çokgen Çiz.
 graphicstype.linepoly = İçi Boş Çokgen Çiz.
 graphicstype.triangle = İçi Dolu Üçgen Çiz.
 graphicstype.image = Bir ikon çiz. \nörnek: [accent]@router[] veya [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Her Zaman Doğru
 lenum.idiv = Tamsayı Bölme
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 9e8557f0e7..ad56f75c28 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -1778,7 +1778,6 @@ block.disperse.name = Розпорошувач
 block.afflict.name = Уражач
 block.lustre.name = Блиск
 block.scathe.name = Знищувач
-block.fabricator.name = Виробник
 block.tank-refabricator.name = Танковий перебудовний завод
 block.mech-refabricator.name = Меховий перебудовний завод
 block.ship-refabricator.name = Корабельний перебудовний завод
@@ -2107,7 +2106,6 @@ block.logic-display.description = Англійська назва: Logic Display
 block.large-logic-display.description = Англійська назва: Large Logic Display\nПоказує довільну графіку з логічного процесора.
 block.interplanetary-accelerator.description = Англійська назва: Interplanetary Accelerator\nВелика електромагнітна башта-рейкотрон. Прискорює ядра, щоби подолати планетне тяжіння для міжпланетного розгортання.
 block.repair-turret.description = Англійська назва: Repair Turret\nБезпервно ремонтує найближчу пошкоджену одиницю. Для прискорення ремонтування можна охолодити.
-block.payload-propulsion-tower.description = Англійська назва: Payload Propulsion Tower\nСтруктура транспортування вантажу на великі відстані. Вистрілює вантаж в інші вантажні катапульти.
 
 #Erekir
 block.core-bastion.description = Англійська назва: Core Bastion\nЯдро бази. Броньоване. Після знищення сектор втрачається.
@@ -2145,7 +2143,6 @@ block.impact-drill.description = Англійська назва: Impact Drill\n
 block.eruption-drill.description = Англійська назва: Eruption Drill\nПоліпшений імпульсний бур. Здатний видобувати торій. Потребує водню.
 block.reinforced-conduit.description = Англійська назва: Reinforced Conduit\nПереміщує рідини вперед. Не приймає нетрубоповідні входи з боків.
 block.reinforced-liquid-router.description = Англійська назва: Reinforced Liquid Router\nРівномірно розподіляє рідини на всі сторони.
-block.reinforced-junction.description = Англійська назва: Reinforced Junction\nВиконує роль моста для двох пересічних водоводів.
 block.reinforced-liquid-tank.description = Англійська назва: Reinforced Liquid Tank\nЗберігає велику кількість рідини.
 block.reinforced-liquid-container.description = Англійська назва: Reinforced Liquid Container\nЗберігає значну кількість рідини.
 block.reinforced-bridge-conduit.description = Англійська назва: Reinforced Bridge Conduit\nТранспортує рідини над спорудами та місцевістю.
@@ -2346,6 +2343,7 @@ graphicstype.poly = Залити кольором правильний бага
 graphicstype.linepoly = Намалювати контур правильного багатокутника.
 graphicstype.triangle = Залити кольором трикутник.
 graphicstype.image = Намалювати зображення із деяким вмістом.\nНаприклад: [accent]@router[] чи [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Завжди істинне.
 lenum.idiv = Ціле ділення.
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 1cf937b88c..acc823c0d8 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -1767,7 +1767,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Máy tạo đơn vị
 block.tank-refabricator.name = Máy nâng cấp xe tăng
 block.mech-refabricator.name = Máy nâng cấp lính cơ động
 block.ship-refabricator.name = Máy nâng cấp phi thuyền
@@ -2085,7 +2084,6 @@ block.logic-display.description = Hiển thị đồ họa tùy ý từ bộ x
 block.large-logic-display.description = Hiển thị đồ họa tùy ý từ bộ xử lý.
 block.interplanetary-accelerator.description = Tòa súng từ trường cỡ lớn. Tăng tốc vật phóng đến vận tốc thoát để di chuyển giữa các hành tinh.
 block.repair-turret.description = Sửa chữa những đơn vị bị hư hỏng trong khu vực nhất định. Có thể làm mát để tăng hiệu quả.
-block.payload-propulsion-tower.description = Cơ cấu vận chuyển các khối hàng tầm xa. Bắn khối hàng cho các tháp đẩy khối hàng khác.
 block.core-bastion.description = Trung tâm của căn cứ. Bọc giáp. Khu vực sẽ mất khi bị phá hủy.
 block.core-citadel.description = Trung tâm của căn cứ. Bọc giáp tốt hơn. Lưu trữ nhiều vật phẩm hơn căn cứ Pháo đài.
 block.core-acropolis.description = Trung tâm của căn cứ. Được bọc giáp rất tốt. Lưu trữ nhiều vật phẩm hơn căn cứ Thủ Phủ.
@@ -2121,7 +2119,6 @@ block.impact-drill.description = Khi được đặt lên một loại quặng,
 block.eruption-drill.description = Phiên bản cải tiến củ máy khoan động lực. Có thể khoan thorium. Yêu cầu hydrogen.
 block.reinforced-conduit.description = Di chuyển chất lỏng về phía trước. Không nhận đầu vào từ các bên.
 block.reinforced-liquid-router.description = Phân chia chất lỏng đều cho tất cả các bên.
-block.reinforced-junction.description = Làm cầu nối cho hai ống dẫn chất lỏng giao nhau.
 block.reinforced-liquid-tank.description = Lưu trữ một lượng chất lỏng lớn.
 block.reinforced-liquid-container.description = Lưu trữ một lượng chất lỏng vừa phải.
 block.reinforced-bridge-conduit.description = Vận chuyển chất lỏng qua các công trình và địa hình.
@@ -2319,6 +2316,7 @@ graphicstype.poly = Tô vào đa giác đều.
 graphicstype.linepoly = Vẽ đường viền đa giác đều.
 graphicstype.triangle = Tô một hình tam giác.
 graphicstype.image = Vẽ hình ảnh một số nội dung.\nVí dụ: [accent]@router[] hoặc [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Luôn đúng.
 lenum.idiv = Chia lấy phần nguyên.
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index eb6231ae48..260ada9c3d 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -1779,7 +1779,6 @@ block.disperse.name = 驱离
 block.afflict.name = 劫难
 block.lustre.name = 光辉
 block.scathe.name = 创伤
-block.fabricator.name = 重构厂
 block.tank-refabricator.name = 坦克重构厂
 block.mech-refabricator.name = 机甲重构厂
 block.ship-refabricator.name = 飞船重构厂
@@ -2106,7 +2105,6 @@ block.logic-display.description = 显示处理器中绘制的各种图像。
 block.large-logic-display.description = 显示处理器中绘制的各种图像。
 block.interplanetary-accelerator.description = 一个巨大的电磁轨道加速器。 将核心加速至逃逸速度以进行星际部署。
 block.repair-turret.description = 持续修复范围内受损的单位。 可以用冷却液强化。
-block.payload-propulsion-tower.description = 远距离载荷运送建筑。 向相连的其他载荷驱动器发射载荷。
 
 #埃里克尔
 block.core-bastion.description = 基地的核心。 拥有装甲。 一旦被摧毁，此区块就会丢失。
@@ -2144,7 +2142,6 @@ block.impact-drill.description = 放置在矿物上时，以缓慢的速度无
 block.eruption-drill.description = 改进过的冲击钻头。 能够开采钍。 需要氢。
 block.reinforced-conduit.description = 向前传输流体。 不接受侧面的非导管输入。
 block.reinforced-liquid-router.description = 将流体平均分配到所有侧面方向。
-block.reinforced-junction.description = 两条交叉物品管道的桥梁。
 block.reinforced-liquid-tank.description = 储存大量的流体。
 block.reinforced-liquid-container.description = 储存数量可观的流体。
 block.reinforced-bridge-conduit.description = 跨越任意地形或建筑物传输流体。
@@ -2345,6 +2342,7 @@ graphicstype.poly = 绘制实心正多边形
 graphicstype.linepoly = 绘制正多边形轮廓
 graphicstype.triangle = 绘制实心三角形
 graphicstype.image = 画出某个游戏内容的图像\n例如[accent]@router[]或者[accent]@dagger[]
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = 无条件跳转
 lenum.idiv = 整数除法，返回不带小数的商
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 968ce5cbcc..bedb9b9313 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -1775,7 +1775,6 @@ block.disperse.name = 驅離者
 block.afflict.name = 折磨
 block.lustre.name = 餘光
 block.scathe.name = 毀損
-block.fabricator.name = 製造廠
 block.tank-refabricator.name = 戰車重塑者
 block.mech-refabricator.name = 機甲重塑者
 block.ship-refabricator.name = 飛船重塑者
@@ -2096,7 +2095,6 @@ block.logic-display.description = 顯示由處理器輸出的任意圖像。
 block.large-logic-display.description = 顯示由處理器輸出的任意圖像。
 block.interplanetary-accelerator.description = 巨大的電磁砲塔。將核心加速至脫離速度以在其他星球部署。
 block.repair-turret.description = 持續修復最靠近的受損單位。能使用冷卻劑。
-block.payload-propulsion-tower.description = 遠程原料輸送建築。發射原料至另一個連接的推進塔。
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
 block.core-citadel.description = Core of the base. Very well armored. Stores more resources than a Bastion core.
 block.core-acropolis.description = Core of the base. Exceptionally well armored. Stores more resources than a Citadel core.
@@ -2132,7 +2130,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge for two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2331,6 +2328,7 @@ graphicstype.poly = 畫實心正多邊形
 graphicstype.linepoly = 畫空心正多邊形
 graphicstype.triangle = 畫實心三角形
 graphicstype.image = 繪製內建圖畫\n如: [accent]@router[]或[accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = 永遠 true (直接跳).
 lenum.idiv = 整數除法，無條件捨去.

From 5f06ce0bff9a9495d4ec6740914b8970cae774ba Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 27 Nov 2023 20:37:25 -0500
Subject: [PATCH 023/369] Added draw print instruction

---
 core/assets/bundles/bundle.properties         |   4 +-
 core/assets/fonts/logic.ttf                   | Bin 0 -> 41208 bytes
 core/src/mindustry/logic/LExecutor.java       |  49 ++++++++++++++++++
 core/src/mindustry/logic/LStatements.java     |  40 +++++++++++---
 core/src/mindustry/ui/Fonts.java              |  12 ++++-
 .../world/blocks/logic/LogicDisplay.java      |  16 ++++--
 6 files changed, 107 insertions(+), 14 deletions(-)
 create mode 100644 core/assets/fonts/logic.ttf

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index f9d668db70..bb16016601 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1785,7 +1785,6 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.fabricator.name = Fabricator
 block.tank-refabricator.name = Tank Refabricator
 block.mech-refabricator.name = Mech Refabricator
 block.ship-refabricator.name = Ship Refabricator
@@ -2111,7 +2110,6 @@ block.logic-display.description = Displays arbitrary graphics from a logic proce
 block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
 block.interplanetary-accelerator.description = A massive electromagnetic railgun tower. Accelerates cores to escape velocity for interplanetary deployment.
 block.repair-turret.description = Continuously repairs the closest damaged unit in its vicinity. Optionally accepts coolant.
-block.payload-propulsion-tower.description = Long-range payload transport structure. Shoots payloads to other linked payload propulsion towers.
 
 #Erekir
 block.core-bastion.description = Core of the base. Armored. Once destroyed, the sector is lost.
@@ -2149,7 +2147,6 @@ block.impact-drill.description = When placed on ore, outputs items in bursts ind
 block.eruption-drill.description = An improved impact drill. Capable of mining thorium. Requires hydrogen.
 block.reinforced-conduit.description = Moves fluids forward. Doesn't accept non-conduit inputs to the sides.
 block.reinforced-liquid-router.description = Distributes fluids equally to all sides.
-block.reinforced-junction.description = Acts as a bridge between two crossing conduits.
 block.reinforced-liquid-tank.description = Stores a large amount of fluids.
 block.reinforced-liquid-container.description = Stores a sizeable amount of fluids.
 block.reinforced-bridge-conduit.description = Transports fluids over structures and terrain.
@@ -2350,6 +2347,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
+graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
 
 lenum.always = Always true.
 lenum.idiv = Integer division.
diff --git a/core/assets/fonts/logic.ttf b/core/assets/fonts/logic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0270cdfe3caa811e1b252cdcc5b179989c1b8ad6
GIT binary patch
literal 41208
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
b>R(G#|5~E@*AmsgmZ<)<MD?#_8Uq6WNcm#-

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index fea21b936b..6e2bf9ee4a 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -19,6 +19,7 @@ import mindustry.game.Teams.*;
 import mindustry.gen.*;
 import mindustry.logic.LogicFx.*;
 import mindustry.type.*;
+import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
 import mindustry.world.blocks.logic.*;
@@ -962,6 +963,54 @@ public class LExecutor{
                 a = ((value & 0x000000ff));
 
                 exec.graphicsBuffer.add(DisplayCmd.get(LogicDisplay.commandColor, pack(r), pack(g), pack(b), pack(a), 0, 0));
+            }else if(type == LogicDisplay.commandPrint){
+                CharSequence str = exec.textBuffer;
+
+                if(str.length() > 0){
+                    var data = Fonts.logic.getData();
+                    int advance = (int)data.spaceXadvance, lineHeight = (int)data.lineHeight;
+
+                    int xOffset, yOffset;
+                    int align = p1; //p1 is not a variable, it's a raw align value. what a massive hack
+
+                    int maxWidth = 0, lines = 1, lineWidth = 0;
+                    for(int i = 0; i < str.length(); i++){
+                        char next = str.charAt(i);
+                        if(next == '\n'){
+                            maxWidth = Math.max(maxWidth, lineWidth);
+                            lineWidth = 0;
+                            lines ++;
+                        }else{
+                            lineWidth ++;
+                        }
+                    }
+                    maxWidth = Math.max(maxWidth, lineWidth);
+
+                    float
+                    width = maxWidth * advance,
+                    height = lines * lineHeight,
+                    ha = ((Align.isLeft(align) ? -1f : 0f) + 1f + (Align.isRight(align) ? 1f : 0f))/2f,
+                    va = ((Align.isBottom(align) ? -1f : 0f) + 1f + (Align.isTop(align) ? 1f : 0f))/2f;
+
+                    xOffset = -(int)(width * ha);
+                    yOffset = -(int)(height * va) + (lines - 1) * lineHeight;
+
+
+                    int curX = exec.numi(x), curY = exec.numi(y);
+                    for(int i = 0; i < str.length(); i++){
+                        char next = str.charAt(i);
+                        if(next == '\n'){
+                            //move Y down when newline is encountered
+                            curY -= lineHeight;
+                            curX = exec.numi(x); //reset
+                            continue;
+                        }
+                        exec.graphicsBuffer.add(DisplayCmd.get(LogicDisplay.commandPrint, packSign(curX + xOffset), packSign(curY + yOffset), next, 0, 0, 0));
+                        curX += advance;
+                    }
+
+                    exec.textBuffer.setLength(0);
+                }
             }else{
                 //add graphics calls, cap graphics buffer size
                 exec.graphicsBuffer.add(DisplayCmd.get(type, packSign(exec.numi(x)), packSign(exec.numi(y)), packSign(num1), packSign(exec.numi(p2)), packSign(exec.numi(p3)), packSign(exec.numi(p4))));
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 3806254550..2c0c8159c4 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -6,6 +6,7 @@ import arc.graphics.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
 import mindustry.annotations.Annotations.*;
@@ -121,6 +122,20 @@ public class LStatements{
 
     @RegisterStatement("draw")
     public static class DrawStatement extends LStatement{
+        static final String[] aligns = {"center", "top", "bottom", "left", "right", "topLeft", "topRight", "bottomLeft", "bottomRight"};
+        //yes, boxing Integer is gross but this is easier to construct and Integers <128 don't allocate anyway
+        static final ObjectMap<String, Integer> nameToAlign = ObjectMap.of(
+        "center", Align.center,
+        "top", Align.top,
+        "bottom", Align.bottom,
+        "left", Align.left,
+        "right", Align.right,
+        "topLeft", Align.topLeft,
+        "topRight", Align.topRight,
+        "bottomLeft", Align.bottomLeft,
+        "bottomRight", Align.bottomRight
+        );
+
         public GraphicsType type = GraphicsType.clear;
         public String x = "0", y = "0", p1 = "0", p2 = "0", p3 = "0", p4 = "0";
 
@@ -147,6 +162,11 @@ public class LStatements{
                         p2 = "32";
                         p3 = "0";
                     }
+
+                    if(type == GraphicsType.print){
+                        p2 = "bottomLeft";
+                    }
+
                     rebuild(table);
                 }, 2, cell -> cell.size(100, 50)));
             }, Styles.logict, () -> {}).size(90, 40).color(table.color).left().padLeft(2);
@@ -221,14 +241,21 @@ public class LStatements{
                         row(s);
                         fields(s, "rotation", p3, v -> p3 = v);
                     }
-                    //TODO
-                    /*
-                    case character -> {
+                    case print -> {
                         fields(s, "x", x, v -> x = v);
                         fields(s, "y", y, v -> y = v);
+
                         row(s);
-                        fields(s, "char", p1, v -> p1 = v);
-                    }*/
+
+                        s.add("align ");
+
+                        s.button(b -> {
+                            b.label(() -> nameToAlign.containsKey(p1) ? p1 : "bottomLeft");
+                            b.clicked(() -> showSelect(b, aligns, p1, t -> {
+                                p1 = t;
+                            }, 2, cell -> cell.size(165, 50)));
+                        }, Styles.logict, () -> {}).size(165, 40).color(s.color).left().padLeft(2);
+                    }
                 }
             }).expand().left();
         }
@@ -243,7 +270,8 @@ public class LStatements{
 
         @Override
         public LInstruction build(LAssembler builder){
-            return new DrawI((byte)type.ordinal(), 0, builder.var(x), builder.var(y), builder.var(p1), builder.var(p2), builder.var(p3), builder.var(p4));
+            return new DrawI((byte)type.ordinal(), 0, builder.var(x), builder.var(y),
+                type == GraphicsType.print ? nameToAlign.get(p1, Align.bottomLeft) : builder.var(p1), builder.var(p2), builder.var(p3), builder.var(p4));
         }
 
         @Override
diff --git a/core/src/mindustry/ui/Fonts.java b/core/src/mindustry/ui/Fonts.java
index b32847a353..6dd4ff1c24 100644
--- a/core/src/mindustry/ui/Fonts.java
+++ b/core/src/mindustry/ui/Fonts.java
@@ -35,7 +35,7 @@ public class Fonts{
     private static TextureRegion[] iconTable;
     private static int lastCid;
 
-    public static Font def, outline, icon, iconLarge, tech;
+    public static Font def, outline, icon, iconLarge, tech, logic;
 
     public static TextureRegion logicIcon(int id){
         return iconTable[id];
@@ -71,11 +71,13 @@ public class Fonts{
         FreeTypeFontParameter param = fontParameter();
 
         Core.assets.load("default", Font.class, new FreeTypeFontLoaderParameter(mainFont, param)).loaded = f -> Fonts.def = f;
+
         Core.assets.load("icon", Font.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{
             size = 30;
             incremental = true;
             characters = "\0";
         }})).loaded = f -> Fonts.icon = f;
+
         Core.assets.load("iconLarge", Font.class, new FreeTypeFontLoaderParameter("fonts/icon.ttf", new FreeTypeFontParameter(){{
             size = 48;
             incremental = false;
@@ -83,6 +85,14 @@ public class Fonts{
             borderWidth = 5f;
             borderColor = Color.darkGray;
         }})).loaded = f -> Fonts.iconLarge = f;
+
+        Core.assets.load("logic", Font.class, new FreeTypeFontLoaderParameter("fonts/logic.ttf", new FreeTypeFontParameter(){{
+            size = 16;
+            //generated all at once, it's fast enough anyway
+            incremental = false;
+            //ASCII only
+            characters = "\0ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890\"!`?'.,;:()[]{}<>|/@\\^$€-%+=#_&~*";
+        }})).loaded = f -> Fonts.logic = f;
     }
 
     public static TextureRegion getLargeIcon(String name){
diff --git a/core/src/mindustry/world/blocks/logic/LogicDisplay.java b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
index 453a3391bd..cfd5c45be8 100644
--- a/core/src/mindustry/world/blocks/logic/LogicDisplay.java
+++ b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
@@ -28,7 +28,8 @@ public class LogicDisplay extends Block{
         commandLinePoly = 8,
         commandTriangle = 9,
         commandImage = 10,
-        commandCharacter = 11;
+        //note that this command actually only draws 1 character, unpacked in instruction
+        commandPrint = 11;
 
     public int maxSides = 25;
 
@@ -103,8 +104,14 @@ public class LogicDisplay extends Block{
                                 var icon = Fonts.logicIcon(p1);
                                 Draw.rect(Fonts.logicIcon(p1), x, y, p2, p2 / icon.ratio(), p3);
                             }
-                            case commandCharacter -> {
-                                //TODO
+                            case commandPrint -> {
+                                var glyph = Fonts.logic.getData().getGlyph((char)p1);
+                                if(glyph != null){
+                                    Tmp.tr1.set(Fonts.logic.getRegion().texture);
+                                    Tmp.tr1.set(glyph.u, glyph.v2, glyph.u2, glyph.v);
+
+                                    Draw.rect(Tmp.tr1, x + Tmp.tr1.width/2f + glyph.xoffset, y + Tmp.tr1.height/2f + glyph.yoffset + Fonts.logic.getData().capHeight + Fonts.logic.getData().ascent, Tmp.tr1.width, Tmp.tr1.height);
+                                }
                             }
                         }
                     }
@@ -151,7 +158,8 @@ public class LogicDisplay extends Block{
         linePoly,
         triangle,
         image,
-        ;//character;
+        //note that this command actually only draws 1 character, unpacked in instruction
+        print;
 
         public static final GraphicsType[] all = values();
     }

From bc308847f4cb77a2dbb6dbfe3130ea5aa9647e70 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 27 Nov 2023 20:47:24 -0500
Subject: [PATCH 024/369] Clarify that only ASCII is supported

---
 core/assets/bundles/bundle.properties   | 2 +-
 core/src/mindustry/logic/LExecutor.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index bb16016601..bf88e0992b 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2347,7 +2347,7 @@ graphicstype.poly = Fill a regular polygon.
 graphicstype.linepoly = Draw a regular polygon outline.
 graphicstype.triangle = Fill a triangle.
 graphicstype.image = Draw an image of some content.\nex: [accent]@router[] or [accent]@dagger[].
-graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+graphicstype.print = Draws text from the print buffer.\nOnly ASCII characters are allowed.\nClears the print buffer.
 
 lenum.always = Always true.
 lenum.idiv = Integer division.
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 6e2bf9ee4a..eaede37d20 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1005,7 +1005,9 @@ public class LExecutor{
                             curX = exec.numi(x); //reset
                             continue;
                         }
-                        exec.graphicsBuffer.add(DisplayCmd.get(LogicDisplay.commandPrint, packSign(curX + xOffset), packSign(curY + yOffset), next, 0, 0, 0));
+                        if(Fonts.logic.getData().hasGlyph(next)){
+                            exec.graphicsBuffer.add(DisplayCmd.get(LogicDisplay.commandPrint, packSign(curX + xOffset), packSign(curY + yOffset), next, 0, 0, 0));
+                        }
                         curX += advance;
                     }
 

From 6543c41bded9b4af98a3c7c6698a1a966d553cf2 Mon Sep 17 00:00:00 2001
From: "Arksource (ShardDustry [ES]) Owner"
 <93954648+ArkSourcer@users.noreply.github.com>
Date: Tue, 28 Nov 2023 06:29:04 -0400
Subject: [PATCH 025/369] Agua en HD (#9323)

* Funny change

* Update servers_v7.json

* Update bundle_es.properties

Traductions for the bundle_es
By ArkSource

* Update servers_v7.json

* Agua prt 2

* Update servers_v7.json

* Update servers_v7.json

* Agua 2-3
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index c655bdd02b..0cd81ae316 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -17,7 +17,7 @@
   },
   {
     "name": "ShardDustry Eventos",
-    "address": ["45.158.9.198:31290"]
+    "address": ["45.158.9.198:31719"]
   },
   {
     "name": "ShardDustry ES",

From 120860665dface6a6e769751e189fffd352ba94f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 28 Nov 2023 05:31:14 -0500
Subject: [PATCH 026/369] Fixed #9322

---
 core/src/mindustry/logic/LExecutor.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index eaede37d20..643efb387f 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -946,12 +946,6 @@ public class LExecutor{
             //graphics on headless servers are useless.
             if(Vars.headless || exec.graphicsBuffer.size >= maxGraphicsBuffer) return;
 
-            int num1 = exec.numi(p1);
-
-            if(type == LogicDisplay.commandImage){
-                num1 = exec.obj(p1) instanceof UnlockableContent u ? u.iconId : 0;
-            }
-
             //explicitly unpack colorPack, it's pre-processed here
             if(type == LogicDisplay.commandColorPack){
                 double packed = exec.num(x);
@@ -1014,6 +1008,12 @@ public class LExecutor{
                     exec.textBuffer.setLength(0);
                 }
             }else{
+                int num1 = exec.numi(p1);
+
+                if(type == LogicDisplay.commandImage){
+                    num1 = exec.obj(p1) instanceof UnlockableContent u ? u.iconId : 0;
+                }
+
                 //add graphics calls, cap graphics buffer size
                 exec.graphicsBuffer.add(DisplayCmd.get(type, packSign(exec.numi(x)), packSign(exec.numi(y)), packSign(num1), packSign(exec.numi(p2)), packSign(exec.numi(p3)), packSign(exec.numi(p4))));
             }

From 02a53daa587629ca77790fac841d2257906672e1 Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Tue, 28 Nov 2023 22:00:08 +0300
Subject: [PATCH 027/369] Marker autoscale now works outside of minimap mode,
 another yet lmarkercontrol instructions cleanup, fix renderer's draw color
 breaking after drawing markers

---
 core/assets/bundles/bundle.properties        |   2 +-
 core/src/mindustry/core/Renderer.java        |   2 +
 core/src/mindustry/game/MapObjectives.java   | 172 +++++++++----------
 core/src/mindustry/logic/LMarkerControl.java |   4 +-
 4 files changed, 81 insertions(+), 99 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 48b132a762..7d230ea73f 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2462,4 +2462,4 @@ lenum.boost = Start/stop boosting.
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nSecond and third arguments are additional suffixes added using "-" separator.\nIf additional arguments are not strings, nothing is added to first string.
 lenum.texturewidth = Width of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.textureheight = Height of texture in tiles. Zero value scales marker height to original texture's size.
-lenum.minimapautoscale = Whether to scale marker in minimap mode corresponding to player's zoom level.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index ba935f438d..62008fc3a7 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -380,6 +380,8 @@ public class Renderer implements ApplicationListener{
             if(marker != null) marker.draw();
         }
 
+        Draw.reset();
+
         Draw.draw(Layer.overlayUI, overlays::drawTop);
         if(state.rules.fog) Draw.draw(Layer.fogOfWar, fog::drawFog);
         Draw.draw(Layer.space, this::drawLanding);
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index a1c78e2516..e03bdea492 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -615,8 +615,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public transient boolean wasAdded;
         /** Whether to display marker on minimap instead of world. {@link MinimapMarker} ignores this value. */
         public boolean minimap = false;
-        /** Whether to scale marker in minimap mode corresponding to player's zoom level. {@link MinimapMarker} ignores this value. */
-        public boolean minimapAutoscale = false;
+        /** Whether to scale marker corresponding to player's zoom level. {@link MinimapMarker} ignores this value. */
+        public boolean autoscale = false;
         /** Hides the marker, used by world processors. */
         protected boolean hidden = false;
         /** On which z-sorting layer is marker drawn. */
@@ -633,10 +633,10 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         /** Control marker with world processor code*/
         public void control(LMarkerControl type, double p1, double p2, double p3){
             switch(type){
-                case visibility -> hidden = (Math.abs(p1) < 1e-5);
+                case visibility -> hidden = Mathf.equal((float)p1, 0f);
                 case drawLayer -> drawLayer = (float)p1;
-                case minimap -> minimap = (Math.abs(p1) >= 1e-5);
-                case minimapAutoscale -> minimapAutoscale = (Math.abs(p1) >= 1e-5);
+                case minimap -> minimap = !Mathf.equal((float)p1, 0f);
+                case autoscale -> autoscale = !Mathf.equal((float)p1, 0f);
             }
         }
         public void setText(String text, boolean fetch){}
@@ -708,11 +708,13 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             //in case some idiot decides to make 9999999 sides and freeze the game
             int sides = Math.min(this.sides, 200);
 
+            float scl = autoscale ? 4f / renderer.getDisplayScale() : 1f;
+
             Draw.z(drawLayer);
-            Lines.stroke(3f, Pal.gray);
-            Lines.poly(pos.x, pos.y, sides, radius + 1f, rotation);
-            Lines.stroke(1f, color);
-            Lines.poly(pos.x, pos.y, sides, radius + 1f, rotation);
+            Lines.stroke(3f * scl, Pal.gray);
+            Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scl, rotation);
+            Lines.stroke(scl, color);
+            Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scl, rotation);
             Draw.reset();
 
             if(fetchedText == null){
@@ -720,9 +722,9 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             }
 
             // font size cannot be 0
-            if(Math.abs(fontSize) < 1e-5) return;
+            if(Mathf.equal(fontSize, 0f)) return;
 
-            WorldLabel.drawAt(fetchedText, pos.x, pos.y + radius + textHeight, drawLayer, flags, fontSize);
+            WorldLabel.drawAt(fetchedText, pos.x, pos.y + radius * scl + textHeight * scl, drawLayer, flags, fontSize * scl);
         }
 
         @Override
@@ -734,12 +736,12 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
 
-            float rad = minimap.scale(radius, minimapAutoscale);
+            float rad = minimap.scale(radius, autoscale);
 
             Draw.z(drawLayer);
-            Lines.stroke(minimap.scale(3f, minimapAutoscale), Pal.gray);
+            Lines.stroke(minimap.scale(3f, autoscale), Pal.gray);
             Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, rad + 1f, rotation);
-            Lines.stroke(minimap.scale(1f, minimapAutoscale), color);
+            Lines.stroke(minimap.scale(1f, autoscale), color);
             Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, rad + 1f, rotation);
             Draw.reset();
 
@@ -748,9 +750,9 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             }
 
             // font size cannot be 0
-            if(Math.abs(fontSize) < 1e-5) return;
+            if(Mathf.equal(fontSize, 0f)) return;
 
-            WorldLabel.drawAt(fetchedText, Tmp.v1.x, Tmp.v1.y + rad + minimap.scale(textHeight, minimapAutoscale), drawLayer, flags, minimap.scale(fontSize, minimapAutoscale));
+            WorldLabel.drawAt(fetchedText, Tmp.v1.x, Tmp.v1.y + rad + minimap.scale(textHeight, autoscale), drawLayer, flags, minimap.scale(fontSize, autoscale));
         }
 
         @Override
@@ -761,23 +763,9 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 case pos -> pos.set((float)p1 * tilesize, (float)p2  * tilesize);
                 case fontSize -> fontSize = (float)p1;
                 case textHeight -> textHeight = (float)p1;
-                case labelBackground -> {
-                    if((Math.abs(p1) >= 1e-5)){
-                        flags |= WorldLabel.flagBackground;
-                    }else{
-                        flags &= ~WorldLabel.flagBackground;
-                    }
-                }
-                case labelOutline -> {
-                    if((Math.abs(p1) >= 1e-5)){
-                        flags |= WorldLabel.flagOutline;
-                    }else{
-                        flags &= ~WorldLabel.flagOutline;
-                    }
-                }
                 case labelFlags -> {
-                    flags = ((Math.abs(p1) >= 1e-5) ? WorldLabel.flagBackground : 0);
-                    if((Math.abs(p2) >= 1e-5)) flags |= WorldLabel.flagOutline;
+                    flags = (!Mathf.equal((float)p1, 0f) ? WorldLabel.flagBackground : 0);
+                    if(!Mathf.equal((float)p2, 0f)) flags |= WorldLabel.flagOutline;
                 }
                 case radius -> radius = (float)p1;
                 case rotation -> rotation = (float)p1;
@@ -828,7 +816,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             minimap.transform(Tmp.v1.set(pos.x * tilesize, pos.y * tilesize));
 
-            float rad = minimap.scale(radius * tilesize);
+            float rad = minimap.scale(radius * tilesize, autoscale);
             float fin = Interp.pow2Out.apply((Time.globalTime / 100f) % 1f);
 
             Draw.z(drawLayer);
@@ -879,18 +867,20 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             //in case some idiot decides to make 9999999 sides and freeze the game
             int sides = Math.min(this.sides, 200);
 
+            float scl = autoscale ? 4f / renderer.getDisplayScale() : 1f;
+
             Draw.z(drawLayer);
             if(!fill){
                 if(outline){
-                    Lines.stroke(stroke + 2f, Pal.gray);
-                    Lines.poly(pos.x, pos.y, sides, radius + 1f, rotation);
+                    Lines.stroke((stroke + 2f) * scl, Pal.gray);
+                    Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scl, rotation);
                 }
 
-                Lines.stroke(stroke, color);
-                Lines.poly(pos.x, pos.y, sides, radius + 1f, rotation);
+                Lines.stroke(stroke * scl, color);
+                Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scl, rotation);
             }else{
                 Draw.color(color);
-                Fill.poly(pos.x, pos.y, sides, radius, rotation);
+                Fill.poly(pos.x, pos.y, sides, radius * scl, rotation);
             }
 
             Draw.reset();
@@ -905,20 +895,20 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
 
-            float rad = minimap.scale(radius, minimapAutoscale);
+            float rad = minimap.scale(radius, autoscale);
 
             Draw.z(drawLayer);
             if(!fill){
                 if(outline){
-                    Lines.stroke(minimap.scale(stroke + 2f, minimapAutoscale), Pal.gray);
-                    Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius + 1f, minimapAutoscale), rotation);
+                    Lines.stroke(minimap.scale(stroke + 2f, autoscale), Pal.gray);
+                    Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius + 1f, autoscale), rotation);
                 }
 
                 Lines.stroke(stroke, color);
-                Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius + 1f, minimapAutoscale), rotation);
+                Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius + 1f, autoscale), rotation);
             }else{
                 Draw.color(color);
-                Fill.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius, minimapAutoscale), rotation);
+                Fill.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius, autoscale), rotation);
             }
 
             Draw.reset();
@@ -934,12 +924,12 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 case rotation -> rotation = (float)p1;
                 case stroke -> stroke = (float)p1;
                 case shapeSides -> sides = (int)p1;
-                case shapeFill -> fill = (Math.abs(p1) >= 1e-5);
-                case shapeOutline -> outline = (Math.abs(p1) >= 1e-5);
+                case shapeFill -> fill = !Mathf.equal((float)p1, 0f);
+                case shapeOutline -> outline = !Mathf.equal((float)p1, 0f);
                 case shape -> {
                     sides = (int)p1;
-                    fill = (Math.abs(p2) >= 1e-5);
-                    outline = (Math.abs(p3) >= 1e-5);
+                    fill = !Mathf.equal((float)p2, 0f);
+                    outline = !Mathf.equal((float)p3, 0f);
                 }
                 case color -> color.set(Tmp.c1.fromDouble(p1));
                 default -> super.control(type, p1, p2, p3);
@@ -973,23 +963,25 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         @Override
         public void draw(){
             // font size cannot be 0
-            if(hidden || Math.abs(fontSize) < 1e-5 || minimap) return;
+            if(hidden || Mathf.equal(fontSize, 0f) || minimap) return;
 
             if(fetchedText == null){
                 fetchedText = fetchText(text);
             }
 
-            WorldLabel.drawAt(fetchedText, pos.x, pos.y, drawLayer, flags, fontSize);
+            float scl = autoscale ? 4f / renderer.getScale() : 1f;
+
+            WorldLabel.drawAt(fetchedText, pos.x, pos.y, drawLayer, flags, fontSize * scl);
         }
 
         @Override
         public void drawMinimap(MinimapRenderer minimap){
             if(hidden || !this.minimap) return;
 
-            float size = minimap.scale(fontSize, minimapAutoscale);
+            float size = minimap.scale(fontSize, autoscale);
 
             // font size cannot be 0
-            if(Math.abs(fontSize) < 1e-5) return;
+            if(Mathf.equal(fontSize, 0f)) return;
 
             minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
 
@@ -1007,23 +999,9 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 case y -> pos.y = (float)p1 * tilesize;
                 case pos -> pos.set((float)p1 * tilesize, (float)p2 * tilesize);
                 case fontSize -> fontSize = (float)p1;
-                case labelBackground -> {
-                    if((Math.abs(p1) >= 1e-5)){
-                        flags |= WorldLabel.flagBackground;
-                    }else{
-                        flags &= ~WorldLabel.flagBackground;
-                    }
-                }
-                case labelOutline -> {
-                    if((Math.abs(p1) >= 1e-5)){
-                        flags |= WorldLabel.flagOutline;
-                    }else{
-                        flags &= ~WorldLabel.flagOutline;
-                    }
-                }
                 case labelFlags -> {
-                    flags = ((Math.abs(p1) >= 1e-5) ? WorldLabel.flagBackground : 0);
-                    if((Math.abs(p2) >= 1e-5)) flags |= WorldLabel.flagOutline;
+                    flags = (!Mathf.equal((float)p1, 0f) ? WorldLabel.flagBackground : 0);
+                    if(!Mathf.equal((float)p2, 0f)) flags |= WorldLabel.flagOutline;
                 }
                 default -> super.control(type, p1, p2, p3);
             }
@@ -1060,33 +1038,19 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         public LineMarker(){}
 
-        @Override
-        public void control(LMarkerControl type, double p1, double p2, double p3){
-            switch(type){
-                case x -> pos1.x = (float)p1 * tilesize;
-                case y -> pos1.y = (float)p1 * tilesize;
-                case pos -> pos1.set((float)p1 * tilesize, (float)p2 * tilesize);
-                case endX -> pos2.x = (float)p1 * tilesize;
-                case endY -> pos2.y = (float)p1 * tilesize;
-                case endPos -> pos2.set((float)p1 * tilesize, (float)p2 * tilesize);
-                case stroke -> stroke = (float)p1;
-                case shapeOutline -> outline = ((Math.abs(p1) >= 1e-5));
-                case color -> color.set(Tmp.c1.fromDouble(p1));
-                default -> super.control(type, p1, p2, p3);
-            }
-        }
-
         @Override
         public void draw(){
             if(hidden || minimap) return;
 
+            float scl = autoscale ? 4f / renderer.getDisplayScale() : 1f;
+
             Draw.z(drawLayer);
             if(outline){
-                Lines.stroke(stroke + 2f, Pal.gray);
+                Lines.stroke((stroke + 2f) * scl, Pal.gray);
                 Lines.line(pos1.x, pos1.y, pos2.x, pos2.y);
             }
 
-            Lines.stroke(stroke, color);
+            Lines.stroke(stroke * scl, color);
             Lines.line(pos1.x, pos1.y, pos2.x, pos2.y);
         }
 
@@ -1099,13 +1063,29 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             Draw.z(drawLayer);
             if(outline){
-                Lines.stroke(minimap.scale(stroke + 2f, minimapAutoscale), Pal.gray);
+                Lines.stroke(minimap.scale(stroke + 2f, autoscale), Pal.gray);
                 Lines.line(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
             }
 
-            Lines.stroke(minimap.scale(stroke, minimapAutoscale), color);
+            Lines.stroke(minimap.scale(stroke, autoscale), color);
             Lines.line(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
         }
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            switch(type){
+                case x -> pos1.x = (float)p1 * tilesize;
+                case y -> pos1.y = (float)p1 * tilesize;
+                case pos -> pos1.set((float)p1 * tilesize, (float)p2 * tilesize);
+                case endX -> pos2.x = (float)p1 * tilesize;
+                case endY -> pos2.y = (float)p1 * tilesize;
+                case endPos -> pos2.set((float)p1 * tilesize, (float)p2 * tilesize);
+                case stroke -> stroke = (float)p1;
+                case shapeOutline -> outline = !Mathf.equal((float)p1, 0f);
+                case color -> color.set(Tmp.c1.fromDouble(p1));
+                default -> super.control(type, p1, p2, p3);
+            }
+        }
     }
 
     /** Displays a texture with specified name. */
@@ -1149,16 +1129,18 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             if(fetchedRegion == null) fetchedRegion = Core.atlas.find(textureName);
 
             // Zero width/height scales marker to original texture's size
-            if(width < 1e-5) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
-            if(height < 1e-5) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
+            if(Mathf.equal(width, 0f)) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
+            if(Mathf.equal(height, 0f)) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
+
+            float scl = autoscale ? 4f / renderer.getDisplayScale() : 1f;
 
             Draw.z(drawLayer);
             if(fetchedRegion.found()){
                 Draw.color(color);
-                Draw.rect(fetchedRegion, pos.x, pos.y, width, height, rotation);
+                Draw.rect(fetchedRegion, pos.x, pos.y, width * scl, height * scl, rotation);
             }else{
                 Draw.color(Color.white);
-                Draw.rect("error", pos.x, pos.y, width, height, rotation);
+                Draw.rect("error", pos.x, pos.y, width * scl, height * scl, rotation);
             }
         }
 
@@ -1169,18 +1151,18 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             if(fetchedRegion == null) fetchedRegion = Core.atlas.find(textureName);
 
             // Zero width/height scales marker to original texture's size
-            if(width < 1e-5) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
-            if(height < 1e-5) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
+            if(Mathf.equal(width, 0f)) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
+            if(Mathf.equal(height, 0f)) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
 
             minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
 
             Draw.z(drawLayer);
             if(fetchedRegion.found()){
                 Draw.color(color);
-                Draw.rect(fetchedRegion, Tmp.v1.x, Tmp.v1.y, minimap.scale(width, minimapAutoscale), minimap.scale(height, minimapAutoscale), rotation);
+                Draw.rect(fetchedRegion, Tmp.v1.x, Tmp.v1.y, minimap.scale(width, autoscale), minimap.scale(height, autoscale), rotation);
             }else{
                 Draw.color(Color.white);
-                Draw.rect("error", Tmp.v1.x, Tmp.v1.y, minimap.scale(width, minimapAutoscale), minimap.scale(height, minimapAutoscale), rotation);
+                Draw.rect("error", Tmp.v1.x, Tmp.v1.y, minimap.scale(width, autoscale), minimap.scale(height, autoscale), rotation);
             }
         }
 
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
index f9d826003d..b98d3fd8f6 100644
--- a/core/src/mindustry/logic/LMarkerControl.java
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -4,7 +4,7 @@ public enum LMarkerControl{
     remove,
     visibility("true/false"),
     minimap("true/false"),
-    minimapAutoscale("true/false"),
+    autoscale("true/false"),
     x("x"),
     y("y"),
     pos("x", "y"),
@@ -24,8 +24,6 @@ public enum LMarkerControl{
     flushText,
     fontSize("size"),
     textHeight("height"),
-    labelBackground("true/false"),
-    labelOutline("true/false"),
     labelFlags("background", "outline"),
     texture("name", "-", "-"),
     textureWidth("width"),

From 20b2be5de8dad85351b87d68299f723b7f690bbe Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Tue, 28 Nov 2023 22:19:08 +0300
Subject: [PATCH 028/369] "i forgor" fix

---
 core/src/mindustry/game/MapObjectives.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index e03bdea492..9e074f2ff4 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -969,7 +969,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 fetchedText = fetchText(text);
             }
 
-            float scl = autoscale ? 4f / renderer.getScale() : 1f;
+            float scl = autoscale ? 4f / renderer.getDisplayScale() : 1f;
 
             WorldLabel.drawAt(fetchedText, pos.x, pos.y, drawLayer, flags, fontSize * scl);
         }

From 90e40af8c15b6dab5a24b39e6a534be74cf332f4 Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Tue, 28 Nov 2023 22:24:48 +0300
Subject: [PATCH 029/369] Minor setmarker ui statement fix (farming tiny
 commits?)

---
 core/src/mindustry/logic/LStatements.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 977459c9b8..92b09605b7 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -2001,7 +2001,7 @@ public class LStatements{
                                     }
                                 }).width(240f).left();
                             }));
-                        }, Styles.logict, () -> {}).size(40f).padLeft(-2).color(table.color);
+                        }, Styles.logict, () -> {}).size(40f).padLeft(-11).color(table.color);
                     }
                 });
 

From 2ad5e373028340c0dec2b4de9808cc97ff606a01 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 28 Nov 2023 15:00:39 -0500
Subject: [PATCH 030/369] Fixed #9325

---
 core/src/mindustry/logic/LStatements.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 2c0c8159c4..fe3308212a 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -164,7 +164,7 @@ public class LStatements{
                     }
 
                     if(type == GraphicsType.print){
-                        p2 = "bottomLeft";
+                        p1 = "bottomLeft";
                     }
 
                     rebuild(table);

From 45aee7d5820be54d552e3bbbfb39a338efce6e1c Mon Sep 17 00:00:00 2001
From: OSP <76648940+osp54@users.noreply.github.com>
Date: Wed, 29 Nov 2023 01:35:49 +0300
Subject: [PATCH 031/369] Darkdustry reborn (#9324)

---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index 0cd81ae316..397a24135f 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -83,6 +83,10 @@
     "name": "XCore",
     "address": ["128.140.88.66", "128.140.88.66:6568", "128.140.88.66:6569", "128.140.88.66:6570", "128.140.88.66:6571", "128.140.88.66:6572", "128.140.88.66:6573", "128.140.88.66:6574", "128.140.88.66:6575"]
   },
+  {
+    "name": "MinDurka",
+    "address": ["143.47.246.70", "143.47.246.70:3001", "143.47.246.70:3002", "143.47.246.70:3003", "143.47.246.70:3004", "143.47.246.70:3005", "143.47.246.70:3006", "143.47.246.70:3007", "143.47.246.70:3008", "143.47.246.70:3009", "143.47.246.70:3010"]
+  },
   {
     "name": "Chaotic Neutral",
     "address": ["c-n.ddns.net:7012", "c-n.ddns.net:7013", "c-n.ddns.net:7014", "c-n.ddns.net:7015", "c-n.ddns.net:7016", "c-n.ddns.net:7017", "c-n.ddns.net:7003", "37.187.73.180:7021"]

From ada2ee128ba1e537df94c73937e54bde042d2e17 Mon Sep 17 00:00:00 2001
From: router <messagebus@vk.com>
Date: Wed, 29 Nov 2023 10:10:52 +0300
Subject: [PATCH 032/369] fix typo in russian bundle (#9326)

---
 core/assets/bundles/bundle_ru.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 35858bc73c..ab749a1a86 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -1982,7 +1982,7 @@ block.door-large.description = Стена, которую можно откры
 block.mender.description = Периодически ремонтирует блоки в непосредственной близости.\nОпционально использует кремний для увеличения дальности и эффективности.
 block.mend-projector.description = Периодически ремонтирует блоки в непосредственной близости.\nОпционально использует фазовую ткань для увеличения дальности и эффективности.
 block.overdrive-projector.description = Увеличивает скорость близлежащих зданий.\nОпционально использует фазовую ткань для увеличения дальности и эффективности.
-block.force-projector.description = Создает вокруг себя шестиугольное силовое поле, защищая здания и боевые единицы внутри от повреждений.\nПерегревается, если нанесено слишком большое количество повреждений. Опционально использует охлаждающую жидкость для предотвращения перегрева. Фазовая ткань увеличивает размера щита.
+block.force-projector.description = Создает вокруг себя шестиугольное силовое поле, защищая здания и боевые единицы внутри от повреждений.\nПерегревается, если нанесено слишком большое количество повреждений. Опционально использует охлаждающую жидкость для предотвращения перегрева. Фазовая ткань увеличивает размер щита.
 block.shock-mine.description = Высвобождает электрический разряд при контакте с вражеской единицей.
 block.conveyor.description = Перемещает предметы вперёд.
 block.titanium-conveyor.description = Перемещает предметы вперёд. Быстрее, чем стандартный конвейер.

From 08758ec29c36b3ac71ae8a14b105781680e9b9db Mon Sep 17 00:00:00 2001
From: router <messagebus@vk.com>
Date: Wed, 29 Nov 2023 23:01:41 +0300
Subject: [PATCH 033/369] Clean up 0.baseduser.eu.org (servers_v7.json) (#9328)

---
 servers_v7.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index 397a24135f..f4cb6be8c1 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -49,7 +49,7 @@
   },
   {
     "name": "Mindustry.pl",
-    "address": ["78.46.100.178", "0.baseduser.eu.org:6966", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6000", "1.baseduser.eu.org:6966", "1.baseduser.eu.org:6666", "1.baseduser.eu.org:6000"]
+    "address": ["1.baseduser.eu.org:6966", "1.baseduser.eu.org:6666", "1.baseduser.eu.org:6000"]
   },
   {
     "name": "SynapseOS",
@@ -59,10 +59,6 @@
     "name": "Untitled Mindustry Servers",
     "address": ["45.144.66.250:6567", "45.144.66.250:6601", "45.144.66.250:6611"]
   },
-  {
-    "name": "C.A.M.S.",
-    "address": ["0.baseduser.eu.org:42001", "0.baseduser.eu.org:42002"]
-  },
   {
     "name": "thedimas",
     "address": ["167.86.69.235", "167.86.69.235:6503","167.86.69.235:6505", "167.86.69.235:6506", "167.86.69.235:6507", "167.86.69.235:6508", "167.86.69.235:6509", "167.86.69.235:6510", "167.86.69.235:6511", "167.86.69.235:6512", "167.86.69.235:6513"]

From 871209d88050428e4917dad7c73b9f61ef7c2100 Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Thu, 30 Nov 2023 07:29:52 +0700
Subject: [PATCH 034/369] Update servers_v7.json (#9329)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index f4cb6be8c1..1a0f7180dc 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -226,7 +226,7 @@
   },
   {
     "name": "ABCXYZ Community",
-    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269"]
+    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133"]
   },
   {
     "name": "CroCraft Network",

From 9bd494504e7b4480f5469d0974d241c1a59e75f4 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Thu, 30 Nov 2023 04:18:40 -0800
Subject: [PATCH 035/369] angleOffset is added twice in Weapon shoot (#9332)

---
 core/src/mindustry/type/Weapon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index 6397a899e1..51136e5a6b 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -468,7 +468,7 @@ public class Weapon implements Cloneable{
         bulletY = mountY + Angles.trnsy(weaponRotation, this.shootX + xOffset + xSpread, this.shootY + yOffset),
         shootAngle = bulletRotation(unit, mount, bulletX, bulletY) + angleOffset,
         lifeScl = bullet.scaleLife ? Mathf.clamp(Mathf.dst(bulletX, bulletY, mount.aimX, mount.aimY) / bullet.range) : 1f,
-        angle = angleOffset + shootAngle + Mathf.range(inaccuracy + bullet.inaccuracy);
+        angle = shootAngle + Mathf.range(inaccuracy + bullet.inaccuracy);
 
         Entityc shooter = unit.controller() instanceof MissileAI ai ? ai.shooter : unit; //Pass the missile's shooter down to its bullets
         mount.bullet = bullet.create(unit, shooter, unit.team, bulletX, bulletY, angle, -1f, (1f - velocityRnd) + Mathf.random(velocityRnd), lifeScl, null, mover, mount.aimX, mount.aimY);

From 0271089211e98dfa4c7017ac7f892c042fa50bc8 Mon Sep 17 00:00:00 2001
From: alex <67626131+alexpvpmindustry@users.noreply.github.com>
Date: Thu, 30 Nov 2023 20:18:59 +0800
Subject: [PATCH 036/369] Update servers_v7.json for alex mindustry (#9330)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 1a0f7180dc..08481a93c2 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -238,7 +238,7 @@
   },
   {
     "name": "Alex Multiverse",
-    "address": ["alexmindustryv7.servegame.com:25588", "173.255.208.38:41962", "alexmindustrypvp.ddns.net:6767", "172.104.188.197:6768", "172.234.80.96:6768", "139.162.41.78:6767"]
+    "address": ["alexmindustryv7.servegame.com:25588", "172.234.80.96:6768", "139.162.41.78:6767", "172.245.187.143:6868", "172.245.187.143:6869" ]
   },
   {
     "name": "Open PVP",

From 0afed49b7c31f014b051e25822771df8e1f35ff2 Mon Sep 17 00:00:00 2001
From: NazrinNya <137837419+NazrinNya@users.noreply.github.com>
Date: Thu, 30 Nov 2023 18:17:09 +0300
Subject: [PATCH 037/369] IP change of cyandustry (#9312)

* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 08481a93c2..d284a7312d 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -206,7 +206,7 @@
   },
   {
     "name": "Cyandustry",
-    "address": ["88.99.95.188:7000","88.99.95.188:7001", "88.99.95.188:7002", "88.99.95.188:7003", "88.99.95.188:7004", "88.99.95.188:7005", "88.99.95.188:7006"]
+    "address": ["81.30.157.68:7000","81.30.157.68:7001", "81.30.157.68:7002", "81.30.157.68:7003", "81.30.157.68:7004", "81.30.157.68:7005", "81.30.157.68:7006"]
   },
   {
     "name": "Four Family",

From 5fe28254e787afd020178555dc82d2ae91fcd691 Mon Sep 17 00:00:00 2001
From: Mythril382 <77225817+Mythril382@users.noreply.github.com>
Date: Fri, 1 Dec 2023 03:16:44 +0800
Subject: [PATCH 038/369] Custom Launch Music for Each Planet (#8901)

* plant

* what

* literal ctrl+c ctrl+v

* more music

* issue

* feedback

* commit return
---
 core/src/mindustry/audio/SoundControl.java |  2 +-
 core/src/mindustry/mod/ContentParser.java  | 16 ++++++++++++++++
 core/src/mindustry/type/Planet.java        |  4 ++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/audio/SoundControl.java b/core/src/mindustry/audio/SoundControl.java
index 93f8fda115..f035306b2c 100644
--- a/core/src/mindustry/audio/SoundControl.java
+++ b/core/src/mindustry/audio/SoundControl.java
@@ -146,7 +146,7 @@ public class SoundControl{
         if(state.isMenu()){
             silenced = false;
             if(ui.planet.isShown()){
-                play(Musics.launch);
+                play(ui.planet.state.planet.launchMusic);
             }else if(ui.editor.isShown()){
                 play(Musics.editor);
             }else{
diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 519b47ff71..2d3f2a7487 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -2,6 +2,7 @@ package mindustry.mod;
 
 import arc.*;
 import arc.assets.*;
+import arc.assets.loaders.MusicLoader.*;
 import arc.assets.loaders.SoundLoader.*;
 import arc.audio.*;
 import arc.files.*;
@@ -61,6 +62,7 @@ public class ContentParser{
     ObjectMap<Class<?>, ContentType> contentTypes = new ObjectMap<>();
     ObjectSet<Class<?>> implicitNullable = ObjectSet.with(TextureRegion.class, TextureRegion[].class, TextureRegion[][].class, TextureRegion[][][].class);
     ObjectMap<String, AssetDescriptor<?>> sounds = new ObjectMap<>();
+    ObjectMap<String, AssetDescriptor<?>> musics = new ObjectMap<>();
     Seq<ParseListener> listeners = new Seq<>();
 
     ObjectMap<Class<?>, FieldParser> classParsers = new ObjectMap<>(){{
@@ -284,6 +286,20 @@ public class ContentParser{
             sounds.put(path, desc);
             return sound;
         });
+        put(Music.class, (type, data) -> {
+            if(fieldOpt(Musics.class, data) != null) return fieldOpt(Musics.class, data);
+            if(Vars.headless) return new Music();
+            
+            String name = "music/" + data.asString();
+            String path = Vars.tree.get(name + ".ogg").exists() ? name + ".ogg" : name + ".mp3";
+            
+            if(musics.containsKey(path)) return ((MusicParameter)musics.get(path).params).music;
+            var music = new Music();
+            AssetDescriptor<?> desc = Core.assets.load(path, Music.class, new MusicParameter(music));
+            desc.errored = Throwable::printStackTrace;
+            musics.put(path, desc);
+            return music;
+        });
         put(Objectives.Objective.class, (type, data) -> {
             if(data.isString()){
                 var cont = locateAny(data.asString());
diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java
index 68c07a239b..1aa63264e2 100644
--- a/core/src/mindustry/type/Planet.java
+++ b/core/src/mindustry/type/Planet.java
@@ -1,6 +1,7 @@
 package mindustry.type;
 
 import arc.*;
+import arc.audio.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.g3d.*;
@@ -15,6 +16,7 @@ import mindustry.content.TechTree.*;
 import mindustry.ctype.*;
 import mindustry.game.*;
 import mindustry.game.EventType.ContentInitEvent;
+import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.graphics.g3d.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
@@ -128,6 +130,8 @@ public class Planet extends UnlockableContent{
     public boolean allowLaunchToNumbered = true;
     /** Icon as displayed in the planet selection dialog. This is a string, as drawables are null at load time. */
     public String icon = "planet";
+    /** Plays in the planet dialog when this planet is selected. */
+    public Music launchMusic = Musics.launch;
     /** Default core block for launching. */
     public Block defaultCore = Blocks.coreShard;
     /** Sets up rules on game load for any sector on this planet. */

From ed96b2eec8d52f5d3851cd8561df11ea013542c0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 30 Nov 2023 14:19:30 -0500
Subject: [PATCH 039/369] Simplified JSON music/sound loading

---
 core/assets/icons/icons.properties        |   1 +
 core/assets/logicids.dat                  | Bin 4666 -> 4680 bytes
 core/src/mindustry/mod/ContentParser.java |  31 ++++------------------
 gradle.properties                         |   2 +-
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index d72941dee9..64963dd203 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -587,3 +587,4 @@
 63095=ranai|ranai
 63094=cat|cat
 63093=world-switch|block-world-switch-ui
+63092=dynamic|status-dynamic-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index c5ed10a04e9b53918436d645b2a2b4d90940ddb2..1a821f841ab622df099a5fbfb7d540afb380f134 100644
GIT binary patch
delta 30
lcmdm`azcfP;r~V^XMSFu^8BKl6y4(T%#!4c%`W`km;j@v3eNxl

delta 16
XcmX@1vP*@D;on9kXa3E>{9l;>Gz<mY

diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 2d3f2a7487..0cf60c79e6 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -61,8 +61,6 @@ public class ContentParser{
 
     ObjectMap<Class<?>, ContentType> contentTypes = new ObjectMap<>();
     ObjectSet<Class<?>> implicitNullable = ObjectSet.with(TextureRegion.class, TextureRegion[].class, TextureRegion[][].class, TextureRegion[][][].class);
-    ObjectMap<String, AssetDescriptor<?>> sounds = new ObjectMap<>();
-    ObjectMap<String, AssetDescriptor<?>> musics = new ObjectMap<>();
     Seq<ParseListener> listeners = new Seq<>();
 
     ObjectMap<Class<?>, FieldParser> classParsers = new ObjectMap<>(){{
@@ -273,32 +271,14 @@ public class ContentParser{
             return new Vec3(data.getFloat("x", 0f), data.getFloat("y", 0f), data.getFloat("z", 0f));
         });
         put(Sound.class, (type, data) -> {
-            if(fieldOpt(Sounds.class, data) != null) return fieldOpt(Sounds.class, data);
-            if(Vars.headless) return new Sound();
+            var field = fieldOpt(Sounds.class, data);
 
-            String name = "sounds/" + data.asString();
-            String path = Vars.tree.get(name + ".ogg").exists() ? name + ".ogg" : name + ".mp3";
-
-            if(sounds.containsKey(path)) return ((SoundParameter)sounds.get(path).params).sound;
-            var sound = new Sound();
-            AssetDescriptor<?> desc = Core.assets.load(path, Sound.class, new SoundParameter(sound));
-            desc.errored = Throwable::printStackTrace;
-            sounds.put(path, desc);
-            return sound;
+            return field != null ? field : Vars.tree.loadSound(data.asString());
         });
         put(Music.class, (type, data) -> {
-            if(fieldOpt(Musics.class, data) != null) return fieldOpt(Musics.class, data);
-            if(Vars.headless) return new Music();
-            
-            String name = "music/" + data.asString();
-            String path = Vars.tree.get(name + ".ogg").exists() ? name + ".ogg" : name + ".mp3";
-            
-            if(musics.containsKey(path)) return ((MusicParameter)musics.get(path).params).music;
-            var music = new Music();
-            AssetDescriptor<?> desc = Core.assets.load(path, Music.class, new MusicParameter(music));
-            desc.errored = Throwable::printStackTrace;
-            musics.put(path, desc);
-            return music;
+            var field = fieldOpt(Musics.class, data);
+
+            return field != null ? field : Vars.tree.loadMusic(data.asString());
         });
         put(Objectives.Objective.class, (type, data) -> {
             if(data.isString()){
@@ -1011,7 +991,6 @@ public class ContentParser{
             throw new RuntimeException(e);
         }
     }
-
     Object fieldOpt(Class<?> type, JsonValue value){
         try{
             return type.getField(value.asString()).get(null);
diff --git a/gradle.properties b/gradle.properties
index 5965736f20..63ba2cb1ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=34775c79250cab391499fac8f4747365984c6923
+archash=f1e4bdee85

From af36f5fd6de35849d107750859ff00b64bd19363 Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <29004178+Redstonneur1256@users.noreply.github.com>
Date: Thu, 30 Nov 2023 21:56:57 +0100
Subject: [PATCH 040/369] Update servers_v7.json (#9333)

---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index d284a7312d..dccae5b7e7 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -255,5 +255,9 @@
   {
     "name": "Atomic",
     "address": ["atomic-de.ddns.net:35199", "atomic-de.ddns.net:35176", "atomic-de.ddns.net:35845"]
+  },
+  {
+    "name": "SkyPlex",
+    "address": ["mc-skyplex.net"]
   }
 ]

From 88b10f4cf81dacfa2216c58aa5a5860b6da642c0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 1 Dec 2023 13:34:17 -0500
Subject: [PATCH 041/369] Fixed #9336

---
 core/src/mindustry/input/InputHandler.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 90ac947c52..9472028766 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -654,7 +654,13 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         }
 
         if(player.team() == build.team && build.canControlSelect(player.unit())){
+            var before = player.unit();
+
             build.onControlSelect(player.unit());
+
+            if(!before.dead && before.spawnedByCore && !before.isPlayer()){
+                Call.unitDespawn(before);
+            }
         }
     }
 
@@ -699,6 +705,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
                     //direct dock transfer???
                     unit.dockedType = before.dockedType;
                 }
+
+                if(before.spawnedByCore && !before.isPlayer()){
+                    Call.unitDespawn(before);
+                }
             }
 
             Time.run(Fx.unitSpirit.lifetime, () -> Fx.unitControl.at(unit.x, unit.y, 0f, unit));

From 2d6e1cdf655be8b11fd95dfb55ab3b7891e97ef1 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Fri, 1 Dec 2023 17:50:32 -0800
Subject: [PATCH 042/369] PointLaserBulletType support for Weapons (#9331)

* PointLaserBulletType support for Weapons

I hate adding more fields to Weapon, but oh well. It's the price to pay when the behavior of what should be spread across multiple classes is compacted into a single class.

* Fix several problems
---
 .../mindustry/entities/units/WeaponMount.java |  2 ++
 core/src/mindustry/type/Weapon.java           | 27 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/units/WeaponMount.java b/core/src/mindustry/entities/units/WeaponMount.java
index 752b3fd071..5cc1567533 100644
--- a/core/src/mindustry/entities/units/WeaponMount.java
+++ b/core/src/mindustry/entities/units/WeaponMount.java
@@ -40,6 +40,8 @@ public class WeaponMount{
     public int totalShots;
     /** counter for which barrel bullets have been fired from; used for alternating patterns */
     public int barrelCounter;
+    /** Last aim length of weapon. Only used for point lasers. */
+    public float lastLength;
     /** current bullet for continuous weapons */
     public @Nullable Bullet bullet;
     /** sound loop for continuous weapons */
diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index 51136e5a6b..0864d670eb 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -54,6 +54,8 @@ public class Weapon implements Cloneable{
     public boolean continuous;
     /** whether this weapon uses continuous fire without reloading; implies continuous = true */
     public boolean alwaysContinuous;
+    /** Speed at which the turret can change its bullet "aim" distance. This is only used for point laser bullets. */
+    public float aimChangeSpeed = Float.POSITIVE_INFINITY;
     /** whether this weapon can be aimed manually by players */
     public boolean controllable = true;
     /** whether this weapon can be automatically aimed by the unit */
@@ -370,6 +372,18 @@ public class Weapon implements Cloneable{
                     mount.sound.update(bulletX, bulletY, true);
                 }
 
+                //target length of laser
+                float shootLength = Math.min(Mathf.dst(bulletX, bulletY, mount.aimX, mount.aimY), range());
+                //current length of laser
+                float curLength = Mathf.dst(bulletX, bulletY, mount.bullet.aimX, mount.bullet.aimY);
+                //resulting length of the bullet (smoothed)
+                float resultLength = Mathf.approachDelta(curLength, shootLength, aimChangeSpeed);
+                //actual aim end point based on length
+                Tmp.v1.trns(shootAngle, mount.lastLength = resultLength).add(bulletX, bulletY);
+
+                mount.bullet.aimX = Tmp.v1.x;
+                mount.bullet.aimY = Tmp.v1.y;
+
                 if(alwaysContinuous && mount.shoot){
                     mount.bullet.time = mount.bullet.lifetime * mount.bullet.type.optimalLifeFract * mount.warmup;
                     mount.bullet.keepAlive = true;
@@ -493,7 +507,18 @@ public class Weapon implements Cloneable{
 
     //override to do special things to a bullet after spawning
     protected void handleBullet(Unit unit, WeaponMount mount, Bullet bullet){
-
+        if(continuous){
+            float
+                weaponRotation = unit.rotation - 90 + (rotate ? mount.rotation : baseRotation),
+                mountX = unit.x + Angles.trnsx(unit.rotation - 90, x, y),
+                mountY = unit.y + Angles.trnsy(unit.rotation - 90, x, y),
+                bulletX = mountX + Angles.trnsx(weaponRotation, this.shootX, this.shootY),
+                bulletY = mountY + Angles.trnsy(weaponRotation, this.shootX, this.shootY);
+            //make sure the length updates to the last set value
+            Tmp.v1.trns(bulletRotation(unit, mount, bulletX, bulletY), shootY + mount.lastLength).add(bulletX, bulletY);
+            bullet.aimX = Tmp.v1.x;
+            bullet.aimY = Tmp.v1.y;
+        }
     }
 
     public void flip(){

From 862d3153d94f620e1793177b7e6d4752a999dd24 Mon Sep 17 00:00:00 2001
From: ApsZoldat <128713348+ApsZoldat@users.noreply.github.com>
Date: Sat, 2 Dec 2023 05:14:10 +0300
Subject: [PATCH 043/369] Map-specific locale bundles system (#9199)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix text setting in marker control

* Fix marker and bridge calculation game crashes, minor marker instruction code fixes

* Add privileged desynced client constant global variables

* Remove broken attempt to not initialize client vars on server

* Make @clientLocale variable non-constant, make @server and @client privileged

* WIP Implementation of map-specific locale bundles

* Progress on map locale bundles: add locale data to saves, make objectives use map locales if possible

* Add print formatting and map locale printing to world processors

* 🗿

* Minor map locales dialog ui changes

* Make map locale bundles load when joining multiplayer server

* Remove static declaration of current locale in MapLocales to fix tests failing

* Unify name of localeprint instruction, minor instruction description change, fix map locales incorrectly loading from clipboard

* Fix locale bundles not saving in game state, add  global var, make objective markers use map locale bundles and .mobile properties on mobile devices

* Even more map locales dialog improvements

* Fix english locale picking (when property isn't presented in current locale but english version has it) not working

* Add icon pasting to map locales dialog, minor ui changes

* Fix inconsistent game crash with null text in objectives, define player.locale on game loading (for clientLocale var)

* Change format instruction placeholders to backslash, fix map locales system incorrectly handling default locale

* understood
---
 core/assets/bundles/bundle.properties         |  23 +
 core/src/mindustry/core/Control.java          |   7 +
 core/src/mindustry/core/GameState.java        |   2 +
 .../src/mindustry/editor/MapEditorDialog.java |   1 +
 core/src/mindustry/editor/MapInfoDialog.java  |  15 +
 .../mindustry/editor/MapLocalesDialog.java    | 758 ++++++++++++++++++
 core/src/mindustry/game/MapObjectives.java    |  39 +-
 core/src/mindustry/io/SaveVersion.java        |   3 +
 core/src/mindustry/logic/GlobalVars.java      |  16 +-
 core/src/mindustry/logic/LExecutor.java       |  69 ++
 core/src/mindustry/logic/LStatements.java     |  46 ++
 core/src/mindustry/net/NetworkIO.java         |   3 +
 core/src/mindustry/type/MapLocales.java       |  97 +++
 .../ui/dialogs/CustomRulesDialog.java         |   2 +-
 .../mindustry/ui/dialogs/LanguageDialog.java  |   1 +
 15 files changed, 1070 insertions(+), 12 deletions(-)
 create mode 100644 core/src/mindustry/editor/MapLocalesDialog.java
 create mode 100644 core/src/mindustry/type/MapLocales.java

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index bf88e0992b..708d3bd0e1 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -444,6 +444,7 @@ editor.waves = Waves
 editor.rules = Rules
 editor.generation = Generation
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Edit In-Game
 editor.playtest = Playtest
 editor.publish.workshop = Publish On Workshop
@@ -511,6 +512,7 @@ editor.errorlegacy = This map is too old, and uses a legacy map format that is n
 editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined. Are you trying to load a save file?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Update
 editor.randomize = Randomize
 editor.moveup = Move Up
@@ -522,6 +524,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Resize
 editor.loadmap = Load Map
 editor.savemap = Save Map
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Saved!
 editor.save.noname = Your map does not have a name! Set one in the 'map info' menu.
 editor.save.overwrite = Your map overwrites a built-in map! Pick a different name in the 'map info' menu.
@@ -610,6 +613,24 @@ filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
 
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
+
 width = Width:
 height = Height:
 menu = Menu
@@ -2267,6 +2288,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2304,6 +2326,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nLimited to 20 times a second per variable.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 
diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index 9d6a699bde..7e5ab7fde0 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -332,6 +332,13 @@ public class Control implements ApplicationListener, Loadable{
     void createPlayer(){
         player = Player.create();
         player.name = Core.settings.getString("name");
+
+        String locale = Core.settings.getString("locale");
+        if(locale.equals("default")){
+            locale = Locale.getDefault().toString();
+        }
+        player.locale = locale;
+
         player.color.set(Core.settings.getInt("color-0"));
 
         if(mobile){
diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java
index abad7d3899..5d9ee3515e 100644
--- a/core/src/mindustry/core/GameState.java
+++ b/core/src/mindustry/core/GameState.java
@@ -36,6 +36,8 @@ public class GameState{
     public GameStats stats = new GameStats();
     /** Markers not linked to objectives. Controlled by world processors. */
     public IntMap<ObjectiveMarker> markers = new IntMap<>();
+    /** Locale-specific string bundles of current map */
+    public MapLocales mapLocales = new MapLocales();
     /** Global attributes of the environment, calculated by weather. */
     public Attributes envAttrs = new Attributes();
     /** Team data. Gets reset every new game. */
diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java
index 0010346f9a..56ce52d8e1 100644
--- a/core/src/mindustry/editor/MapEditorDialog.java
+++ b/core/src/mindustry/editor/MapEditorDialog.java
@@ -24,6 +24,7 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.io.*;
 import mindustry.maps.*;
+import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 import mindustry.world.*;
diff --git a/core/src/mindustry/editor/MapInfoDialog.java b/core/src/mindustry/editor/MapInfoDialog.java
index 2c7e4e46ab..86a217e82e 100644
--- a/core/src/mindustry/editor/MapInfoDialog.java
+++ b/core/src/mindustry/editor/MapInfoDialog.java
@@ -7,6 +7,7 @@ import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.io.*;
 import mindustry.maps.filters.*;
+import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 
@@ -17,6 +18,7 @@ public class MapInfoDialog extends BaseDialog{
     private final MapGenerateDialog generate;
     private final CustomRulesDialog ruleInfo = new CustomRulesDialog();
     private final MapObjectivesDialog objectives = new MapObjectivesDialog();
+    private final MapLocalesDialog locales = new MapLocalesDialog();
 
     public MapInfoDialog(){
         super("@editor.mapinfo");
@@ -94,6 +96,19 @@ public class MapInfoDialog extends BaseDialog{
                     });
                     hide();
                 }).marginLeft(10f);
+
+                r.row();
+
+                r.button("@editor.locales", Icon.fileText, style, () -> {
+                    try{
+                        MapLocales res = JsonIO.read(MapLocales.class, editor.tags.get("locales", "{}"));
+                        locales.show(res);
+                    }catch(Throwable e){
+                        locales.show(new MapLocales());
+                        ui.showException(e);
+                    }
+                    hide();
+                }).marginLeft(10f).width(0f).colspan(2).center().growX();
             }).colspan(2).center();
 
             name.change();
diff --git a/core/src/mindustry/editor/MapLocalesDialog.java b/core/src/mindustry/editor/MapLocalesDialog.java
new file mode 100644
index 0000000000..0a8098fb29
--- /dev/null
+++ b/core/src/mindustry/editor/MapLocalesDialog.java
@@ -0,0 +1,758 @@
+package mindustry.editor;
+
+import arc.Core;
+import arc.func.*;
+import arc.graphics.*;
+import arc.scene.style.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.scene.utils.*;
+import arc.struct.*;
+import mindustry.*;
+import mindustry.ctype.*;
+import mindustry.game.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.io.*;
+import mindustry.type.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+
+import static mindustry.Vars.*;
+
+public class MapLocalesDialog extends BaseDialog{
+    /** Width of UI property card. */
+    private static final float cardWidth = 400f;
+    /** Icons for use in map locales dialog. */
+    private static final ContentType[] contentIcons = {ContentType.item, ContentType.block, ContentType.liquid, ContentType.status, ContentType.unit};
+
+    private MapLocales locales;
+    private MapLocales lastSaved;
+    private boolean saved = true;
+    private Table langs;
+    private Table main;
+    private Table propView;
+    private String selectedLocale;
+
+    private boolean applytoall = true;
+    private boolean collapsed = false;
+    private String searchString = "";
+    private boolean searchByValue = false;
+    private boolean showCorrect = true;
+    private boolean showMissing = true;
+    private boolean showSame = true;
+
+    public MapLocalesDialog(){
+        super("@editor.locales");
+
+        selectedLocale = MapLocales.currentLocale();
+
+        langs = new Table(Tex.button);
+        main = new Table();
+        propView = new Table();
+
+        buttons.add("").uniform();
+
+        buttons.table(t -> {
+            t.defaults().pad(3).center();
+
+            t.button("@back", Icon.left, () -> {
+                if(!saved) ui.showConfirm("@editor.locales", "@editor.savechanges", () -> {
+                    editor.tags.put("locales", JsonIO.write(locales));
+                    state.mapLocales = locales;
+                });
+                hide();
+            }).size(210f, 64f);
+            closeOnBack(() -> {
+                if(!saved) ui.showConfirm("@editor.locales", "@editor.savechanges", () -> {
+                    editor.tags.put("locales", JsonIO.write(locales));
+                    state.mapLocales = locales;
+                });
+            });
+
+            t.button("@editor.apply", Icon.ok, () -> {
+                editor.tags.put("locales", JsonIO.write(locales));
+                state.mapLocales = locales;
+                lastSaved = locales.copy();
+                saved = true;
+            }).size(210f, 64f).disabled(b -> saved);
+
+            t.button("@edit", Icon.edit, this::editDialog).size(210f, 64f);
+        }).growX();
+
+        buttons.button("?", () -> ui.showInfo("@locales.info")).size(60f, 64f).uniform();
+
+        shown(this::setup);
+    }
+
+    public void show(MapLocales locales){
+        this.locales = locales;
+        lastSaved = locales.copy();
+        saved = true;
+        show();
+    }
+
+    private void setup(){
+        cont.clear();
+
+        buildTables();
+
+        cont.add(langs).left();
+
+        cont.table(t -> {
+            // search/collapse all/filter
+            t.table(a -> {
+                a.button(Icon.downOpen, Styles.emptyTogglei, () -> {
+                    collapsed = !collapsed;
+                    buildMain();
+                }).update(b -> {
+                    b.replaceImage(new Image(collapsed ? Icon.upOpen : Icon.downOpen));
+                    b.setChecked(collapsed);
+                }).size(35f);
+
+                a.button(Icon.filter, Styles.emptyi, () -> filterDialog(this::buildMain)).padLeft(10f).size(35f);
+
+                var field = a.field("", v -> {
+                    searchString = v;
+                    buildMain();
+                }).update(f -> f.setText(searchString)).maxTextLength(64).padLeft(10f).width(250f).update(f -> f.setMessageText(searchByValue ? "@locales.searchvalue": "@locales.searchname")).get();
+
+                a.button(Icon.cancel, Styles.emptyi, () -> {
+                    searchString = "";
+                    field.setText("");
+                    buildMain();
+                }).padLeft(10f).size(35f);
+            }).row();
+
+            t.check("@locales.applytoall", applytoall, b -> applytoall = b).pad(10f).row();
+
+            t.add(main).center().grow().row();
+        }).pad(10f).grow();
+
+        // property addition
+        cont.table(Tex.button, t -> {
+            TextField name = t.field("name", s -> {}).maxTextLength(64).fillX().padTop(10f).get();
+            t.row();
+            TextField value = t.area("text", s -> {}).maxTextLength(1000).fillX().height(140f).get();
+            t.row();
+
+            t.button("@add", Icon.add, () -> {
+                if(applytoall){
+                    for(var locale : locales.values()){
+                        locale.put(name.getText(), value.getText());
+                    }
+                }else{
+                    locales.get(selectedLocale).put(name.getText(), value.getText());
+                }
+
+                saved = false;
+                buildMain();
+            }).padTop(10f).size(400f, 50f).fillX().row();
+        }).right();
+    }
+
+    private void buildTables(){
+        if(!locales.containsKey(selectedLocale)){
+            locales.put(selectedLocale, new StringMap());
+        }
+
+        buildLocalesTable();
+        buildMain();
+    }
+
+    private void buildLocalesTable(){
+        langs.clear();
+
+        langs.pane(p -> {
+            for(var loc : Vars.locales){
+                String name = loc.toString();
+
+                if(locales.containsKey(name)){
+                    p.button(loc.getDisplayName(), Styles.flatTogglet, () -> {
+                        if(name.equals(selectedLocale)) return;
+
+                        selectedLocale = name;
+                        buildTables();
+                    }).update(b -> b.setChecked(selectedLocale.equals(name))).size(300f, 50f);
+                    p.button(Icon.edit, Styles.flati, () -> localeEditDialog(name)).size(50f);
+                    p.button(Icon.trash, Styles.flati, () -> ui.showConfirm("@confirm", "@locales.deletelocale", () -> {
+                        locales.remove(name);
+
+                        selectedLocale = (locales.size != 0 ? locales.keys().next() : Core.settings.getString("locale"));
+                        saved = false;
+                        buildTables();
+                    })).size(50f).row();
+                }
+            }
+        }).row();
+        langs.button("@add", Icon.add, this::addLocaleDialog).padTop(10f).width(400f);
+    }
+
+    private void buildMain(){
+        main.clear();
+
+        StringMap props = locales.get(selectedLocale);
+
+        main.image().color(Pal.gray).height(3f).growX().expandY().top().row();
+        main.pane(p -> {
+            int cols = (Core.graphics.getWidth() - 380) / ((int)cardWidth + 10);
+            if(props.size == 0 || cols == 0){
+                main.add("@empty").center().row();
+                return;
+            }
+            p.defaults().top();
+
+            Table[] colTables = new Table[cols];
+            for(var i = 0; i < cols; i++){
+                colTables[i] = new Table();
+            }
+            int i = 0;
+
+            // To sort properties in alphabetic order
+            Seq<String> keys = props.keys().toSeq().sort();
+
+            for(var key : keys){
+                var comparsionString = (searchByValue ? props.get(key).toLowerCase() : key.toLowerCase());
+                if(!searchString.isEmpty() && !comparsionString.contains(searchString.toLowerCase())) continue;
+
+                PropertyStatus status = getPropertyStatus(key, props.get(key), selectedLocale, false);
+                if(status == PropertyStatus.correct && !showCorrect) continue;
+                if(status == PropertyStatus.missing && !showMissing) continue;
+                if(status == PropertyStatus.same && !showSame) continue;
+
+                colTables[i].table(Tex.whitePane, t -> {
+                    boolean[] shown = {!collapsed};
+                    String[] propKey = {key};
+                    String[] propValue = {props.get(key)};
+
+                    // collapse button
+                    t.button(Icon.downOpen, Styles.emptyTogglei, () -> shown[0] = !shown[0]).update(b -> {
+                        b.replaceImage(new Image(shown[0] ? Icon.upOpen : Icon.downOpen));
+                        b.setChecked(shown[0]);
+                    }).size(35f);
+
+                    // property name field
+                    t.field(propKey[0], (f, c) -> c != '=' && c != ':', v -> {
+                        if(props.containsKey(v)){
+                            t.setColor(Color.valueOf("f25555"));
+                            return;
+                        }
+
+                        if(applytoall){
+                            for(var bundle : locales.values()){
+                                if(!bundle.containsKey(v)){
+                                    String value = bundle.get(propKey[0]);
+                                    if(value == null) continue;
+
+                                    bundle.remove(propKey[0]);
+                                    bundle.put(v, value);
+                                }
+                            }
+                        }else{
+                            if(!props.containsKey(v)){
+                                props.remove(propKey[0]);
+                                props.put(v, propValue[0]);
+                            }
+                        }
+
+                        propKey[0] = v;
+                        updateCard(t, v, propValue[0]);
+                        saved = false;
+                    }).maxTextLength(64).width(cardWidth - 125f);
+
+                    // remove button
+                    t.button(Icon.trash, Styles.emptyi, () -> {
+                        if(applytoall){
+                            for(var bundle : locales.values()){
+                                bundle.remove(propKey[0]);
+                            }
+                        }else{
+                            props.remove(propKey[0]);
+                        }
+                        saved = false;
+                        buildMain();
+                    }).size(35f);
+
+                    // more actions
+                    t.button(Icon.edit, Styles.emptyi, () -> propEditDialog(t, propKey[0], propValue[0])).size(35f).row();
+
+                    // property value area
+                    t.collapser(c -> c.area(propValue[0], v -> {
+                        props.put(propKey[0], v);
+                        updateCard(t, propKey[0], v);
+                        saved = false;
+                    }).maxTextLength(1000).height(140f).update(a -> {
+                        propValue[0] = props.get(propKey[0]);
+                        a.setText(props.get(propKey[0]));
+                    }).growX(), () -> shown[0]).colspan(4).growX();
+
+                    updateCard(t, propKey[0], propValue[0]);
+                }).top().width(cardWidth).pad(5f).row();
+
+                i = ++i % cols;
+            }
+
+            if(!colTables[0].hasChildren()){
+                main.add("@empty").center().row();
+            }else{
+                p.add(colTables);
+            }
+        }).growX().row();
+        main.image().color(Pal.gray).height(3f).growX().expandY().bottom().row();
+    }
+
+    private void updateCard(Table table, String propKey, String propValue){
+        updateCard(table, propKey, propValue, selectedLocale, false);
+    }
+
+    private void updateCard(Table table, String propKey, String propValue, String locale, boolean viewCard){
+        switch(getPropertyStatus(propKey, propValue, locale, viewCard)){
+            case missing -> table.setColor(Pal.accent);
+            case same -> table.setColor(Pal.techBlue);
+            case correct -> table.setColor(Pal.gray);
+        }
+    }
+
+    // Property statuses for main dialog and property view dialog are a bit different
+    private PropertyStatus getPropertyStatus(String propKey, String propValue, String locale, boolean forView){
+        if(forView && propValue == null) return PropertyStatus.missing;
+
+        for(var bundle : locales.entries()){
+            if(!forView && bundle.key.equals(selectedLocale)) continue;
+            if(forView && bundle.key.equals(locale)) continue;
+
+            StringMap props = bundle.value;
+
+            if(!props.containsKey(propKey)){
+                if(!forView) return PropertyStatus.missing;
+            }else{
+                if(props.get(propKey).equals(propValue)){
+                    return PropertyStatus.same;
+                }
+            }
+        }
+
+        return PropertyStatus.correct;
+    }
+
+    private void addLocaleDialog(){
+        BaseDialog dialog = new BaseDialog("@add");
+
+        dialog.cont.pane(t -> {
+            for(var loc : Vars.locales){
+                String name = loc.toString();
+
+                if(!locales.containsKey(name)){
+                    t.button(loc.getDisplayName(), Styles.flatTogglet, () -> {
+                        if(name.equals(selectedLocale)) return;
+
+                        locales.put(name, new StringMap());
+
+                        selectedLocale = name;
+                        saved = false;
+                        buildTables();
+                        dialog.hide();
+                    }).update(b -> b.setChecked(selectedLocale.equals(name))).size(400f, 50f).row();
+                }
+            }
+        });
+
+        dialog.addCloseButton();
+        dialog.show();
+    }
+
+    private void propEditDialog(Table card, String key, String value){
+        BaseDialog dialog = new BaseDialog("@edit");
+
+        dialog.cont.pane(p -> {
+            p.margin(10f);
+            p.table(Tex.button, t -> {
+                t.defaults().size(450f, 60f).left();
+
+                t.button("@locales.addtoother", Icon.add, Styles.flatt, () -> {
+                    for(var bundle : locales.values()){
+                        if(!bundle.containsKey(key)){
+                            bundle.put(key, value);
+                        }
+                    }
+
+                    saved = false;
+                    updateCard(card, key, value);
+                    dialog.hide();
+                }).marginLeft(12f).row();
+
+                t.button("@locales.viewproperty", Icon.zoom, Styles.flatt, () -> {
+                    viewPropertyDialog(key);
+                    dialog.hide();
+                }).marginLeft(12f).row();
+
+                t.button("@locales.addicon", Icon.image, Styles.flatt, () -> {
+                    addIconDialog(res -> {
+                        locales.get(selectedLocale).put(key, value + res);
+                        saved = false;
+                    });
+                    dialog.hide();
+                }).marginLeft(12f).row();
+
+                t.button("@locales.rollback", Icon.undo, Styles.flatt, () -> {
+                    locales.get(selectedLocale).put(key, lastSaved.get(selectedLocale).get(key));
+                    buildTables();
+                    dialog.hide();
+                }).disabled(b -> {
+                    if(!lastSaved.containsKey(selectedLocale)) return true;
+                    StringMap savedMap = lastSaved.get(selectedLocale);
+                    return !savedMap.containsKey(key) || savedMap.get(key).equals(locales.get(selectedLocale).get(key));
+                }).marginLeft(12f).row();
+            });
+        });
+
+        dialog.addCloseButton();
+        dialog.show();
+    }
+
+    private void localeEditDialog(String locale){
+        BaseDialog dialog = new BaseDialog("@edit");
+
+        dialog.cont.pane(p -> {
+            p.margin(10f);
+            p.table(Tex.button, t -> {
+                t.defaults().size(350f, 60f).left();
+
+                t.button("@waves.copy", Icon.copy, Styles.flatt, () -> {
+                    Core.app.setClipboardText(writeLocale(locale));
+                    ui.showInfoFade("@copied");
+                    dialog.hide();
+                }).marginLeft(12f).row();
+                t.button("@waves.load", Icon.download, Styles.flatt, () -> {
+                    locales.put(locale, readLocale(Core.app.getClipboardText()));
+                    buildTables();
+                    saved = false;
+                    dialog.hide();
+                }).disabled(Core.app.getClipboardText() == null).marginLeft(12f).row();
+            });
+        });
+
+        dialog.addCloseButton();
+        dialog.show();
+    }
+
+    private void editDialog(){
+        BaseDialog dialog = new BaseDialog("@edit");
+
+        dialog.cont.pane(p -> {
+            p.margin(10f);
+            p.table(Tex.button, t -> {
+                t.defaults().size(450f, 60f).left();
+
+                t.button("@waves.copy", Icon.copy, Styles.flatt, () -> {
+                    Core.app.setClipboardText(writeBundles());
+                    ui.showInfoFade("@copied");
+                    dialog.hide();
+                }).marginLeft(12f).row();
+                t.button("@waves.load", Icon.download, Styles.flatt, () -> {
+                    locales = readBundles(Core.app.getClipboardText());
+                    buildTables();
+                    saved = false;
+                    dialog.hide();
+                }).disabled(Core.app.getClipboardText() == null).marginLeft(12f).row();
+                t.button("@locales.rollback", Icon.undo, Styles.flatt, () -> {
+                    locales = lastSaved.copy();
+                    saved = true;
+                    buildTables();
+                    dialog.hide();
+                }).disabled(b -> saved).marginLeft(12f).row();
+            });
+        });
+
+        dialog.addCloseButton();
+        dialog.show();
+    }
+
+    private void viewPropertyDialog(String key){
+        BaseDialog dialog = new BaseDialog(Core.bundle.format("locales.viewing", key));
+
+        dialog.cont.table(t -> {
+            t.button(Icon.filter, Styles.emptyi, () -> filterDialog(() -> buildPropView(key))).size(35f);
+
+            var field = t.field(searchString, v -> {
+                searchString = v;
+                buildPropView(key);
+            }).update(f -> f.setText(searchString)).maxTextLength(64).padLeft(10f).width(250f).update(f -> f.setMessageText(searchByValue ? "@locales.searchvalue" : "@locales.searchlocale")).get();
+
+            t.button(Icon.cancel, Styles.emptyi, () -> {
+                searchString = "";
+                field.setText("");
+                buildPropView(key);
+            }).padLeft(10f).size(35f);
+        }).row();
+
+        buildPropView(key);
+        dialog.cont.add(propView).grow().center().row();
+
+        dialog.addCloseButton();
+        dialog.closeOnBack();
+        dialog.hidden(this::buildMain);
+
+        dialog.show();
+    }
+
+    private void buildPropView(String key){
+        propView.clear();
+
+        propView.image().color(Pal.gray).height(3f).fillX().top().row();
+        propView.pane(p -> {
+            int cols = (Core.graphics.getWidth() - 100) / ((int)cardWidth + 10);
+            if(cols == 0){
+                propView.add("@empty").center().row();
+                return;
+            }
+            p.defaults().top();
+
+            Table[] colTables = new Table[cols];
+            for(var i = 0; i < cols; i++){
+                colTables[i] = new Table();
+            }
+            int i = 0;
+
+            for(var loc : Vars.locales){
+                String name = loc.toString();
+                if(!locales.containsKey(name)) continue;
+
+                PropertyStatus status = getPropertyStatus(key, locales.get(name).get(key), name, true);
+                if(status == PropertyStatus.correct && !showCorrect) continue;
+                if(status == PropertyStatus.missing && !showMissing) continue;
+                if(status == PropertyStatus.same && !showSame) continue;
+
+                if(status != PropertyStatus.missing){
+                    var comparsionString = (searchByValue ? locales.get(name).get(key).toLowerCase() : loc.getDisplayName().toLowerCase());
+                    if(!searchString.isEmpty() && !comparsionString.contains(searchString.toLowerCase())) continue;
+                }
+
+                colTables[i].table(Tex.whitePane, t -> {
+                    t.add(loc.getDisplayName()).left().color(Pal.accent).row();
+                    t.image().color(Pal.accent).fillX().row();
+
+                    if(status == PropertyStatus.missing){
+                        t.table(b ->
+                        b.button("@add", Icon.add, () -> {
+                            locales.get(name).put(key, "moai");
+
+                            t.getCells().get(2).clearElement();
+                            t.getCells().remove(2);
+
+                            t.area(locales.get(name).get(key), v -> {
+                                locales.get(name).put(key, v);
+                                saved = false;
+                            }).maxTextLength(1000).height(140f).growX().row();
+                        }).size(160f, 50f)).height(140f).growX().row();
+                    }else{
+                        t.area(locales.get(name).get(key), v -> {
+                            locales.get(name).put(key, v);
+                            saved = false;
+                        }).maxTextLength(1000).height(140f).growX().row();
+                    }
+                }).update(t -> updateCard(t, key, locales.get(name).get(key), name, true)).top().width(cardWidth).pad(5f).row();
+
+                i = ++i % cols;
+            }
+
+            if(!colTables[0].hasChildren()){
+                propView.add("@empty").center().row();
+            }else{
+                p.add(colTables);
+            }
+        }).grow().row();
+        propView.image().color(Pal.gray).height(3f).fillX().bottom().row();
+    }
+
+    private void filterDialog(Runnable hidden){
+        BaseDialog dialog = new BaseDialog("@locales.filter");
+
+        dialog.cont.table(t -> {
+            t.add("@search").row();
+            t.table(b -> {
+                b.button("@locales.byname", Styles.togglet, () -> searchByValue = false).size(300f, 50f).checked(v -> !searchByValue);
+                b.button("@locales.byvalue", Styles.togglet, () -> searchByValue = true).padLeft(10f).size(300f, 50f).checked(v -> searchByValue);
+            }).padTop(5f);
+        }).row();
+
+        dialog.cont.table(Tex.whitePane, t ->
+        t.button("@locales.showcorrect", Icon.ok, Styles.nonet, () -> showCorrect = !showCorrect).update(b -> {
+            ((Image)b.getChildren().get(1)).setDrawable(showCorrect ? Icon.ok : Icon.cancel);
+            b.setChecked(showCorrect);
+        }).grow().pad(15f)).size(450f, 100f).color(Pal.gray).padTop(50f);
+
+        dialog.cont.row();
+
+        dialog.cont.table(Tex.whitePane, t ->
+            t.button("@locales.showmissing", Icon.ok, Styles.nonet, () -> showMissing = !showMissing).update(b -> {
+                ((Image)b.getChildren().get(1)).setDrawable(showMissing ? Icon.ok : Icon.cancel);
+                b.setChecked(showMissing);
+        }).grow().pad(15f)).size(450f, 100f).color(Pal.accent).padTop(50f);
+
+        dialog.cont.row();
+        dialog.cont.table(Tex.whitePane, t ->
+            t.button("@locales.showsame", Icon.ok, Styles.nonet, () -> showSame = !showSame).update(b -> {
+                ((Image)b.getChildren().get(1)).setDrawable(showSame ? Icon.ok : Icon.cancel);
+                b.setChecked(showSame);
+        }).grow().pad(15f)).size(450f, 100f).color(Pal.techBlue).padTop(50f);
+
+        dialog.buttons.button("@back", Icon.left, () -> {
+            hidden.run();
+            dialog.hide();
+        }).size(210f, 64f);
+        dialog.closeOnBack(hidden);
+
+        dialog.show();
+    }
+
+    private void addIconDialog(Cons<String> cons){
+        BaseDialog dialog = new BaseDialog("@locales.addicon");
+
+        Table icons = new Table();
+        TextField search = Elem.newField("", v -> iconsTable(icons, v.replace(" ", "").toLowerCase(), dialog, cons));
+        search.setMessageText("@search");
+
+        dialog.cont.table(t -> {
+            t.add(search).maxTextLength(64).padLeft(10f).width(250f);
+
+            t.button(Icon.cancel, Styles.emptyi, () -> {
+                search.setText("");
+                iconsTable(icons, "", dialog, cons);
+            }).padLeft(10f).size(35f);
+        }).row();
+
+        dialog.cont.pane(icons).scrollX(false);
+        dialog.resized(true, () -> iconsTable(icons, search.getText().replace(" ", "").toLowerCase(), dialog, cons));
+
+        dialog.addCloseButton();
+        dialog.closeOnBack();
+        dialog.setFillParent(true);
+        dialog.show();
+    }
+
+    private void iconsTable(Table table, String search, Dialog dialog, Cons<String> cons){
+        table.clear();
+
+        table.marginRight(19f).marginLeft(12f);
+        table.defaults().size(48f);
+
+        int cols = (int)Math.min(20, Core.graphics.getWidth() / Scl.scl(52f));
+
+        int i = 0;
+
+        var codes = new ObjectIntMap<>(Iconc.codes);
+
+        for(var name : codes.keys()){
+            if(!name.toLowerCase().contains(search)) codes.remove(name);
+        }
+
+        if(codes.size > 0) table.image().colspan(cols).growX().width(-1f).height(3f).color(Pal.accent).row();
+
+        for(var icon : codes){
+            String res = (char)icon.value + "";
+
+            table.button(Icon.icons.get(icon.key), Styles.flati, iconMed, () -> {
+                cons.get(res);
+                dialog.hide();
+            }).tooltip(icon.key);
+
+            if(++i % cols == 0) table.row();
+        }
+
+        for(ContentType ctype : contentIcons){
+            var all = content.getBy(ctype).<UnlockableContent>as().select(u -> u.localizedName.replace(" ", "").toLowerCase().contains(search) && u.uiIcon.found());
+
+            table.row();
+            if(all.size > 0) table.image().colspan(cols).growX().width(-1f).height(3f).color(Pal.accent).row();
+
+            i = 0;
+            for(UnlockableContent u : all){
+                table.button(new TextureRegionDrawable(u.uiIcon), Styles.flati, iconMed, () -> {
+                    cons.get(u.emoji() + "");
+                    dialog.hide();
+                }).tooltip(u.localizedName);
+
+                if(++i % cols == 0) table.row();
+            }
+        }
+
+        var teams = new Seq<>(Team.baseTeams);
+        teams = teams.select(u -> u.localized().toLowerCase().contains(search) && Core.atlas.has("team-" + u.name));
+
+        table.row();
+        if(teams.size > 0) table.image().colspan(cols).growX().width(-1f).height(3f).color(Pal.accent).row();
+
+        for(Team team : teams){
+            var region = Core.atlas.find("team-" + team.name);
+
+            table.button(new TextureRegionDrawable(region), Styles.flati, iconMed, () -> {
+                cons.get(team.emoji);
+                dialog.hide();
+            }).tooltip(team.localized());
+
+            if(++i % cols == 0) table.row();
+        }
+    }
+
+    private String writeBundles(){
+        StringBuilder data = new StringBuilder();
+
+        for(var locale : locales.keys()){
+            data.append(locale).append(":\n").append(writeLocale(locale));
+        }
+
+        return data.toString();
+    }
+
+    private String writeLocale(String key){
+        StringBuilder data = new StringBuilder();
+
+        if(!locales.containsKey(key)) return "";
+
+        for(var prop : locales.get(key).entries()){
+            data.append(prop.key).append(" = ").append(prop.value).append("\n");
+        }
+
+        return data.toString();
+    }
+
+    private MapLocales readBundles(String data){
+        MapLocales bundles = new MapLocales();
+
+        String currentLocale = "";
+
+        for(var line : data.split("\\r?\\n|\\r")){
+            if(line.endsWith(":") && !line.contains("=")){
+                currentLocale = line.substring(0, line.length() - 1);
+                bundles.put(currentLocale, new StringMap());
+            }else{
+                int sepIndex = line.indexOf(" = ");
+                if(sepIndex != -1 && !currentLocale.isEmpty()){
+                    bundles.get(currentLocale).put(line.substring(0, sepIndex), line.substring(sepIndex + 3));
+                }
+            }
+        }
+
+        return bundles;
+    }
+
+    private StringMap readLocale(String data){
+        StringMap map = new StringMap();
+
+        for(var line : data.split("\\r?\\n|\\r")){
+            int sepIndex = line.indexOf(" = ");
+            if(sepIndex != -1){
+                map.put(line.substring(0, sepIndex), line.substring(sepIndex + 3));
+            }
+        }
+
+        return map;
+    }
+
+    private enum PropertyStatus{
+        correct,
+        missing,
+        same
+    }
+}
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index cef72e7971..264375ae1d 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -483,6 +483,14 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 timeString.append(s);
 
                 if(text.startsWith("@")){
+                    if(state.mapLocales.containsProperty(text.substring(1))){
+                        try{
+                            return state.mapLocales.getFormatted(text.substring(1), timeString.toString());
+                        }catch(IllegalArgumentException e){
+                            //illegal text.
+                            text = "";
+                        }
+                    }
                     return Core.bundle.format(text.substring(1), timeString.toString());
                 }else{
                     try{
@@ -589,9 +597,17 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             return state.rules.objectiveFlags.contains(flag);
         }
 
+        @Nullable
         @Override
         public String text(){
-            return text != null && text.startsWith("@") ? Core.bundle.get(text.substring(1)) : text;
+            if(text == null) return null;
+
+            if(text.startsWith("@")){
+                if(state.mapLocales.containsProperty(text.substring(1))) return state.mapLocales.getProperty(text.substring(1));
+                return Core.bundle.get(text.substring(1));
+            }else{
+                return text;
+            }
         }
     }
 
@@ -639,12 +655,23 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         }
 
         public static String fetchText(String text){
-            return text.startsWith("@") ?
-                //on mobile, try ${text}.mobile first for mobile-specific hints.
-                mobile ? Core.bundle.get(text.substring(1) + ".mobile", Core.bundle.get(text.substring(1))) :
-                Core.bundle.get(text.substring(1)) :
-                text;
+            if(text == null) return "";
 
+            if(text.startsWith("@")){
+                String key = text.substring(1);
+
+                if(mobile){
+                    return state.mapLocales.containsProperty(key + ".mobile") ?
+                    state.mapLocales.getProperty(key + ".mobile") :
+                    Core.bundle.get(key + ".mobile", Core.bundle.get(key));
+                }else{
+                    return state.mapLocales.containsProperty(key) ?
+                    state.mapLocales.getProperty(key) :
+                    Core.bundle.get(key);
+                }
+            }else{
+                return text;
+            }
         }
     }
 
diff --git a/core/src/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java
index 30cefcfc1f..a1089b7dd3 100644
--- a/core/src/mindustry/io/SaveVersion.java
+++ b/core/src/mindustry/io/SaveVersion.java
@@ -17,6 +17,7 @@ import mindustry.game.MapObjectives.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
 import mindustry.maps.Map;
+import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.meta.*;
 
@@ -141,6 +142,7 @@ public abstract class SaveVersion extends SaveFileReader{
             "wavetime", state.wavetime,
             "stats", JsonIO.write(state.stats),
             "rules", JsonIO.write(state.rules),
+            "locales", JsonIO.write(state.mapLocales),
             "mods", JsonIO.write(mods.getModStrings().toArray(String.class)),
             "controlGroups", headless || control == null ? "null" : JsonIO.write(control.input.controlGroups),
             "width", world.width(),
@@ -160,6 +162,7 @@ public abstract class SaveVersion extends SaveFileReader{
         state.tick = map.getFloat("tick");
         state.stats = JsonIO.read(GameStats.class, map.get("stats", "{}"));
         state.rules = JsonIO.read(Rules.class, map.get("rules", "{}"));
+        state.mapLocales = JsonIO.read(MapLocales.class, map.get("locales", "{}"));
         if(state.rules.spawns.isEmpty()) state.rules.spawns = waves.get();
         lastReadBuild = map.getInt("build", -1);
 
diff --git a/core/src/mindustry/logic/GlobalVars.java b/core/src/mindustry/logic/GlobalVars.java
index 7805db3e5f..bd2a162e6d 100644
--- a/core/src/mindustry/logic/GlobalVars.java
+++ b/core/src/mindustry/logic/GlobalVars.java
@@ -27,7 +27,7 @@ public class GlobalVars{
     public static final Rand rand = new Rand();
 
     //non-constants that depend on state
-    private static int varTime, varTick, varSecond, varMinute, varWave, varWaveTime, varServer, varClient, varClientLocale, varClientUnit, varClientName, varClientTeam;
+    private static int varTime, varTick, varSecond, varMinute, varWave, varWaveTime, varServer, varClient, varClientLocale, varClientUnit, varClientName, varClientTeam, varClientMobile;
 
     private ObjectIntMap<String> namesToIds = new ObjectIntMap<>();
     private Seq<Var> vars = new Seq<>(Var.class);
@@ -65,6 +65,7 @@ public class GlobalVars{
         varClientUnit = put("@clientUnit", null, true);
         varClientName = put("@clientName", null, true);
         varClientTeam = put("@clientTeam", 0, true);
+        varClientMobile = put("@clientMobile", 0, true);
 
         //special enums
         put("@ctrlProcessor", ctrlProcessor);
@@ -168,6 +169,7 @@ public class GlobalVars{
             vars.items[varClientUnit].objval = player.unit();
             vars.items[varClientName].objval = player.name();
             vars.items[varClientTeam].numval = player.team().id;
+            vars.items[varClientMobile].numval = mobile ? 1 : 0;
         }
     }
 
@@ -183,14 +185,18 @@ public class GlobalVars{
         return arr != null && content.id >= 0 && content.id < arr.length ? arr[content.id] : -1;
     }
 
-    /** @return a constant ID > 0 if there is a constant with this name, otherwise -1.
-     * Attempt to get privileged variable id from non-privileged logic executor returns null constant id. */
+    /**
+     * @return a constant ID > 0 if there is a constant with this name, otherwise -1.
+     * Attempt to get privileged variable id from non-privileged logic executor returns null constant id.
+     */
     public int get(String name){
         return namesToIds.get(name, -1);
     }
 
-    /** @return a constant variable by ID. ID is not bound checked and must be positive.
-     * Attempt to get privileged variable from non-privileged logic executor returns null constant */
+    /**
+     * @return a constant variable by ID. ID is not bound checked and must be positive.
+     * Attempt to get privileged variable from non-privileged logic executor returns null constant
+     */
     public Var get(int id, boolean privileged){
         if(!privileged && privilegedIds.contains(id)) return vars.get(namesToIds.get("null"));
         return vars.items[id];
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 643efb387f..253d452b0c 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1099,6 +1099,41 @@ public class LExecutor{
         }
     }
 
+    public static class FormatI implements LInstruction{
+        public int value;
+
+        public FormatI(int value){
+            this.value = value;
+        }
+
+        FormatI(){}
+
+        @Override
+        public void run(LExecutor exec){
+
+            if(exec.textBuffer.length() >= maxTextBuffer) return;
+
+            int placeholderIndex = exec.textBuffer.indexOf("@");
+
+            if(placeholderIndex == -1) return;
+
+            //this should avoid any garbage allocation
+            Var v = exec.var(value);
+            if(v.isobj && value != 0){
+                String strValue = PrintI.toString(v.objval);
+
+                exec.textBuffer.replace(placeholderIndex, placeholderIndex + 1, strValue);
+            }else{
+                //display integer version when possible
+                if(Math.abs(v.numval - (long)v.numval) < 0.00001){
+                    exec.textBuffer.replace(placeholderIndex, placeholderIndex + 1, (long)v.numval + "");
+                }else{
+                    exec.textBuffer.replace(placeholderIndex, placeholderIndex + 1, v.numval + "");
+                }
+            }
+        }
+    }
+
     public static class PrintFlushI implements LInstruction{
         public int target;
 
@@ -1996,5 +2031,39 @@ public class LExecutor{
         }
     }
 
+    public static class LocalePrintI implements LInstruction{
+        public int name;
+
+        public LocalePrintI(int name){
+            this.name = name;
+        }
+
+        public LocalePrintI(){
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(exec.textBuffer.length() >= maxTextBuffer) return;
+
+            //this should avoid any garbage allocation
+            Var v = exec.var(name);
+            if(v.isobj){
+                String name = PrintI.toString(v.objval);
+
+                String strValue;
+
+                if(mobile){
+                    strValue = state.mapLocales.containsProperty(name + ".mobile") ?
+                    state.mapLocales.getProperty(name + ".mobile") :
+                    state.mapLocales.getProperty(name);
+                }else{
+                    strValue = state.mapLocales.getProperty(name);
+                }
+
+                exec.textBuffer.append(strValue);
+            }
+        }
+    }
+
     //endregion
 }
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index fe3308212a..1a9e0473d8 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -301,6 +301,27 @@ public class LStatements{
         }
     }
 
+    @RegisterStatement("format")
+    public static class FormatStatement extends LStatement{
+        public String value = "\"frog\"";
+
+        @Override
+        public void build(Table table){
+            field(table, value, str -> value = str).width(0f).growX().padRight(3);
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new FormatI(builder.var(value));
+        }
+
+
+        @Override
+        public LCategory category(){
+            return LCategory.io;
+        }
+    }
+
     @RegisterStatement("drawflush")
     public static class DrawFlushStatement extends LStatement{
         public String target = "display1";
@@ -2055,4 +2076,29 @@ public class LStatements{
             return LCategory.world;
         }
     }
+
+    @RegisterStatement("localeprint")
+    public static class LocalePrintStatement extends LStatement{
+        public String value = "\"name\"";
+
+        @Override
+        public void build(Table table){
+            field(table, value, str -> value = str).width(0f).growX().padRight(3);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new LocalePrintI(builder.var(value));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
 }
diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java
index fdc223184c..48599c6b96 100644
--- a/core/src/mindustry/net/NetworkIO.java
+++ b/core/src/mindustry/net/NetworkIO.java
@@ -11,6 +11,7 @@ import mindustry.io.*;
 import mindustry.logic.*;
 import mindustry.maps.Map;
 import mindustry.net.Administration.*;
+import mindustry.type.*;
 
 import java.io.*;
 import java.nio.*;
@@ -36,6 +37,7 @@ public class NetworkIO{
             }
 
             stream.writeUTF(JsonIO.write(state.rules));
+            stream.writeUTF(JsonIO.write(state.mapLocales));
             SaveIO.getSaveWriter().writeStringMap(stream, state.map.tags);
 
             stream.writeInt(state.wave);
@@ -62,6 +64,7 @@ public class NetworkIO{
         try(DataInputStream stream = new DataInputStream(is)){
             Time.clear();
             state.rules = JsonIO.read(Rules.class, stream.readUTF());
+            state.mapLocales = JsonIO.read(MapLocales.class, stream.readUTF());
             state.map = new Map(SaveIO.getSaveWriter().readStringMap(stream));
 
             state.wave = stream.readInt();
diff --git a/core/src/mindustry/type/MapLocales.java b/core/src/mindustry/type/MapLocales.java
new file mode 100644
index 0000000000..88dc81237a
--- /dev/null
+++ b/core/src/mindustry/type/MapLocales.java
@@ -0,0 +1,97 @@
+package mindustry.type;
+
+import arc.struct.*;
+import arc.util.serialization.*;
+import arc.util.serialization.Json.*;
+
+import java.util.*;
+
+import static arc.Core.*;
+
+/** Class for storing map-specific locale bundles */
+public class MapLocales extends ObjectMap<String, StringMap> implements JsonSerializable{
+
+    @Override
+    public void write(Json json){
+        for(var entry : entries()){
+            json.writeValue(entry.key, entry.value, StringMap.class, String.class);
+        }
+    }
+
+    @Override
+    public void read(Json json, JsonValue jsonData){
+        for(JsonValue value : jsonData){
+            put(value.name, json.readValue(StringMap.class, value));
+        }
+    }
+
+    @Override
+    public MapLocales copy(){
+        MapLocales out = new MapLocales();
+
+        for(var entry : this.entries()){
+            StringMap map = new StringMap();
+            map.putAll(entry.value);
+            out.put(entry.key, map);
+        }
+
+        return out;
+    }
+
+    public String getProperty(String key){
+        if(!containsProperty(currentLocale(), key)){
+            if(containsProperty("en", key)) return get("en").get(key);
+            return "???" + key + "???";
+        }
+        return get(currentLocale()).get(key);
+    }
+
+    private String getProperty(String locale, String key){
+        if(!containsProperty(locale, key)){
+            if(containsProperty("en", key)) return get("en").get(key);
+            return "???" + key + "???";
+        }
+        return get(locale).get(key);
+    }
+
+    public boolean containsProperty(String key){
+        return containsProperty(currentLocale(), key) || containsProperty("en", key);
+    }
+
+    private boolean containsProperty(String locale, String key){
+        if(!containsKey(locale)) return false;
+        return get(locale).containsKey(key);
+    }
+
+    public String getFormatted(String key, Object... args){
+        StringBuilder result = new StringBuilder();
+        if(!containsProperty(currentLocale(), key)){
+            if(containsProperty("en", key)){
+                result.append(getProperty("en", key));
+            }else{
+                return "???" + key + "???";
+            }
+        }else{
+            result.append(getProperty(currentLocale(), key));
+        }
+
+        for(var arg : args){
+            int placeholderIndex = result.indexOf("@");
+
+            if(placeholderIndex == -1) break;
+
+            result.replace(placeholderIndex, placeholderIndex + 1, arg.toString());
+        }
+
+        return result.toString();
+    }
+
+    // To handle default locale properly
+    public static String currentLocale(){
+        String locale = settings.getString("locale");
+        if(locale.equals("default")){
+            locale = Locale.getDefault().getLanguage();
+        }
+        return locale;
+    }
+}
diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index e3112cf3b6..4c54569b4d 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -50,7 +50,7 @@ public class CustomRulesDialog extends BaseDialog{
                 t.defaults().size(280f, 64f).pad(2f);
 
                 t.button("@waves.copy", Icon.copy, style, () -> {
-                    ui.showInfoFade("@waves.copied");
+                    ui.showInfoFade("@copied");
 
                     //hack: don't write the spawns, they just waste space
                     var spawns = rules.spawns;
diff --git a/core/src/mindustry/ui/dialogs/LanguageDialog.java b/core/src/mindustry/ui/dialogs/LanguageDialog.java
index 495ae5e2ce..eb1b4baf50 100644
--- a/core/src/mindustry/ui/dialogs/LanguageDialog.java
+++ b/core/src/mindustry/ui/dialogs/LanguageDialog.java
@@ -5,6 +5,7 @@ import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.type.*;
 import mindustry.ui.*;
 
 import java.util.*;

From 54cf7812f0c9e442c150551dadb0d78760fed993 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az1245-633.44uquw3knzoenloncamig1c14h.dx.internal.cloudapp.net>
Date: Sat, 2 Dec 2023 02:14:51 +0000
Subject: [PATCH 044/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_bg.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_ca.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_cs.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_da.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_de.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_es.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_et.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_eu.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_fi.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_fil.properties   | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_fr.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_hu.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_id_ID.properties | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_it.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_ja.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_ko.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_lt.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_nl.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_nl_BE.properties | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_pl.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_pt_BR.properties | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_pt_PT.properties | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_ro.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_ru.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_sr.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_sv.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_th.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_tk.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_tr.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_uk_UA.properties | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_vi.properties    | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_zh_CN.properties | 22 +++++++++++++++++++++
 core/assets/bundles/bundle_zh_TW.properties | 22 +++++++++++++++++++++
 34 files changed, 748 insertions(+)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index bb595100d0..35af3f2e99 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -433,6 +433,7 @@ editor.waves = Хвалі:
 editor.rules = Правілы:
 editor.generation = Генерацыя:
 editor.objectives = Мэты
+editor.locales = Locale Bundles
 editor.ingame = Рэдагаваць ў гульні
 editor.playtest = Тэставаць
 editor.publish.workshop = Апублікаваць у майстэрні
@@ -499,6 +500,7 @@ editor.errorlegacy = Гэтая карта занадта старая і вык
 editor.errornot = Гэта не файл карты.
 editor.errorheader = Гэты файл карты ня дзейнічае або пашкоджаны.
 editor.errorname = Карта не мае імя. Можа быць, Вы спрабуеце загрузіць захаванне?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Абнавіць
 editor.randomize = Выпадкова
 editor.moveup = Рухацца Уверх
@@ -510,6 +512,7 @@ editor.sectorgenerate = Згенераваць Сектар
 editor.resize = Змяніць \nразмер
 editor.loadmap = Загрузіць \nкарту
 editor.savemap = Захаваць \nкарту
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Захавана!
 editor.save.noname = У Вашай карты няма імя! Назавіце яе ў меню «Інфармацыя аб карце».
 editor.save.overwrite = Ваша карта не можа быць запісана па-над убудаванай карты! Калі ласка, увядзіце іншую назву ў меню «Інфармацыя аб карце»
@@ -594,6 +597,23 @@ filter.option.floor2 = Другая паверхню
 filter.option.threshold2 = Другасны гранічны парог
 filter.option.radius = Радыус
 filter.option.percentile = Процентль
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Шырыня:
 height = Вышыня:
@@ -2216,6 +2236,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2253,6 +2274,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index e4c21ee198..759c7bd4b8 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -438,6 +438,7 @@ editor.waves = Вълни:
 editor.rules = Правила:
 editor.generation = Генериране:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Редактирай в игра
 editor.playtest = Playtest
 editor.publish.workshop = Публикувай в Работилницата
@@ -505,6 +506,7 @@ editor.errorlegacy = Тази карта е твърде стара, играт
 editor.errornot = Този файл не е карта.
 editor.errorheader = Този файл с карта е повреден или невалиден.
 editor.errorname = Картата няма зададено име. Да не се опитвате да заредите игра?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Обнови
 editor.randomize = Случайно
 editor.moveup = Move Up
@@ -516,6 +518,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Смени размера
 editor.loadmap = Зареди Карта
 editor.savemap = Запиши Карта
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Записано!
 editor.save.noname = Картата няма име! Задайте такова в 'Информация за картата' от менюто.
 editor.save.overwrite = Съществува стандартна карта с такова име! Изберете различно име от 'Информация за картата' от менюто.
@@ -600,6 +603,23 @@ filter.option.floor2 = Втори под
 filter.option.threshold2 = Втори праг
 filter.option.radius = Радиус
 filter.option.percentile = Перцентил
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Дължина:
 height = Височина:
@@ -2231,6 +2251,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Прочети число от свързано хранилище за памет.
 lst.write = Запиши число в свързано хранилище за памет.
 lst.print = Добави текст в буфера за изписване.\nНе визуализира нищо докато не използвате [accent]Print Flush[].
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Добавя операция в буфера за изображение.\nНе показва нищо докато не използвате [accent]Draw Flush[].
 lst.drawflush = Изпълнява операции, поискани с команда [accent]Draw[] върху посочен дисплей.
 lst.printflush = Извежда текст натрупан с [accent]Print[] върху посочен блок за съобщение.
@@ -2268,6 +2289,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Действия за строене на единици не са позволени тук.
 
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index d334a07bb2..925d9dfd54 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -438,6 +438,7 @@ editor.waves = Onades
 editor.rules = Regles
 editor.generation = Generació
 editor.objectives = Objectius
+editor.locales = Locale Bundles
 editor.ingame = Edita des de la partida
 editor.playtest = Prova el mapa
 editor.publish.workshop = Publica al Workshop
@@ -505,6 +506,7 @@ editor.errorlegacy = Aquest mapa és massa antic i fa servir un format obsolet.
 editor.errornot = No és un fitxer de mapa.
 editor.errorheader = Aquest fitxer de mapa no és vàlid o està corromput.
 editor.errorname = No s’ha definit el nom del mapa. Esteu intentant carregar una partida desada?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Actualitza
 editor.randomize = Assigna a l’atzar
 editor.moveup = Mou amunt
@@ -516,6 +518,7 @@ editor.sectorgenerate = Generació del sector
 editor.resize = Canvia la mida
 editor.loadmap = Carrega un mapa
 editor.savemap = Desa el mapa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = S’ha desat.
 editor.save.noname = El mapa no té nom! Trieu-ne un des del menú «Informació del mapa».
 editor.save.overwrite = El vostre mapa sobreescriu un mapa incorporat al joc! Trieu un nom diferent des del menú «Informació del mapa».
@@ -603,6 +606,23 @@ filter.option.floor2 = Terra secundari
 filter.option.threshold2 = Llindar secundari
 filter.option.radius = Radi
 filter.option.percentile = Percentil
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Amplada:
 height = Alçada:
@@ -2241,6 +2261,7 @@ unit.emanate.description = Construeix estructures per defensar el nucli Acròpol
 lst.read = Llegeix un nombre des d’una cel·la de memòria connectada.
 lst.write = Escriu un nombre en una cel·la de memòria connectada.
 lst.print = Afegeix un text a la cua d’impressió.\nEl text no es mostrarà fins que s’apliqui «[accent]Print Flush[]».
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Afegeix una instrucció de dibuix a la cua corresponent.\nEl resultat no es mostrarà fins que s’apliqui «[accent]Draw Flush[]».
 lst.drawflush = Executa les operacions de la cua de dibuix al monitor lògic.
 lst.printflush = Executa les operacions de la cua d’impressió al monitor lògic.
@@ -2278,6 +2299,7 @@ lst.effect = Crea un efecte de particula.
 lst.sync = Sincronitza una variable a través de la xarxa.\nS’invoca com a molt 10 vegades per segon.
 lst.makemarker = Crea una marca lògica al món.\nS’ha de donar un ID per a identificar-la.\nEs poden establir fins a 20.000 marcadors per món.
 lst.setmarker = Estableix una propietat per a la marca.\nL’ID que es faci servir ha de ser el mateix que el de la instrucció de crear la marca.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Aquí no es permet construir blocs de tipus lògic.
 
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 573074df31..16d1683b3d 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -438,6 +438,7 @@ editor.waves = Vln:
 editor.rules = Pravidla:
 editor.generation = Generace:
 editor.objectives = Úkoly:
+editor.locales = Locale Bundles
 editor.ingame = Upravit ve hře
 editor.playtest = Playtest
 editor.publish.workshop = Publikovat do Workshopu na Steamu
@@ -505,6 +506,7 @@ editor.errorlegacy = Tato mapa je příliš stará a používá formát mapy, kt
 editor.errornot = Toto není soubor mapy.
 editor.errorheader = Tento soubor mapy je buď neplatný nebo poškozen.
 editor.errorname = Mapa nemá definované jméno. Nesnažíš se náhodou nahrát soubor s uložením hry?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Aktualizovat
 editor.randomize = Náhodně vygenerovat
 editor.moveup = Pohyb Nahoru
@@ -516,6 +518,7 @@ editor.sectorgenerate = Generovat Sektor
 editor.resize = Změnit velikost
 editor.loadmap = Načíst mapu
 editor.savemap = Uložit mapu
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Uloženo!
 editor.save.noname = Tvoje mapa nemá jméno! Jméno nastavíš v položce nabídky "Informace o mapě".
 editor.save.overwrite = Tvoje mapa přepisuje vestavěnou mapu! Nastav jí radši jiné jméno v položce nabídky "Informace o mapě".
@@ -601,6 +604,23 @@ filter.option.floor2 = Druhotný  povrch
 filter.option.threshold2 = Druhotný práh
 filter.option.radius = Poloměr
 filter.option.percentile = Percentil
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Šířka:
 height = Výška:
@@ -2235,6 +2255,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Přečte číslo z připojené paměti.
 lst.write = Zapíše číslo do připojené paměti.
 lst.print = Přídá text do vypisovacího buferu.\nNezobrazí nic dokud [accent]Print Flush[] je použít.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Přídá operaci do vykreslovacího buferu.\nNezobrazí nic dokud [accent]Draw Flush[] je použít.
 lst.drawflush = Provede všechny [accent]Draw[] operace na zobrazovač logiky. Pak vyčistí vykreslovací bufer.
 lst.printflush = Provede všechny [accent]Print[] operace do zprávy. Pak vyčistí vypisovací bufer.
@@ -2272,6 +2293,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Stavba budov pomoci jednotek kontrolované procesorem neni povolené.
 
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 433f80e1a0..0e2c8d5a67 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -434,6 +434,7 @@ editor.waves = Bølge:
 editor.rules = Regler:
 editor.generation = Generering:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Ændr i spil
 editor.playtest = Playtest
 editor.publish.workshop = Publicer på Workshop
@@ -500,6 +501,7 @@ editor.errorlegacy = Denne bane er forældet, og bruger et eftermægle-format, d
 editor.errornot = Dette er ikke en bane-fil.
 editor.errorheader = Denne bane er enten ugyldig eller i stykker.
 editor.errorname = Banen har ikke noget navn. Forsøger du at gemme filen?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Opdater
 editor.randomize = Tilfældiggør
 editor.moveup = Move Up
@@ -511,6 +513,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Omskaler
 editor.loadmap = Indlæs bane
 editor.savemap = Gem bane
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Gemt!
 editor.save.noname = Din bane har intet navn! Giv den et navn under 'bane-information'-menuen.
 editor.save.overwrite = Din bane overskriver en indbygget bane! Vælge et andet navn under 'bane-information'-menuen.
@@ -595,6 +598,23 @@ filter.option.floor2 = Sekundært gulv
 filter.option.threshold2 = Sekundær terskel
 filter.option.radius = Radius
 filter.option.percentile = Percentil
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Bredde:
 height = Højde:
@@ -2216,6 +2236,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2253,6 +2274,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index ec44d25f83..22409d6be9 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -441,6 +441,7 @@ editor.waves = Wellen
 editor.rules = Regeln
 editor.generation = Generator
 editor.objectives = Ziele
+editor.locales = Locale Bundles
 editor.ingame = Im Spiel bearbeiten
 editor.playtest = Playtest
 editor.publish.workshop = Im Workshop veröffentlichen
@@ -508,6 +509,7 @@ editor.errorlegacy = Diese Karte ist zu alt und benutzt ein veraltetes Kartenfor
 editor.errornot = Dies ist keine Kartendatei.
 editor.errorheader = Diese Karte ist entweder nicht gültig oder beschädigt.
 editor.errorname = Karte hat keinen Namen.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Aktualisieren
 editor.randomize = Zufällig anordnen
 editor.moveup = Hochschieben
@@ -519,6 +521,7 @@ editor.sectorgenerate = Sektor generieren
 editor.resize = Größe\nanpassen
 editor.loadmap = Karte\nladen
 editor.savemap = Karte\nspeichern
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Gespeichert!
 editor.save.noname = Deine Karte hat keinen Namen! Setze einen Namen im [accent]Karten-Info[]-Menü.
 editor.save.overwrite = Deine Karte überschreibt eine Standardkarte! Wähle einen anderen Karten Namen im [accent]Karten-Info[]-Menü.
@@ -606,6 +609,23 @@ filter.option.floor2 = Sekundärer Boden
 filter.option.threshold2 = Sekundärer Grenzwert
 filter.option.radius = Radius
 filter.option.percentile = Perzentil
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Breite:
 height = Höhe:
@@ -2266,6 +2286,7 @@ unit.emanate.description = Baut Blöcke, um den Akropolis-Kern zu beschützen. H
 lst.read = Liest einen Wert aus einer verbundenen Speicherzelle.
 lst.write = Schreibt eine Zahl in einer verbundene Speicherzelle.
 lst.print = Fügt Text zum Textspeicher hinzu.\nZeigt nichts an, bis [accent]Print Flush[] verwendet wird.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Fügt eine [accent]Draw[]-Aufgabe zum Bildspeicher hinzu.\nZeigt nichts an, bis [accent]Draw Flush[] verwendet wird.
 lst.drawflush = Druckt [accent]Draw[]-Aufgaben aus dem Bildspeicher auf einen Bildschirm.
 lst.printflush = Druckt [accent]Print[]-Aufgaben aus dem Textspeicher auf einen Nachrichtenblock.
@@ -2303,6 +2324,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Logik, die Blöcke baut, ist hier nicht erlaubt.
 
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index d0f31317af..0a468fef0c 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -438,6 +438,7 @@ editor.waves = Oleadas:
 editor.rules = Normas:
 editor.generation = Generación:
 editor.objectives = Objetivos
+editor.locales = Locale Bundles
 editor.ingame = Editar desde la nave
 editor.playtest = Probar mapa
 editor.publish.workshop = Publicar en Steam Workshop
@@ -505,6 +506,7 @@ editor.errorlegacy = Este mapa es demasiado antiguo y usa un formato obsoleto.
 editor.errornot = Esto no es un fichero de mapa.
 editor.errorheader = Este mapa no es válido o está corrupto.
 editor.errorname = El mapa no tiene un nombre definido. ¿Estás intentando cargar un fichero de guardado?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Actualizar
 editor.randomize = Aleatorizar
 editor.moveup = Subir
@@ -516,6 +518,7 @@ editor.sectorgenerate = Generación de sector
 editor.resize = Redimensionar
 editor.loadmap = Cargar mapa
 editor.savemap = Guardar mapa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = ¡Guardado!
 editor.save.noname = ¡Tu mapa no tiene un nombre! Ponle uno en el menú "Info del Mapa".
 editor.save.overwrite = ¡Tu mapa sobrescribe uno ya incorporado! Elige un nombre diferente en el menú 'Info del Mapa'.
@@ -603,6 +606,23 @@ filter.option.floor2 = Terreno secundario
 filter.option.threshold2 = Umbral secundario
 filter.option.radius = Radio
 filter.option.percentile = Percentil
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Ancho:
 height = Alto:
@@ -2259,6 +2279,7 @@ unit.emanate.description = Construye estructuras para defender el núcleo Acropo
 lst.read = Lee un número desde una unidad de memoria conectada.
 lst.write = Escribe un número en una unidad de memoria conectada.
 lst.print = Añade texto a la cola para imprimir texto.\nNo mostrará nada hasta que se use [accent]Print Flush[].
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Añade una operación a la cola para dibujar.\nNo mostrará nada hasta que se use [accent]Draw Flush[].
 lst.drawflush = Muestra los datos en cola de operaciones [accent]Draw[] en un monitor gráfico.
 lst.printflush = Muestra los datos en cola de operaciones de [accent]Print[] en un bloque de mensaje.
@@ -2296,6 +2317,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]No se permite construir bloques de categoría lógica.
 
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index e315dfc24d..a8ab0d2fc9 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -434,6 +434,7 @@ editor.waves = Lahingulained:
 editor.rules = Reeglid:
 editor.generation = Genereerimine:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Redigeeri mängus
 editor.playtest = Playtest
 editor.publish.workshop = Avalda Workshop'is
@@ -500,6 +501,7 @@ editor.errorlegacy = See maailmafail on liiga vana ja kasutab iganenud formaati,
 editor.errornot = See ei ole maailmafail.
 editor.errorheader = See maailmafail on ebasobiv või riknenud.
 editor.errorname = Maailma nime pole täpsustatud.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Uuenda
 editor.randomize = Juhuslikusta
 editor.moveup = Move Up
@@ -511,6 +513,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Suurus
 editor.loadmap = Lae maailm
 editor.savemap = Salvesta
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Salvestatud!
 editor.save.noname = Su maailmal ei ole nime! Anna maailmale nimi, vajutades menüüs nupule "Üldinfo".
 editor.save.overwrite = Sinu maailm kirjutaks üle sisse-ehitatud maailma! Anna maailmale teistsugune nimi, vajutades menüüs nupule "Üldinfo".
@@ -595,6 +598,23 @@ filter.option.floor2 = Teine põrand
 filter.option.threshold2 = Teine lävi
 filter.option.radius = Raadius
 filter.option.percentile = Protsentiil
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Laius:
 height = Kõrgus:
@@ -2218,6 +2238,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2255,6 +2276,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 2db4ff04d5..c1284ec210 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -436,6 +436,7 @@ editor.waves = Boladak:
 editor.rules = Arauak:
 editor.generation = Sorrarazi:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Editatu jolasean
 editor.playtest = Playtest
 editor.publish.workshop = Argitaratu lantegian
@@ -502,6 +503,7 @@ editor.errorlegacy = Mapa hau zaharregia da, eta jada onartzen ez den formatu za
 editor.errornot = Hau ez da mapa-fitxategi bat.
 editor.errorheader = Mapa hau hondatuta dago edo baliogabea da.
 editor.errorname = Mapak ez du zehaztutako izenik. Gordetako partida bat kargatzen saiatu zara?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Eguneratu
 editor.randomize = Ausazkoa
 editor.moveup = Move Up
@@ -513,6 +515,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Aldatu neurria
 editor.loadmap = Kargatu mapa
 editor.savemap = Gorde mapa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Gordeta!
 editor.save.noname = Zure mapak ez du izenik" Jarri baten bat 'Mapa info' menuan.
 editor.save.overwrite = Zure mapak jolas barneko mapa bat gainidatziko luke! Hautatu beste izen bat 'Mapa info' menuan.
@@ -597,6 +600,23 @@ filter.option.floor2 = Bigarren zorua
 filter.option.threshold2 = Bigarren atalasea
 filter.option.radius = Erradioa
 filter.option.percentile = Pertzentila
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Zabalera:
 height = Altuera:
@@ -2220,6 +2240,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2257,6 +2278,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 9962837363..64c142e223 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -434,6 +434,7 @@ editor.waves = Tasot:
 editor.rules = Säännöt:
 editor.generation = Generaatio:
 editor.objectives = Tehtävät
+editor.locales = Locale Bundles
 editor.ingame = Muokka pelin sisällä
 editor.playtest = Testaa pelin sisällä
 editor.publish.workshop = Julkaise Workshoppiin
@@ -500,6 +501,7 @@ editor.errorlegacy = Tämä kartta on liian vanha, ja se käyttää vanhentunutt
 editor.errornot = Tämä ei ole karttatiedosto.
 editor.errorheader = Tämä karttatiedosto on joko kelvoton tai turmeltunut.
 editor.errorname = Kartalla ei ole määritettyä nimeä. Yritätkö ladata tallennusta?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Päivitä
 editor.randomize = Satunnaista
 editor.moveup = Liiku yläkansioon
@@ -511,6 +513,7 @@ editor.sectorgenerate = Sektorigeneraatio
 editor.resize = Säädä kokoa
 editor.loadmap = Lataa kartta
 editor.savemap = Tallenna kartta
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Tallennettu!
 editor.save.noname = Kartallasi ei ole nimeä! Aseta sellainen 'Kartan tiedot' valikossa.
 editor.save.overwrite = Karttasi on ylikirjoittamassa sisäänrakennettua karttaa! Valitse toinen nimi 'Kartan tiedot' -valikossa.
@@ -595,6 +598,23 @@ filter.option.floor2 = Toinen lattia
 filter.option.threshold2 = Toissijainen raja-arvo
 filter.option.radius = Säde
 filter.option.percentile = Prosentti
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Leveys:
 height = Korkeus:
@@ -2221,6 +2241,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Lue numero yhdistetystä muistisolusta.
 lst.write = Kirjoita numero yhdistettyyn muistisoluun.
 lst.print = Lisää tekstiä tekstipuskuriin.\nEi näytä mitään, kunnes [accent]Painosyötettä[] käytetään.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Lisää operaation piirtopuskuriin.\nEi näytä mitään, kunnes [accent]Piirtosyötettä[] käytetään.
 lst.drawflush = Syöttää jonottavat [accent]Piirto[]-operaatiot näyttöön.
 lst.printflush = Syöttää jonottavat [accent]Paino[]-operaatiot viestipalikkaan.
@@ -2258,6 +2279,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Logiikan käyttö ei täällä ole sallittu yksikköjen tuottamisessa.
 lenum.type = Rakennuksen/Yksikön tyyppi.\nEsim. jokaisesta reitittimestä tämä palauttaa [accent]@router[].\nEi ole merkkijono.
 lenum.shoot = Ammu tiettyä sijaintia.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 01780b4db8..6a8950a100 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -434,6 +434,7 @@ editor.waves = Waves:
 editor.rules = Rules:
 editor.generation = Generation:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Edit In-Game
 editor.playtest = Playtest
 editor.publish.workshop = I-Publish Sa Workshop
@@ -500,6 +501,7 @@ editor.errorlegacy = Masyadong luma ang mapang ito, at gumagamit ng legacy na fo
 editor.errornot = Ito ay hindi isang file ng mapa.
 editor.errorheader = Ang file ng mapa na ito ay maaaring hindi wasto o sira.
 editor.errorname = Walang tinukoy na pangalan ang mapa. Sinusubukan mo bang mag-load ng save file?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Update
 editor.randomize = Randomize
 editor.moveup = Move Up
@@ -511,6 +513,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Resize
 editor.loadmap = Load Map
 editor.savemap = Save Map
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Saved!
 editor.save.noname = Walang pangalan ang iyong mapa! Itakda ang isa sa menu na 'impormasyon ng mapa'.
 editor.save.overwrite = Ino-overwrite ng iyong mapa ang isang built-in na mapa! Pumili ng ibang pangalan sa menu na 'impormasyon ng mapa'.
@@ -595,6 +598,23 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Width:
 height = Height:
@@ -2217,6 +2237,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2254,6 +2275,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index fb44cebe88..9f481dd570 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -444,6 +444,7 @@ editor.waves = Vagues
 editor.rules = Règles
 editor.generation = Génération
 editor.objectives = Objectifs
+editor.locales = Locale Bundles
 editor.ingame = Éditer dans le jeu
 editor.playtest = Tester
 editor.publish.workshop = Publier sur le Workshop
@@ -511,6 +512,7 @@ editor.errorlegacy = Cette carte est trop ancienne et utilise un format de carte
 editor.errornot = Ceci n'est pas un fichier de carte.
 editor.errorheader = Ce fichier de carte est invalide ou corrompu.
 editor.errorname = La carte n'a pas de nom. Essayez-vous de charger une sauvegarde ?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Mettre à jour
 editor.randomize = Générer
 editor.moveup = Monter
@@ -522,6 +524,7 @@ editor.sectorgenerate = Générer un Secteur
 editor.resize = Redimensionner
 editor.loadmap = Charger la carte
 editor.savemap = Sauvegarder la carte
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Sauvegardé !
 editor.save.noname = Votre carte n'a pas de nom !\nAjoutez un nom dans le menu 'Infos de la Carte'.
 editor.save.overwrite = Votre carte écrase une carte de base du jeu !\nChoisissez un nom différent dans le menu 'Infos de la Carte'.
@@ -609,6 +612,23 @@ filter.option.floor2 = Sol secondaire
 filter.option.threshold2 = Seuil secondaire
 filter.option.radius = Rayon
 filter.option.percentile = Pourcentage
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Largeur :
 height = Hauteur :
@@ -2267,6 +2287,7 @@ unit.emanate.description = Construit des structures pour défendre le Noyau acro
 lst.read = Lit un nombre depuis un bloc de mémoire relié au processeur.
 lst.write = Écrit un nombre dans un bloc de mémoire relié au processeur.
 lst.print = Ajoute du texte dans la mémoire tampon de l'imprimante.\nNe montrera aucun texte tant que [accent]Print Flush[] ne sera pas utilisé.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Ajoute une opération dans la mémoire tampon de dessin.\nNe montrera aucune image tant que [accent]Draw Flush[] ne sera pas utilisé.
 lst.drawflush = Affiche les opérations [accent]Draw[] en file d'attente vers un écran.
 lst.printflush = Affiche les opérations [accent]Print[] en file d'attente vers un bloc de message.
@@ -2304,6 +2325,7 @@ lst.effect = Crée un effet de particules.
 lst.sync = Synchronise une variable dans le réseau.\nLimité à 20 fois par seconde et par variable.
 lst.makemarker = Crée un marqueur dans le monde.\nUn ID pour identifier le marqueur doit être donné.\nLes marqueurs sont limités à 20,000 par monde.
 lst.setmarker = Change une propriété d'un marqueur.\nL'ID utilisé doit être le même que celui de l'instruction "Make Marker".
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Les unités contrôlées par des processeurs ne peuvent pas construire ici.
 
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index b1af857920..88c1fbec78 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -444,6 +444,7 @@ editor.waves = Hullámok:
 editor.rules = Szabályok:
 editor.generation = Generálás:
 editor.objectives = Célok
+editor.locales = Locale Bundles
 editor.ingame = Szerkesztés a játékban
 editor.playtest = Teszt játékban
 editor.publish.workshop = Közzététel Steam Műhelyben
@@ -511,6 +512,7 @@ editor.errorlegacy = Ez a pálya túl régi, és már nem támogatott formátumo
 editor.errornot = Ez nem egy pálya fájl.
 editor.errorheader = Ez a pálya fájl vagy érvénytelen vagy sérült.
 editor.errorname = A pályának nincs neve. Mentést próbálsz betölteni?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Frissítés
 editor.randomize = Véletlenszerű
 editor.moveup = Mozgás fel
@@ -522,6 +524,7 @@ editor.sectorgenerate = Szektor generálása
 editor.resize = Átméretezés
 editor.loadmap = pálya betöltése
 editor.savemap = Mentés
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Mentve!
 editor.save.noname = Nem adtál meg nevet! Állíts be egyet az "Általános" menüpont alatt!
 editor.save.overwrite = A pályád felülír egy már létező pályát! Válassz egy másik nevet az "Általános" menüpont alatt!
@@ -609,6 +612,23 @@ filter.option.floor2 = Másodlagos Szint
 filter.option.threshold2 = Másodlagos Küszöbérték
 filter.option.radius = Sugár
 filter.option.percentile = Arány
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Szélesség:
 height = Magasság:
@@ -2267,6 +2287,7 @@ unit.emanate.description = Az Akropolisz védelmére szolgáló építményeket
 lst.read = Szám kiolvasása egy összekapcsolt memóriacellából.
 lst.write = Írj egy számot egy összekapcsolt memóriacellába.
 lst.print = Szöveg hozzáadása a nyomtatási pufferhez.\nNem jelenít meg semmit, amíg a [accent]Kiírási Művelet[] használatban van.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Művelet hozzáadása a rajzpufferhez.\nNem jelenít meg semmit, amíg a [accent]Rajzolási Művelet[] használatban van.
 lst.drawflush = Sorba állított [accent]rajz[]műveletek megjelenítése a kijelzőn.
 lst.printflush = Sorba állított [accent]kiírási[] műveletek kiírása egy üzenetblokkba.
@@ -2304,6 +2325,7 @@ lst.effect = Létrehoz egy részecske-effektet.
 lst.sync = Egy változó szinkronizálása a hálózaton keresztül.\nMásodpercenként legfeljebb 10 alkalommal hívható meg.
 lst.makemarker = Új logikai jelölő létrehozása a világban.\nEgy azonosítót kell megadni a jelölő azonosításához.\nA jelölők száma jelenleg világonként 20 000-re van korlátozva.
 lst.setmarker = Egy jelölő tulajdonságának beállítása.\nA használt azonosítónak meg kell egyeznie a Jelölő Készítő utasításban megadottal.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Az egységépítési logika itt nem megengedett.
 
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index b43bfac379..0da00b10b9 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -438,6 +438,7 @@ editor.waves = Gelombang:
 editor.rules = Peraturan:
 editor.generation = Generasi:
 editor.objectives = Tujuan
+editor.locales = Locale Bundles
 editor.ingame = Sunting dalam Permainan
 editor.playtest = Tes Bermain
 editor.publish.workshop = Terbitkan di Workshop
@@ -505,6 +506,7 @@ editor.errorlegacy = Peta ini terlalu tua, dan memakai format peta "legacy" yang
 editor.errornot = Ini bukan merupakan file peta.
 editor.errorheader = File peta ini bisa jadi tidak sah atau rusak.
 editor.errorname = Peta tidak ada nama. Apakah Anda mencoba untuk memuat file simpanan?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Perbaruan
 editor.randomize = Acak
 editor.moveup = Pindah Ke Atas
@@ -516,6 +518,7 @@ editor.sectorgenerate = Generasi Sektor
 editor.resize = Ubah Ukuran
 editor.loadmap = Memuat Peta
 editor.savemap = Simpan Peta
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Tersimpan!
 editor.save.noname = Peta Anda tidak ada nama! Tambahkan di menu 'info peta'.
 editor.save.overwrite = Peta ini menindih peta built-in! Pilih nama yang berbeda di menu 'info peta'.
@@ -603,6 +606,23 @@ filter.option.floor2 = Lantai Sekunder
 filter.option.threshold2 = Ambang Sekunder
 filter.option.radius = Radius
 filter.option.percentile = Perseratus
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Lebar:
 height = Tinggi:
@@ -2257,6 +2277,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Membaca angka dari memori sel yang dihubungkan.
 lst.write = Menulis angka ke memori sel yang dihubungkan.
 lst.print = Menambahkan teks ke daftar cetak.\nTidak dapat menampilkan apapun sampai [accent]Print Flush[] dipakai.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Menambahkan perintah ke daftar gambar.\nTidak dapat menampilkan apapun sampai [accent]Draw Flush[] dipakai.
 lst.drawflush = Mengeluarkan perintah [accent]Draw[] dari daftar antrean untuk ditampilkan.
 lst.printflush = Mengeluarkan perintah [accent]Print[] dari daftar antrean untuk blok pesan.
@@ -2294,6 +2315,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Logika unit membangun tidak diperbolehkan di sini.
 
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 65cc5f965c..7d5cee5309 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -436,6 +436,7 @@ editor.waves = Ondate:
 editor.rules = Regole:
 editor.generation = Generazione:
 editor.objectives = Obbiettivi
+editor.locales = Locale Bundles
 editor.ingame = Modifica in Gioco
 editor.playtest = Playtest
 editor.publish.workshop = Pubblica nel Workshop
@@ -503,6 +504,7 @@ editor.errorlegacy = La mappa è troppo vecchia ed usa un formato che non è pi
 editor.errornot = Questo non è un file mappa.
 editor.errorheader = Il file di questa mappa non è valido o è corrotto.
 editor.errorname = Questa mappa è senza nome. Stai cercando di caricare un salvataggio?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Aggiorna
 editor.randomize = Casualizza
 editor.moveup = Muovi in alto
@@ -514,6 +516,7 @@ editor.sectorgenerate = Genera settore
 editor.resize = Ridimensiona
 editor.loadmap = Carica Mappa
 editor.savemap = Salva Mappa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Salvato!
 editor.save.noname = La tua mappa non ha un nome! Impostane uno nel menu 'Info Mappa'.
 editor.save.overwrite = La tua mappa sovrascrive quelle incluse! Imposta un nome diverso nel menu 'Info Mappa'.
@@ -598,6 +601,23 @@ filter.option.floor2 = Terreno Secondario
 filter.option.threshold2 = Soglia Secondaria
 filter.option.radius = Raggio
 filter.option.percentile = Percentuale
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Larghezza:
 height = Altezza:
@@ -2231,6 +2251,7 @@ unit.emanate.description = Costruisce strutture per difendere il nucleo dell'Acr
 lst.read = Leggi un numero da una cella di memoria collegata.
 lst.write = Scrivi un numero in una cella di memoria collegata.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2268,6 +2289,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 47f5fa4d70..b59a37a712 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -438,6 +438,7 @@ editor.waves = ウェーブ:
 editor.rules = ルール:
 editor.generation = 生成:
 editor.objectives = オブジェクティブ
+editor.locales = Locale Bundles
 editor.ingame = ゲーム内で編集する
 editor.playtest = Playtest
 editor.publish.workshop = ワークショップで公開
@@ -505,6 +506,7 @@ editor.errorlegacy = このマップは古いです。今後、古いマップ
 editor.errornot = これはマップファイルではありません。
 editor.errorheader = このマップファイルは無効または破損しています。
 editor.errorname = マップに名前が設定されていません。
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = 更新
 editor.randomize = ランダム
 editor.moveup = 上に移動
@@ -516,6 +518,7 @@ editor.sectorgenerate = セクターを生成
 editor.resize = リサイズ
 editor.loadmap = マップを読み込む
 editor.savemap = マップを保存
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = 保存しました!
 editor.save.noname = マップに名前が設定されていません! メニューの 'マップ情報' から設定してください。
 editor.save.overwrite = 組み込みマップを上書きしようとしています! メニューの 'マップ情報' から異なる名前に設定してください。
@@ -602,6 +605,23 @@ filter.option.floor2 = 2番目の地面
 filter.option.threshold2 = 2番目の閾値
 filter.option.radius = 半径
 filter.option.percentile = パーセンタイル
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = 幅:
 height = 高さ:
@@ -2235,6 +2255,7 @@ unit.emanate.description = アクロポリスコアを敵から守ります。\n
 lst.read = リンクされたメモリセルから数値を読み取ります。
 lst.write = リンクされたメモリセルに数値を書き込みます。
 lst.print = メッセージブロックにテキストを追加します。[accent]Print Flush[] を使用するまで何も表示しません。
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = ロジックディスプレイに操作を追加します。[accent]Draw Flush[] を使用するまで何も表示しません。
 lst.drawflush = キューに入れられた [accent]Draw[] 操作をディスプレイにフラッシュします。
 lst.printflush = キューに入れられた [accent]Print[] 操作をメッセージ ブロックにフラッシュします。
@@ -2272,6 +2293,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]ここではユニット構築ロジックは使用できません。
 lenum.type = ユニットや建物の種類を取得します。\n例：任意のルーターに対して、 [accent]@router[] を返します。\n文字列ではありません。
 lenum.shoot = 指定した座標に向かって撃ちます。
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 9843f25f70..c138e309d8 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -437,6 +437,7 @@ editor.waves = 단계
 editor.rules = 규칙
 editor.generation = 지형 생성
 editor.objectives = 목표
+editor.locales = Locale Bundles
 editor.ingame = 인게임 편집
 editor.playtest = 맵 테스트
 editor.publish.workshop = 창작마당 게시
@@ -504,6 +505,7 @@ editor.errorlegacy = 이 맵은 너무 오래됐고, 더 이상 지원하지 않
 editor.errornot = 맵 파일이 아닙니다.
 editor.errorheader = 이 맵 파일은 유효하지 않거나 손상되었습니다.
 editor.errorname = 맵에 이름이 지정되어 있지 않습니다. 저장 파일을 불러오려고 시도하는 건가요?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = 업데이트
 editor.randomize = 무작위
 editor.moveup = 위로 이동
@@ -515,6 +517,7 @@ editor.sectorgenerate = 구역 형성
 editor.resize = 맵 크기조정
 editor.loadmap = 맵 불러오기
 editor.savemap = 맵 저장
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = 저장됨!
 editor.save.noname = 맵에 이름이 없습니다! '맵 정보' 메뉴에서 설정하세요.
 editor.save.overwrite = 이 맵은 내장된 맵을 덮어씁니다! '맵 정보' 에서 다른 이름을 선택하세요.
@@ -602,6 +605,23 @@ filter.option.floor2 = 2번째 타일
 filter.option.threshold2 = 2번째 경계선
 filter.option.radius = 반경
 filter.option.percentile = 백분율
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = 너비:
 height = 높이:
@@ -2234,6 +2254,7 @@ unit.emanate.description = 코어: 도심을 지켜내기 위해 구조물을 
 lst.read = 연결된 메모리 셀에서 숫자 읽음
 lst.write = 연결된 메모리 셀에 숫자 작성
 lst.print = 프린트 버퍼에 텍스트 추가\n[accent]Print Flush[]가 사용되기 전까진 아무것도 보여주지 않습니다
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = 드로잉 버퍼에 실행문 추가\n[accent]Draw Flush[]가 사용되기 전까진 아무것도 보여주지 않습니다
 lst.drawflush = 대기중인 [accent]Draw[]실행문을 디스플레이에 출력
 lst.printflush = 대기중인 [accent]Print[]실행문을 메시지 블록에 출력
@@ -2271,6 +2292,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]기체의 건설 로직은 여기서 허용되지 않습니다.
 
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index c419d033ef..f644b1b3a1 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -434,6 +434,7 @@ editor.waves = Bangos:
 editor.rules = Taisyklės:
 editor.generation = Generacija:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Redaguoti žaidime
 editor.playtest = Playtest
 editor.publish.workshop = Publikuoti Dirbtuvėje
@@ -500,6 +501,7 @@ editor.errorlegacy = Šis žemėlapis yra per senas ir naudoja seną žemėlapi
 editor.errornot = Tai nėra žemėlapio formatas.
 editor.errorheader = Šis žemėlapis yra netaisyklingas arba sugadintas.
 editor.errorname = Šis žemėlapis neturi nustatyto pavadinimo. Ar bandote užkrauti išsaugotą failą?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Atnaujinti
 editor.randomize = Sumaišyti atsitiktinai
 editor.moveup = Move Up
@@ -511,6 +513,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Pakeisti dydį
 editor.loadmap = Užkrauti žemėlapį
 editor.savemap = Išsaugoti žemėlapį
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Išsaugota!
 editor.save.noname = Jūsų žemėlapis neturi pavadinimo! Nustatykite meniu 'žemėlapio informacija'.
 editor.save.overwrite = Jūsų žemėlapis perrašo integruotą žemėlapį! Pasirinkite skirtingą pavadinimą 'žemėlapio informacija' meniu.
@@ -595,6 +598,23 @@ filter.option.floor2 = Antrasis sluoksnis
 filter.option.threshold2 = Antrasis slenkstis
 filter.option.radius = Spindulys
 filter.option.percentile = Procentilė
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Plotis:
 height = Aukštis:
@@ -2218,6 +2238,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2255,6 +2276,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 096b01124c..84872be5fa 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -442,6 +442,7 @@ editor.waves = Rondes:
 editor.rules = Regels:
 editor.generation = Generatie:
 editor.objectives = Doelen
+editor.locales = Locale Bundles
 editor.ingame = Bewerk In-Spel
 editor.playtest = Speeltest
 editor.publish.workshop = Publiceer in Werkplaats
@@ -508,6 +509,7 @@ editor.errorlegacy = Deze kaart is te oud, bestandsformaat word niet meer onders
 editor.errornot = Dat is geen kaartbestand.
 editor.errorheader = Dit kaartbestand is ongeldig of corrupt.
 editor.errorname = Kaart heeft geen naam.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Bijwerken
 editor.randomize = Willekeurig
 editor.moveup = Beweeg Omhoog
@@ -519,6 +521,7 @@ editor.sectorgenerate = Sector Genereren
 editor.resize = Verander formaat
 editor.loadmap = Laad Kaart
 editor.savemap = Bewaar Kaart
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Bewaard!
 editor.save.noname = Je kaart heeft geen naam! Stel er ��n in het menu 'kaartinfo'.
 editor.save.overwrite = De naam van deze kaart is al in gebruik door een van het spel zelf, kies een andere.
@@ -605,6 +608,23 @@ filter.option.floor2 = Secundaire Vloer
 filter.option.threshold2 = Secundaire Drempel
 filter.option.radius = Straal
 filter.option.percentile = percentiel
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Breedte:
 height = Hoogte:
@@ -2231,6 +2251,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2268,6 +2289,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 74caec860a..74169a455d 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -434,6 +434,7 @@ editor.waves = Waves:
 editor.rules = Rules:
 editor.generation = Generation:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Edit In-Game
 editor.playtest = Playtest
 editor.publish.workshop = Publish On Workshop
@@ -500,6 +501,7 @@ editor.errorlegacy = This map is too old, and uses a legacy map format that is n
 editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Update
 editor.randomize = Randomize
 editor.moveup = Move Up
@@ -511,6 +513,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Resize
 editor.loadmap = Load Map
 editor.savemap = Save Map
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Saved!
 editor.save.noname = Your map does not have a name! Set one in the 'map info' menu.
 editor.save.overwrite = Your map overwrites a built-in map! Pick a different name in the 'map info' menu.
@@ -595,6 +598,23 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Width:
 height = Height:
@@ -2218,6 +2238,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2255,6 +2276,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index c618f1421a..4006da0d66 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -438,6 +438,7 @@ editor.waves = Fale:
 editor.rules = Zasady:
 editor.generation = Generacja:
 editor.objectives = Cele
+editor.locales = Locale Bundles
 editor.ingame = Edytuj w Grze
 editor.playtest = Testuj Mapę
 editor.publish.workshop = Opublikuj w Warsztacie
@@ -505,6 +506,7 @@ editor.errorlegacy = Ta mapa jest zbyt stara i używa starszego formatu mapy, kt
 editor.errornot = To nie jest plik mapy.
 editor.errorheader = Ten plik mapy jest nieprawidłowy lub uszkodzony.
 editor.errorname = Mapa nie zawiera nazwy. Czy próbujesz załadować zapis gry?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Aktualizuj
 editor.randomize = Losuj
 editor.moveup = Przesuń w górę
@@ -516,6 +518,7 @@ editor.sectorgenerate = Generuj Sektor
 editor.resize = Zmień Rozmiar
 editor.loadmap = Załaduj Mapę
 editor.savemap = Zapisz Mapę
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Zapisano!
 editor.save.noname = Twoja mapa nie ma nazwy! Ustaw ją w 'Informacjach o mapie'.
 editor.save.overwrite = Ta mapa nadpisze wbudowaną mapę! Ustaw inną nazwę w 'Informacjach o mapie'.
@@ -600,6 +603,23 @@ filter.option.floor2 = Druga Podłoga
 filter.option.threshold2 = Drugi Próg
 filter.option.radius = Zasięg
 filter.option.percentile = Procent
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Szerokość:
 height = Wysokość:
@@ -2253,6 +2273,7 @@ unit.emanate.description = Lotnicza jednostka aministracyjna zdolna do wydobycia
 lst.read = Wczytuje liczbę z połączonej komórki pamięci.
 lst.write = Zapisuje liczbę do połączonej komórki pamięci.
 lst.print = Dodaje tekst do buforu drukującego.\nNie wyświetla niczego dopóki [accent]Print Flush[] nie jest użyte.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Dodaje operacje do buforu rysującego.\nNie wyświetla niczego dopóki [accent]Draw Flush[] nie jest użyte.
 lst.drawflush = Wyświetla oczekujące operacje z funkcji [accent]Draw[] na wyświetlaczu.
 lst.printflush = Dodaje oczekujące operacje z funkcji [accent]Print[] do bloku wiadomości.
@@ -2290,6 +2311,7 @@ lst.effect = Stwórz efekt cząsteczki.
 lst.sync = Synchronizuje zmienną poprzez sieć.\nWywoływane maksymalnie 10 razy na sekundę.
 lst.makemarker = Stwórz nowy marker logiki.\nMusisz podać ID, aby móc go później zidentyfikować.\nLimit markerów to 20,000.
 lst.setmarker = Ustaw właściwości markera.\nID markera musi być takie samo jak podczas jego tworzenia.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Logika budowania jednostek nie jest tu dozwolona.
 
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index e304212ffd..187a136e0b 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -438,6 +438,7 @@ editor.waves = Hordas:
 editor.rules = Regras:
 editor.generation = Geração:
 editor.objectives = Objetivos:
+editor.locales = Locale Bundles
 editor.ingame = Editar em jogo
 editor.playtest = Jogar Teste
 editor.publish.workshop = Publicar na oficina
@@ -505,6 +506,7 @@ editor.errorlegacy = Esse mapa é velho demais, e usa um formato de mapa legacy
 editor.errornot = Este não é um arquivo de mapa.
 editor.errorheader = Este arquivo de mapa não é mais válido ou está corrompido.
 editor.errorname = O mapa não tem nome definido.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Atualizar
 editor.randomize = Aleatorizar
 editor.moveup = Mover para Cima
@@ -516,6 +518,7 @@ editor.sectorgenerate = Gerar Setor
 editor.resize = Redimen-\nsionar
 editor.loadmap = Carregar\nmapa
 editor.savemap = Salvar\nmapa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Salvo!
 editor.save.noname = Seu mapa não tem um nome! Coloque um no menu de "Informação do mapa"
 editor.save.overwrite = O seu mapa substitui um mapa já construído! Coloque um nome diferente no menu "Informação do mapa"
@@ -603,6 +606,23 @@ filter.option.floor2 = Chão secundário
 filter.option.threshold2 = Margem secundária
 filter.option.radius = Raio
 filter.option.percentile = Percentual
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Largura:
 height = Altura:
@@ -2252,6 +2272,7 @@ unit.emanate.description = Constrói estruturas para defender o Núcelo Acrópol
 lst.read = Ler um número de uma célula de memória vinculada.
 lst.write = Escrever um número de uma célula de memória vinculada.
 lst.print = Adiciona texto ao buffer de impressão.\nNão exibe nada até [accent]Print Flush[] ser usado.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Adicionar uma operação ao buffer de desenho.\nNão exibe nada até [accent]Draw Flush[] ser usado.
 lst.drawflush = Liberar operações [accent]Draw[] enfileiradas para um display.
 lst.printflush = Liberar operações [accent]Print[] enfileiradas para um bloco de mensagem.
@@ -2289,6 +2310,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Lógica de construção de unidades não é permitida aqui.
 
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 9872b289e5..a43d85d095 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -434,6 +434,7 @@ editor.waves = Hordas:
 editor.rules = Regras:
 editor.generation = Geração:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Editar em jogo
 editor.playtest = Playtest
 editor.publish.workshop = Publicar na oficina
@@ -500,6 +501,7 @@ editor.errorlegacy = Esse mapa é velho demais, E usa um formato de mapa legacy
 editor.errornot = Este não é um ficheiro de mapa.
 editor.errorheader = Este ficheiro de mapa não é mais válido ou está corrompido.
 editor.errorname = O mapa não tem nome definido.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Atualizar
 editor.randomize = Aleatorizar
 editor.moveup = Move Up
@@ -511,6 +513,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Redimen-\nsionar
 editor.loadmap = Carregar\nmapa
 editor.savemap = Gravar\nmapa
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Gravado!
 editor.save.noname = Seu mapa não tem um nome! Coloque um no menu de "Informação do mapa"
 editor.save.overwrite = O seu mapa substitui um mapa já construído! Coloque um nome diferente no menu "Informação do mapa"
@@ -595,6 +598,23 @@ filter.option.floor2 = Chão secundário
 filter.option.threshold2 = Margem secundária
 filter.option.radius = Raio
 filter.option.percentile = Percentual
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Largura:
 height = Altura:
@@ -2218,6 +2238,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2255,6 +2276,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index 7eb9475b2d..594bee3481 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -438,6 +438,7 @@ editor.waves = Valuri:
 editor.rules = Reguli:
 editor.generation = Generare:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Editează în Joc
 editor.playtest = Playtest
 editor.publish.workshop = Publică pe Workshop
@@ -505,6 +506,7 @@ editor.errorlegacy = Hartă aceasta este prea veche, și folosește un format î
 editor.errornot = Acesta nu este un fișier cu o hartă.
 editor.errorheader = Acest fișier de hartă este invalid sau corupf.
 editor.errorname = Harta nu are un nume definit. Încerci cumva să încarci un fișier cu o salvare de joc?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Update
 editor.randomize = Aleatoriu
 editor.moveup = Move Up
@@ -516,6 +518,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Schimbă Dimensiune
 editor.loadmap = Încarcă Harta
 editor.savemap = Salvează Harta
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Salvat!
 editor.save.noname = Hartă ta nu are un nume! Setează unul în meniul 'Informații despre hartă'.
 editor.save.overwrite = Hartă ta suprascrie o hartă prestabilită! Alege un nume diferit în meniul 'Informații despre hartă'.
@@ -602,6 +605,23 @@ filter.option.floor2 = Podea Secundară
 filter.option.threshold2 = Cantitate Secundară
 filter.option.radius = Rază
 filter.option.percentile = Procent
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Lățime:
 height = Înălțime:
@@ -2236,6 +2256,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Citește un număr dintr-o celulă de memorie conectată.
 lst.write = Scrie un număr într-o celulă de memorie conectată.
 lst.print = Adaugă text în bufferul de tipărire.\nNu tipărește decât când se execută [accent]Print Flush[].
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Adaugă o operație în bufferul de desenare.\nNu afișează decât când se execută [accent]Draw Flush[].
 lst.drawflush = Afișează pe un monitor instrucțiunile [accent]Draw[] aflate în așteptare.
 lst.printflush = Tipărește  într-un bloc Mesaj instrucțiunile [accent]Print[] aflate în așteptare.
@@ -2273,6 +2294,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Nu ai voie să construiești cu unitățile folosind procesoare.
 
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index ab749a1a86..3e9fa23b84 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -438,6 +438,7 @@ editor.waves = Волны:
 editor.rules = Правила:
 editor.generation = Генерация:
 editor.objectives = Цели
+editor.locales = Locale Bundles
 editor.ingame = Редактировать в игре
 editor.playtest = Опробовать карту
 editor.publish.workshop = Опубликовать в Мастерской
@@ -505,6 +506,7 @@ editor.errorlegacy = Эта карта слишком старая и испол
 editor.errornot = Это не файл карты.
 editor.errorheader = Этот файл карты недействителен или повреждён.
 editor.errorname = Карта не имеет имени. Может быть, вы пытаетесь загрузить сохранение?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Обновить
 editor.randomize = Случайно
 editor.moveup = Выше
@@ -516,6 +518,7 @@ editor.sectorgenerate = Генерация сектора
 editor.resize = Изменить\nразмер
 editor.loadmap = Загрузить\nкарту
 editor.savemap = Сохранить\nкарту
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Сохранено!
 editor.save.noname = У вашей карты нет имени! Назовите её в меню «Информация о карте».
 editor.save.overwrite = Ваша карта не может быть записана поверх встроенной карты! Введите другое название в меню «Информация о карте»
@@ -602,6 +605,23 @@ filter.option.floor2 = Вторая поверхность
 filter.option.threshold2 = Вторичный предельный порог
 filter.option.radius = Радиус
 filter.option.percentile = Процентиль
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Ширина:
 height = Высота:
@@ -2238,6 +2258,7 @@ unit.emanate.description = Защищает ядро «Акрополь» от 
 lst.read = Считывает число из соединённой ячейки памяти.
 lst.write = Записывает число в соединённую ячейку памяти.
 lst.print = Добавляет текст в текстовый буфер. Ничего не отображает, пока не будет вызван [accent]Print Flush[].
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Добавляет операцию в буфер отрисовки. Ничего не отображает, пока не будет вызван [accent]Draw Flush[].
 lst.drawflush = Сбрасывает буфер [accent]Draw[] операций на дисплей.
 lst.printflush = Сбрасывает буфер [accent]Print[] операций в блок-сообщение.
@@ -2275,6 +2296,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Строительство с помощью процессоров здесь запрещено.
 
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 8f9dcb248c..8fa9e69023 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -438,6 +438,7 @@ editor.waves = Talasi:
 editor.rules = Pravila:
 editor.generation = Generisanje:
 editor.objectives = Zadaci
+editor.locales = Locale Bundles
 editor.ingame = Izmeni "U Igri"
 editor.playtest = Testiranje
 editor.publish.workshop = Objavi u Radionicu
@@ -505,6 +506,7 @@ editor.errorlegacy = Ova mapa je stara, i koristi format mape koji nije podržan
 editor.errornot = Ovo nije datoteka mape.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Mapa nema definisano ime. Da li pokušavate da učitate sačuvanu igru?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Aržuriraj
 editor.randomize = Nasumično
 editor.moveup = Pomeri Gore
@@ -516,6 +518,7 @@ editor.sectorgenerate = Sektorska Generacija
 editor.resize = Preuveličaj
 editor.loadmap = Učitaj Mapu
 editor.savemap = Sačuvaj Mapu
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Sačuvano!
 editor.save.noname = Vaša mapa ne sadrži ime! Postavi neko u 'informacije o mapi' meniju.
 editor.save.overwrite = Vaša mapa prerezuje ugrađenu mapu! Izaberi drugo ime u 'informacije o mapi' meniju.
@@ -602,6 +605,23 @@ filter.option.floor2 = Drugi Pod
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Širina:
 height = Visina:
@@ -2239,6 +2259,7 @@ unit.emanate.description = Gradi građevine da odbrani Veliki Grad jezgro. Popra
 lst.read = Čita broj iz povezane memorijske ćelije.
 lst.write = Piše broj u povezanu memorijsku ćeliju.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2276,6 +2297,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 2cad751f7d..3a82182162 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -434,6 +434,7 @@ editor.waves = Vågor:
 editor.rules = Regler:
 editor.generation = Generering:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Edit In-Game
 editor.playtest = Playtest
 editor.publish.workshop = Publish On Workshop
@@ -500,6 +501,7 @@ editor.errorlegacy = This map is too old, and uses a legacy map format that is n
 editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined. Are you trying to load a save file?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Uppdatera
 editor.randomize = Slumpa
 editor.moveup = Move Up
@@ -511,6 +513,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Resize
 editor.loadmap = Load Map
 editor.savemap = Save Map
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Sparad!
 editor.save.noname = Your map does not have a name! Set one in the 'map info' menu.
 editor.save.overwrite = Your map overwrites a built-in map! Pick a different name in the 'map info' menu.
@@ -595,6 +598,23 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radie
 filter.option.percentile = Percentile
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Bredd:
 height = Höjd:
@@ -2218,6 +2238,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2255,6 +2276,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 44bf5b9c64..88b9f11dc2 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -438,6 +438,7 @@ editor.waves = คลื่น
 editor.rules = กฎ
 editor.generation = เจนเนอเรชั่น
 editor.objectives = เป้าหมาย
+editor.locales = Locale Bundles
 editor.ingame = แก้ไขในเกม
 editor.playtest = เล่นทดสอบ
 editor.publish.workshop = เผยแพร่บนเวิร์กช็อป
@@ -505,6 +506,7 @@ editor.errorlegacy = แมพนี้เก่าเกินไปและ
 editor.errornot = นี่ไม่ใช้ไฟล์แมพ
 editor.errorheader = ไฟล์แมพนี้เสียหรือไม่ถูกต้อง
 editor.errorname = แมพไม่มีการกำหนดชื่อ คุณกำลังพยายามโหลดไฟล์เซฟอยู่หรือไม่?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = อัปเดต
 editor.randomize = สุ่ม
 editor.moveup = ขยับขึ้น
@@ -516,6 +518,7 @@ editor.sectorgenerate = สร้างเซ็กเตอร์
 editor.resize = เปลี่ยนขนาด
 editor.loadmap = โหลดแมพ
 editor.savemap = เซฟแมพ
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = เซฟเรียบร้อย!
 editor.save.noname = แมพของคุณไม่มีชื่อ! สามารถตั้งชื่อได้ในเมนู 'ข้อมูลแมพ'
 editor.save.overwrite = แมพของคุณไปทับซ้อนกับแมพค่าเริ่มต้น! เปลี่ยนชื่อได้ในเมนู 'ข้อมูลแมพ'
@@ -602,6 +605,23 @@ filter.option.floor2 = พื้นชั้นสอง
 filter.option.threshold2 = เกณฑ์ชั้นสอง
 filter.option.radius = รัศมี
 filter.option.percentile = เปอร์เซ็นต์ไทล์
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = กว้าง:
 height = สูง:
@@ -2256,6 +2276,7 @@ unit.emanate.description = สร้างสิ่งต่างๆ เพื
 lst.read = อ่านเลขจากเซลล์ความจำที่เชื่อมต่อไว้
 lst.write = เขียนเลขไปยังเซลล์ความจำที่เชื่อมต่อไว้
 lst.print = เพิ่มข้อความไปยังคิวข้อความ\nข้อความจะยังไม่แสดงจนกว่าจะใช้คำสั่ง [accent]Print Flush[]
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = เพิ่มรูปไปยังคิวการวาด\nภาพจะยังไม่แสดงจนกว่าจะใช้คำสั่ง [accent]Draw Flush[]
 lst.drawflush = ปล่อยคิว [accent]Draw[] ไปยังหน้าจอลอจิกที่เชื่อมต่อไว้
 lst.printflush = ปล่อยคิว [accent]Print[] ไปยังตัวเก็บข้อความที่เชื่อมต่อไว้
@@ -2293,6 +2314,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]ไม่อนุญาตให้ใช้ลอจิกควบคุมให้ยูนิตสร้างที่นี่
 
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index e195095e3e..cabd2f7088 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -434,6 +434,7 @@ editor.waves = Waves:
 editor.rules = Rules:
 editor.generation = Generation:
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = Edit In-Game
 editor.playtest = Playtest
 editor.publish.workshop = Publish On Workshop
@@ -500,6 +501,7 @@ editor.errorlegacy = This map is too old, and uses a legacy map format that is n
 editor.errornot = This is not a map file.
 editor.errorheader = This map file is either not valid or corrupt.
 editor.errorname = Map has no name defined.
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Update
 editor.randomize = Randomize
 editor.moveup = Move Up
@@ -511,6 +513,7 @@ editor.sectorgenerate = Sector Generate
 editor.resize = Boyutunu degistir
 editor.loadmap = Harita yukle
 editor.savemap = Haritayi kaydet
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Kaydedildi!
 editor.save.noname = Haritanin ismi yok! 'Harita bilgisinden' bi tane ekle
 editor.save.overwrite = Haritanin ismi varolan bir haritanin ismi ile ayni! 'Harita bilgisinden' degisik bir isim sec
@@ -595,6 +598,23 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Genislik:
 height = Yukseklik:
@@ -2218,6 +2238,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
@@ -2255,6 +2276,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index ad6a0cfa2f..2a3c2a8fb7 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -438,6 +438,7 @@ editor.waves = Dalgalar:
 editor.rules = Kurallar:
 editor.generation = Oluşum:
 editor.objectives = Görevler:
+editor.locales = Locale Bundles
 editor.ingame = Oyun içinde düzenle
 editor.playtest = Test Et
 editor.publish.workshop = Atölyede Yayınla
@@ -505,6 +506,7 @@ editor.errorlegacy = Bu harita çok eski ve artık desteklenmeyen bir legacy har
 editor.errornot = Bu bir harita dosyası değil.
 editor.errorheader = Bu harita dosyası geçerli değil ya da bozuk.
 editor.errorname = Haritanın ismi yok!?! Bir kayıt dosyası mı yüklemeye çalışıyorsunuz?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Güncelle
 editor.randomize = Rastgele Yap
 editor.moveup = Yukarı Kaydır
@@ -516,6 +518,7 @@ editor.sectorgenerate = Sektör Oluştur
 editor.resize = Yeniden Boyutlandır
 editor.loadmap = Harita Yükle
 editor.savemap = Haritayı Kaydet
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Kaydedildi!
 editor.save.noname = Haritanın bir ismi yok! 'Harita bilgileri' menüsünden bir isim seç.
 editor.save.overwrite = Haritan bir yerleşik haritayla örtüşüyor! 'Harita bilgileri' menüsünden farklı bir isim seç.
@@ -602,6 +605,23 @@ filter.option.floor2 = İkincil Duvar
 filter.option.threshold2 = İkincil Eşik
 filter.option.radius = Yarıçap
 filter.option.percentile = Yüzdelik
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = En:
 height = Boy:
@@ -2236,6 +2256,7 @@ unit.emanate.description = Akropolis Merkezini korumak için binalar inşa eder.
 lst.read = Bağlı hafıza kutusundaki numarayı okur.
 lst.write = Bağlı hafıza kutuaundaki numaraya yazar.
 lst.print = Yazı yazar.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Ekrana Çizer.
 lst.drawflush = Ekrana Çizimi Aktarır.
 lst.printflush = Mesaj bloğuna metnini aktarır,
@@ -2273,6 +2294,7 @@ lst.effect = Parçacık efekti oluştur.
 lst.sync = Ağ boyunca bir değişkeni senkronize et.\nSaniyede en fazla 10 kere yapılabilir.
 lst.makemarker = Dünyada yeni bir İşlemci İşareti koy.\nBu İşarete bir Kimlik adamalısın.\nDünya başına 20.000 limit bulunmakta.
 lst.setmarker = Bir İşlemci İşareti için bir arazi seç.\nKimlik, İşaret Koyucudaki ile aynı olmalı.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Birim İnşası Yasak!
 
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index ad56f75c28..298033e0b9 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -440,6 +440,7 @@ editor.waves = Хвилі
 editor.rules = Правила
 editor.generation = Генерація
 editor.objectives = Завдання
+editor.locales = Locale Bundles
 editor.ingame = Редагувати в грі
 editor.playtest = Протестувати в грі
 editor.publish.workshop = Опублікувати в Майстерні Steam
@@ -507,6 +508,7 @@ editor.errorlegacy = Ця мапа занадто стара і використ
 editor.errornot = Це не мапа.
 editor.errorheader = Цей файл мапи недійсний або пошкоджений.
 editor.errorname = Мапа не має назви. Може, ви намагаєтеся завантажити збереження?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Оновити
 editor.randomize = Випадково
 editor.moveup = Підняти вище
@@ -518,6 +520,7 @@ editor.sectorgenerate = Згенерувати сектор
 editor.resize = Змінити\nрозмір
 editor.loadmap = Завантажити мапу
 editor.savemap = Зберегти мапу
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Збережено!
 editor.save.noname = Ваша мапа не має назви! Установіть його в «Інформація про мапу».
 editor.save.overwrite = Ваша мапа перезаписує вбудовану мапу! Виберіть іншу назву в «Інформація про мапу».
@@ -605,6 +608,23 @@ filter.option.floor2 = Друга поверхня
 filter.option.threshold2 = Вторинний граничний поріг
 filter.option.radius = Радіус
 filter.option.percentile = Спад
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Ширина:
 height = Висота:
@@ -2263,6 +2283,7 @@ unit.emanate.description = Англійська назва: Emanate\nБудує
 lst.read = Зчитує число із з’єднаної комірки пам’яті.
 lst.write = Записує числу у з’єднану комірку пам’яті.
 lst.print = Додайте текст до буфера друку.\nНічого не відображає, поки [accent]Print Flush[] використовується.
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Додає операцію до буфера рисунка.\nНічого не відображає, поки [accent]Draw Flush[] використовується.
 lst.drawflush = Скидає буфер операцій [accent]Draw[] на дисплей.
 lst.printflush = Скидає буфер операцій [accent]Print[] у блок «Повідомлення».
@@ -2300,6 +2321,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Будування за допомогою процесорів заборено.
 
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index acc823c0d8..53cadbfa1c 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -439,6 +439,7 @@ editor.waves = Lượt:
 editor.rules = Luật:
 editor.generation = Cấu trúc:
 editor.objectives = Mục tiêu
+editor.locales = Locale Bundles
 editor.ingame = Chỉnh sửa trong trò chơi
 editor.playtest = Chơi thử
 editor.publish.workshop = Xuất bản lên Workshop
@@ -506,6 +507,7 @@ editor.errorlegacy = Bản đồ này quá cũ, và sử dụng định dạng b
 editor.errornot = Đây không phải là tệp bản đồ.
 editor.errorheader = Tệp bản đồ này không hợp lệ hoặc bị hỏng.
 editor.errorname = Bản đồ không có tên được xác định. Bạn đang cố gắng tải một bản lưu?
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = Cập nhật
 editor.randomize = Ngẫu nhiên
 editor.moveup = Di chuyển lên
@@ -517,6 +519,7 @@ editor.sectorgenerate = Tạo ra khu vực
 editor.resize = Thay đổi kích thước
 editor.loadmap = Mở bản đồ
 editor.savemap = Lưu bản đồ
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = Đã lưu!
 editor.save.noname = Bản đồ của bạn không có tên! Hãy đặt một cái tên trong 'Thông tin bản đồ'.
 editor.save.overwrite = Bản đồ của bạn ghi đè lên một bản đồ đã có sẵn! Hãy chọn một cái tên khác trong 'Thông tin bản đồ'.
@@ -603,6 +606,23 @@ filter.option.floor2 = Nền phụ
 filter.option.threshold2 = Ngưỡng phụ
 filter.option.radius = Bán kính
 filter.option.percentile = Phần trăm
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = Chiều rộng:
 height = Chiều cao:
@@ -2237,6 +2257,7 @@ unit.emanate.description = Xây công trình để phòng thủ lõi Acropolis.
 lst.read = Đọc một số từ bộ nhớ được liên kết.
 lst.write = Ghi một số vào bộ nhớ được liên kết.
 lst.print = Thêm văn bản vào bộ nhớ in.\nKhông hiển thị gì cho đến khi sử dụng [accent]Print Flush[].
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Thêm một thao tác vào bộ nhớ vẽ.\nKhông hiển thị gì cho đến khi sử dụng [accent]Draw Flush[].
 lst.drawflush = Chuyển các thao tác [accent]Draw[] đến màn hình.
 lst.printflush = Chuyển các thao tác [accent]Print[] đến khối tin nhắn.
@@ -2274,6 +2295,7 @@ lst.effect = Tạo một phần hiệu ứng nhỏ.
 lst.sync = Đồng bộ giá trị biến qua mạng.\nChỉ gọi tối đa 10 lần mỗi giây.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Lô-gíc xây dựng đơn vị không được phép ở đây.
 
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 260ada9c3d..8ed46e5e41 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -441,6 +441,7 @@ editor.waves = 波次
 editor.rules = 规则
 editor.generation = 生成
 editor.objectives = 目标
+editor.locales = Locale Bundles
 editor.ingame = 游戏内编辑
 editor.playtest = 游戏内测试
 editor.publish.workshop = 上传到创意工坊
@@ -508,6 +509,7 @@ editor.errorlegacy = 此地图太旧了，旧的地图格式已不再支持。
 editor.errornot = 这不是地图文件。
 editor.errorheader = 此地图文件无效或已损坏。
 editor.errorname = 地图没有定义名称。 加载的可能是存档文件？
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = 更新
 editor.randomize = 重新生成
 editor.moveup = 上移
@@ -519,6 +521,7 @@ editor.sectorgenerate = 生成区块
 editor.resize = 改变尺寸
 editor.loadmap = 载入地图
 editor.savemap = 保存地图
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = 已保存！
 editor.save.noname = 您还没有指定地图的名称！在“地图信息”菜单里设置一个名称。
 editor.save.overwrite = 您正试图覆盖一张内置地图！在“地图信息”菜单里重新设置一个其他的名称。
@@ -606,6 +609,23 @@ filter.option.floor2 = 内层地形
 filter.option.threshold2 = 内层比例
 filter.option.radius = 半径
 filter.option.percentile = 百分比
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = 宽度：
 height = 高度：
@@ -2262,6 +2282,7 @@ unit.emanate.description = 保护卫城核心，可建造建筑。 使用一对
 lst.read = 从连接的内存读取数字
 lst.write = 向连接的内存写入数字
 lst.print = 添加文字到打印缓存\n使用[accent]Print Flush[]后才会真正显示
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = 添加绘图操作到绘图缓存\n使用[accent]Draw Flush[]后才会真正显示
 lst.drawflush = 将绘图缓存中的[accent]Draw[]队列刷新到显示屏
 lst.printflush = 将打印缓存中的[accent]Print[]队列刷新到信息板
@@ -2299,6 +2320,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]此处不允许处理器操控单位去建设
 
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index bedb9b9313..aa8aa82eb9 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -438,6 +438,7 @@ editor.waves = 波次：
 editor.rules = 規則：
 editor.generation = 自動生成：
 editor.objectives = Objectives
+editor.locales = Locale Bundles
 editor.ingame = 在遊戲中編輯
 editor.playtest = 測試
 editor.publish.workshop = 在工作坊上發佈
@@ -505,6 +506,7 @@ editor.errorlegacy = 此地圖太舊，並使用不支援的舊地圖格式。
 editor.errornot = 這不是地圖檔。
 editor.errorheader = 此地圖檔無效或已損毀。
 editor.errorname = 地圖沒有定義名稱。
+editor.errorlocales = Error reading invalid locale bundles.
 editor.update = 更新
 editor.randomize = 隨機化
 editor.moveup = Move Up
@@ -516,6 +518,7 @@ editor.sectorgenerate = 產生地區
 editor.resize = 調整大小
 editor.loadmap = 載入地圖
 editor.savemap = 儲存地圖
+editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
 editor.saved = 已儲存！
 editor.save.noname = 您的地圖沒有名稱！在「地圖資訊」畫面設定一個名稱。
 editor.save.overwrite = 您的地圖覆寫了內建的地圖！在「地圖資訊」畫面設定其他名稱。
@@ -603,6 +606,23 @@ filter.option.floor2 = 次要地板
 filter.option.threshold2 = 次要閾值
 filter.option.radius = 半徑
 filter.option.percentile = 百分比
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.deletelocale = Are you sure you want to delete this locale bundle?
+locales.applytoall = Apply Changes To All Locales
+locales.addtoother = Add To Other Locales
+locales.rollback = Rollback to last applied
+locales.filter = Property filter
+locales.searchname = Search name...
+locales.searchvalue = Search value...
+locales.searchlocale = Search locale...
+locales.byname = By name
+locales.byvalue = By value
+locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
+locales.showmissing = Show properties that are missing in some locales
+locales.showsame = Show properties that have same values in different locales
+locales.viewproperty = View in all locales
+locales.viewing = Viewing property "{0}"
+locales.addicon = Add Icon
 
 width = 寬度：
 height = 長度：
@@ -2248,6 +2268,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = [accent]讀取[]記憶體中的一項數值
 lst.write = [accent]寫入[]一項數值到記憶體中
 lst.print = 將文字加入輸出的暫存中，搭配[accent]Print Flush[], [accent]Flush message[]使用
+lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = 將圖形加入顯示的暫存中，搭配[accent]Draw Flush[]使用
 lst.drawflush = 將所有暫存的[accent]Draw[]指令推到顯示器上
 lst.printflush = 將所有暫存的[accent]Print[]指令推到訊息板上
@@ -2285,6 +2306,7 @@ lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]單位建造邏輯已被禁止。
 

From de50b207e5c3f75b6c95decdba87f4e5a083a4eb Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 1 Dec 2023 21:16:37 -0500
Subject: [PATCH 045/369] Revert back to {0}-style format

---
 core/assets/bundles/bundle.properties   |  2 +-
 core/src/mindustry/logic/LExecutor.java | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 708d3bd0e1..9efc9b9a4b 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2288,7 +2288,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 253d452b0c..01e5266fea 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1113,7 +1113,21 @@ public class LExecutor{
 
             if(exec.textBuffer.length() >= maxTextBuffer) return;
 
-            int placeholderIndex = exec.textBuffer.indexOf("@");
+            int placeholderIndex = -1;
+            int placeholderNumber = 10;
+
+            for(int i = 0; i < exec.textBuffer.length(); i++){
+                if(exec.textBuffer.charAt(i) == '{' && exec.textBuffer.length() - i > 2){
+                    char numChar = exec.textBuffer.charAt(i + 1);
+
+                    if(numChar >= '0' && numChar <= '9' && exec.textBuffer.charAt(i + 2) == '}'){
+                        if(numChar - '0' < placeholderNumber){
+                            placeholderNumber = numChar - '0';
+                            placeholderIndex = i;
+                        }
+                    }
+                }
+            }
 
             if(placeholderIndex == -1) return;
 
@@ -1122,13 +1136,13 @@ public class LExecutor{
             if(v.isobj && value != 0){
                 String strValue = PrintI.toString(v.objval);
 
-                exec.textBuffer.replace(placeholderIndex, placeholderIndex + 1, strValue);
+                exec.textBuffer.replace(placeholderIndex, placeholderIndex + 3, strValue);
             }else{
                 //display integer version when possible
                 if(Math.abs(v.numval - (long)v.numval) < 0.00001){
-                    exec.textBuffer.replace(placeholderIndex, placeholderIndex + 1, (long)v.numval + "");
+                    exec.textBuffer.replace(placeholderIndex, placeholderIndex + 3, (long)v.numval + "");
                 }else{
-                    exec.textBuffer.replace(placeholderIndex, placeholderIndex + 1, v.numval + "");
+                    exec.textBuffer.replace(placeholderIndex, placeholderIndex + 3, v.numval + "");
                 }
             }
         }

From c63e853f8b3a633ba041bd4205b58ac6ea3fbd8b Mon Sep 17 00:00:00 2001
From: 112Hack <144626073+112Hack@users.noreply.github.com>
Date: Sat, 2 Dec 2023 18:48:07 +0300
Subject: [PATCH 046/369] Update servers_v7.json (#9338)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index dccae5b7e7..c8e026b26a 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -13,7 +13,7 @@
   },
   {
     "name": "CMS",
-    "address": ["195.2.84.144","23.88.73.88:25617"]
+    "address": ["195.2.84.144","65.108.101.89:32577"]
   },
   {
     "name": "ShardDustry Eventos",

From c353163c34706ce154d9254a756de91dd7ee30f0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 2 Dec 2023 20:04:34 -0500
Subject: [PATCH 047/369] Fixed #9342

---
 core/src/mindustry/entities/comp/BuilderComp.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java
index 64e9e155fa..64a575bb16 100644
--- a/core/src/mindustry/entities/comp/BuilderComp.java
+++ b/core/src/mindustry/entities/comp/BuilderComp.java
@@ -109,8 +109,8 @@ abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{
 
             var core = core();
 
-            //nothing to build.
-            if(buildPlan() == null) return;
+            //nothing to build, or core doesn't exist
+            if(buildPlan() == null || (core == null && !infinite)) return;
 
             //find the next build plan
             if(plans.size > 1){
@@ -163,7 +163,7 @@ abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{
             }
 
             //if there is no core to build with or no build entity, stop building!
-            if((core == null && !infinite) || !(tile.build instanceof ConstructBuild entity)){
+            if(!(tile.build instanceof ConstructBuild entity)){
                 continue;
             }
 

From a0dc08aaca7893c938e5b3da5a341e2352c0b872 Mon Sep 17 00:00:00 2001
From: The1Crux <134880334+The1Crux@users.noreply.github.com>
Date: Mon, 4 Dec 2023 07:44:17 -0400
Subject: [PATCH 048/369] Update servers_v7.json (#9345)

new slots
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index c8e026b26a..f14b001d17 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -9,7 +9,7 @@
   },
   {
     "name": "Crux's Revelations",
-    "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35160"]
+    "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35160", "de-prem-01.hosts.optikservers.com:35116", "de-prem-01.hosts.optikservers.com:35922"]
   },
   {
     "name": "CMS",

From 5d4d904ef93a13fac56125ad2b647ac9267592d6 Mon Sep 17 00:00:00 2001
From: OSP <76648940+osp54@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:35:37 +0300
Subject: [PATCH 049/369] Darkdustry reborn. Again. (#9346)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index f14b001d17..df78ef83f7 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -81,7 +81,7 @@
   },
   {
     "name": "MinDurka",
-    "address": ["143.47.246.70", "143.47.246.70:3001", "143.47.246.70:3002", "143.47.246.70:3003", "143.47.246.70:3004", "143.47.246.70:3005", "143.47.246.70:3006", "143.47.246.70:3007", "143.47.246.70:3008", "143.47.246.70:3009", "143.47.246.70:3010"]
+    "address": ["81.30.157.68", "81.30.157.68:3001", "81.30.157.68:3002", "81.30.157.68:3003", "81.30.157.68:3004", "81.30.157.68:3005", "81.30.157.68:3006", "81.30.157.68:3007", "81.30.157.68:3008", "81.30.157.68:3009", "81.30.157.68:3010"]
   },
   {
     "name": "Chaotic Neutral",

From cf02b0f36d2adc93259b73d6fbef940aa4d1c234 Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Mon, 4 Dec 2023 22:39:27 +0300
Subject: [PATCH 050/369] Make setmarker ignor null values, remove redundant
 marker control operations

---
 core/assets/bundles/bundle.properties        |   5 +-
 core/src/mindustry/game/MapObjectives.java   | 200 ++++++++++++-------
 core/src/mindustry/logic/LExecutor.java      | 113 ++++++-----
 core/src/mindustry/logic/LMarkerControl.java |   9 -
 core/src/mindustry/logic/LStatements.java    |   2 +-
 5 files changed, 198 insertions(+), 131 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 439f15ddd2..c1d591f83f 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2303,7 +2303,7 @@ lst.setprop = Sets a property of a unit or building.
 lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nLimited to 20 times a second per variable.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
-lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.\n[accent]null []values are being ignored instead of converting to 0.
 
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 
@@ -2458,6 +2458,5 @@ lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
 
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nSecond and third arguments are additional suffixes added using "-" separator.\nIf additional arguments are not strings, nothing is added to first string.
-lenum.texturewidth = Width of texture in tiles. Zero value scales marker width to original texture's size.
-lenum.textureheight = Height of texture in tiles. Zero value scales marker height to original texture's size.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index 9e074f2ff4..98ddd24bc2 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -630,8 +630,9 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public void added(){}
         /** Remove any UI elements, if necessary. */
         public void removed(){}
-        /** Control marker with world processor code*/
+        /** Control marker with world processor code. Ignores NaN (null) values. */
         public void control(LMarkerControl type, double p1, double p2, double p3){
+            if(Double.isNaN(p1)) return;
             switch(type){
                 case visibility -> hidden = Mathf.equal((float)p1, 0f);
                 case drawLayer -> drawLayer = (float)p1;
@@ -757,21 +758,38 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
-            switch(type){
-                case x -> pos.x = (float)p1 * tilesize;
-                case y -> pos.y = (float)p1 * tilesize;
-                case pos -> pos.set((float)p1 * tilesize, (float)p2  * tilesize);
-                case fontSize -> fontSize = (float)p1;
-                case textHeight -> textHeight = (float)p1;
-                case labelFlags -> {
-                    flags = (!Mathf.equal((float)p1, 0f) ? WorldLabel.flagBackground : 0);
-                    if(!Mathf.equal((float)p2, 0f)) flags |= WorldLabel.flagOutline;
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case pos -> pos.x = (float)p1 * tilesize;
+                    case fontSize -> fontSize = (float)p1;
+                    case textHeight -> textHeight = (float)p1;
+                    case labelFlags -> {
+                        if(!Mathf.equal((float)p1, 0f)){
+                            flags |= WorldLabel.flagBackground;
+                        }else{
+                            flags &= ~WorldLabel.flagBackground;
+                        }
+                    }
+                    case radius -> radius = (float)p1;
+                    case rotation -> rotation = (float)p1;
+                    case color -> color.set(Tmp.c1.fromDouble(p1));
+                    case shape -> sides = (int)p1;
+                    default -> super.control(type, p1, p2, p3);
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case pos -> pos.y = (float)p2 * tilesize;
+                    case labelFlags -> {
+                        if(!Mathf.equal((float)p2, 0f)){
+                            flags |= WorldLabel.flagOutline;
+                        }else{
+                            flags &= ~WorldLabel.flagOutline;
+                        }
+                    }
+                    default -> super.control(type, p1, p2, p3);
                 }
-                case radius -> radius = (float)p1;
-                case rotation -> rotation = (float)p1;
-                case shapeSides -> sides = (int)p1;
-                case color -> color.set(Tmp.c1.fromDouble(p1));
-                default -> super.control(type, p1, p2, p3);
             }
         }
 
@@ -828,14 +846,22 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
-            switch(type){
-                case x -> pos.x = (int)p1;
-                case y -> pos.y = (int)p1;
-                case pos -> pos.set((int)p1, (int)p2);
-                case radius -> radius = (float)p1;
-                case stroke -> stroke = (float)p1;
-                case color -> color.set(Tmp.c1.fromDouble(p1));
-                default -> super.control(type, p1, p2, p3);
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case pos -> pos.x = (int)p1;
+                    case radius -> radius = (float)p1;
+                    case stroke -> stroke = (float)p1;
+                    case color -> color.set(Tmp.c1.fromDouble(p1));
+                    default -> super.control(type, p1, p2, p3);
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                if(type == LMarkerControl.pos){
+                    pos.y = (int)p2;
+                }else{
+                    super.control(type, p1, p2, p3);
+                }
             }
         }
     }
@@ -916,23 +942,32 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
-            switch(type){
-                case x -> pos.x = (float)p1 * tilesize;
-                case y -> pos.y = (float)p1 * tilesize;
-                case pos -> pos.set((float)p1 * tilesize, (float)p2 * tilesize);
-                case radius -> radius = (float)p1;
-                case rotation -> rotation = (float)p1;
-                case stroke -> stroke = (float)p1;
-                case shapeSides -> sides = (int)p1;
-                case shapeFill -> fill = !Mathf.equal((float)p1, 0f);
-                case shapeOutline -> outline = !Mathf.equal((float)p1, 0f);
-                case shape -> {
-                    sides = (int)p1;
-                    fill = !Mathf.equal((float)p2, 0f);
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case pos -> pos.x = (float)p1 * tilesize;
+                    case radius -> radius = (float)p1;
+                    case stroke -> stroke = (float)p1;
+                    case rotation -> rotation = (float)p1;
+                    case color -> color.set(Tmp.c1.fromDouble(p1));
+                    case shape -> sides = (int)p1;
+                    default -> super.control(type, p1, p2, p3);
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case pos -> pos.y = (float)p2 * tilesize;
+                    case shape -> fill = !Mathf.equal((float)p2, 0f);
+                    default -> super.control(type, p1, p2, p3);
+                }
+            }
+
+            if(!Double.isNaN(p3)){
+                if(type == LMarkerControl.shape){
                     outline = !Mathf.equal((float)p3, 0f);
+                }else{
+                    super.control(type, p1, p2, p3);
                 }
-                case color -> color.set(Tmp.c1.fromDouble(p1));
-                default -> super.control(type, p1, p2, p3);
             }
         }
     }
@@ -994,16 +1029,33 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
-            switch(type){
-                case x -> pos.x = (float)p1 * tilesize;
-                case y -> pos.y = (float)p1 * tilesize;
-                case pos -> pos.set((float)p1 * tilesize, (float)p2 * tilesize);
-                case fontSize -> fontSize = (float)p1;
-                case labelFlags -> {
-                    flags = (!Mathf.equal((float)p1, 0f) ? WorldLabel.flagBackground : 0);
-                    if(!Mathf.equal((float)p2, 0f)) flags |= WorldLabel.flagOutline;
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case pos -> pos.x = (float)p1 * tilesize;
+                    case fontSize -> fontSize = (float)p1;
+                    case labelFlags -> {
+                        if(!Mathf.equal((float)p1, 0f)){
+                            flags |= WorldLabel.flagBackground;
+                        }else{
+                            flags &= ~WorldLabel.flagBackground;
+                        }
+                    }
+                    default -> super.control(type, p1, p2, p3);
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case pos -> pos.y = (float)p2 * tilesize;
+                    case labelFlags -> {
+                        if(!Mathf.equal((float)p2, 0f)){
+                            flags |= WorldLabel.flagOutline;
+                        }else{
+                            flags &= ~WorldLabel.flagOutline;
+                        }
+                    }
+                    default -> super.control(type, p1, p2, p3);
                 }
-                default -> super.control(type, p1, p2, p3);
             }
         }
 
@@ -1073,17 +1125,22 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
-            switch(type){
-                case x -> pos1.x = (float)p1 * tilesize;
-                case y -> pos1.y = (float)p1 * tilesize;
-                case pos -> pos1.set((float)p1 * tilesize, (float)p2 * tilesize);
-                case endX -> pos2.x = (float)p1 * tilesize;
-                case endY -> pos2.y = (float)p1 * tilesize;
-                case endPos -> pos2.set((float)p1 * tilesize, (float)p2 * tilesize);
-                case stroke -> stroke = (float)p1;
-                case shapeOutline -> outline = !Mathf.equal((float)p1, 0f);
-                case color -> color.set(Tmp.c1.fromDouble(p1));
-                default -> super.control(type, p1, p2, p3);
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case pos -> pos1.x = (float)p1 * tilesize;
+                    case endPos -> pos2.x = (float)p1 * tilesize;
+                    case stroke -> stroke = (float)p1;
+                    case color -> color.set(Tmp.c1.fromDouble(p1));
+                    default -> super.control(type, p1, p2, p3);
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case pos -> pos1.y = (float)p2 * tilesize;
+                    case endPos -> pos2.y = (float)p2 * tilesize;
+                    default -> super.control(type, p1, p2, p3);
+                }
             }
         }
     }
@@ -1106,19 +1163,22 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
-            switch(type){
-                case x -> pos.x = (float)p1 * tilesize;
-                case y -> pos.y = (float)p1 * tilesize;
-                case pos -> pos.set((float)p1 * tilesize, (float)p2 * tilesize);
-                case rotation -> rotation = (float)p1;
-                case textureWidth -> width = (float)p1 * tilesize;
-                case textureHeight -> height = (float)p1 * tilesize;
-                case textureSize -> {
-                    width = (float)p1 * tilesize;
-                    height = (float)p2 * tilesize;
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case pos -> pos.x = (float)p1 * tilesize;
+                    case rotation -> rotation = (float)p1;
+                    case textureSize -> width = (float)p1 * tilesize;
+                    case color -> color.set(Tmp.c1.fromDouble(p1));
+                    default -> super.control(type, p1, p2, p3);
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case pos -> pos.y = (float)p2 * tilesize;
+                    case textureSize -> height = (float)p2 * tilesize;
+                    default -> super.control(type, p1, p2, p3);
                 }
-                case color -> color.set(Tmp.c1.fromDouble(p1));
-                default -> super.control(type, p1, p2, p3);
             }
         }
 
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index e59156502f..7318e0837d 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -157,18 +157,29 @@ public class LExecutor{
         return v.isobj ? v.objval != null : Math.abs(v.numval) >= 0.00001;
     }
 
-    public double num(int index){
+    @Nullable
+    public double num(int index, boolean nullToNan){
         Var v = var(index);
-        return v.isobj ? v.objval != null ? 1 : 0 : invalid(v.numval) ? 0 : v.numval;
+        return v.isobj ? v.objval != null ? 1 : nullToNan ? Double.NaN : 0: invalid(v.numval) ? 0 : v.numval;
+    }
+
+    public double num(int index){
+        return num(index, false);
+    }
+
+    @Nullable
+    public float numf(int index, boolean nullToNan){
+        Var v = var(index);
+        return v.isobj ? v.objval != null ? 1 : nullToNan ? Float.NaN : 0: invalid(v.numval) ? 0 : (float)v.numval;
     }
 
     public float numf(int index){
-        Var v = var(index);
-        return v.isobj ? v.objval != null ? 1 : 0 : invalid(v.numval) ? 0 : (float)v.numval;
+        return numf(index, false);
     }
 
+    @Nullable
     public int numi(int index){
-        return (int)num(index);
+        return (int)num(index, true);
     }
 
     public void setbool(int index, boolean value){
@@ -254,7 +265,7 @@ public class LExecutor{
                         //bind to the next unit
                         exec.setconst(varUnit, seq.get(exec.binds[type.id]));
                     }
-                    exec.binds[type.id] ++;
+                    exec.binds[type.id]++;
                 }else{
                     //no units of this type found
                     exec.setconst(varUnit, null);
@@ -334,9 +345,9 @@ public class LExecutor{
                         cache.found = false;
                         exec.setnum(outFound, 0);
                     }
-                    
-                    if(res != null && res.build != null && 
-                        (unit.within(res.build.x, res.build.y, Math.max(unit.range(), buildingRange)) || res.build.team == exec.team)){
+
+                    if(res != null && res.build != null &&
+                    (unit.within(res.build.x, res.build.y, Math.max(unit.range(), buildingRange)) || res.build.team == exec.team)){
                         cache.build = res.build;
                         exec.setobj(outBuild, res.build);
                     }else{
@@ -501,7 +512,7 @@ public class LExecutor{
                     }
                     case build -> {
                         if((state.rules.logicUnitBuild || exec.privileged) && unit.canBuild() && exec.obj(p3) instanceof Block block && block.canBeBuilt() && (block.unlockedNow() || unit.team.isAI())){
-                            int x = World.toTile(x1 - block.offset/tilesize), y = World.toTile(y1 - block.offset/tilesize);
+                            int x = World.toTile(x1 - block.offset / tilesize), y = World.toTile(y1 - block.offset / tilesize);
                             int rot = Mathf.mod(exec.numi(p4), 4);
 
                             //reset state of last request when necessary
@@ -559,7 +570,7 @@ public class LExecutor{
                         }else{
                             Building build = exec.building(p1);
                             int dropped = Math.min(unit.stack.amount, exec.numi(p2));
-                            if(build != null && build.team == unit.team && build.isValid() && dropped > 0 && unit.within(build, logicItemTransferRange + build.block.size * tilesize/2f)){
+                            if(build != null && build.team == unit.team && build.isValid() && dropped > 0 && unit.within(build, logicItemTransferRange + build.block.size * tilesize / 2f)){
                                 int accepted = build.acceptStack(unit.item(), dropped, unit);
                                 if(accepted > 0){
                                     Call.transferItemTo(unit, unit.item(), accepted, unit.x, unit.y, build);
@@ -575,7 +586,7 @@ public class LExecutor{
                         int amount = exec.numi(p3);
 
                         if(build != null && build.team == unit.team && build.isValid() && build.items != null &&
-                            exec.obj(p2) instanceof Item item && unit.within(build, logicItemTransferRange + build.block.size * tilesize/2f)){
+                        exec.obj(p2) instanceof Item item && unit.within(build, logicItemTransferRange + build.block.size * tilesize / 2f)){
                             int taken = Math.min(build.items.get(item), Math.min(amount, unit.maxAccepted(item)));
 
                             if(taken > 0){
@@ -584,7 +595,8 @@ public class LExecutor{
                             }
                         }
                     }
-                    default -> {}
+                    default -> {
+                    }
                 }
             }
         }
@@ -605,7 +617,8 @@ public class LExecutor{
             this.p4 = p4;
         }
 
-        ControlI(){}
+        ControlI(){
+        }
 
         @Override
         public void run(LExecutor exec){
@@ -773,7 +786,7 @@ public class LExecutor{
             LogicAI ai = null;
 
             if(base instanceof Ranged r && (exec.privileged || r.team() == exec.team) &&
-                (base instanceof Building || (ai = UnitControlI.checkLogicAI(exec, base)) != null)){ //must be a building or a controllable unit
+            (base instanceof Building || (ai = UnitControlI.checkLogicAI(exec, base)) != null)){ //must be a building or a controllable unit
                 float range = r.range();
 
                 Healthc targeted;
@@ -829,9 +842,9 @@ public class LExecutor{
                 if(!u.within(b, range) || !u.targetable(team) || b == u) return;
 
                 boolean valid =
-                    target1.func.get(b.team(), u) &&
-                    target2.func.get(b.team(), u) &&
-                    target3.func.get(b.team(), u);
+                target1.func.get(b.team(), u) &&
+                target2.func.get(b.team(), u) &&
+                target3.func.get(b.team(), u);
 
                 if(!valid) return;
 
@@ -852,7 +865,8 @@ public class LExecutor{
             this.to = to;
         }
 
-        SetI(){}
+        SetI(){
+        }
 
         @Override
         public void run(LExecutor exec){
@@ -884,7 +898,8 @@ public class LExecutor{
             this.dest = dest;
         }
 
-        OpI(){}
+        OpI(){
+        }
 
         @Override
         public void run(LExecutor exec){
@@ -919,7 +934,8 @@ public class LExecutor{
 
     public static class NoopI implements LInstruction{
         @Override
-        public void run(LExecutor exec){}
+        public void run(LExecutor exec){
+        }
     }
 
     public static class DrawI implements LInstruction{
@@ -973,9 +989,9 @@ public class LExecutor{
                         if(next == '\n'){
                             maxWidth = Math.max(maxWidth, lineWidth);
                             lineWidth = 0;
-                            lines ++;
+                            lines++;
                         }else{
-                            lineWidth ++;
+                            lineWidth++;
                         }
                     }
                     maxWidth = Math.max(maxWidth, lineWidth);
@@ -983,8 +999,8 @@ public class LExecutor{
                     float
                     width = maxWidth * advance,
                     height = lines * lineHeight,
-                    ha = ((Align.isLeft(align) ? -1f : 0f) + 1f + (Align.isRight(align) ? 1f : 0f))/2f,
-                    va = ((Align.isBottom(align) ? -1f : 0f) + 1f + (Align.isTop(align) ? 1f : 0f))/2f;
+                    ha = ((Align.isLeft(align) ? -1f : 0f) + 1f + (Align.isRight(align) ? 1f : 0f)) / 2f,
+                    va = ((Align.isBottom(align) ? -1f : 0f) + 1f + (Align.isTop(align) ? 1f : 0f)) / 2f;
 
                     xOffset = -(int)(width * ha);
                     yOffset = -(int)(height * va) + (lines - 1) * lineHeight;
@@ -1061,7 +1077,8 @@ public class LExecutor{
             this.value = value;
         }
 
-        PrintI(){}
+        PrintI(){
+        }
 
         @Override
         public void run(LExecutor exec){
@@ -1086,16 +1103,16 @@ public class LExecutor{
 
         public static String toString(Object obj){
             return
-                obj == null ? "null" :
-                obj instanceof String s ? s :
-                obj == Blocks.stoneWall ? "solid" : //special alias
-                obj instanceof MappableContent content ? content.name :
-                obj instanceof Content ? "[content]" :
-                obj instanceof Building build ? build.block.name :
-                obj instanceof Unit unit ? unit.type.name :
-                obj instanceof Enum<?> e ? e.name() :
-                obj instanceof Team team ? team.name :
-                "[object]";
+            obj == null ? "null" :
+            obj instanceof String s ? s :
+            obj == Blocks.stoneWall ? "solid" : //special alias
+            obj instanceof MappableContent content ? content.name :
+            obj instanceof Content ? "[content]" :
+            obj instanceof Building build ? build.block.name :
+            obj instanceof Unit unit ? unit.type.name :
+            obj instanceof Enum<?> e ? e.name() :
+            obj instanceof Team team ? team.name :
+            "[object]";
         }
     }
 
@@ -1179,7 +1196,7 @@ public class LExecutor{
                 curTime = 0f;
             }else{
                 //skip back to self.
-                exec.var(varCounter).numval --;
+                exec.var(varCounter).numval--;
                 exec.yield = true;
             }
 
@@ -1195,7 +1212,7 @@ public class LExecutor{
         @Override
         public void run(LExecutor exec){
             //skip back to self.
-            exec.var(varCounter).numval --;
+            exec.var(varCounter).numval--;
             exec.yield = true;
         }
     }
@@ -1609,15 +1626,15 @@ public class LExecutor{
         public void run(LExecutor exec){
             //set default to success
             exec.setnum(outSuccess, 1);
-            if(headless && type != MessageType.mission) {
+            if(headless && type != MessageType.mission){
                 exec.textBuffer.setLength(0);
                 return;
             }
 
             if(
-                type == MessageType.announce && ui.hasAnnouncement() ||
-                type == MessageType.notify && ui.hudfrag.hasToast() ||
-                type == MessageType.toast && ui.hasAnnouncement()
+            type == MessageType.announce && ui.hasAnnouncement() ||
+            type == MessageType.notify && ui.hudfrag.hasToast() ||
+            type == MessageType.toast && ui.hasAnnouncement()
             ){
                 //set outSuccess=false to let user retry.
                 exec.setnum(outSuccess, 0);
@@ -1666,7 +1683,7 @@ public class LExecutor{
                 double col = exec.num(color);
                 //limit size so people don't create lag with ridiculous numbers (some explosions scale with size)
                 float rot = type.rotate ? exec.numf(rotation) :
-                    Math.min(exec.numf(rotation), 1000f);
+                Math.min(exec.numf(rotation), 1000f);
 
                 type.effect.at(World.unconv(exec.numf(x)), World.unconv(exec.numf(y)), rot, Tmp.c1.fromDouble(col), exec.obj(data));
             }
@@ -1850,8 +1867,8 @@ public class LExecutor{
             }
 
             float
-                spawnX = World.unconv(exec.numf(x)),
-                spawnY = World.unconv(exec.numf(y));
+            spawnX = World.unconv(exec.numf(x)),
+            spawnY = World.unconv(exec.numf(y));
             int packed = Point2.pack(exec.numi(x), exec.numi(y));
 
             for(SpawnGroup group : state.rules.spawns){
@@ -1904,7 +1921,7 @@ public class LExecutor{
     }
 
     public static class SetMarkerI implements LInstruction{
-        public LMarkerControl type = LMarkerControl.x;
+        public LMarkerControl type = LMarkerControl.pos;
         public int id, p1, p2, p3;
 
         public SetMarkerI(LMarkerControl type, int id, int p1, int p2, int p3){
@@ -1939,7 +1956,7 @@ public class LExecutor{
                         marker.setTexture(res.toString());
                     }
                 }else{
-                    marker.control(type, exec.num(p1), exec.num(p2), exec.num(p3));
+                    marker.control(type, exec.num(p1, true), exec.num(p2, true), exec.num(p3, true));
                 }
             }
         }
@@ -1971,7 +1988,7 @@ public class LExecutor{
                 int mid = exec.numi(id);
                 if(exec.bool(replace) || !state.markers.containsKey(mid)){
                     var marker = cons.get();
-                    marker.control(LMarkerControl.pos, exec.num(x), exec.num(y), 0);
+                    marker.control(LMarkerControl.pos, exec.num(x, true), exec.num(y, true), 0);
                     state.markers.put(mid, marker);
                 }
             }
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
index b98d3fd8f6..8d96dd00cd 100644
--- a/core/src/mindustry/logic/LMarkerControl.java
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -5,20 +5,13 @@ public enum LMarkerControl{
     visibility("true/false"),
     minimap("true/false"),
     autoscale("true/false"),
-    x("x"),
-    y("y"),
     pos("x", "y"),
-    endX("x"),
-    endY("y"),
     endPos("x", "y"),
     drawLayer("layer"),
     color("color"),
     radius("radius"),
     stroke("stroke"),
     rotation("rotation"),
-    shapeSides("sides"),
-    shapeFill("true/false"),
-    shapeOutline("true/false"),
     shape("sides", "fill", "outline"),
     text("text"),
     flushText,
@@ -26,8 +19,6 @@ public enum LMarkerControl{
     textHeight("height"),
     labelFlags("background", "outline"),
     texture("name", "-", "-"),
-    textureWidth("width"),
-    textureHeight("height"),
     textureSize("width", "height");
 
     public final String[] params;
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 92b09605b7..ade3579391 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -1945,7 +1945,7 @@ public class LStatements{
 
     @RegisterStatement("setmarker")
     public static class SetMarkerStatement extends LStatement{
-        public LMarkerControl type = LMarkerControl.x;
+        public LMarkerControl type = LMarkerControl.pos;
         public String id = "0", p1 = "0", p2 = "0", p3 = "0";
 
         @Override

From adada50f1c83c3b2252fb8a5cab347acea7d760f Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Mon, 4 Dec 2023 23:33:23 +0300
Subject: [PATCH 051/369] Minor map locales dialog fixes

---
 .../mindustry/editor/MapLocalesDialog.java    | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/core/src/mindustry/editor/MapLocalesDialog.java b/core/src/mindustry/editor/MapLocalesDialog.java
index 0a8098fb29..0ac5a53d6d 100644
--- a/core/src/mindustry/editor/MapLocalesDialog.java
+++ b/core/src/mindustry/editor/MapLocalesDialog.java
@@ -5,6 +5,8 @@ import arc.func.*;
 import arc.graphics.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
+import arc.scene.ui.Button.*;
+import arc.scene.ui.TextButton.*;
 import arc.scene.ui.layout.*;
 import arc.scene.utils.*;
 import arc.struct.*;
@@ -23,6 +25,15 @@ import static mindustry.Vars.*;
 public class MapLocalesDialog extends BaseDialog{
     /** Width of UI property card. */
     private static final float cardWidth = 400f;
+    /** Style for filter options buttons */
+    private static final TextButtonStyle filterStyle = new TextButtonStyle(){{
+        up = down = checked = over = Tex.whitePane;
+        font = Fonts.outline;
+        fontColor = Color.lightGray;
+        overFontColor = Pal.accent;
+        disabledFontColor = Color.gray;
+        disabled = Styles.black;
+    }};
     /** Icons for use in map locales dialog. */
     private static final ContentType[] contentIcons = {ContentType.item, ContentType.block, ContentType.liquid, ContentType.status, ContentType.unit};
 
@@ -168,7 +179,7 @@ public class MapLocalesDialog extends BaseDialog{
                 String name = loc.toString();
 
                 if(locales.containsKey(name)){
-                    p.button(loc.getDisplayName(), Styles.flatTogglet, () -> {
+                    p.button(loc.getDisplayName(Core.bundle.getLocale()), Styles.flatTogglet, () -> {
                         if(name.equals(selectedLocale)) return;
 
                         selectedLocale = name;
@@ -195,8 +206,8 @@ public class MapLocalesDialog extends BaseDialog{
 
         main.image().color(Pal.gray).height(3f).growX().expandY().top().row();
         main.pane(p -> {
-            int cols = (Core.graphics.getWidth() - 380) / ((int)cardWidth + 10);
-            if(props.size == 0 || cols == 0){
+            int cols = Math.max(1, (Core.graphics.getWidth() - 630) / ((int)cardWidth + 10));
+            if(props.size == 0){
                 main.add("@empty").center().row();
                 return;
             }
@@ -343,7 +354,7 @@ public class MapLocalesDialog extends BaseDialog{
                 String name = loc.toString();
 
                 if(!locales.containsKey(name)){
-                    t.button(loc.getDisplayName(), Styles.flatTogglet, () -> {
+                    t.button(loc.getDisplayName(Core.bundle.getLocale()), Styles.flatTogglet, () -> {
                         if(name.equals(selectedLocale)) return;
 
                         locales.put(name, new StringMap());
@@ -524,12 +535,12 @@ public class MapLocalesDialog extends BaseDialog{
                 if(status == PropertyStatus.same && !showSame) continue;
 
                 if(status != PropertyStatus.missing){
-                    var comparsionString = (searchByValue ? locales.get(name).get(key).toLowerCase() : loc.getDisplayName().toLowerCase());
+                    var comparsionString = (searchByValue ? locales.get(name).get(key).toLowerCase() : loc.getDisplayName(Core.bundle.getLocale()).toLowerCase());
                     if(!searchString.isEmpty() && !comparsionString.contains(searchString.toLowerCase())) continue;
                 }
 
                 colTables[i].table(Tex.whitePane, t -> {
-                    t.add(loc.getDisplayName()).left().color(Pal.accent).row();
+                    t.add(loc.getDisplayName(Core.bundle.getLocale())).left().color(Pal.accent).row();
                     t.image().color(Pal.accent).fillX().row();
 
                     if(status == PropertyStatus.missing){
@@ -576,26 +587,24 @@ public class MapLocalesDialog extends BaseDialog{
             }).padTop(5f);
         }).row();
 
-        dialog.cont.table(Tex.whitePane, t ->
-        t.button("@locales.showcorrect", Icon.ok, Styles.nonet, () -> showCorrect = !showCorrect).update(b -> {
+        dialog.cont.button("@locales.showcorrect", Icon.ok, filterStyle, () -> showCorrect = !showCorrect).update(b -> {
             ((Image)b.getChildren().get(1)).setDrawable(showCorrect ? Icon.ok : Icon.cancel);
             b.setChecked(showCorrect);
-        }).grow().pad(15f)).size(450f, 100f).color(Pal.gray).padTop(50f);
+        }).size(450f, 100f).color(Pal.gray).padTop(65f);
 
         dialog.cont.row();
 
-        dialog.cont.table(Tex.whitePane, t ->
-            t.button("@locales.showmissing", Icon.ok, Styles.nonet, () -> showMissing = !showMissing).update(b -> {
-                ((Image)b.getChildren().get(1)).setDrawable(showMissing ? Icon.ok : Icon.cancel);
-                b.setChecked(showMissing);
-        }).grow().pad(15f)).size(450f, 100f).color(Pal.accent).padTop(50f);
+        dialog.cont.button("@locales.showmissing", Icon.ok, filterStyle, () -> showMissing = !showMissing).update(b -> {
+            ((Image)b.getChildren().get(1)).setDrawable(showMissing ? Icon.ok : Icon.cancel);
+            b.setChecked(showMissing);
+        }).size(450f, 100f).color(Pal.accent).padTop(65f);
 
         dialog.cont.row();
-        dialog.cont.table(Tex.whitePane, t ->
-            t.button("@locales.showsame", Icon.ok, Styles.nonet, () -> showSame = !showSame).update(b -> {
-                ((Image)b.getChildren().get(1)).setDrawable(showSame ? Icon.ok : Icon.cancel);
-                b.setChecked(showSame);
-        }).grow().pad(15f)).size(450f, 100f).color(Pal.techBlue).padTop(50f);
+
+        dialog.cont.button("@locales.showsame", Icon.ok, filterStyle, () -> showSame = !showSame).update(b -> {
+            ((Image)b.getChildren().get(1)).setDrawable(showSame ? Icon.ok : Icon.cancel);
+            b.setChecked(showSame);
+        }).size(450f, 100f).color(Pal.techBlue).padTop(65f);
 
         dialog.buttons.button("@back", Icon.left, () -> {
             hidden.run();

From b3c26fac0527c1781bf28e28364d19635dfd3ef8 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 5 Dec 2023 13:54:47 -0500
Subject: [PATCH 052/369] Fixed Steam kicking

---
 build.gradle                                  |  2 +-
 core/src/mindustry/net/NetConnection.java     | 12 +++++-------
 desktop/src/mindustry/desktop/steam/SNet.java |  8 +++++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4ad56f59ff..e3ae3ad3e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -326,7 +326,7 @@ project(":core"){
 
         annotationProcessor 'com.github.Anuken:jabel:0.9.0'
         compileOnly project(":annotations")
-        kapt project(":annotations")
+        if(!project.hasProperty("noKapt")) kapt project(":annotations")
     }
 
     afterEvaluate{
diff --git a/core/src/mindustry/net/NetConnection.java b/core/src/mindustry/net/NetConnection.java
index a8d27786ed..7c9e51890f 100644
--- a/core/src/mindustry/net/NetConnection.java
+++ b/core/src/mindustry/net/NetConnection.java
@@ -1,6 +1,5 @@
 package mindustry.net;
 
-import arc.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.entities.units.*;
@@ -82,17 +81,16 @@ public abstract class NetConnection{
             Call.kick(this, reason);
         }
 
-        if(uuid.startsWith("steam:")){
-            //run with a 2-frame delay so there is time to send the kick packet, steam handles this weirdly
-            Core.app.post(() -> Core.app.post(this::close));
-        }else{
-            close();
-        }
+        kickDisconnect();
 
         netServer.admins.save();
         kicked = true;
     }
 
+    protected void kickDisconnect(){
+        close();
+    }
+
     public boolean isConnected(){
         return true;
     }
diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java
index 0d6a760dc3..e648af88b9 100644
--- a/desktop/src/mindustry/desktop/steam/SNet.java
+++ b/desktop/src/mindustry/desktop/steam/SNet.java
@@ -263,7 +263,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         //check version
         if(version != Version.build){
             ui.loadfrag.hide();
-            ui.showInfo("[scarlet]" + (version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated).toString() + "\n[]" +
+            ui.showInfo("[scarlet]" + (version > Version.build ? KickReason.clientOutdated : KickReason.serverOutdated) + "\n[]" +
                 Core.bundle.format("server.versions", Version.build, version));
             smat.leaveLobby(steamIDLobby);
             return;
@@ -437,6 +437,12 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
             return true;//state.isConnectionActive();
         }
 
+        @Override
+        protected void kickDisconnect(){
+            //delay the close so the kick packet can be sent on steam
+            Core.app.post(() -> Core.app.post(this::close));
+        }
+
         @Override
         public void close(){
             disconnectSteamUser(sid);

From 2f9f371c88eca561962bc9b4cb5e4df526dad1f4 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 5 Dec 2023 13:55:47 -0500
Subject: [PATCH 053/369] ok buthed

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d0a0666c26..61926257ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ steam_appid.txt
 ios/robovm.properties
 packr-out/
 config/
+buildSrc/
 *.gif
 /tests/out
 

From 91cc4f922e53c6b42641ec4f04a1fc5f04cd6280 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 5 Dec 2023 13:57:41 -0500
Subject: [PATCH 054/369] steamtest task destination

---
 desktop/build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/desktop/build.gradle b/desktop/build.gradle
index f5a9fca57f..7f4ecdcf0a 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -71,7 +71,9 @@ task steamtest(dependsOn: dist){
     doLast{
         copy{
             from "build/libs/Mindustry.jar"
-            if(System.properties["os.name"].contains("Mac")){
+            if(project.hasProperty("destination")){
+                into project.property("destination")
+            }else if(System.properties["os.name"].contains("Mac")){
                 into "/Users/anuke/Library/Application Support/Steam/steamapps/common/Mindustry/Mindustry.app/Contents/Resources"
             }else{
                 into "/home/anuke/.steam/steam/steamapps/common/Mindustry/jre"

From 351c2c84f2ea78c1902796ed3cf5cffecc251d60 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 5 Dec 2023 15:17:55 -0500
Subject: [PATCH 055/369] Fixed banned Steam users loading indefinitely

---
 core/assets/bundles/bundle.properties         | 2 +-
 desktop/src/mindustry/desktop/steam/SNet.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 9efc9b9a4b..64cb47a770 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1156,7 +1156,7 @@ setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chat Opacity
 setting.lasersopacity.name = Power Laser Opacity
diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java
index e648af88b9..446a8653f3 100644
--- a/desktop/src/mindustry/desktop/steam/SNet.java
+++ b/desktop/src/mindustry/desktop/steam/SNet.java
@@ -405,7 +405,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         final SteamID sid;
 
         public SteamConnection(SteamID sid){
-            super(sid.getAccountID() + "");
+            super("steam:" + sid.getAccountID());
             this.sid = sid;
             Log.info("Created STEAM connection: @", sid.getAccountID());
         }
@@ -440,7 +440,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         @Override
         protected void kickDisconnect(){
             //delay the close so the kick packet can be sent on steam
-            Core.app.post(() -> Core.app.post(this::close));
+            Time.runTask(10f, this::close);
         }
 
         @Override

From 3aa4da7ebda2dfa4bad9b624e696293b1ba2c781 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az1245-633.44uquw3knzoenloncamig1c14h.dx.internal.cloudapp.net>
Date: Tue, 5 Dec 2023 20:18:42 +0000
Subject: [PATCH 056/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 2 +-
 core/assets/bundles/bundle_bg.properties    | 2 +-
 core/assets/bundles/bundle_ca.properties    | 2 +-
 core/assets/bundles/bundle_cs.properties    | 2 +-
 core/assets/bundles/bundle_da.properties    | 2 +-
 core/assets/bundles/bundle_de.properties    | 2 +-
 core/assets/bundles/bundle_es.properties    | 2 +-
 core/assets/bundles/bundle_et.properties    | 2 +-
 core/assets/bundles/bundle_eu.properties    | 2 +-
 core/assets/bundles/bundle_fi.properties    | 2 +-
 core/assets/bundles/bundle_fil.properties   | 2 +-
 core/assets/bundles/bundle_fr.properties    | 2 +-
 core/assets/bundles/bundle_hu.properties    | 2 +-
 core/assets/bundles/bundle_id_ID.properties | 2 +-
 core/assets/bundles/bundle_it.properties    | 2 +-
 core/assets/bundles/bundle_ja.properties    | 2 +-
 core/assets/bundles/bundle_ko.properties    | 2 +-
 core/assets/bundles/bundle_lt.properties    | 2 +-
 core/assets/bundles/bundle_nl.properties    | 2 +-
 core/assets/bundles/bundle_nl_BE.properties | 2 +-
 core/assets/bundles/bundle_pl.properties    | 2 +-
 core/assets/bundles/bundle_pt_BR.properties | 2 +-
 core/assets/bundles/bundle_pt_PT.properties | 2 +-
 core/assets/bundles/bundle_ro.properties    | 2 +-
 core/assets/bundles/bundle_ru.properties    | 2 +-
 core/assets/bundles/bundle_sr.properties    | 2 +-
 core/assets/bundles/bundle_sv.properties    | 2 +-
 core/assets/bundles/bundle_th.properties    | 2 +-
 core/assets/bundles/bundle_tk.properties    | 2 +-
 core/assets/bundles/bundle_tr.properties    | 2 +-
 core/assets/bundles/bundle_uk_UA.properties | 2 +-
 core/assets/bundles/bundle_vi.properties    | 2 +-
 core/assets/bundles/bundle_zh_CN.properties | 2 +-
 core/assets/bundles/bundle_zh_TW.properties | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index 35af3f2e99..b559a248b7 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -1128,7 +1128,7 @@ setting.sfxvol.name = Гучнасць эфектаў
 setting.mutesound.name = Заглушыць гук
 setting.crashreport.name = Адпраўляць ананімныя справаздачы аб вылетах
 setting.savecreate.name = Аўтаматычнае стварэнне захаванняў
-setting.publichost.name = Агульная даступнасць гульні
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Абмежаванне гульцоў
 setting.chatopacity.name = Непразрыстасць чата
 setting.lasersopacity.name = Непразрыстасць лазераў энергазабеспячэння
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 759c7bd4b8..ff7771fc5f 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -1140,7 +1140,7 @@ setting.sfxvol.name = Сила на Звуковите Ефекти
 setting.mutesound.name = Заглуши Звука
 setting.crashreport.name = ИЗпращай Анонимни Отчети за Сривове
 setting.savecreate.name = Автоматични Записи
-setting.publichost.name = Видимост на Публичните Игри
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Лимит на Играчи
 setting.chatopacity.name = Плътност на Чата
 setting.lasersopacity.name = Плътност на Енергийните Лазери
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index 925d9dfd54..166189e37d 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -1143,7 +1143,7 @@ setting.sfxvol.name = Volums dels efectes de so
 setting.mutesound.name = Silencia el so
 setting.crashreport.name = Envia informes d’error anònims
 setting.savecreate.name = Desa automàticament la partida
-setting.publichost.name = Visibilitat de la partida pública
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Límit de jugadors
 setting.chatopacity.name = Opacitat del xat
 setting.lasersopacity.name = Opacitat dels làsers d’energia
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 16d1683b3d..d96220ed35 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -1141,7 +1141,7 @@ setting.sfxvol.name = Hlasitost efektů
 setting.mutesound.name = Ztišit zvuk
 setting.crashreport.name = Poslat anonymní hlášení o spadnutí Mindustry
 setting.savecreate.name = Automaticky ukládat hru
-setting.publichost.name = Veřejná viditelnost hry
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Nejvyšší počet hráčů
 setting.chatopacity.name = Průsvitnost kanálu zpráv
 setting.lasersopacity.name = Průsvitnost energetického laseru
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 0e2c8d5a67..aea8011160 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -1130,7 +1130,7 @@ setting.sfxvol.name = SFX-volumen
 setting.mutesound.name = Forstum lyde
 setting.crashreport.name = Send anonyme fejlrapporter
 setting.savecreate.name = Gem automatisk
-setting.publichost.name = Synlighed af offentlige spil
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Spiller-grænse
 setting.chatopacity.name = Chat-gennemsigtighed
 setting.lasersopacity.name = Strøm-laser-gennemsigtighed
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 22409d6be9..d148a01445 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -1153,7 +1153,7 @@ setting.sfxvol.name = Audioeffekt-Lautstärke
 setting.mutesound.name = Audioeffekte stummschalten
 setting.crashreport.name = Anonyme Absturzberichte senden
 setting.savecreate.name = Automatisch speichern
-setting.publichost.name = Öffentliche Sichtbarkeit des Spiels
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Spielerbegrenzung
 setting.chatopacity.name = Chat-Deckkraft
 setting.lasersopacity.name = Power-Laser-Deckkraft
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 0a468fef0c..41b25772f8 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -1149,7 +1149,7 @@ setting.sfxvol.name = Volumen del sonido
 setting.mutesound.name = Silenciar sonido
 setting.crashreport.name = Enviar registros de errores anónimos
 setting.savecreate.name = Guardado automático
-setting.publichost.name = Visibilidad pública de la partida
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Limite de jugadores
 setting.chatopacity.name = Opacidad del chat
 setting.lasersopacity.name = Opacidad de láseres energía
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index a8ab0d2fc9..0c088e1193 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -1130,7 +1130,7 @@ setting.sfxvol.name = Heliefektide tugevus
 setting.mutesound.name = Vaigista heli
 setting.crashreport.name = Saada automaatseid veateateid
 setting.savecreate.name = Loo automaatseid salvestisi
-setting.publichost.name = Avaliku mängu nähtavus
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Vestlusakna läbipaistmatus
 setting.lasersopacity.name = Power Laser Opacity
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index c1284ec210..50325ca09e 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -1132,7 +1132,7 @@ setting.sfxvol.name = Efektuen bolumena
 setting.mutesound.name = Isilarazi soinua
 setting.crashreport.name = Bidali kraskatze txosten automatikoak
 setting.savecreate.name = Gorde automatikoki
-setting.publichost.name = Partidaren ikusgaitasun publikoa
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Txataren opakotasuna
 setting.lasersopacity.name = Energia laserraren opakutasuna
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 64c142e223..e657836822 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -1129,7 +1129,7 @@ setting.sfxvol.name = SFX-voimakkuus
 setting.mutesound.name = Mykistä äänet
 setting.crashreport.name = Lähetä anonyymejä kaatumisilmoituksia
 setting.savecreate.name = Luo tallenuksia automaattisesti
-setting.publichost.name = Julkisen pelin näkyvyys
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Pelaajaraja
 setting.chatopacity.name = Keskustelun läpinäkymättömyys
 setting.lasersopacity.name = Energia laserin läpinäkymättömyys
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 6a8950a100..bb9ea59e67 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -1129,7 +1129,7 @@ setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Mag-send ng Anonymous Crash Reports
 setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chat Opacity
 setting.lasersopacity.name = Power Laser Opacity
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 9f481dd570..5219de9fe4 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -1155,7 +1155,7 @@ setting.sfxvol.name = Volume des Sons et Effets
 setting.mutesound.name = Couper les Sons et Effets
 setting.crashreport.name = Envoyer des Rapports de crash anonymes
 setting.savecreate.name = Sauvegardes Automatiques
-setting.publichost.name = Visibilité de la Partie publique
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Limite de Joueurs
 setting.chatopacity.name = Opacité du Chat
 setting.lasersopacity.name = Opacité des Connexions laser
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 88c1fbec78..39b911bc3b 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1155,7 +1155,7 @@ setting.sfxvol.name = SFX hangerő
 setting.mutesound.name = Hang némítása
 setting.crashreport.name = Névtelen összeomlási jelentések
 setting.savecreate.name = Automatikus mentés
-setting.publichost.name = Nyilvános játék láthatósága
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Játékos limit
 setting.chatopacity.name = Csevegő átlátszatlansága
 setting.lasersopacity.name = Villanyvezeték átlátszatlansága
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index 0da00b10b9..37ac2fac03 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -1149,7 +1149,7 @@ setting.sfxvol.name = Volume Efek Suara
 setting.mutesound.name = Diamkan Suara
 setting.crashreport.name = Laporkan Masalah
 setting.savecreate.name = Otomatis Menyimpan
-setting.publichost.name = Visibilitas Game Publik
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Batas pemain
 setting.chatopacity.name = Jelas-Beningnya Pesan
 setting.lasersopacity.name = Jelas-Beningnya Tenaga Laser
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 7d5cee5309..962f742aa3 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -1136,7 +1136,7 @@ setting.sfxvol.name = Volume Effetti
 setting.mutesound.name = Silenzia Suoni
 setting.crashreport.name = Invia rapporti anonimi sugli arresti anomali
 setting.savecreate.name = Salvataggi Automatici
-setting.publichost.name = Gioco Visibile Pubblicamente
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Limite Giocatori
 setting.chatopacity.name = Opacità Chat
 setting.lasersopacity.name = Opacità Raggi Energetici
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index b59a37a712..83af7e6755 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -1142,7 +1142,7 @@ setting.sfxvol.name = 効果音 音量
 setting.mutesound.name = 効果音をミュート
 setting.crashreport.name = 匿名でクラッシュレポートを送信する
 setting.savecreate.name = 自動保存
-setting.publichost.name = 誰でもゲームに参加できるようにする
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = プレイヤー数制限
 setting.chatopacity.name = チャットの透明度
 setting.lasersopacity.name = 電線の透明度
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index c138e309d8..fafa137270 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -1141,7 +1141,7 @@ setting.sfxvol.name = 효과음 크기
 setting.mutesound.name = 소리 끄기
 setting.crashreport.name = 익명으로 오류 보고서 자동 전송
 setting.savecreate.name = 자동 저장 활성화
-setting.publichost.name = 공용 서버로 표시
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = 플레이어 제한
 setting.chatopacity.name = 채팅창 투명도
 setting.lasersopacity.name = 전선 투명도
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index f644b1b3a1..bc785a4c78 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -1130,7 +1130,7 @@ setting.sfxvol.name = SFX Garsumas
 setting.mutesound.name = Nutildyti Garsus
 setting.crashreport.name = Siųsti Anoniminius Strigties Pranešimus
 setting.savecreate.name = Automatiškai Kurti Išsaugojimus
-setting.publichost.name = Viešojo Žaidimo Matomumas
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Žaidėjų Limitas
 setting.chatopacity.name = Pokalbių Lentos Nepermatomumas
 setting.lasersopacity.name = Elektros Tinklo Nepermatomumas
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 84872be5fa..6e747d38bf 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -1142,7 +1142,7 @@ setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Demp Geluid
 setting.crashreport.name = Stuur Anonieme Crashmeldingen
 setting.savecreate.name = Bewaar Saves Automatisch
-setting.publichost.name = Publieke Server Zichtbaarheid
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Spelerslijst
 setting.chatopacity.name = Chat Transparantie
 setting.lasersopacity.name = Stroomdraad Transparantie
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 74169a455d..ea3d7db054 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -1130,7 +1130,7 @@ setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chat Opacity
 setting.lasersopacity.name = Power Laser Opacity
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index 4006da0d66..2c7d6c9586 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -1140,7 +1140,7 @@ setting.sfxvol.name = Głośność dźwięków
 setting.mutesound.name = Wycisz dźwięki
 setting.crashreport.name = Wysyłaj anonimowo dane o crashu gry
 setting.savecreate.name = Automatyczne tworzenie zapisów
-setting.publichost.name = Widoczność gry publicznej
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Limit graczy
 setting.chatopacity.name = Przezroczystość czatu
 setting.lasersopacity.name = Przezroczystość laserów zasilających
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 187a136e0b..75e2a23295 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -1150,7 +1150,7 @@ setting.sfxvol.name = Volume de Efeitos
 setting.mutesound.name = Desligar Som
 setting.crashreport.name = Enviar denúncias anônimas de erros
 setting.savecreate.name = Criar salvamentos automaticamente
-setting.publichost.name = Visibilidade do jogo público
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Limites de Player
 setting.chatopacity.name = Opacidade do chat
 setting.lasersopacity.name = Opacidade do laser
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index a43d85d095..208e560ca3 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -1130,7 +1130,7 @@ setting.sfxvol.name = Volume de Efeitos
 setting.mutesound.name = Desligar Som
 setting.crashreport.name = Enviar denuncias de crash anonimas
 setting.savecreate.name = Criar gravamentos automaticamente
-setting.publichost.name = Visibilidade do jogo público
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Limite de Jogadores
 setting.chatopacity.name = Opacidade do chat
 setting.lasersopacity.name = Opacidade do Power Laser
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index 594bee3481..62a12c2af2 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -1142,7 +1142,7 @@ setting.sfxvol.name = Volum Efecte Sonore
 setting.mutesound.name = Sunetul pe Mut
 setting.crashreport.name = Trimite Rapoarte de Crash anonime
 setting.savecreate.name = Auto-Creează Salvări
-setting.publichost.name = Vizibilitatea Jocurilor Publice
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Limita Jucătorilor
 setting.chatopacity.name = Opacitate Chat
 setting.lasersopacity.name = Opacitate Laser Electric
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 3e9fa23b84..ae5eadb2d5 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -1142,7 +1142,7 @@ setting.sfxvol.name = Громкость эффектов
 setting.mutesound.name = Заглушить звук
 setting.crashreport.name = Отправлять анонимные отчёты о вылетах
 setting.savecreate.name = Автоматическое создание сохранений
-setting.publichost.name = Общедоступность игры
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Ограничение игроков
 setting.chatopacity.name = Непрозрачность чата
 setting.lasersopacity.name = Непрозрачность лазеров энергоснабжения
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 8fa9e69023..25a0778287 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -1144,7 +1144,7 @@ setting.sfxvol.name = Jačina Zvučnih Efekata
 setting.mutesound.name = Nema Zvuka
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.savecreate.name = Automatski Snimaj Igru
-setting.publichost.name = Vidljivost Javne Igre
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Limit Igrača
 setting.chatopacity.name = Prozirnost Četa
 setting.lasersopacity.name = Prozirnost Energetskih Lasera
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 3a82182162..f5e12f5995 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -1130,7 +1130,7 @@ setting.sfxvol.name = Ljudeffektvolym
 setting.mutesound.name = Stäng Av Ljudeffekter
 setting.crashreport.name = Skicka Anonyma Krashrapporter
 setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chattgenomskinlighet
 setting.lasersopacity.name = Power Laser Opacity
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 88b9f11dc2..b3702b3e69 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -1143,7 +1143,7 @@ setting.sfxvol.name = ระดับเสียง SFX
 setting.mutesound.name = ปิดเสียง
 setting.crashreport.name = ส่งรายงานข้อขัดข้องแบบไม่ระบุตัวตน
 setting.savecreate.name = สร้างเซฟโดยอัตโนมัติ
-setting.publichost.name = การมองเห็นเซิร์ฟเวอร์สาธารณะ
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = จำกัดผู้เล่น
 setting.chatopacity.name = ความโปร่งแสงของแชท
 setting.lasersopacity.name = ความโปร่งแสงของลำแสงพลังงาน
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index cabd2f7088..32b50b9a54 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -1130,7 +1130,7 @@ setting.sfxvol.name = Ses seviyesi
 setting.mutesound.name = Sesi kapat
 setting.crashreport.name = Send Anonymous Crash Reports
 setting.savecreate.name = Auto-Create Saves
-setting.publichost.name = Public Game Visibility
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Player Limit
 setting.chatopacity.name = Chat Opacity
 setting.lasersopacity.name = Power Laser Opacity
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 2a3c2a8fb7..b26237acc4 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -1140,7 +1140,7 @@ setting.sfxvol.name = Oyun Sesi
 setting.mutesound.name = Sesi Kapat
 setting.crashreport.name = Anonim Çökme Raporları Gönder
 setting.savecreate.name = Otomatik Kayıt Oluştur
-setting.publichost.name = Halka Açık Sunucular
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Oyuncu Limiti
 setting.chatopacity.name = Mesajlaşma Opaklığı
 setting.lasersopacity.name = Enerji Lazeri Opaklığı
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 298033e0b9..88d02346da 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -1151,7 +1151,7 @@ setting.sfxvol.name = Гучність звукових ефектів
 setting.mutesound.name = Заглушити звук
 setting.crashreport.name = Відсилати анонімні звіти про аварійне завершення гри
 setting.savecreate.name = Автоматичне створення збережень
-setting.publichost.name = Загальнодоступність гри
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Обмеження гравців
 setting.chatopacity.name = Непрозорість чату
 setting.lasersopacity.name = Непрозорість лазерів енергопостачання
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 53cadbfa1c..a7fa4af8c4 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -1144,7 +1144,7 @@ setting.sfxvol.name = Âm lượng SFX
 setting.mutesound.name = Tắt tiếng
 setting.crashreport.name = Gửi báo cáo sự cố
 setting.savecreate.name = Tự động lưu
-setting.publichost.name = Hiển thị trò chơi công khai
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = Giới hạn người chơi
 setting.chatopacity.name = Độ mờ trò chuyện
 setting.lasersopacity.name = Độ mờ kết nối năng lượng
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 8ed46e5e41..46dabee5b7 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -1152,7 +1152,7 @@ setting.sfxvol.name = 音效音量
 setting.mutesound.name = 禁用音效
 setting.crashreport.name = 发送匿名的崩溃报告
 setting.savecreate.name = 自动创建存档
-setting.publichost.name = 游戏公开可见
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = 玩家数量限制
 setting.chatopacity.name = 聊天界面不透明度
 setting.lasersopacity.name = 电力连接线不透明度
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index aa8aa82eb9..deb30b3855 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -1148,7 +1148,7 @@ setting.sfxvol.name = 音效音量
 setting.mutesound.name = 靜音
 setting.crashreport.name = 傳送匿名當機回報
 setting.savecreate.name = 自動建立存檔
-setting.publichost.name = 公開遊戲可見度
+setting.steampublichost.name = Public Game Visibility
 setting.playerlimit.name = 玩家數限制
 setting.chatopacity.name = 聊天框不透明度
 setting.lasersopacity.name = 雷射不透明度

From 3232e97d1aa43ea51373875a68b774c7c2705439 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 5 Dec 2023 15:43:33 -0500
Subject: [PATCH 057/369] Display banned status in Steam lobbies

---
 core/src/mindustry/ui/dialogs/JoinDialog.java |  9 +++++----
 desktop/src/mindustry/desktop/steam/SNet.java | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index 3092db179f..01e2019401 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -250,9 +250,10 @@ public class JoinDialog extends BaseDialog{
         buildServer(host, server.content, false);
     }
 
-    void buildServer(Host host, Table content, boolean inner){
+    void buildServer(Host host, Table content, boolean local){
         content.top().left();
-        String versionString = getVersionString(host);
+        boolean isBanned = local && Vars.steam && host.description != null && host.description.equals("[banned]");
+        String versionString = getVersionString(host) + (isBanned ? "[red] [banned]" : "");
 
         float twidth = targetWidth() - 40f;
 
@@ -260,7 +261,7 @@ public class JoinDialog extends BaseDialog{
 
         Color color = Pal.gray;
 
-        if(inner){
+        if(local){
             content.table(Tex.whiteui, t -> {
                 t.left();
                 t.setColor(color);
@@ -274,7 +275,7 @@ public class JoinDialog extends BaseDialog{
             t.setColor(color);
             t.left();
 
-            if(!host.description.isEmpty()){
+            if(!host.description.isEmpty() && !isBanned){
                 //limit newlines.
                 int count = 0;
                 StringBuilder result = new StringBuilder(host.description.length());
diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java
index 446a8653f3..a08ecf3120 100644
--- a/desktop/src/mindustry/desktop/steam/SNet.java
+++ b/desktop/src/mindustry/desktop/steam/SNet.java
@@ -107,6 +107,9 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
 
         Events.on(WaveEvent.class, e -> updateWave());
         Events.run(Trigger.newGame, this::updateWave);
+
+        Events.on(PlayerIpBanEvent.class, e -> updateBans(e.ip));
+        Events.on(PlayerIpUnbanEvent.class, e -> updateBans(e.ip));
     }
 
     public boolean isSteamClient(){
@@ -207,6 +210,12 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
         }
     }
 
+    /** Updates the ban list so that lobbies don't appear for banned players. The list will only be updated when a steam player is banned/unbanned. */
+    void updateBans(String changed){
+        if(changed != null && !changed.startsWith("steam:")) return; //hacky way to ignore non-steam ids
+        smat.setLobbyData(currentLobby, "banned", netServer.admins.bannedIPs.select(ip -> ip.contains("steam:")).reduce(new StringBuilder(), (ip, str) -> str.append(ip.substring(6)).append(',')).toString()); //list of handles split by commas
+    }
+
     @Override
     public void closeServer(){
         provider.closeServer();
@@ -321,6 +330,11 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
                     String mode = smat.getLobbyData(lobby, "gamemode");
                     //make sure versions are equal, don't list incompatible lobbies
                     if(mode == null || mode.isEmpty() || (Version.build != -1 && Strings.parseInt(smat.getLobbyData(lobby, "version"), -1) != Version.build)) continue;
+
+                    String banList = smat.getLobbyData(lobby, "banned");
+
+                    boolean banned = banList.length() > 0 && Structs.contains(banList.split(","), SVars.user.user.getSteamID().getAccountID() + "");
+
                     Host out = new Host(
                         -1, //invalid ping
                         smat.getLobbyData(lobby, "name"),
@@ -332,7 +346,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
                         smat.getLobbyData(lobby, "versionType"),
                         Gamemode.valueOf(mode),
                         smat.getLobbyMemberLimit(lobby),
-                        "",
+                        banned ? "[banned]" : "",
                         null
                     );
                     hosts.add(out);
@@ -365,6 +379,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
             smat.setLobbyData(steamID, "versionType", Version.type);
             smat.setLobbyData(steamID, "wave", state.wave + "");
             smat.setLobbyData(steamID, "gamemode", state.rules.mode().name() + "");
+            updateBans(null);
         }
     }
 

From ec48733150e32ff7367349e267401d0533ecdeb6 Mon Sep 17 00:00:00 2001
From: Gamer-art9044 <131509007+Gamer-art9044@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:20:14 +0400
Subject: [PATCH 058/369] Update servers_v7.json (#9352)

add a STP server to the list
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index df78ef83f7..68bbcfec89 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -3,6 +3,10 @@
     "name": "Vndustry",
     "address": ["140.238.246.78:7000"]
   },
+  {
+    "name": "STP",
+    "address": ["23.88.73.88:25617"]
+  },
   {
     "name": "meiqiuMDT",
     "address": ["cn1.plush.run:10001","211.101.236.94:10000","bj-1.lcf.icu:10240","play.simpfun.cn:14523"]

From c20684025e05f27dbc53a944166d08519cf25d80 Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Thu, 7 Dec 2023 18:24:51 +0300
Subject: [PATCH 059/369] Small git shenanigans to actually (i really hope)
 revert all the bad stuff

---
 core/src/mindustry/logic/LExecutor.java | 117 ++++++++++++------------
 1 file changed, 56 insertions(+), 61 deletions(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index ecc91196c9..9641d1eb85 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -157,29 +157,30 @@ public class LExecutor{
         return v.isobj ? v.objval != null : Math.abs(v.numval) >= 0.00001;
     }
 
-    @Nullable
-    public double num(int index, boolean nullToNan){
-        Var v = var(index);
-        return v.isobj ? v.objval != null ? 1 : nullToNan ? Double.NaN : 0: invalid(v.numval) ? 0 : v.numval;
-    }
-
     public double num(int index){
-        return num(index, false);
+        Var v = var(index);
+        return v.isobj ? v.objval != null ? 1 : 0 : invalid(v.numval) ? 0 : v.numval;
     }
 
-    @Nullable
-    public float numf(int index, boolean nullToNan){
+    /** Get num value from variable, convert null to NaN to handle it differently in some instructions */
+    public double numOrNan(int index){
         Var v = var(index);
-        return v.isobj ? v.objval != null ? 1 : nullToNan ? Float.NaN : 0: invalid(v.numval) ? 0 : (float)v.numval;
+        return v.isobj ? v.objval != null ? 1 : Double.NaN : invalid(v.numval) ? 0 : v.numval;
     }
 
     public float numf(int index){
-        return numf(index, false);
+        Var v = var(index);
+        return v.isobj ? v.objval != null ? 1 : 0 : invalid(v.numval) ? 0 : (float)v.numval;
+    }
+
+    /** Get float value from variable, convert null to NaN to handle it differently in some instructions */
+    public float numfOrNan(int index){
+        Var v = var(index);
+        return v.isobj ? v.objval != null ? 1 : Float.NaN : invalid(v.numval) ? 0 : (float)v.numval;
     }
 
-    @Nullable
     public int numi(int index){
-        return (int)num(index, true);
+        return (int)num(index);
     }
 
     public void setbool(int index, boolean value){
@@ -265,7 +266,7 @@ public class LExecutor{
                         //bind to the next unit
                         exec.setconst(varUnit, seq.get(exec.binds[type.id]));
                     }
-                    exec.binds[type.id]++;
+                    exec.binds[type.id] ++;
                 }else{
                     //no units of this type found
                     exec.setconst(varUnit, null);
@@ -345,9 +346,9 @@ public class LExecutor{
                         cache.found = false;
                         exec.setnum(outFound, 0);
                     }
-
-                    if(res != null && res.build != null &&
-                    (unit.within(res.build.x, res.build.y, Math.max(unit.range(), buildingRange)) || res.build.team == exec.team)){
+                    
+                    if(res != null && res.build != null && 
+                        (unit.within(res.build.x, res.build.y, Math.max(unit.range(), buildingRange)) || res.build.team == exec.team)){
                         cache.build = res.build;
                         exec.setobj(outBuild, res.build);
                     }else{
@@ -512,7 +513,7 @@ public class LExecutor{
                     }
                     case build -> {
                         if((state.rules.logicUnitBuild || exec.privileged) && unit.canBuild() && exec.obj(p3) instanceof Block block && block.canBeBuilt() && (block.unlockedNow() || unit.team.isAI())){
-                            int x = World.toTile(x1 - block.offset / tilesize), y = World.toTile(y1 - block.offset / tilesize);
+                            int x = World.toTile(x1 - block.offset/tilesize), y = World.toTile(y1 - block.offset/tilesize);
                             int rot = Mathf.mod(exec.numi(p4), 4);
 
                             //reset state of last request when necessary
@@ -570,7 +571,7 @@ public class LExecutor{
                         }else{
                             Building build = exec.building(p1);
                             int dropped = Math.min(unit.stack.amount, exec.numi(p2));
-                            if(build != null && build.team == unit.team && build.isValid() && dropped > 0 && unit.within(build, logicItemTransferRange + build.block.size * tilesize / 2f)){
+                            if(build != null && build.team == unit.team && build.isValid() && dropped > 0 && unit.within(build, logicItemTransferRange + build.block.size * tilesize/2f)){
                                 int accepted = build.acceptStack(unit.item(), dropped, unit);
                                 if(accepted > 0){
                                     Call.transferItemTo(unit, unit.item(), accepted, unit.x, unit.y, build);
@@ -586,7 +587,7 @@ public class LExecutor{
                         int amount = exec.numi(p3);
 
                         if(build != null && build.team == unit.team && build.isValid() && build.items != null &&
-                        exec.obj(p2) instanceof Item item && unit.within(build, logicItemTransferRange + build.block.size * tilesize / 2f)){
+                            exec.obj(p2) instanceof Item item && unit.within(build, logicItemTransferRange + build.block.size * tilesize/2f)){
                             int taken = Math.min(build.items.get(item), Math.min(amount, unit.maxAccepted(item)));
 
                             if(taken > 0){
@@ -595,8 +596,7 @@ public class LExecutor{
                             }
                         }
                     }
-                    default -> {
-                    }
+                    default -> {}
                 }
             }
         }
@@ -617,8 +617,7 @@ public class LExecutor{
             this.p4 = p4;
         }
 
-        ControlI(){
-        }
+        ControlI(){}
 
         @Override
         public void run(LExecutor exec){
@@ -786,7 +785,7 @@ public class LExecutor{
             LogicAI ai = null;
 
             if(base instanceof Ranged r && (exec.privileged || r.team() == exec.team) &&
-            (base instanceof Building || (ai = UnitControlI.checkLogicAI(exec, base)) != null)){ //must be a building or a controllable unit
+                (base instanceof Building || (ai = UnitControlI.checkLogicAI(exec, base)) != null)){ //must be a building or a controllable unit
                 float range = r.range();
 
                 Healthc targeted;
@@ -842,9 +841,9 @@ public class LExecutor{
                 if(!u.within(b, range) || !u.targetable(team) || b == u) return;
 
                 boolean valid =
-                target1.func.get(b.team(), u) &&
-                target2.func.get(b.team(), u) &&
-                target3.func.get(b.team(), u);
+                    target1.func.get(b.team(), u) &&
+                    target2.func.get(b.team(), u) &&
+                    target3.func.get(b.team(), u);
 
                 if(!valid) return;
 
@@ -865,8 +864,7 @@ public class LExecutor{
             this.to = to;
         }
 
-        SetI(){
-        }
+        SetI(){}
 
         @Override
         public void run(LExecutor exec){
@@ -898,8 +896,7 @@ public class LExecutor{
             this.dest = dest;
         }
 
-        OpI(){
-        }
+        OpI(){}
 
         @Override
         public void run(LExecutor exec){
@@ -934,8 +931,7 @@ public class LExecutor{
 
     public static class NoopI implements LInstruction{
         @Override
-        public void run(LExecutor exec){
-        }
+        public void run(LExecutor exec){}
     }
 
     public static class DrawI implements LInstruction{
@@ -989,9 +985,9 @@ public class LExecutor{
                         if(next == '\n'){
                             maxWidth = Math.max(maxWidth, lineWidth);
                             lineWidth = 0;
-                            lines++;
+                            lines ++;
                         }else{
-                            lineWidth++;
+                            lineWidth ++;
                         }
                     }
                     maxWidth = Math.max(maxWidth, lineWidth);
@@ -999,8 +995,8 @@ public class LExecutor{
                     float
                     width = maxWidth * advance,
                     height = lines * lineHeight,
-                    ha = ((Align.isLeft(align) ? -1f : 0f) + 1f + (Align.isRight(align) ? 1f : 0f)) / 2f,
-                    va = ((Align.isBottom(align) ? -1f : 0f) + 1f + (Align.isTop(align) ? 1f : 0f)) / 2f;
+                    ha = ((Align.isLeft(align) ? -1f : 0f) + 1f + (Align.isRight(align) ? 1f : 0f))/2f,
+                    va = ((Align.isBottom(align) ? -1f : 0f) + 1f + (Align.isTop(align) ? 1f : 0f))/2f;
 
                     xOffset = -(int)(width * ha);
                     yOffset = -(int)(height * va) + (lines - 1) * lineHeight;
@@ -1077,8 +1073,7 @@ public class LExecutor{
             this.value = value;
         }
 
-        PrintI(){
-        }
+        PrintI(){}
 
         @Override
         public void run(LExecutor exec){
@@ -1103,16 +1098,16 @@ public class LExecutor{
 
         public static String toString(Object obj){
             return
-            obj == null ? "null" :
-            obj instanceof String s ? s :
-            obj == Blocks.stoneWall ? "solid" : //special alias
-            obj instanceof MappableContent content ? content.name :
-            obj instanceof Content ? "[content]" :
-            obj instanceof Building build ? build.block.name :
-            obj instanceof Unit unit ? unit.type.name :
-            obj instanceof Enum<?> e ? e.name() :
-            obj instanceof Team team ? team.name :
-            "[object]";
+                obj == null ? "null" :
+                obj instanceof String s ? s :
+                obj == Blocks.stoneWall ? "solid" : //special alias
+                obj instanceof MappableContent content ? content.name :
+                obj instanceof Content ? "[content]" :
+                obj instanceof Building build ? build.block.name :
+                obj instanceof Unit unit ? unit.type.name :
+                obj instanceof Enum<?> e ? e.name() :
+                obj instanceof Team team ? team.name :
+                "[object]";
         }
     }
 
@@ -1245,7 +1240,7 @@ public class LExecutor{
                 curTime = 0f;
             }else{
                 //skip back to self.
-                exec.var(varCounter).numval--;
+                exec.var(varCounter).numval --;
                 exec.yield = true;
             }
 
@@ -1261,7 +1256,7 @@ public class LExecutor{
         @Override
         public void run(LExecutor exec){
             //skip back to self.
-            exec.var(varCounter).numval--;
+            exec.var(varCounter).numval --;
             exec.yield = true;
         }
     }
@@ -1675,15 +1670,15 @@ public class LExecutor{
         public void run(LExecutor exec){
             //set default to success
             exec.setnum(outSuccess, 1);
-            if(headless && type != MessageType.mission){
+            if(headless && type != MessageType.mission) {
                 exec.textBuffer.setLength(0);
                 return;
             }
 
             if(
-            type == MessageType.announce && ui.hasAnnouncement() ||
-            type == MessageType.notify && ui.hudfrag.hasToast() ||
-            type == MessageType.toast && ui.hasAnnouncement()
+                type == MessageType.announce && ui.hasAnnouncement() ||
+                type == MessageType.notify && ui.hudfrag.hasToast() ||
+                type == MessageType.toast && ui.hasAnnouncement()
             ){
                 //set outSuccess=false to let user retry.
                 exec.setnum(outSuccess, 0);
@@ -1732,7 +1727,7 @@ public class LExecutor{
                 double col = exec.num(color);
                 //limit size so people don't create lag with ridiculous numbers (some explosions scale with size)
                 float rot = type.rotate ? exec.numf(rotation) :
-                Math.min(exec.numf(rotation), 1000f);
+                    Math.min(exec.numf(rotation), 1000f);
 
                 type.effect.at(World.unconv(exec.numf(x)), World.unconv(exec.numf(y)), rot, Tmp.c1.fromDouble(col), exec.obj(data));
             }
@@ -1916,8 +1911,8 @@ public class LExecutor{
             }
 
             float
-            spawnX = World.unconv(exec.numf(x)),
-            spawnY = World.unconv(exec.numf(y));
+                spawnX = World.unconv(exec.numf(x)),
+                spawnY = World.unconv(exec.numf(y));
             int packed = Point2.pack(exec.numi(x), exec.numi(y));
 
             for(SpawnGroup group : state.rules.spawns){
@@ -2005,7 +2000,7 @@ public class LExecutor{
                         marker.setTexture(res.toString());
                     }
                 }else{
-                    marker.control(type, exec.num(p1, true), exec.num(p2, true), exec.num(p3, true));
+                    marker.control(type, exec.numOrNan(p1), exec.numOrNan(p2), exec.numOrNan(p3));
                 }
             }
         }
@@ -2037,7 +2032,7 @@ public class LExecutor{
                 int mid = exec.numi(id);
                 if(exec.bool(replace) || !state.markers.containsKey(mid)){
                     var marker = cons.get();
-                    marker.control(LMarkerControl.pos, exec.num(x, true), exec.num(y, true), 0);
+                    marker.control(LMarkerControl.pos, exec.num(x), exec.num(y), 0);
                     state.markers.put(mid, marker);
                 }
             }

From dd5dfa6a9734bb459a59e1022fc3ace93685a424 Mon Sep 17 00:00:00 2001
From: CamoGekko <142858559+CamoGekko@users.noreply.github.com>
Date: Thu, 7 Dec 2023 11:38:12 -0600
Subject: [PATCH 060/369] Fixed an error message (#9355)

---
 core/src/mindustry/type/UnitType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index a8623a6d65..8c29a2e50d 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -952,7 +952,7 @@ public class UnitType extends UnlockableContent implements Senseable{
     public void createIcons(MultiPacker packer){
         super.createIcons(packer);
 
-        if(constructor == null) throw new IllegalArgumentException("No constructor set up for unit '" + name + "'. Make sure you assign a valid value to `constructor`, e.g. `constructor = UnitEntity::new`");
+        if(constructor == null) throw new IllegalArgumentException("No constructor set up for unit '" + name + "', add this argument to your units field: `constructor = UnitEntity::create`");
 
         sample = constructor.get();
 

From d15de9f4fc480ae9a9db85e0f308dc478765f943 Mon Sep 17 00:00:00 2001
From: Lifeless-Darkness <153267145+Lifeless-Darkness@users.noreply.github.com>
Date: Fri, 8 Dec 2023 15:11:11 +0300
Subject: [PATCH 061/369] Update servers_v7.json (#9357)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 68bbcfec89..c79de2b051 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -85,7 +85,7 @@
   },
   {
     "name": "MinDurka",
-    "address": ["81.30.157.68", "81.30.157.68:3001", "81.30.157.68:3002", "81.30.157.68:3003", "81.30.157.68:3004", "81.30.157.68:3005", "81.30.157.68:3006", "81.30.157.68:3007", "81.30.157.68:3008", "81.30.157.68:3009", "81.30.157.68:3010"]
+    "address": ["95.181.151.210", "95.181.151.210:3001", "95.181.151.210:3002", "95.181.151.210:3003", "95.181.151.210:3004", "95.181.151.210:3005", "95.181.151.210:3006", "95.181.151.210:3007", "95.181.151.210:3008", "95.181.151.210:3009", "95.181.151.210:3010"]
   },
   {
     "name": "Chaotic Neutral",

From a2a690834daa21c996460414dcb34d9f31bad8e1 Mon Sep 17 00:00:00 2001
From: BnDLett <73402249+BnDLett@users.noreply.github.com>
Date: Fri, 8 Dec 2023 17:03:40 -0500
Subject: [PATCH 062/369] Add DDNS experimental server to server list (#9360)

Added DDNS experimental server to the server list under "mindustry.ddns.net".
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index c79de2b051..9338238d2a 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -141,7 +141,7 @@
   },
   {
     "name": "mindustry.ddns.net",
-    "address": ["mindustry.ddns.net", "mindustry.ddns.net:1000", "mindustry.ddns.net:2000", "mindustry.ddns.net:3000", "mindustry.ddns.net:4000"]
+    "address": ["mindustry.ddns.net", "mindustry.ddns.net:1000", "mindustry.ddns.net:2000", "mindustry.ddns.net:3000", "mindustry.ddns.net:4000", "mindustry.ddns.net:5000"]
   },
   {
     "name": "EasyPlay.su",

From 626edbbf2a7c6666a391b88cd1fba214ea3e5fad Mon Sep 17 00:00:00 2001
From: meiqiu <119494143+MEIQIUawa@users.noreply.github.com>
Date: Sat, 9 Dec 2023 07:25:22 +0800
Subject: [PATCH 063/369] Update servers_v7.json (#9361)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 9338238d2a..57963eb011 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -9,7 +9,7 @@
   },
   {
     "name": "meiqiuMDT",
-    "address": ["cn1.plush.run:10001","211.101.236.94:10000","bj-1.lcf.icu:10240","play.simpfun.cn:14523"]
+    "address": ["cn1.meiqiumdy.top:7000","cn1.meiqiumdt.top:7002","cn1.meiqiumdt.top:7006,""bj-1.lcf.icu:10240"]
   },
   {
     "name": "Crux's Revelations",

From f3e351cd9bb29153357f2183bf93bdd9d5359204 Mon Sep 17 00:00:00 2001
From: AwA <96404493+aawwaaa@users.noreply.github.com>
Date: Sat, 9 Dec 2023 21:37:56 +0800
Subject: [PATCH 064/369] Update servers_v7.json (#9365)

fix a syntax error in line 12
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 57963eb011..8509fcd9dc 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -9,7 +9,7 @@
   },
   {
     "name": "meiqiuMDT",
-    "address": ["cn1.meiqiumdy.top:7000","cn1.meiqiumdt.top:7002","cn1.meiqiumdt.top:7006,""bj-1.lcf.icu:10240"]
+    "address": ["cn1.meiqiumdy.top:7000","cn1.meiqiumdt.top:7002","cn1.meiqiumdt.top:7006","bj-1.lcf.icu:10240"]
   },
   {
     "name": "Crux's Revelations",

From ee52588ae7401c74e7b03aea08463079745ac7ca Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Sat, 9 Dec 2023 20:38:46 +0700
Subject: [PATCH 065/369] Update servers_v7.json (#9364)

vndustry wants to merge into abcxyzdustry
---
 servers_v7.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index 8509fcd9dc..03bb7bc307 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -1,8 +1,4 @@
 [
-  {
-    "name": "Vndustry",
-    "address": ["140.238.246.78:7000"]
-  },
   {
     "name": "STP",
     "address": ["23.88.73.88:25617"]
@@ -230,7 +226,7 @@
   },
   {
     "name": "ABCXYZ Community",
-    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133"]
+    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "140.238.246.78:7000"]
   },
   {
     "name": "CroCraft Network",

From 5bc73fafea91f64828eaaabda8d4247ddf8f497a Mon Sep 17 00:00:00 2001
From: 3MIDustry <137229648+tech3mi@users.noreply.github.com>
Date: Sat, 9 Dec 2023 13:39:35 +0000
Subject: [PATCH 066/369] Update servers_v7.json (#9362)

* Update servers_v7.json

We changed our server and ports

* Update servers_v7.json
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 03bb7bc307..24fcf6253c 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -222,7 +222,7 @@
   },
   {
     "name": "3MIDustry",
-    "address": ["3midustry.xyz:10", "3midustry.xyz:20", "3midustry.xyz:30", "3midustry.xyz:40", "3midustry.xyz:50", "3midustry.xyz:60", "3midustry.xyz:6567"]
+    "address": ["play.3midustry.xyz:6001", "play.3midustry.xyz:6002", "play.3midustry.xyz:6003", "play.3midustry.xyz:6004", "play.3midustry.xyz:6005", "play.3midustry.xyz:6006", "play.3midustry.xyz:6007", "play.3midustry.xyz:6008", "play.3midustry.xyz:6009", "play.3midustry.xyz:6010"]
   },
   {
     "name": "ABCXYZ Community",

From cecd84817cab61d960d6a9793a637e74edf11f01 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 9 Dec 2023 12:38:16 -0500
Subject: [PATCH 067/369] Validate server JSON with org.json as well

---
 build.gradle                              | 1 +
 tests/src/test/java/ApplicationTests.java | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/build.gradle b/build.gradle
index e3ae3ad3e9..1828919509 100644
--- a/build.gradle
+++ b/build.gradle
@@ -381,6 +381,7 @@ project(":tests"){
         testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.1"
         testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
         testImplementation arcModule("backends:backend-headless")
+        testImplementation "org.json:json:20230618"
         testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
     }
 
diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java
index 1885a31d94..773a91ffa3 100644
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -26,6 +26,7 @@ import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.storage.*;
+import org.json.*;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.params.*;
 import org.junit.jupiter.params.provider.*;
@@ -227,11 +228,14 @@ public class ApplicationTests{
     void serverListJson(){
         String[] files = {"servers_v6.json", "servers_v7.json", "servers_be.json"};
 
+
         for(String file : files){
             try{
                 String str = Core.files.absolute("./../../" + file).readString();
                 assertEquals(ValueType.array, new JsonReader().parse(str).type());
                 assertTrue(Jval.read(str).isArray());
+                JSONArray array = new JSONArray(str);
+                assertTrue(array.length() > 0);
             }catch(Exception e){
                 fail("Failed to parse " + file, e);
             }

From c02a052b7b2192186ba32293b8ae71153e95dbae Mon Sep 17 00:00:00 2001
From: TheRadioactiveBanana
 <89061718+TheRadioactiveBanana@users.noreply.github.com>
Date: Sun, 10 Dec 2023 06:45:20 +0530
Subject: [PATCH 068/369] Load Balancing Refactor (#9369)

- Move off of dumb port scheme that I was too lazy to fix
- 3MIDustry partnership for more servers
- Load balancing because eradication servers have maxed out my two machines (yes, really)
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 24fcf6253c..f8984c7fea 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -129,7 +129,7 @@
   },
   {
     "name": "Eradication Mindustry",
-    "address": ["140.238.246.78:6569", "140.238.246.78:9547", "140.238.246.78:6572", "140.238.246.78:6570", "140.238.246.78:6571", "140.238.246.78:6574", "140.238.246.78:6573", "140.238.246.78:6568", "140.238.246.78:6677", "140.238.246.78:6678", "140.238.246.78:6675", "130.61.22.183:6573", "130.61.22.183:6599", "130.61.22.183:6774", "130.61.22.183:6777"]
+    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "140.238.246.78:7005", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "130.61.22.183:7005", "77.99.254.211:7000", "77.99.254.211:7001", "77.99.254.211:7002", "141.148.196.135:7000"]
   },
   {
     "name": "Conservatory",

From e494806cc808e934b0553c3f87f7a81ff6db6a90 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 10 Dec 2023 08:32:49 -0500
Subject: [PATCH 069/369] Better Flare/Avert targeting / Fixed targets
 resetting on save load

---
 core/src/mindustry/ai/types/CommandAI.java           | 12 +++++++++++-
 core/src/mindustry/entities/comp/EntityComp.java     |  5 +++++
 core/src/mindustry/entities/comp/UnitComp.java       |  5 +++++
 core/src/mindustry/entities/units/AIController.java  |  5 +++++
 .../src/mindustry/entities/units/UnitController.java |  4 ++++
 core/src/mindustry/io/SaveVersion.java               |  7 +++++++
 core/src/mindustry/io/TypeIO.java                    |  3 ++-
 7 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/ai/types/CommandAI.java b/core/src/mindustry/ai/types/CommandAI.java
index 0cf650ccc2..bedc78fc14 100644
--- a/core/src/mindustry/ai/types/CommandAI.java
+++ b/core/src/mindustry/ai/types/CommandAI.java
@@ -30,6 +30,8 @@ public class CommandAI extends AIController{
     public int groupIndex = 0;
     /** All encountered unreachable buildings of this AI. Why a sequence? Because contains() is very rarely called on it. */
     public IntSeq unreachableBuildings = new IntSeq(8);
+    /** ID of unit read as target. This is set up after reading. Do not access! */
+    public int readAttackTarget = -1;
 
     protected boolean stopAtTarget, stopWhenInRange;
     protected Vec2 lastTargetPos;
@@ -284,7 +286,7 @@ public class CommandAI extends AIController{
                 attackTarget = null;
             }
 
-            if(unit.isFlying() && move){
+            if(unit.isFlying() && move && (attackTarget == null || !unit.within(attackTarget, unit.type.range))){
                 unit.lookAt(vecMovePos);
             }else{
                 faceTarget();
@@ -349,6 +351,14 @@ public class CommandAI extends AIController{
         }
     }
 
+    @Override
+    public void afterRead(Unit unit){
+        if(readAttackTarget != -1){
+            attackTarget = Groups.unit.getByID(readAttackTarget);
+            readAttackTarget = -1;
+        }
+    }
+
     @Override
     public float prefSpeed(){
         return group == null ? super.prefSpeed() : Math.min(group.minSpeed, unit.speed());
diff --git a/core/src/mindustry/entities/comp/EntityComp.java b/core/src/mindustry/entities/comp/EntityComp.java
index aaacdc521b..fdba35a737 100644
--- a/core/src/mindustry/entities/comp/EntityComp.java
+++ b/core/src/mindustry/entities/comp/EntityComp.java
@@ -66,4 +66,9 @@ abstract class EntityComp{
     void afterRead(){
 
     }
+
+    /** Called after *all* entities are read. */
+    void afterAllRead(){
+
+    }
 }
diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index 4ff6b3168f..828c9880d7 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -490,6 +490,11 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         }
     }
 
+    @Override
+    public void afterAllRead(){
+        controller.afterRead(self());
+    }
+
     @Override
     public void add(){
         team.data().updateCount(type, 1);
diff --git a/core/src/mindustry/entities/units/AIController.java b/core/src/mindustry/entities/units/AIController.java
index 6b688eb60a..963fb67933 100644
--- a/core/src/mindustry/entities/units/AIController.java
+++ b/core/src/mindustry/entities/units/AIController.java
@@ -55,6 +55,11 @@ public class AIController implements UnitController{
         return false;
     }
 
+    @Override
+    public void afterRead(Unit unit){
+
+    }
+
     @Override
     public boolean isLogicControllable(){
         return true;
diff --git a/core/src/mindustry/entities/units/UnitController.java b/core/src/mindustry/entities/units/UnitController.java
index ff861b805d..b77a857a2f 100644
--- a/core/src/mindustry/entities/units/UnitController.java
+++ b/core/src/mindustry/entities/units/UnitController.java
@@ -27,6 +27,10 @@ public interface UnitController{
 
     }
 
+    default void afterRead(Unit unit){
+
+    }
+
     default boolean isBeingControlled(Unit player){
         return false;
     }
diff --git a/core/src/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java
index a1089b7dd3..e45d510893 100644
--- a/core/src/mindustry/io/SaveVersion.java
+++ b/core/src/mindustry/io/SaveVersion.java
@@ -437,6 +437,8 @@ public abstract class SaveVersion extends SaveFileReader{
         //entityMapping is null in older save versions, so use the default
         var mapping = this.entityMapping == null ? EntityMapping.idMap : this.entityMapping;
 
+        Seq<Entityc> entities = new Seq<>();
+
         int amount = stream.readInt();
         for(int j = 0; j < amount; j++){
             readChunk(stream, true, in -> {
@@ -449,12 +451,17 @@ public abstract class SaveVersion extends SaveFileReader{
                 int id = in.readInt();
 
                 Entityc entity = (Entityc)mapping[typeid].get();
+                entities.add(entity);
                 EntityGroup.checkNextId(id);
                 entity.id(id);
                 entity.read(Reads.get(in));
                 entity.add();
             });
         }
+
+        for(var e : entities){
+            e.afterAllRead();
+        }
     }
 
     public void readEntityMapping(DataInput stream) throws IOException{
diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java
index d2db6b1e70..4a80eca3e9 100644
--- a/core/src/mindustry/io/TypeIO.java
+++ b/core/src/mindustry/io/TypeIO.java
@@ -563,13 +563,14 @@ public class TypeIO{
                 ai.targetPos = null;
             }
             ai.setupLastPos();
+            ai.readAttackTarget = -1;
 
             if(hasAttack){
                 byte entityType = read.b();
                 if(entityType == 1){
                     ai.attackTarget = world.build(read.i());
                 }else{
-                    ai.attackTarget = Groups.unit.getByID(read.i());
+                    ai.attackTarget = Groups.unit.getByID(ai.readAttackTarget = read.i());
                 }
             }else{
                 ai.attackTarget = null;

From 3e4b86d095db7c90cc967d006a13465d0fdb012b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 10 Dec 2023 09:29:02 -0500
Subject: [PATCH 070/369] Clear block config background on rebuild

---
 core/src/mindustry/ui/fragments/BlockConfigFragment.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/mindustry/ui/fragments/BlockConfigFragment.java
index 144bfeb8d6..356c63fca4 100644
--- a/core/src/mindustry/ui/fragments/BlockConfigFragment.java
+++ b/core/src/mindustry/ui/fragments/BlockConfigFragment.java
@@ -43,6 +43,7 @@ public class BlockConfigFragment{
 
             table.visible = true;
             table.clear();
+            table.background(null);
             tile.buildConfiguration(table);
             table.pack();
             table.setTransform(true);

From 4802076bf81709d690889e24c9a86eccb95fd209 Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Sun, 10 Dec 2023 22:44:30 +0300
Subject: [PATCH 071/369] WIP marker changes, fix server name not appearing for
 saved hosts in join dialog

---
 core/assets/bundles/bundle.properties         |  3 ++-
 core/src/mindustry/core/Renderer.java         |  8 ++++--
 core/src/mindustry/game/MapObjectives.java    | 26 ++++++++++++++-----
 .../mindustry/graphics/MinimapRenderer.java   |  6 +++--
 core/src/mindustry/logic/LExecutor.java       | 26 +++++++++----------
 core/src/mindustry/logic/LMarkerControl.java  |  5 ++--
 core/src/mindustry/ui/dialogs/JoinDialog.java | 10 +++----
 7 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 80775411ac..f36943bd96 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2480,6 +2480,7 @@ lenum.getblock = Fetch a building, floor and type at coordinates.\nUnit must be
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
 
-lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nSecond and third arguments are additional suffixes added using "-" separator.\nIf additional arguments are not strings, nothing is added to first string.
+lenum.text = Set marker text, if applicable to marker's type.\nIf printFlush is set to true, consumes text buffer content as text argument.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index 62008fc3a7..a97b13c8e1 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -373,11 +373,15 @@ public class Renderer implements ApplicationListener{
 
         //draw objective markers
         state.rules.objectives.eachRunning(obj -> {
-            for(var marker : obj.markers) marker.draw();
+            for(var marker : obj.markers){
+                if(!marker.minimap) marker.drawWorld();
+            }
         });
 
         for(var marker : state.markers.values()){
-            if(marker != null) marker.draw();
+            if(marker != null){
+                if(!marker.isHidden() && !marker.minimap) marker.drawWorld();
+            }
         }
 
         Draw.reset();
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index 192d1ee86b..6aee74ff9d 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -638,14 +638,18 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         /** On which z-sorting layer is marker drawn. */
         protected float drawLayer = Layer.overlayUI;
 
-        /** Called in the overlay draw layer.*/
-        public void draw(){}
+        /** Called in the main renderer */
+        public void drawWorld(){}
         /** Called in the small and large map. */
         public void drawMinimap(MinimapRenderer minimap){}
         /** Add any UI elements necessary. */
         public void added(){}
         /** Remove any UI elements, if necessary. */
         public void removed(){}
+        /** Whether the marker is hidden */
+        public boolean isHidden(){
+            return hidden;
+        }
         /** Control marker with world processor code. Ignores NaN (null) values. */
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(Double.isNaN(p1)) return;
@@ -730,7 +734,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public ShapeTextMarker(){}
 
         @Override
-        public void draw(){
+        public void drawWorld(){
             if(hidden || minimap) return;
 
             //in case some idiot decides to make 9999999 sides and freeze the game
@@ -844,6 +848,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public MinimapMarker(int x, int y, Color color){
             this.pos.set(x, y);
             this.color = color;
+            minimap = true;
         }
 
         public MinimapMarker(int x, int y, float radius, float stroke, Color color){
@@ -851,10 +856,16 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             this.stroke = stroke;
             this.radius = radius;
             this.color = color;
+            minimap = true;
         }
 
         public MinimapMarker(){}
 
+        @Override
+        public void drawWorld(){
+            minimap = true;
+        }
+
         @Override
         public void drawMinimap(MinimapRenderer minimap){
             if(hidden) return;
@@ -879,6 +890,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                     case radius -> radius = (float)p1;
                     case stroke -> stroke = (float)p1;
                     case color -> color.set(Tmp.c1.fromDouble(p1));
+                    case minimap -> minimap = true;
                     default -> super.control(type, p1, p2, p3);
                 }
             }
@@ -914,7 +926,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public ShapeMarker(){}
 
         @Override
-        public void draw(){
+        public void drawWorld(){
             if(hidden || minimap) return;
 
             //in case some idiot decides to make 9999999 sides and freeze the game
@@ -1023,7 +1035,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public TextMarker(){}
 
         @Override
-        public void draw(){
+        public void drawWorld(){
             // font size cannot be 0
             if(hidden || Mathf.equal(fontSize, 0f) || minimap) return;
 
@@ -1118,7 +1130,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public LineMarker(){}
 
         @Override
-        public void draw(){
+        public void drawWorld(){
             if(hidden || minimap) return;
 
             float scl = autoscale ? 4f / renderer.getDisplayScale() : 1f;
@@ -1210,7 +1222,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         }
 
         @Override
-        public void draw(){
+        public void drawWorld(){
             if(hidden || textureName.isEmpty() || minimap) return;
 
             if(fetchedRegion == null) fetchedRegion = Core.atlas.find(textureName);
diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java
index 74d038e87f..fbc95e4b6e 100644
--- a/core/src/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/mindustry/graphics/MinimapRenderer.java
@@ -255,12 +255,14 @@ public class MinimapRenderer{
 
         state.rules.objectives.eachRunning(obj -> {
             for(var marker : obj.markers){
-                marker.drawMinimap(this);
+                if(marker.minimap) marker.drawMinimap(this);
             }
         });
 
         for(var marker : state.markers.values()){
-            if(marker != null) marker.drawMinimap(this);
+            if(marker != null){
+                if(!marker.isHidden() && marker.minimap) marker.drawMinimap(this);
+            }
         }
     }
 
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 9641d1eb85..a07cf3d9a8 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1988,16 +1988,18 @@ public class LExecutor{
                 if(marker == null) return;
 
                 if(type == LMarkerControl.text){
-                    marker.setText((exec.obj(p1) != null ? exec.obj(p1).toString() : "null"), false);
-                }else if(type == LMarkerControl.flushText){
-                    marker.setText(exec.textBuffer.toString(), true);
-                    exec.textBuffer.setLength(0);
+                    if(exec.bool(p1)){
+                        marker.setText(exec.textBuffer.toString(), exec.bool(p3));
+                        exec.textBuffer.setLength(0);
+                    }else{
+                        marker.setText((exec.obj(p2) != null ? exec.obj(p2).toString() : "null"), exec.bool(p3));
+                    }
                 }else if(type == LMarkerControl.texture){
-                    if(exec.obj(p1) != null){
-                        StringBuilder res = new StringBuilder(exec.obj(p1).toString());
-                        if(exec.obj(p2) != null) res.append("-").append(exec.obj(p2).toString());
-                        if(exec.obj(p3) != null) res.append("-").append(exec.obj(p3).toString());
-                        marker.setTexture(res.toString());
+                    if(exec.bool(p1)){
+                        marker.setTexture(exec.textBuffer.toString());
+                        exec.textBuffer.setLength(0);
+                    }else{
+                        marker.setTexture((exec.obj(p2) != null ? exec.obj(p2).toString() : "null"));
                     }
                 }else{
                     marker.control(type, exec.numOrNan(p1), exec.numOrNan(p2), exec.numOrNan(p3));
@@ -2053,13 +2055,11 @@ public class LExecutor{
     }
 
     @Remote(called = Loc.server, variants = Variant.both, unreliable = true)
-    public static void updateMarkerText(int id, LMarkerControl type, String text){
+    public static void updateMarkerText(int id, LMarkerControl type, boolean fetch, String text){
         var marker = state.markers.get(id);
         if(marker != null){
             if(type == LMarkerControl.text){
-                marker.setText(text, true);
-            }else if(type == LMarkerControl.flushText){
-                marker.setText(text, false);
+                marker.setText(text, fetch);
             }
         }
     }
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
index 8d96dd00cd..e51a25481c 100644
--- a/core/src/mindustry/logic/LMarkerControl.java
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -13,12 +13,11 @@ public enum LMarkerControl{
     stroke("stroke"),
     rotation("rotation"),
     shape("sides", "fill", "outline"),
-    text("text"),
-    flushText,
+    text("printFlush", "text", "fetch"),
     fontSize("size"),
     textHeight("height"),
     labelFlags("background", "outline"),
-    texture("name", "-", "-"),
+    texture("printFlush", "name"),
     textureSize("width", "height");
 
     public final String[] params;
diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index 01e2019401..3b826c3c79 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -247,10 +247,10 @@ public class JoinDialog extends BaseDialog{
     void setupServer(Server server, Host host){
         server.lastHost = host;
         server.content.clear();
-        buildServer(host, server.content, false);
+        buildServer(host, server.content, false, true);
     }
 
-    void buildServer(Host host, Table content, boolean local){
+    void buildServer(Host host, Table content, boolean local, boolean addName){
         content.top().left();
         boolean isBanned = local && Vars.steam && host.description != null && host.description.equals("[banned]");
         String versionString = getVersionString(host) + (isBanned ? "[red] [banned]" : "");
@@ -261,7 +261,7 @@ public class JoinDialog extends BaseDialog{
 
         Color color = Pal.gray;
 
-        if(local){
+        if(addName){
             content.table(Tex.whiteui, t -> {
                 t.left();
                 t.setColor(color);
@@ -513,7 +513,7 @@ public class JoinDialog extends BaseDialog{
 
         button[0].row();
 
-        buildServer(host, button[0].table(t -> {}).grow().get(), false);
+        buildServer(host, button[0].table(t -> {}).grow().get(), false, false);
 
         if((container.getChildren().size) % columns() == 0){
             container.row();
@@ -544,7 +544,7 @@ public class JoinDialog extends BaseDialog{
             local.row();
         }
 
-        local.button(b -> buildServer(host, b, true), style, () -> {
+        local.button(b -> buildServer(host, b, true, true), style, () -> {
             Events.fire(new ClientPreConnectEvent(host));
             safeConnect(host.address, host.port, host.version);
         }).width(w).top().left().growY();

From a0f235b4309790d2d9c6dfac4e83dbbdbe4dd47e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 10 Dec 2023 15:48:35 -0500
Subject: [PATCH 072/369] Make isSaveValid check backups

---
 core/src/mindustry/io/SaveIO.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/io/SaveIO.java b/core/src/mindustry/io/SaveIO.java
index 3ba9a38aa6..dea4ce7b72 100644
--- a/core/src/mindustry/io/SaveIO.java
+++ b/core/src/mindustry/io/SaveIO.java
@@ -56,8 +56,13 @@ public class SaveIO{
     }
 
     public static boolean isSaveValid(Fi file){
+        return isSaveFileValid(file) || isSaveFileValid(backupFileFor(file));
+    }
+
+    private static boolean isSaveFileValid(Fi file){
         try(DataInputStream stream = new DataInputStream(new InflaterInputStream(file.read(bufferSize)))){
-            return isSaveValid(stream);
+            getMeta(stream);
+            return true;
         }catch(Throwable e){
             return false;
         }

From 1eb70404d7e92bbfdd9ba329cb5f69a510fcd687 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 10 Dec 2023 20:01:40 -0500
Subject: [PATCH 073/369] GC retention fixes

---
 core/src/mindustry/entities/Fires.java        | 43 +++++++++++--------
 core/src/mindustry/entities/Puddles.java      |  4 +-
 .../mindustry/entities/comp/PlayerComp.java   |  1 +
 core/src/mindustry/world/Tiles.java           | 13 +++++-
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/core/src/mindustry/entities/Fires.java b/core/src/mindustry/entities/Fires.java
index b22e39eb4f..0deafd3618 100644
--- a/core/src/mindustry/entities/Fires.java
+++ b/core/src/mindustry/entities/Fires.java
@@ -1,8 +1,6 @@
 package mindustry.entities;
 
 import arc.*;
-import arc.math.geom.*;
-import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.game.EventType.*;
@@ -14,13 +12,12 @@ import static mindustry.Vars.*;
 
 public class Fires{
     private static final float baseLifetime = 1000f;
-    private static final IntMap<Fire> map = new IntMap<>();
 
     /** Start a fire on the tile. If there already is a fire there, refreshes its lifetime. */
     public static void create(Tile tile){
         if(net.client() || tile == null || !state.rules.fire || !state.rules.hasEnv(Env.oxygen)) return; //not clientside.
 
-        Fire fire = map.get(tile.pos());
+        Fire fire = get(tile);
 
         if(fire == null){
             fire = Fire.create();
@@ -28,48 +25,58 @@ public class Fires{
             fire.lifetime = baseLifetime;
             fire.set(tile.worldx(), tile.worldy());
             fire.add();
-            map.put(tile.pos(), fire);
+            set(tile, fire);
         }else{
             fire.lifetime = baseLifetime;
             fire.time = 0f;
         }
     }
 
-    public static Fire get(int x, int y){
-        return map.get(Point2.pack(x, y));
+    public static @Nullable Fire get(Tile tile){
+        return world.tiles.getFire(tile.array());
+    }
+
+    public static @Nullable Fire get(int x, int y){
+        return world.tiles.getFire(world.packArray(x, y));
+    }
+
+    private static void set(Tile tile, Fire fire){
+        world.tiles.setFire(tile.array(), fire);
     }
 
     public static boolean has(int x, int y){
-        if(!Structs.inBounds(x, y, world.width(), world.height()) || !map.containsKey(Point2.pack(x, y))){
+        if(!Structs.inBounds(x, y, world.width(), world.height())){
             return false;
         }
-        Fire fire = map.get(Point2.pack(x, y));
-        return fire.isAdded() && fire.fin() < 1f && fire.tile() != null && fire.tile().x == x && fire.tile().y == y;
+        Fire fire = get(x, y);
+        return fire != null && fire.isAdded() && fire.fin() < 1f && fire.tile != null && fire.tile.x == x && fire.tile.y == y;
     }
 
     /**
      * Attempts to extinguish a fire by shortening its life. If there is no fire here, does nothing.
      */
     public static void extinguish(Tile tile, float intensity){
-        if(tile != null && map.containsKey(tile.pos())){
-            Fire fire = map.get(tile.pos());
-            fire.time(fire.time + intensity * Time.delta);
-            Fx.steam.at(fire);
-            if(fire.time >= fire.lifetime){
-                Events.fire(Trigger.fireExtinguish);
+        if(tile != null){
+            Fire fire = get(tile);
+            if(fire != null){
+                fire.time(fire.time + intensity * Time.delta);
+                Fx.steam.at(fire);
+                if(fire.time >= fire.lifetime){
+                    Events.fire(Trigger.fireExtinguish);
+                }
             }
         }
     }
 
     public static void remove(Tile tile){
         if(tile != null){
-            map.remove(tile.pos());
+            set(tile, null);
         }
     }
 
     public static void register(Fire fire){
         if(fire.tile != null){
-            map.put(fire.tile.pos(), fire);
+            set(fire.tile, fire);
         }
     }
 }
diff --git a/core/src/mindustry/entities/Puddles.java b/core/src/mindustry/entities/Puddles.java
index aa7e5bde8d..be7b1bba1b 100644
--- a/core/src/mindustry/entities/Puddles.java
+++ b/core/src/mindustry/entities/Puddles.java
@@ -26,8 +26,8 @@ public class Puddles{
     }
 
     /** Returns the Puddle on the specified tile. May return null. */
-    public static Puddle get(Tile tile){
-        return world.tiles.puddle(tile.array());
+    public static @Nullable Puddle get(Tile tile){
+        return world.tiles.getPuddle(tile.array());
     }
 
     public static void deposit(Tile tile, Tile source, Liquid liquid, float amount, boolean initial){
diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java
index c995d3d9f0..b72fe2946c 100644
--- a/core/src/mindustry/entities/comp/PlayerComp.java
+++ b/core/src/mindustry/entities/comp/PlayerComp.java
@@ -183,6 +183,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         if(!unit.isNull()){
             clearUnit();
         }
+        lastReadUnit = justSwitchTo = justSwitchFrom = null;
     }
 
     public void team(Team team){
diff --git a/core/src/mindustry/world/Tiles.java b/core/src/mindustry/world/Tiles.java
index 37d8bd41d2..85a2f54c4c 100644
--- a/core/src/mindustry/world/Tiles.java
+++ b/core/src/mindustry/world/Tiles.java
@@ -14,15 +14,17 @@ public class Tiles implements Iterable<Tile>{
 
     final Tile[] array;
     final Puddle[] puddles;
+    final Fire[] fires;
 
     public Tiles(int width, int height){
         this.array = new Tile[width * height];
         this.width = width;
         this.height = height;
         this.puddles = new Puddle[width * height];
+        this.fires = new Fire[width * height];
     }
 
-    public Puddle puddle(int pos){
+    public Puddle getPuddle(int pos){
         return puddles[pos];
     }
 
@@ -30,6 +32,15 @@ public class Tiles implements Iterable<Tile>{
         puddles[pos] = p;
     }
 
+    public Fire getFire(int pos){
+        return fires[pos];
+    }
+
+    public void setFire(int pos, Fire f){
+        fires[pos] = f;
+    }
+
+
     public void each(Intc2 cons){
         for(int x = 0; x < width; x++){
             for(int y = 0; y < height; y++){

From eeefdd8054cf0d6a8ca3665c2bd9b0a87757bc97 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 10 Dec 2023 21:55:21 -0500
Subject: [PATCH 074/369] Crash fix

---
 core/src/mindustry/entities/Units.java           | 5 ++++-
 core/src/mindustry/entities/comp/PlayerComp.java | 4 +++-
 gradle.properties                                | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java
index 998c2c05f3..a641bac7a8 100644
--- a/core/src/mindustry/entities/Units.java
+++ b/core/src/mindustry/entities/Units.java
@@ -214,7 +214,10 @@ public class Units{
             }
         });
 
-        return buildResult;
+        var result = buildResult;
+        buildResult = null;
+
+        return result;
     }
 
     /** Iterates through all buildings in a range. */
diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java
index b72fe2946c..fe787a8336 100644
--- a/core/src/mindustry/entities/comp/PlayerComp.java
+++ b/core/src/mindustry/entities/comp/PlayerComp.java
@@ -183,7 +183,9 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         if(!unit.isNull()){
             clearUnit();
         }
-        lastReadUnit = justSwitchTo = justSwitchFrom = null;
+
+        lastReadUnit = Nulls.unit;
+        justSwitchTo = justSwitchFrom = null;
     }
 
     public void team(Team team){
diff --git a/gradle.properties b/gradle.properties
index 63ba2cb1ef..1f85852147 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=f1e4bdee85
+archash=774bfa97b0

From 588732c856ecfc5a560845381b6a9c0a5d5cf6e5 Mon Sep 17 00:00:00 2001
From: Gadgetroch <46190566+Gadgetroch@users.noreply.github.com>
Date: Mon, 11 Dec 2023 13:46:37 +0100
Subject: [PATCH 075/369] Update servers_v7.json (#9367)

Good morning,

Compared to your recommendations, everything was done except 2 things:
I left the connection/disconnect message because I am logging this in my discord server (protected channel)

I left the maps at default, to see over time.

Thank's
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index f8984c7fea..2c3686ad46 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -259,5 +259,9 @@
   {
     "name": "SkyPlex",
     "address": ["mc-skyplex.net"]
+  },
+  {
+    "name": "Gadgetroch's Server",
+    "address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568"]
   }
 ]

From 68b06fdea695603b759c255759af684f6bee42c1 Mon Sep 17 00:00:00 2001
From: BalaM314 <71201189+BalaM314@users.noreply.github.com>
Date: Tue, 12 Dec 2023 19:17:40 +0530
Subject: [PATCH 076/369] Allow fetching unitCount by type, and buildCount
 without type (#9374)

* Allow fetching unitCount by type, and buildCount without type

* show in processor ui
---
 core/src/mindustry/logic/LExecutor.java   | 11 +++++++++--
 core/src/mindustry/logic/LStatements.java |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 01e5266fea..16dfe01bf2 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1360,13 +1360,20 @@ public class LExecutor{
                         exec.setobj(result, i < 0 || i >= builds.size ? null : builds.get(i));
                     }
                 }
-                case unitCount -> exec.setnum(result, data.units.size);
+                case unitCount -> {
+                    UnitType type = exec.obj(extra) instanceof UnitType u ? u : null;
+                    if(type == null){
+                        exec.setnum(result, data.units.size);
+                    }else{
+                        exec.setnum(result, data.unitsByType[type.id].size);
+                    }
+                }
                 case coreCount -> exec.setnum(result, data.cores.size);
                 case playerCount -> exec.setnum(result, data.players.size);
                 case buildCount -> {
                     Block block = exec.obj(extra) instanceof Block b ? b : null;
                     if(block == null){
-                        exec.setobj(result, null);
+                        exec.setnum(result, data.buildings.size);
                     }else{
                         exec.setnum(result, data.getBuildings(block).size);
                     }
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 1a9e0473d8..30b7b52b56 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -1748,7 +1748,7 @@ public class LStatements{
                 fields(table, index, i -> index = i);
             }
 
-            if(type == FetchType.buildCount || type == FetchType.build){
+            if(type == FetchType.buildCount || type == FetchType.build || type == FetchType.unitCount){
                 row(table);
 
                 fields(table, "block", extra, i -> extra = i);

From 5830259e411be063cb76649118dcec820c039821 Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Tue, 12 Dec 2023 22:40:33 +0300
Subject: [PATCH 077/369] Markers draw code refactor, minor text marker control
 changes

---
 core/assets/bundles/bundle.properties         |   2 +-
 core/src/mindustry/game/MapObjectives.java    | 209 ++++++------------
 .../mindustry/graphics/MinimapRenderer.java   |   9 +-
 core/src/mindustry/logic/LExecutor.java       |  12 +-
 core/src/mindustry/logic/LMarkerControl.java  |   2 +-
 core/src/mindustry/logic/LStatements.java     |   1 +
 6 files changed, 81 insertions(+), 154 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index f36943bd96..fc8cf95397 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2480,7 +2480,7 @@ lenum.getblock = Fetch a building, floor and type at coordinates.\nUnit must be
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
 
-lenum.text = Set marker text, if applicable to marker's type.\nIf printFlush is set to true, consumes text buffer content as text argument.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index 6aee74ff9d..f7391fa3aa 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -637,8 +637,9 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         protected boolean hidden = false;
         /** On which z-sorting layer is marker drawn. */
         protected float drawLayer = Layer.overlayUI;
-
-        /** Called in the main renderer */
+        /** Draws the marker. Actual marker position and scale are calculated in {@link #drawWorld()} and {@link #drawMinimap(MinimapRenderer)}. */
+        public void baseDraw(float x, float y, float scaleFactor){}
+        /** Called in the main renderer. */
         public void drawWorld(){}
         /** Called in the small and large map. */
         public void drawMinimap(MinimapRenderer minimap){}
@@ -734,19 +735,15 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public ShapeTextMarker(){}
 
         @Override
-        public void drawWorld(){
-            if(hidden || minimap) return;
-
+        public void baseDraw(float x, float y, float scaleFactor){
             //in case some idiot decides to make 9999999 sides and freeze the game
             int sides = Math.min(this.sides, 200);
 
-            float scl = autoscale ? 4f / renderer.getDisplayScale() : 1f;
-
             Draw.z(drawLayer);
-            Lines.stroke(3f * scl, Pal.gray);
-            Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scl, rotation);
-            Lines.stroke(scl, color);
-            Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scl, rotation);
+            Lines.stroke(3f * scaleFactor, Pal.gray);
+            Lines.poly(x, y, sides, (radius + 1f) * scaleFactor, rotation);
+            Lines.stroke(scaleFactor, color);
+            Lines.poly(x, y, sides, (radius + 1f) * scaleFactor, rotation);
             Draw.reset();
 
             if(fetchedText == null){
@@ -756,35 +753,18 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             // font size cannot be 0
             if(Mathf.equal(fontSize, 0f)) return;
 
-            WorldLabel.drawAt(fetchedText, pos.x, pos.y + radius * scl + textHeight * scl, drawLayer, flags, fontSize * scl);
+            WorldLabel.drawAt(fetchedText, x, y + radius * scaleFactor + textHeight * scaleFactor, drawLayer, flags, fontSize * scaleFactor);
+        }
+
+        @Override
+        public void drawWorld(){
+            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
         }
 
         @Override
         public void drawMinimap(MinimapRenderer minimap){
-            if(hidden || !this.minimap) return;
-
-            //in case some idiot decides to make 9999999 sides and freeze the game
-            int sides = Math.min(this.sides, 200);
-
             minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
-
-            float rad = minimap.scale(radius, autoscale);
-
-            Draw.z(drawLayer);
-            Lines.stroke(minimap.scale(3f, autoscale), Pal.gray);
-            Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, rad + 1f, rotation);
-            Lines.stroke(minimap.scale(1f, autoscale), color);
-            Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, rad + 1f, rotation);
-            Draw.reset();
-
-            if(fetchedText == null){
-                fetchedText = fetchText(text);
-            }
-
-            // font size cannot be 0
-            if(Mathf.equal(fontSize, 0f)) return;
-
-            WorldLabel.drawAt(fetchedText, Tmp.v1.x, Tmp.v1.y + rad + minimap.scale(textHeight, autoscale), drawLayer, flags, minimap.scale(fontSize, autoscale));
+            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
         }
 
         @Override
@@ -861,6 +841,18 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         public MinimapMarker(){}
 
+        @Override
+        public void baseDraw(float x, float y, float scaleFactor){
+            float rad = radius * tilesize * scaleFactor;
+            float fin = Interp.pow2Out.apply((Time.globalTime / 100f) % 1f);
+
+            Draw.z(drawLayer);
+            Lines.stroke(Scl.scl((1f - fin) * stroke + 0.1f), color);
+            Lines.circle(x, y, rad * fin);
+
+            Draw.reset();
+        }
+
         @Override
         public void drawWorld(){
             minimap = true;
@@ -868,18 +860,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void drawMinimap(MinimapRenderer minimap){
-            if(hidden) return;
-
             minimap.transform(Tmp.v1.set(pos.x * tilesize, pos.y * tilesize));
-
-            float rad = minimap.scale(radius * tilesize, autoscale);
-            float fin = Interp.pow2Out.apply((Time.globalTime / 100f) % 1f);
-
-            Draw.z(drawLayer);
-            Lines.stroke(Scl.scl((1f - fin) * stroke + 0.1f), color);
-            Lines.circle(Tmp.v1.x, Tmp.v1.y, rad * fin);
-
-            Draw.reset();
+            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
         }
 
         @Override
@@ -926,57 +908,36 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public ShapeMarker(){}
 
         @Override
-        public void drawWorld(){
-            if(hidden || minimap) return;
-
+        public void baseDraw(float x, float y, float scaleFactor){
             //in case some idiot decides to make 9999999 sides and freeze the game
             int sides = Math.min(this.sides, 200);
 
-            float scl = autoscale ? 4f / renderer.getDisplayScale() : 1f;
-
             Draw.z(drawLayer);
             if(!fill){
                 if(outline){
-                    Lines.stroke((stroke + 2f) * scl, Pal.gray);
-                    Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scl, rotation);
+                    Lines.stroke((stroke + 2f) * scaleFactor, Pal.gray);
+                    Lines.poly(x, y, sides, (radius + 1f) * scaleFactor, rotation);
                 }
 
-                Lines.stroke(stroke * scl, color);
-                Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scl, rotation);
+                Lines.stroke(stroke * scaleFactor, color);
+                Lines.poly(x, y, sides, (radius + 1f) * scaleFactor, rotation);
             }else{
                 Draw.color(color);
-                Fill.poly(pos.x, pos.y, sides, radius * scl, rotation);
+                Fill.poly(x, y, sides, radius * scaleFactor, rotation);
             }
 
             Draw.reset();
         }
 
+        @Override
+        public void drawWorld(){
+            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
+        }
+
         @Override
         public void drawMinimap(MinimapRenderer minimap){
-            if(hidden || !this.minimap) return;
-
-            //in case some idiot decides to make 9999999 sides and freeze the game
-            int sides = Math.min(this.sides, 200);
-
             minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
-
-            float rad = minimap.scale(radius, autoscale);
-
-            Draw.z(drawLayer);
-            if(!fill){
-                if(outline){
-                    Lines.stroke(minimap.scale(stroke + 2f, autoscale), Pal.gray);
-                    Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius + 1f, autoscale), rotation);
-                }
-
-                Lines.stroke(stroke, color);
-                Lines.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius + 1f, autoscale), rotation);
-            }else{
-                Draw.color(color);
-                Fill.poly(Tmp.v1.x, Tmp.v1.y, sides, minimap.scale(radius, autoscale), rotation);
-            }
-
-            Draw.reset();
+            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
         }
 
         @Override
@@ -1035,35 +996,26 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public TextMarker(){}
 
         @Override
-        public void drawWorld(){
+        public void baseDraw(float x, float y, float scaleFactor){
             // font size cannot be 0
-            if(hidden || Mathf.equal(fontSize, 0f) || minimap) return;
+            if(Mathf.equal(fontSize, 0f)) return;
 
             if(fetchedText == null){
                 fetchedText = fetchText(text);
             }
 
-            float scl = autoscale ? 4f / renderer.getDisplayScale() : 1f;
+            WorldLabel.drawAt(fetchedText, x, y, drawLayer, flags, fontSize * scaleFactor);
+        }
 
-            WorldLabel.drawAt(fetchedText, pos.x, pos.y, drawLayer, flags, fontSize * scl);
+        @Override
+        public void drawWorld(){
+            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
         }
 
         @Override
         public void drawMinimap(MinimapRenderer minimap){
-            if(hidden || !this.minimap) return;
-
-            float size = minimap.scale(fontSize, autoscale);
-
-            // font size cannot be 0
-            if(Mathf.equal(fontSize, 0f)) return;
-
             minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
-
-            if(fetchedText == null){
-                fetchedText = fetchText(text);
-            }
-
-            WorldLabel.drawAt(fetchedText, Tmp.v1.x, Tmp.v1.y, drawLayer, flags, size);
+            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
         }
 
         @Override
@@ -1129,37 +1081,27 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         public LineMarker(){}
 
-        @Override
-        public void drawWorld(){
-            if(hidden || minimap) return;
-
-            float scl = autoscale ? 4f / renderer.getDisplayScale() : 1f;
-
+        public void baseLineDraw(float x1, float y1, float x2, float y2, float scaleFactor){
             Draw.z(drawLayer);
             if(outline){
-                Lines.stroke((stroke + 2f) * scl, Pal.gray);
-                Lines.line(pos1.x, pos1.y, pos2.x, pos2.y);
+                Lines.stroke((stroke + 2f) * scaleFactor, Pal.gray);
+                Lines.line(x1, y1, x2, y2);
             }
 
-            Lines.stroke(stroke * scl, color);
-            Lines.line(pos1.x, pos1.y, pos2.x, pos2.y);
+            Lines.stroke(stroke * scaleFactor, color);
+            Lines.line(x1, y1, x2, y2);
+        }
+
+        @Override
+        public void drawWorld(){
+            baseLineDraw(pos1.x, pos1.y, pos1.x, pos2.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
         }
 
         @Override
         public void drawMinimap(MinimapRenderer minimap){
-            if(hidden || !this.minimap) return;
-
             minimap.transform(Tmp.v1.set(pos1.x + 4f, pos1.y + 4f));
             minimap.transform(Tmp.v2.set(pos2.x + 4f, pos2.y + 4f));
-
-            Draw.z(drawLayer);
-            if(outline){
-                Lines.stroke(minimap.scale(stroke + 2f, autoscale), Pal.gray);
-                Lines.line(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
-            }
-
-            Lines.stroke(minimap.scale(stroke, autoscale), color);
-            Lines.line(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y);
+            baseLineDraw(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y, minimap.getScaleFactor(autoscale));
         }
 
         @Override
@@ -1222,8 +1164,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         }
 
         @Override
-        public void drawWorld(){
-            if(hidden || textureName.isEmpty() || minimap) return;
+        public void baseDraw(float x, float y, float scaleFactor){
+            if(textureName.isEmpty()) return;
 
             if(fetchedRegion == null) fetchedRegion = Core.atlas.find(textureName);
 
@@ -1231,38 +1173,25 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             if(Mathf.equal(width, 0f)) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
             if(Mathf.equal(height, 0f)) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
 
-            float scl = autoscale ? 4f / renderer.getDisplayScale() : 1f;
-
             Draw.z(drawLayer);
             if(fetchedRegion.found()){
                 Draw.color(color);
-                Draw.rect(fetchedRegion, pos.x, pos.y, width * scl, height * scl, rotation);
+                Draw.rect(fetchedRegion, x, y, width * scaleFactor, height * scaleFactor, rotation);
             }else{
                 Draw.color(Color.white);
-                Draw.rect("error", pos.x, pos.y, width * scl, height * scl, rotation);
+                Draw.rect("error", x, y, width * scaleFactor, height * scaleFactor, rotation);
             }
         }
 
+        @Override
+        public void drawWorld(){
+            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
+        }
+
         @Override
         public void drawMinimap(MinimapRenderer minimap){
-            if(hidden || textureName.isEmpty() || !this.minimap) return;
-
-            if(fetchedRegion == null) fetchedRegion = Core.atlas.find(textureName);
-
-            // Zero width/height scales marker to original texture's size
-            if(Mathf.equal(width, 0f)) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
-            if(Mathf.equal(height, 0f)) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
-
             minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
-
-            Draw.z(drawLayer);
-            if(fetchedRegion.found()){
-                Draw.color(color);
-                Draw.rect(fetchedRegion, Tmp.v1.x, Tmp.v1.y, minimap.scale(width, autoscale), minimap.scale(height, autoscale), rotation);
-            }else{
-                Draw.color(Color.white);
-                Draw.rect("error", Tmp.v1.x, Tmp.v1.y, minimap.scale(width, autoscale), minimap.scale(height, autoscale), rotation);
-            }
+            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
         }
 
         @Override
diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java
index fbc95e4b6e..12694b2b8a 100644
--- a/core/src/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/mindustry/graphics/MinimapRenderer.java
@@ -302,13 +302,14 @@ public class MinimapRenderer{
     }
 
     public float scale(float radius){
-        return scale(radius, false);
+        return worldSpace ? (radius / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width * radius;
     }
-    public float scale(float radius, boolean zoomAutoScale){
+
+    public float getScaleFactor(boolean zoomAutoScale){
         if(!zoomAutoScale){
-            return worldSpace ? (radius / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width * radius;
+            return worldSpace ? (1 / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width;
         }else{
-            return worldSpace ? (radius / (baseSize / 2f)) * 5f : lastW / 256f * radius;
+            return worldSpace ? (1 / (baseSize / 2f)) * 5f : lastW / 256f;
         }
     }
 
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index a07cf3d9a8..3bf89203f4 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1987,13 +1987,9 @@ public class LExecutor{
                 var marker = state.markers.get(exec.numi(id));
                 if(marker == null) return;
 
-                if(type == LMarkerControl.text){
-                    if(exec.bool(p1)){
-                        marker.setText(exec.textBuffer.toString(), exec.bool(p3));
-                        exec.textBuffer.setLength(0);
-                    }else{
-                        marker.setText((exec.obj(p2) != null ? exec.obj(p2).toString() : "null"), exec.bool(p3));
-                    }
+                if(type == LMarkerControl.flushText){
+                    marker.setText(exec.textBuffer.toString(), exec.bool(p1));
+                    exec.textBuffer.setLength(0);
                 }else if(type == LMarkerControl.texture){
                     if(exec.bool(p1)){
                         marker.setTexture(exec.textBuffer.toString());
@@ -2058,7 +2054,7 @@ public class LExecutor{
     public static void updateMarkerText(int id, LMarkerControl type, boolean fetch, String text){
         var marker = state.markers.get(id);
         if(marker != null){
-            if(type == LMarkerControl.text){
+            if(type == LMarkerControl.flushText){
                 marker.setText(text, fetch);
             }
         }
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
index e51a25481c..eb7cfcb196 100644
--- a/core/src/mindustry/logic/LMarkerControl.java
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -13,7 +13,7 @@ public enum LMarkerControl{
     stroke("stroke"),
     rotation("rotation"),
     shape("sides", "fill", "outline"),
-    text("printFlush", "text", "fetch"),
+    flushText("fetch"),
     fontSize("size"),
     textHeight("height"),
     labelFlags("background", "outline"),
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 6a351b6c48..d688c41212 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -2000,6 +2000,7 @@ public class LStatements{
                     t.setColor(table.color);
 
                     fields(t, type.params[i], i == 0 ? p1 : i == 1 ? p2 : p3, i == 0 ? v -> p1 = v : i == 1 ? v -> p2 = v : v -> p3 = v).width(100f);
+
                     if(type == LMarkerControl.color){
                         col(t, p1, res -> {
                             p1 = "%" + res.toString().substring(0, res.a >= 1f ? 6 : 8);

From 317a533b5cb1d48e13596237ee04d228a2774243 Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Wed, 13 Dec 2023 18:24:08 +0300
Subject: [PATCH 078/369] millimicronanopico setmarker texture fix (object
 print consistency)

---
 core/src/mindustry/logic/LExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 3bf89203f4..1541a43f60 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1995,7 +1995,7 @@ public class LExecutor{
                         marker.setTexture(exec.textBuffer.toString());
                         exec.textBuffer.setLength(0);
                     }else{
-                        marker.setTexture((exec.obj(p2) != null ? exec.obj(p2).toString() : "null"));
+                        marker.setTexture(PrintI.toString(exec.obj(p2)));
                     }
                 }else{
                     marker.control(type, exec.numOrNan(p1), exec.numOrNan(p2), exec.numOrNan(p3));

From 5d5783bf54119c30d18065d84649a9c1beaac477 Mon Sep 17 00:00:00 2001
From: a-big-fish-fish <111189982+a-big-fish-fish@users.noreply.github.com>
Date: Thu, 14 Dec 2023 06:04:17 +0800
Subject: [PATCH 079/369] Update servers_v7.json (#9376)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 2c3686ad46..bc3f73b8c2 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -234,7 +234,7 @@
   },
   {
     "name": "Extra Utilities",
-    "address": ["222.186.59.147:15142", "222.186.59.147:15143"]
+    "address": ["222.186.59.147:15142", "222.186.59.147:15143", "p1.i9mr.com:44922", "p1.i9mr.com:44834"]
   },
   {
     "name": "Alex Multiverse",

From 175153e8707bf30e3587ab26c042f77defe39863 Mon Sep 17 00:00:00 2001
From: Estcool9 <111180796+Estcool9@users.noreply.github.com>
Date: Wed, 13 Dec 2023 23:05:15 +0100
Subject: [PATCH 080/369] Update servers_v7.json Add My server mindustry
 est1.be (#9378)

---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index bc3f73b8c2..a760a6979e 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -3,6 +3,10 @@
     "name": "STP",
     "address": ["23.88.73.88:25617"]
   },
+  {
+    "name" : "LesGarsCools",
+    "address": ["est1.be"]
+  },
   {
     "name": "meiqiuMDT",
     "address": ["cn1.meiqiumdy.top:7000","cn1.meiqiumdt.top:7002","cn1.meiqiumdt.top:7006","bj-1.lcf.icu:10240"]

From 3a485eb338df9a01087d0a1fab768a73138916ff Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 13 Dec 2023 22:37:31 -0500
Subject: [PATCH 081/369] Fixed #9379

---
 core/src/mindustry/content/UnitTypes.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index bcb04b2fda..95f5ced15c 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -1845,6 +1845,7 @@ public class UnitTypes{
             armor = 3f;
 
             buildSpeed = 1.5f;
+            rotateToBuilding = false;
 
             weapons.add(new RepairBeamWeapon("repair-beam-weapon-center"){{
                 x = 0f;
@@ -1935,6 +1936,7 @@ public class UnitTypes{
             abilities.add(new StatusFieldAbility(StatusEffects.overclock, 60f * 6, 60f * 6f, 60f));
 
             buildSpeed = 2f;
+            rotateToBuilding = false;
 
             weapons.add(new Weapon("plasma-mount-weapon"){{
 
@@ -2009,6 +2011,7 @@ public class UnitTypes{
             trailScl = 2f;
 
             buildSpeed = 2f;
+            rotateToBuilding = false;
 
             weapons.add(new RepairBeamWeapon("repair-beam-weapon-center"){{
                 x = 11f;
@@ -2150,6 +2153,7 @@ public class UnitTypes{
             trailScl = 3.2f;
 
             buildSpeed = 3f;
+            rotateToBuilding = false;
 
             abilities.add(new EnergyFieldAbility(40f, 65f, 180f){{
                 statusDuration = 60f * 6f;
@@ -2193,6 +2197,7 @@ public class UnitTypes{
             trailScl = 3.5f;
 
             buildSpeed = 3.5f;
+            rotateToBuilding = false;
 
             for(float mountY : new float[]{-117/4f, 50/4f}){
                 for(float sign : Mathf.signs){

From df8f90a02b15647e3cc2b778d2a6768ce34d294d Mon Sep 17 00:00:00 2001
From: ApsZoldat <apszoldat@gmail.com>
Date: Fri, 15 Dec 2023 19:33:03 +0300
Subject: [PATCH 082/369] Small MapObjectives refactor (removal of duplicating
 overrided methods)

---
 core/src/mindustry/game/MapObjectives.java | 94 +++++++---------------
 1 file changed, 30 insertions(+), 64 deletions(-)

diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index f7391fa3aa..ee617ac49e 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -627,6 +627,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
     /** Marker used for drawing various content to indicate something along with an objective. Mostly used as UI overlay.  */
     public static abstract class ObjectiveMarker{
+        /** Position of marker, in world coordinates */
+        public @TilePos Vec2 pos = new Vec2();
         /** Makes sure markers are only added once. */
         public transient boolean wasAdded;
         /** Whether to display marker on minimap instead of world. {@link MinimapMarker} ignores this value. */
@@ -640,9 +642,14 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         /** Draws the marker. Actual marker position and scale are calculated in {@link #drawWorld()} and {@link #drawMinimap(MinimapRenderer)}. */
         public void baseDraw(float x, float y, float scaleFactor){}
         /** Called in the main renderer. */
-        public void drawWorld(){}
+        public void drawWorld(){
+            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
+        }
         /** Called in the small and large map. */
-        public void drawMinimap(MinimapRenderer minimap){}
+        public void drawMinimap(MinimapRenderer minimap){
+            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
+            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
+        }
         /** Add any UI elements necessary. */
         public void added(){}
         /** Remove any UI elements, if necessary. */
@@ -695,7 +702,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     /** Displays text above a shape. */
     public static class ShapeTextMarker extends ObjectiveMarker{
         public @Multiline String text = "frog";
-        public @TilePos Vec2 pos = new Vec2();
         public float fontSize = 1f, textHeight = 7f;
         public @LabelFlag byte flags = WorldLabel.flagBackground | WorldLabel.flagOutline;
 
@@ -756,17 +762,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             WorldLabel.drawAt(fetchedText, x, y + radius * scaleFactor + textHeight * scaleFactor, drawLayer, flags, fontSize * scaleFactor);
         }
 
-        @Override
-        public void drawWorld(){
-            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
-        }
-
-        @Override
-        public void drawMinimap(MinimapRenderer minimap){
-            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
-            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
-        }
-
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(!Double.isNaN(p1)){
@@ -889,7 +884,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
     /** Displays a shape with an outline and color. */
     public static class ShapeMarker extends ObjectiveMarker{
-        public @TilePos Vec2 pos = new Vec2();
         public float radius = 8f, rotation = 0f, stroke = 1f;
         public boolean fill = false, outline = true;
         public int sides = 4;
@@ -929,17 +923,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             Draw.reset();
         }
 
-        @Override
-        public void drawWorld(){
-            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
-        }
-
-        @Override
-        public void drawMinimap(MinimapRenderer minimap){
-            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
-            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
-        }
-
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(!Double.isNaN(p1)){
@@ -975,7 +958,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     /** Displays text at a location. */
     public static class TextMarker extends ObjectiveMarker{
         public @Multiline String text = "uwu";
-        public @TilePos Vec2 pos = new Vec2();
         public float fontSize = 1f;
         public @LabelFlag byte flags = WorldLabel.flagBackground | WorldLabel.flagOutline;
         // Cached localized text.
@@ -1007,17 +989,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             WorldLabel.drawAt(fetchedText, x, y, drawLayer, flags, fontSize * scaleFactor);
         }
 
-        @Override
-        public void drawWorld(){
-            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
-        }
-
-        @Override
-        public void drawMinimap(MinimapRenderer minimap){
-            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
-            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
-        }
-
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(!Double.isNaN(p1)){
@@ -1063,20 +1034,20 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
     /** Displays a line from pos1 to pos2. */
     public static class LineMarker extends ObjectiveMarker{
-        public @TilePos Vec2 pos1 = new Vec2(), pos2 = new Vec2();
+        public @TilePos Vec2 pos = new Vec2(), endPos = new Vec2();
         public float stroke = 1f;
         public boolean outline = true;
         public Color color = Color.valueOf("ffd37f");
 
-        public LineMarker(String text, float x1, float y1, float x2, float y2, float stroke){
+        public LineMarker(float x1, float y1, float x2, float y2, float stroke){
             this.stroke = stroke;
-            this.pos1.set(x1, y1);
-            this.pos2.set(x2, y2);
+            this.pos.set(x1, y1);
+            this.endPos.set(x2, y2);
         }
 
-        public LineMarker(String text, float x1, float y1, float x2, float y2){
-            this.pos1.set(x1, y1);
-            this.pos2.set(x2, y2);
+        public LineMarker(float x1, float y1, float x2, float y2){
+            this.pos.set(x1, y1);
+            this.endPos.set(x2, y2);
         }
 
         public LineMarker(){}
@@ -1094,13 +1065,13 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void drawWorld(){
-            baseLineDraw(pos1.x, pos1.y, pos1.x, pos2.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
+            baseLineDraw(pos.x, pos.y, endPos.x, endPos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
         }
 
         @Override
         public void drawMinimap(MinimapRenderer minimap){
-            minimap.transform(Tmp.v1.set(pos1.x + 4f, pos1.y + 4f));
-            minimap.transform(Tmp.v2.set(pos2.x + 4f, pos2.y + 4f));
+            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
+            minimap.transform(Tmp.v2.set(endPos.x + 4f, endPos.y + 4f));
             baseLineDraw(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y, minimap.getScaleFactor(autoscale));
         }
 
@@ -1108,8 +1079,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(!Double.isNaN(p1)){
                 switch(type){
-                    case pos -> pos1.x = (float)p1 * tilesize;
-                    case endPos -> pos2.x = (float)p1 * tilesize;
+                    case pos -> pos.x = (float)p1 * tilesize;
+                    case endPos -> endPos.x = (float)p1 * tilesize;
                     case stroke -> stroke = (float)p1;
                     case color -> color.set(Tmp.c1.fromDouble(p1));
                     default -> super.control(type, p1, p2, p3);
@@ -1118,8 +1089,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             if(!Double.isNaN(p2)){
                 switch(type){
-                    case pos -> pos1.y = (float)p2 * tilesize;
-                    case endPos -> pos2.y = (float)p2 * tilesize;
+                    case pos -> pos.y = (float)p2 * tilesize;
+                    case endPos -> endPos.y = (float)p2 * tilesize;
                     default -> super.control(type, p1, p2, p3);
                 }
             }
@@ -1128,13 +1099,19 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
     /** Displays a texture with specified name. */
     public static class TextureMarker extends ObjectiveMarker{
-        public @TilePos Vec2 pos = new Vec2();
         public float rotation = 0f, width = 0f, height = 0f; // Zero width/height scales marker to original texture's size
         public String textureName = "";
         public Color color = Color.white.cpy();
 
         private transient TextureRegion fetchedRegion;
 
+        public TextureMarker(String textureName, float x, float y, float width, float height){
+            this.textureName = textureName;
+            this.pos.set(x, y);
+            this.width = width;
+            this.height = height;
+        }
+
         public TextureMarker(String textureName, float x, float y){
             this.textureName = textureName;
             this.pos.set(x, y);
@@ -1183,17 +1160,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             }
         }
 
-        @Override
-        public void drawWorld(){
-            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
-        }
-
-        @Override
-        public void drawMinimap(MinimapRenderer minimap){
-            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
-            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
-        }
-
         @Override
         public void setTexture(String textureName){
             this.textureName = textureName;

From 332d98148bb969ccdc0c6e3932ff405fa6a811ec Mon Sep 17 00:00:00 2001
From: Atomic-Laboratory <146392884+Atomic-Laboratory@users.noreply.github.com>
Date: Fri, 15 Dec 2023 12:21:42 -0500
Subject: [PATCH 083/369] Update servers_v7.json (#9381)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index a760a6979e..b04cfa2caa 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -258,7 +258,7 @@
   },
   {
     "name": "Atomic",
-    "address": ["atomic-de.ddns.net:35199", "atomic-de.ddns.net:35176", "atomic-de.ddns.net:35845"]
+    "address": ["atomic-de.ddns.net:35199", "atomic-de.ddns.net:35176", "atomic-de.ddns.net:35845", "atomic-de.ddns.net:35313"]
   },
   {
     "name": "SkyPlex",

From 41d19ce0cbd23c5f7a4d7a0942e838cf2d382944 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 16 Dec 2023 09:05:22 -0500
Subject: [PATCH 084/369] Less confusing JITPack hash message

---
 .github/workflows/deployment.yml | 2 +-
 .gitignore                       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 059b2bbdad..224a753d65 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -44,7 +44,7 @@ jobs:
         rm -rf .github
         rm README.md
         git add .
-        git commit --allow-empty -m "${GITHUB_SHA}"
+        git commit --allow-empty -m "Updating"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
         git tag ${RELEASE_VERSION}
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
diff --git a/.gitignore b/.gitignore
index 61926257ab..dd3f2a0f06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ logs/
 /core/assets/.gifimages/
 /deploy/
 /out/
+ios/libs/
 /desktop/packr-out/
 /desktop/packr-export/
 /desktop/mindustry-saves/

From 7d3bd7e71b9f9a8bb6f892b922774300e99f8f2c Mon Sep 17 00:00:00 2001
From: HamzaGSopp <104453337+HamzaGSopp@users.noreply.github.com>
Date: Sat, 16 Dec 2023 15:09:00 +0100
Subject: [PATCH 085/369] Update servers_v7.json (#9382)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index b04cfa2caa..eda926b4bc 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -29,7 +29,7 @@
   },
   {
     "name": "Tamazia",
-    "address": ["213.165.76.25:6567", "213.165.76.25:30104"]
+    "address": ["5.250.178.221:6567"]
   },
   {
     "name": "Crux's Federation",

From 180eb6d1f022f08c8759a452daaac24762a0b4ba Mon Sep 17 00:00:00 2001
From: NazrinNya <137837419+NazrinNya@users.noreply.github.com>
Date: Sat, 16 Dec 2023 20:13:09 +0300
Subject: [PATCH 086/369] Update servers_v7.json (#9383)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index eda926b4bc..26ff70b8a0 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -210,7 +210,7 @@
   },
   {
     "name": "Cyandustry",
-    "address": ["81.30.157.68:7000","81.30.157.68:7001", "81.30.157.68:7002", "81.30.157.68:7003", "81.30.157.68:7004", "81.30.157.68:7005", "81.30.157.68:7006"]
+    "address": ["94.130.89.220:7000","94.130.89.220:7001", "94.130.89.220:7002", "94.130.89.220:7003", "94.130.89.220:7004", "94.130.89.220:7005", "94.130.89.220:7006"]
   },
   {
     "name": "Four Family",

From 2a6dc573acd8afdb56a0f26605050b1018fd2803 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 16 Dec 2023 13:10:04 -0500
Subject: [PATCH 087/369] Fixed FPS cap changes

---
 core/src/mindustry/ClientLauncher.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
index ad77dd6bcc..7e07570470 100644
--- a/core/src/mindustry/ClientLauncher.java
+++ b/core/src/mindustry/ClientLauncher.java
@@ -29,6 +29,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
 
     private long nextFrame;
     private long beginTime;
+    private long lastTargetFps = -1;
     private boolean finished = false;
     private LoadRenderer loader;
 
@@ -200,9 +201,12 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
     @Override
     public void update(){
         int targetfps = Core.settings.getInt("fpscap", 120);
+        boolean changed = lastTargetFps != targetfps && lastTargetFps != -1;
         boolean limitFps = targetfps > 0 && targetfps <= 240;
 
-        if(limitFps){
+        lastTargetFps = targetfps;
+
+        if(limitFps && !changed){
             nextFrame += (1000 * 1000000) / targetfps;
         }else{
             nextFrame = Time.nanos();

From 4495e85a4dc81b0b7a078e66cd7fcd56b9c55785 Mon Sep 17 00:00:00 2001
From: HamzaGSopp <104453337+HamzaGSopp@users.noreply.github.com>
Date: Sun, 17 Dec 2023 02:39:07 +0100
Subject: [PATCH 088/369] Update servers_v7.json (#9385)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 26ff70b8a0..4418ac1e3c 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -29,7 +29,7 @@
   },
   {
     "name": "Tamazia",
-    "address": ["5.250.178.221:6567"]
+    "address": ["5.250.178.221:6567","node1.adky.net:3215"]
   },
   {
     "name": "Crux's Federation",

From 790d1e144f2e006616a0a67c37be92b8334f37df Mon Sep 17 00:00:00 2001
From: 112Hack <144626073+112Hack@users.noreply.github.com>
Date: Tue, 19 Dec 2023 17:08:00 +0300
Subject: [PATCH 089/369] Update servers_v7.json (#9395)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 4418ac1e3c..1049cf6419 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -17,7 +17,7 @@
   },
   {
     "name": "CMS",
-    "address": ["195.2.84.144","65.108.101.89:32577"]
+    "address": ["195.2.84.144","65.108.224.31:26165"]
   },
   {
     "name": "ShardDustry Eventos",

From d8da46af879e4b810dfc533875d24978c3db55e0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 22 Dec 2023 19:50:39 -0500
Subject: [PATCH 090/369] Fixed #9399

---
 core/src/mindustry/world/blocks/payloads/BuildPayload.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/world/blocks/payloads/BuildPayload.java b/core/src/mindustry/world/blocks/payloads/BuildPayload.java
index e232df7d58..42f79374ad 100644
--- a/core/src/mindustry/world/blocks/payloads/BuildPayload.java
+++ b/core/src/mindustry/world/blocks/payloads/BuildPayload.java
@@ -98,10 +98,13 @@ public class BuildPayload implements Payload{
     @Override
     public void draw(){
         float prevZ = Draw.z();
-        Draw.z(prevZ - 0.0001f);
+        Draw.z(prevZ - 0.001f);
         drawShadow(1f);
         Draw.z(prevZ);
-        Draw.zTransform(z -> z >= Layer.flyingUnitLow + 1f ? z : 0.0011f + Math.min(Mathf.clamp(z, prevZ - 0.001f, prevZ + 0.9f), Layer.flyingUnitLow - 1f));
+        Draw.zTransform(z ->
+            z >= Layer.flyingUnitLow + 1f ? z :
+            0.0011f + Math.min(Mathf.clamp((z - prevZ)/100f, -0.0009f, 0.9f) + prevZ, Layer.flyingUnitLow - 1f)
+        );
         build.tile = emptyTile;
         build.payloadDraw();
         Draw.zTransform();

From b2f76ea0bd561109ce90b70352baaa4651a8c338 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 22 Dec 2023 19:52:51 -0500
Subject: [PATCH 091/369] Updated Arc

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 1f85852147..fe8cac0d83 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=774bfa97b0
+archash=5917728deff72b7c28c6630f0ab2489ce700f441

From 35df3202aed9dc7232be0150d10cb8408e1339f3 Mon Sep 17 00:00:00 2001
From: BalaM314 <71201189+BalaM314@users.noreply.github.com>
Date: Sat, 23 Dec 2023 19:46:48 +0530
Subject: [PATCH 092/369] Add config option to disable logging trace requests
 (#9401)

* Add config option to disable logging trace requests

* Actually, just remove the trace logging

* Might as well
12 (soon 13) merged PRs
---
 core/assets/contributors               | 1 +
 core/src/mindustry/core/NetServer.java | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/assets/contributors b/core/assets/contributors
index fcd191dc38..b518f242ac 100644
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -161,3 +161,4 @@ SITUVNgcd
 Gabriel "red" Fondato
 Yoru Kitsune
 OpalSoPL
+BalaM314
diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index fb0b36b085..5de465d1be 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -777,7 +777,6 @@ public class NetServer implements ApplicationListener{
                 }else{
                     NetClient.traceInfo(other, info);
                 }
-                info("&lc@ &fi&lk[&lb@&fi&lk]&fb has requested trace info of @ &fi&lk[&lb@&fi&lk]&fb.", player.plainName(), player.uuid(), other.plainName(), other.uuid());
             }
             case switchTeam -> {
                 if(params instanceof Team team){

From 5bf0193cb3e2c075a70be38564a45f1f36f00286 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 24 Dec 2023 16:29:51 -0500
Subject: [PATCH 093/369] Fixed #9405

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index fe8cac0d83..9d841d6412 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=5917728deff72b7c28c6630f0ab2489ce700f441
+archash=13c2e55010

From 93d4eaa970a16de4b40c09462092d1ae358d8b2f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 24 Dec 2023 21:05:14 -0500
Subject: [PATCH 094/369] Fixed logic display flicker with lower opacity
 graphics

---
 core/src/mindustry/world/blocks/logic/LogicDisplay.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/world/blocks/logic/LogicDisplay.java b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
index cfd5c45be8..ba45dd780a 100644
--- a/core/src/mindustry/world/blocks/logic/LogicDisplay.java
+++ b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
@@ -1,6 +1,5 @@
 package mindustry.world.blocks.logic;
 
-import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
@@ -91,7 +90,12 @@ public class LogicDisplay extends Block{
                         p1 = unpackSign(DisplayCmd.p1(c)), p2 = unpackSign(DisplayCmd.p2(c)), p3 = unpackSign(DisplayCmd.p3(c)), p4 = unpackSign(DisplayCmd.p4(c));
 
                         switch(type){
-                            case commandClear -> Core.graphics.clear(x / 255f, y / 255f, p1 / 255f, 1f);
+                            case commandClear -> {
+                                //calling glClear appears to be unreliable and leads to flickering
+                                Draw.color(x / 255f, y / 255f, p1 / 255f, 1f);
+                                Fill.crect(0f, 0f, displaySize, displaySize);
+                                Draw.color(color);
+                            }
                             case commandLine -> Lines.line(x, y, p1, p2);
                             case commandRect -> Fill.crect(x, y, p1, p2);
                             case commandLineRect -> Lines.rect(x, y, p1, p2);

From 3a646852801b2b5fb04cb9e0cfcdb500513d71ba Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 24 Dec 2023 21:14:44 -0500
Subject: [PATCH 095/369] Minor clear optimization

---
 core/src/mindustry/world/blocks/logic/LogicDisplay.java | 8 ++++----
 gradle.properties                                       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/world/blocks/logic/LogicDisplay.java b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
index ba45dd780a..2be75a1e05 100644
--- a/core/src/mindustry/world/blocks/logic/LogicDisplay.java
+++ b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
@@ -1,5 +1,6 @@
 package mindustry.world.blocks.logic;
 
+import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
@@ -91,10 +92,9 @@ public class LogicDisplay extends Block{
 
                         switch(type){
                             case commandClear -> {
-                                //calling glClear appears to be unreliable and leads to flickering
-                                Draw.color(x / 255f, y / 255f, p1 / 255f, 1f);
-                                Fill.crect(0f, 0f, displaySize, displaySize);
-                                Draw.color(color);
+                                //discard any pending batched sprites, so they don't get drawn over the cleared screen later
+                                Draw.discard();
+                                Core.graphics.clear(x / 255f, y / 255f, p1 / 255f, 1f);
                             }
                             case commandLine -> Lines.line(x, y, p1, p2);
                             case commandRect -> Fill.crect(x, y, p1, p2);
diff --git a/gradle.properties b/gradle.properties
index 9d841d6412..4a66b15a49 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=13c2e55010
+archash=d7512241d0

From 2677ea5600a1cead61ffc0059c785672af749d1c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 24 Dec 2023 22:56:12 -0500
Subject: [PATCH 096/369] Update push.yml

---
 .github/workflows/push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 5476ff44ee..38660e3f77 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -52,7 +52,7 @@ jobs:
         rm -rf .github
         rm README.md
         git add .
-        git commit --allow-empty -m "${GITHUB_SHA}"
+        git commit --allow-empty -m "Updating"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
         cd ../Mindustry
     - name: Run unit tests

From 6ce59b74bd46afb78cf543d89e7fd664a6f42e22 Mon Sep 17 00:00:00 2001
From: a-big-fish-fish <111189982+a-big-fish-fish@users.noreply.github.com>
Date: Mon, 25 Dec 2023 21:56:59 +0800
Subject: [PATCH 097/369] Update servers_v7.json (#9408)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 1049cf6419..4e088844b2 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -238,7 +238,7 @@
   },
   {
     "name": "Extra Utilities",
-    "address": ["222.186.59.147:15142", "222.186.59.147:15143", "p1.i9mr.com:44922", "p1.i9mr.com:44834"]
+    "address": ["p1.i9mr.com:44922", "p1.i9mr.com:44834"]
   },
   {
     "name": "Alex Multiverse",

From 288ab37e6f330b456f6db79fa527dfac1d034079 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 28 Dec 2023 16:35:54 -0500
Subject: [PATCH 098/369] Fixed derelict break hint persisting forever

---
 core/src/mindustry/ui/fragments/HintsFragment.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/ui/fragments/HintsFragment.java b/core/src/mindustry/ui/fragments/HintsFragment.java
index 3bed648fdc..8abd723d78 100644
--- a/core/src/mindustry/ui/fragments/HintsFragment.java
+++ b/core/src/mindustry/ui/fragments/HintsFragment.java
@@ -18,6 +18,7 @@ import mindustry.gen.*;
 import mindustry.input.*;
 import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.ConstructBlock.*;
 import mindustry.world.blocks.payloads.PayloadBlock.*;
 import mindustry.world.meta.*;
 
@@ -88,6 +89,12 @@ public class HintsFragment{
                 events.add("factorycontrol");
             }
         });
+
+        Events.on(BlockBuildBeginEvent.class, e -> {
+            if(e.unit == player.unit() && e.tile.build instanceof ConstructBuild c && c.prevBuild != null && c.prevBuild.contains(b -> b.team == Team.derelict)){
+                events.add("derelictbreak");
+            }
+        });
     }
 
     void checkNext(){
@@ -169,7 +176,7 @@ public class HintsFragment{
         conveyorPathfind(() -> control.input.block == Blocks.titaniumConveyor, () -> Core.input.keyRelease(Binding.diagonal_placement) || (mobile && Core.settings.getBool("swapdiagonal"))),
         boost(visibleDesktop, () -> !player.dead() && player.unit().type.canBoost, () -> Core.input.keyDown(Binding.boost)),
         blockInfo(() -> !(state.isCampaign() && state.rules.sector == SectorPresets.groundZero.sector && state.wave < 3), () -> ui.content.isShown()),
-        derelict(() -> ui.hints.events.contains("derelictmouse") && !isTutorial.get(), () -> false),
+        derelict(() -> ui.hints.events.contains("derelictmouse") && !isTutorial.get(), () -> ui.hints.events.contains("derelictbreak")),
         payloadPickup(() -> isSerpulo() && !player.unit().dead && player.unit() instanceof Payloadc p && p.payloads().isEmpty(), () -> player.unit() instanceof Payloadc p && p.payloads().any()),
         payloadDrop(() -> !player.unit().dead && player.unit() instanceof Payloadc p && p.payloads().any(), () -> player.unit() instanceof Payloadc p && p.payloads().isEmpty()),
         waveFire(() -> Groups.fire.size() > 0 && Blocks.wave.unlockedNow(), () -> indexer.getFlagged(state.rules.defaultTeam, BlockFlag.extinguisher).size > 0),

From 33178c16357ec74094c018ea43fd7e24598419e5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 29 Dec 2023 09:48:05 -0500
Subject: [PATCH 099/369] Added launch hint for Erekir

---
 core/assets/bundles/bundle.properties              | 2 +-
 core/src/mindustry/ui/fragments/HintsFragment.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 64cb47a770..e8394127ba 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1865,7 +1865,7 @@ hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to manually cont
 hint.unitControl.mobile = [accent][[Double-tap][] to manually control friendly units or turrets.
 hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
 hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
-hint.launch = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \uE827 [accent]Map[] in the bottom right.
+hint.launch = Once enough resources are collected, you can [accent]Launch[] to the next sector by opening the \uE827 [accent]Map[] in the bottom right.
 hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \uE827 [accent]Map[] in the \uE88C [accent]Menu[].
 hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
 hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
diff --git a/core/src/mindustry/ui/fragments/HintsFragment.java b/core/src/mindustry/ui/fragments/HintsFragment.java
index 8abd723d78..2595fbb041 100644
--- a/core/src/mindustry/ui/fragments/HintsFragment.java
+++ b/core/src/mindustry/ui/fragments/HintsFragment.java
@@ -171,7 +171,7 @@ public class HintsFragment{
         unitControl(() -> isSerpulo() && state.rules.defaultTeam.data().units.size > 2 && !net.active() && !player.dead(), () -> !player.dead() && !player.unit().spawnedByCore),
         unitSelectControl(() -> isSerpulo() && state.rules.defaultTeam.data().units.size > 3 && !net.active() && !player.dead(), () -> control.input.commandMode && control.input.selectedUnits.size > 0),
         respawn(visibleMobile, () -> !player.dead() && !player.unit().spawnedByCore, () -> !player.dead() && player.unit().spawnedByCore),
-        launch(() -> isTutorial.get() && state.rules.sector.isCaptured(), () -> ui.planet.isShown()),
+        launch(() -> (isTutorial.get() || Vars.state.rules.sector == SectorPresets.onset.sector) && state.rules.sector.isCaptured(), () -> ui.planet.isShown()),
         schematicSelect(visibleDesktop, () -> ui.hints.placedBlocks.contains(Blocks.router) || ui.hints.placedBlocks.contains(Blocks.ductRouter), () -> Core.input.keyRelease(Binding.schematic_select) || Core.input.keyTap(Binding.pick)),
         conveyorPathfind(() -> control.input.block == Blocks.titaniumConveyor, () -> Core.input.keyRelease(Binding.diagonal_placement) || (mobile && Core.settings.getBool("swapdiagonal"))),
         boost(visibleDesktop, () -> !player.dead() && player.unit().type.canBoost, () -> Core.input.keyDown(Binding.boost)),

From 9b6d95c507ce1dbd2c9a368040a2fe5aede08c31 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 29 Dec 2023 21:14:39 -0500
Subject: [PATCH 100/369] Bigger stream packet size

---
 core/src/mindustry/net/ArcNetProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java
index 26b160526e..06601b6a39 100644
--- a/core/src/mindustry/net/ArcNetProvider.java
+++ b/core/src/mindustry/net/ArcNetProvider.java
@@ -333,7 +333,7 @@ public class ArcNetProvider implements NetProvider{
 
         @Override
         public void sendStream(Streamable stream){
-            connection.addListener(new InputStreamSender(stream.stream, 512){
+            connection.addListener(new InputStreamSender(stream.stream, 1024){
                 int id;
 
                 @Override

From 288c969f5124f5e09d2d0a4ea21456eadefa3e64 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 3 Jan 2024 14:26:10 -0500
Subject: [PATCH 101/369] Fixed #9422

---
 core/src/mindustry/net/ArcNetProvider.java     | 2 +-
 server/src/mindustry/server/ServerControl.java | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java
index 06601b6a39..15028d37f9 100644
--- a/core/src/mindustry/net/ArcNetProvider.java
+++ b/core/src/mindustry/net/ArcNetProvider.java
@@ -452,7 +452,7 @@ public class ArcNetProvider implements NetProvider{
                 byteBuffer.put((byte)-2); //code for framework message
                 writeFramework(byteBuffer, msg);
             }else{
-                if(!(o instanceof Packet pack)) throw new RuntimeException("All sent objects must implement be Packets! Class: " + o.getClass());
+                if(!(o instanceof Packet pack)) throw new RuntimeException("All sent objects must extend Packet! Class: " + o.getClass());
                 byte id = Net.getPacketId(pack);
                 byteBuffer.put(id);
 
diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java
index e6ab76fb7a..8462871083 100644
--- a/server/src/mindustry/server/ServerControl.java
+++ b/server/src/mindustry/server/ServerControl.java
@@ -295,6 +295,15 @@ public class ServerControl implements ApplicationListener{
             info("Server loaded. Type @ for help.", "'help'");
         });
 
+        Events.on(SaveLoadEvent.class, e -> {
+            Core.app.post(() -> {
+                if(Config.autoPause.bool() && Groups.player.size() == 0){
+                    state.set(State.paused);
+                    autoPaused = true;
+                }
+            });
+        });
+
         Events.on(PlayerJoin.class, e -> {
             if(state.isPaused() && autoPaused && Config.autoPause.bool()){
                 state.set(State.playing);

From 7d1bbb61f0c78be993001408960d92c391093b74 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 3 Jan 2024 16:33:42 -0500
Subject: [PATCH 102/369] Fixed #9420 / Fixed #9429

---
 core/src/mindustry/core/Control.java          |  8 +-
 core/src/mindustry/input/Placement.java       | 79 ++++++++++++-------
 .../ui/dialogs/SchematicsDialog.java          | 23 +++---
 .../world/blocks/distribution/Conveyor.java   |  2 +-
 .../world/blocks/liquid/Conduit.java          |  2 +-
 5 files changed, 72 insertions(+), 42 deletions(-)

diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index 7e5ab7fde0..d39b338b9b 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -53,7 +53,7 @@ public class Control implements ApplicationListener, Loadable{
 
     private Interval timer = new Interval(2);
     private boolean hiscore = false;
-    private boolean wasPaused = false;
+    private boolean wasPaused = false, backgroundPaused = false;
     private Seq<Building> toBePlaced = new Seq<>(false);
 
     public Control(){
@@ -558,6 +558,7 @@ public class Control implements ApplicationListener, Loadable{
     @Override
     public void pause(){
         if(settings.getBool("backgroundpause", true) && !net.active()){
+            backgroundPaused = true;
             wasPaused = state.is(State.paused);
             if(state.is(State.playing)) state.set(State.paused);
         }
@@ -568,6 +569,7 @@ public class Control implements ApplicationListener, Loadable{
         if(state.is(State.paused) && !wasPaused && settings.getBool("backgroundpause", true) && !net.active()){
             state.set(State.playing);
         }
+        backgroundPaused = false;
     }
 
     @Override
@@ -659,6 +661,10 @@ public class Control implements ApplicationListener, Loadable{
                 core.items.each((i, a) -> i.unlock());
             }
 
+            if(backgroundPaused && settings.getBool("backgroundpause") && !net.active()){
+                state.set(State.paused);
+            }
+
             //cannot launch while paused
             if(state.isPaused() && renderer.isCutscene()){
                 state.set(State.playing);
diff --git a/core/src/mindustry/input/Placement.java b/core/src/mindustry/input/Placement.java
index 279bcfb628..09935e4e5c 100644
--- a/core/src/mindustry/input/Placement.java
+++ b/core/src/mindustry/input/Placement.java
@@ -113,6 +113,10 @@ public class Placement{
     }
 
     public static void calculateBridges(Seq<BuildPlan> plans, ItemBridge bridge){
+        calculateBridges(plans, bridge, t -> false);
+    }
+
+    public static void calculateBridges(Seq<BuildPlan> plans, ItemBridge bridge, Boolf<Block> avoid){
         if(isSidePlace(plans) || plans.size == 0) return;
 
         //check for orthogonal placement + unlocked state
@@ -120,11 +124,11 @@ public class Placement{
             return;
         }
 
-        Boolf<BuildPlan> placeable = plan -> (plan.placeable(player.team())) ||
-            (plan.tile() != null && plan.tile().block() == plan.block); //don't count the same block as inaccessible
+        Boolf<BuildPlan> placeable = plan ->
+            (plan.placeable(player.team()) || (plan.tile() != null && plan.tile().block() == plan.block)) &&  //don't count the same block as inaccessible
+           !(plan.build() != null && plan.build().rotation != plan.rotation && avoid.get(plan.tile().block()));
 
         var result = plans1.clear();
-        var team = player.team();
         var rotated = plans.first().tile() != null && plans.first().tile().absoluteRelativeTo(plans.peek().x, plans.peek().y) == Mathf.mod(plans.first().rotation + 2, 4);
 
         outer:
@@ -134,6 +138,7 @@ public class Placement{
 
             //gap found
             if(i < plans.size - 1 && placeable.get(cur) && !placeable.get(plans.get(i + 1))){
+                boolean wereSame = true;
 
                 //find the closest valid position within range
                 for(int j = i + 1; j < plans.size; j++){
@@ -147,18 +152,29 @@ public class Placement{
                         }
                         i = j;
                         continue outer;
-                    }else if(other.placeable(team)){
-                        //found a link, assign bridges
-                        cur.block = bridge;
-                        other.block = bridge;
-                        if(rotated){
-                            other.config = new Point2(cur.x - other.x,  cur.y - other.y);
-                        }else{
-                            cur.config = new Point2(other.x - cur.x, other.y - cur.y);
-                        }
+                    }else if(placeable.get(other)){
 
-                        i = j;
-                        continue outer;
+                        if(wereSame){
+                            //the gap is fake, it's just conveyors that can be replaced with junctions
+                            i ++;
+                            continue outer;
+                        }else{
+                            //found a link, assign bridges
+                            cur.block = bridge;
+                            other.block = bridge;
+                            if(rotated){
+                                other.config = new Point2(cur.x - other.x,  cur.y - other.y);
+                            }else{
+                                cur.config = new Point2(other.x - cur.x, other.y - cur.y);
+                            }
+
+                            i = j;
+                            continue outer;
+                        }
+                    }
+
+                    if(other.tile() != null && !avoid.get(other.tile().block())){
+                        wereSame = false;
                     }
                 }
 
@@ -175,7 +191,7 @@ public class Placement{
         plans.set(result);
     }
 
-    public static void calculateBridges(Seq<BuildPlan> plans, DirectionBridge bridge, boolean hasJunction, Boolf<Block> same){
+    public static void calculateBridges(Seq<BuildPlan> plans, DirectionBridge bridge, boolean hasJunction, Boolf<Block> avoid){
         if(isSidePlace(plans) || plans.size == 0) return;
 
         //check for orthogonal placement + unlocked state
@@ -183,13 +199,9 @@ public class Placement{
             return;
         }
 
-        Boolf<BuildPlan> rotated = plan -> plan.build() != null && same.get(plan.build().block) && plan.rotation != plan.build().rotation;
-
-        //TODO for chains of ducts, do not count consecutives in a different rotation as 'placeable'
         Boolf<BuildPlan> placeable = plan ->
-            !(!hasJunction && rotated.get(plan)) &&
-            (plan.placeable(player.team()) ||
-            (plan.tile() != null && same.get(plan.tile().block()))); //don't count the same block as inaccessible
+            (plan.placeable(player.team()) || (plan.tile() != null && plan.tile().block() == plan.block)) &&  //don't count the same block as inaccessible
+            !(plan.build() != null && plan.build().rotation != plan.rotation && avoid.get(plan.tile().block()));
 
         var result = plans1.clear();
 
@@ -199,10 +211,11 @@ public class Placement{
             result.add(cur);
 
             //gap found
-            if(i < plans.size - 1 && placeable.get(cur) && (!placeable.get(plans.get(i + 1)) || (hasJunction && rotated.get(plans.get(i + 1)) && i < plans.size - 2 && !placeable.get(plans.get(i + 2))))){
+            if(i < plans.size - 1 && placeable.get(cur) && !placeable.get(plans.get(i + 1))){
+                boolean wereSame = true;
 
                 //find the closest valid position within range
-                for(int j = i + 2; j < plans.size; j++){
+                for(int j = i + 1; j < plans.size; j++){
                     var other = plans.get(j);
 
                     //out of range now, set to current position and keep scanning forward for next occurrence
@@ -214,12 +227,22 @@ public class Placement{
                         i = j;
                         continue outer;
                     }else if(placeable.get(other)){
-                        //found a link, assign bridges
-                        cur.block = bridge;
-                        other.block = bridge;
 
-                        i = j;
-                        continue outer;
+                        if(wereSame && hasJunction){
+                            //the gap is fake, it's just conveyors that can be replaced with junctions
+                            i ++;
+                            continue outer;
+                        }else{
+                            //found a link, assign bridges
+                            cur.block = bridge;
+                            other.block = bridge;
+                            i = j;
+                            continue outer;
+                        }
+                    }
+
+                    if(other.tile() != null && !avoid.get(other.tile().block())){
+                        wereSame = false;
                     }
                 }
 
diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
index 51b4e294ec..dea4ee0d8b 100644
--- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java
+++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
@@ -464,9 +464,11 @@ public class SchematicsDialog extends BaseDialog{
 
                 for(var tag : tags){
 
-                    var next = new Table(n -> {
-                        n.table(Tex.pane, move -> {
-                            move.margin(2);
+                    var next = new Table(Tex.whiteui, n -> {
+                        n.setColor(Pal.gray);
+                        n.margin(5f);
+
+                        n.table(move -> {
 
                             //move up
                             move.button(Icon.upOpen, Styles.emptyi, () -> {
@@ -486,10 +488,9 @@ public class SchematicsDialog extends BaseDialog{
                                     rebuild[0].run();
                                 }
                             }).tooltip("@editor.movedown");
-                        }).fillY().margin(6f);
+                        }).fillY();
 
-                        n.table(Tex.whiteui, t -> {
-                            t.setColor(Pal.gray);
+                        n.table(t -> {
                             t.add(tag).left().row();
                             t.add(Core.bundle.format("schematic.tagged", schematics.all().count(s -> s.labels.contains(tag)))).left()
                             .update(b -> b.setColor(b.hasMouse() ? Pal.accent : Color.lightGray)).get().clicked(() -> {
@@ -498,9 +499,9 @@ public class SchematicsDialog extends BaseDialog{
                                 rebuildTags.run();
                                 rebuildPane.run();
                             });
-                        }).growX().fillY().margin(8f);
+                        }).growX().fillY();
 
-                        n.table(Tex.pane, b -> {
+                        n.table(b -> {
                             b.margin(2);
 
                             //rename tag
@@ -541,13 +542,13 @@ public class SchematicsDialog extends BaseDialog{
                                     rebuild[0].run();
                                 });
                             }).tooltip("@save.delete");
-                        }).fillY().margin(6f);
+                        }).fillY();
                     });
 
                     next.pack();
-                    float w = next.getPrefWidth() + Scl.scl(6f);
+                    float w = next.getWidth() + Scl.scl(6f);
 
-                    if(w + sum >= Core.graphics.getWidth() * (Core.graphics.isPortrait() ? 1f : 0.8f)){
+                    if(w*2f + sum >= Core.graphics.getWidth() * 0.8f){
                         p.add(current).row();
                         current = new Table();
                         current.left();
diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java
index bcbecc3f92..ede7e1f269 100644
--- a/core/src/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -92,7 +92,7 @@ public class Conveyor extends Block implements Autotiler{
     public void handlePlacementLine(Seq<BuildPlan> plans){
         if(bridgeReplacement == null) return;
 
-        Placement.calculateBridges(plans, (ItemBridge)bridgeReplacement);
+        Placement.calculateBridges(plans, (ItemBridge)bridgeReplacement, b -> b instanceof Conveyor);
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java
index 06b44c3ae4..64f1b02ac4 100644
--- a/core/src/mindustry/world/blocks/liquid/Conduit.java
+++ b/core/src/mindustry/world/blocks/liquid/Conduit.java
@@ -140,7 +140,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
         if(rotBridgeReplacement instanceof DirectionBridge duct){
             Placement.calculateBridges(plans, duct, true, b -> b instanceof Conduit);
         }else{
-            Placement.calculateBridges(plans, (ItemBridge)bridgeReplacement);
+            Placement.calculateBridges(plans, (ItemBridge)bridgeReplacement, b -> b instanceof Conduit);
         }
     }
 

From c1fabfd4a49a6b8e749c615099f04ed41ddbf999 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 3 Jan 2024 16:47:24 -0500
Subject: [PATCH 103/369] Fixed #9423

---
 .../mindustry/ui/dialogs/SchematicsDialog.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
index dea4ee0d8b..ff444b8991 100644
--- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java
+++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
@@ -463,6 +463,7 @@ public class SchematicsDialog extends BaseDialog{
                 Table current = new Table().left();
 
                 for(var tag : tags){
+                    float si = 40f;
 
                     var next = new Table(Tex.whiteui, n -> {
                         n.setColor(Pal.gray);
@@ -478,7 +479,7 @@ public class SchematicsDialog extends BaseDialog{
                                     tagsChanged();
                                     rebuild[0].run();
                                 }
-                            }).tooltip("@editor.moveup").row();
+                            }).size(si).tooltip("@editor.moveup").row();
                             //move down
                             move.button(Icon.downOpen, Styles.emptyi, () -> {
                                 int idx = tags.indexOf(tag);
@@ -487,7 +488,7 @@ public class SchematicsDialog extends BaseDialog{
                                     tagsChanged();
                                     rebuild[0].run();
                                 }
-                            }).tooltip("@editor.movedown");
+                            }).size(si).tooltip("@editor.movedown");
                         }).fillY();
 
                         n.table(t -> {
@@ -525,7 +526,7 @@ public class SchematicsDialog extends BaseDialog{
                                         rebuild[0].run();
                                     }
                                 });
-                            }).tooltip("@schematic.renametag").row();
+                            }).size(si).tooltip("@schematic.renametag").row();
                             //delete tag
                             b.button(Icon.trash, Styles.emptyi, () -> {
                                 ui.showConfirm("@schematic.tagdelconfirm", () -> {
@@ -541,23 +542,22 @@ public class SchematicsDialog extends BaseDialog{
                                     rebuildPane.run();
                                     rebuild[0].run();
                                 });
-                            }).tooltip("@save.delete");
+                            }).size(si).tooltip("@save.delete");
                         }).fillY();
                     });
 
                     next.pack();
-                    float w = next.getWidth() + Scl.scl(6f);
+                    float w = next.getWidth() + Scl.scl(9f);
 
-                    if(w*2f + sum >= Core.graphics.getWidth() * 0.8f){
+                    if(w + sum >= Core.graphics.getWidth() * 0.9f){
                         p.add(current).row();
                         current = new Table();
                         current.left();
-                        current.add(next).minWidth(240).pad(4);
                         sum = 0;
-                    }else{
-                        current.add(next).minWidth(240).pad(4);
                     }
 
+                    current.add(next).minWidth(210).pad(4);
+
                     sum += w;
                 }
 

From 55881d67b1b01b0df977298b0ab46dd9f78e6c3f Mon Sep 17 00:00:00 2001
From: AFARIUS <afarius.private@gmail.com>
Date: Thu, 4 Jan 2024 00:51:14 +0300
Subject: [PATCH 104/369] Added nuclear strike effects (#9233)

* Delete core/assets/maps/basin.msav

* Added nuclear strike effects

Added 3 lines of code to 1 world processor
---
 core/assets/maps/basin.msav | Bin 80375 -> 80323 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/core/assets/maps/basin.msav b/core/assets/maps/basin.msav
index dc75e5bf11db2a4e51b30c693a1f0986bad80eef..6cd15494fb39709a8d3c4fa6e475fc8007393d81 100644
GIT binary patch
delta 79907
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

delta 79939
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
E05BO>RR910


From a68dc4feb2fd171d1b3756bb5be2e9e478ce2992 Mon Sep 17 00:00:00 2001
From: "Arksource (ShardDustry [ES]) Owner"
 <93954648+ArkSourcer@users.noreply.github.com>
Date: Wed, 3 Jan 2024 17:53:29 -0400
Subject: [PATCH 105/369] =?UTF-8?q?New=20Agua=20bottles=20for=20Atomic=20?=
 =?UTF-8?q?=F0=9F=90=9F=20(#9409)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Funny change

* Update servers_v7.json

* Update bundle_es.properties

Traductions for the bundle_es
By ArkSource

* Update servers_v7.json

* Agua prt 2

* Update servers_v7.json

* Update servers_v7.json

* Agua 2-3

* OWO PVP2

* OWO PVP AGUA2 100% REAL NO FAKE

* Que bueno que nadie lee estos PRs porque parecería retrasado haciéndolos
---
 servers_v7.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index 4e088844b2..1ea8d1805e 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -13,7 +13,7 @@
   },
   {
     "name": "Crux's Revelations",
-    "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35160", "de-prem-01.hosts.optikservers.com:35116", "de-prem-01.hosts.optikservers.com:35922"]
+    "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"]
   },
   {
     "name": "CMS",
@@ -25,7 +25,7 @@
   },
   {
     "name": "ShardDustry ES",
-    "address": ["94.130.132.149:35689","94.130.132.149:35438","45.158.9.198:31290","45.158.9.198:30529"]
+    "address": ["94.130.132.149:35689","94.130.132.149:35438","45.158.9.198:31290","45.158.9.198:30529","94.130.132.149:35116","94.130.132.149:35160"]
   },
   {
     "name": "Tamazia",

From 7652fdf7cd509bc1efa31ad8306dfcd722334dfa Mon Sep 17 00:00:00 2001
From: NazrinNya <137837419+NazrinNya@users.noreply.github.com>
Date: Thu, 4 Jan 2024 00:53:42 +0300
Subject: [PATCH 106/369] Update servers_v7.json (#9415)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 1ea8d1805e..8108c1afd2 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -210,7 +210,7 @@
   },
   {
     "name": "Cyandustry",
-    "address": ["94.130.89.220:7000","94.130.89.220:7001", "94.130.89.220:7002", "94.130.89.220:7003", "94.130.89.220:7004", "94.130.89.220:7005", "94.130.89.220:7006"]
+    "address": ["94.130.89.220:7000","94.130.89.220:7001", "94.130.89.220:7002", "94.130.89.220:7003", "94.130.89.220:7004", "94.130.89.220:7005", "94.130.89.220:7006", "94.130.89.220:7007", "94.130.89.220:7008"]
   },
   {
     "name": "Four Family",

From 60d1c91bf46ffa6a14e53756eef1d370d6a22029 Mon Sep 17 00:00:00 2001
From: nega0311 <139965763+totto0311@users.noreply.github.com>
Date: Thu, 4 Jan 2024 06:57:51 +0900
Subject: [PATCH 107/369] Add Duel.Server to the server list (#9411)

Duel.Server is a server for 1v1.
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index 8108c1afd2..6c9cc51429 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -267,5 +267,9 @@
   {
     "name": "Gadgetroch's Server",
     "address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568"]
+  },
+  {
+    "name": "Duel.Server"
+    "address":["160.251.41.148:6568","160.251.41.148:6569"]
   }
 ]

From faf4432fbe93ebbee728c53c9841601095a049dd Mon Sep 17 00:00:00 2001
From: Dyx175 <77151433+Dyx175@users.noreply.github.com>
Date: Thu, 4 Jan 2024 08:58:00 +1100
Subject: [PATCH 108/369] Update servers_v7.json (#9428)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 6c9cc51429..a959c074db 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -77,7 +77,7 @@
   },
   {
     "name": "KMWStudios",
-    "address": ["x.kmwstudios.xyz:9000", "x.kmwstudios.xyz:9002", "x.kmwstudios.xyz:9003", "x.kmwstudios.xyz:9004", "x.kmwstudios.xyz:9005", "x.kmwstudios.xyz:9006", "x.kmwstudios.xyz:9007"]
+    "address": ["mind.kmwstudios.xyz:28101", "mind.kmwstudios.xyz:28102", "mind.kmwstudios.xyz:28103", "mind.kmwstudios.xyz:28104", "mind.kmwstudios.xyz:28105", "mind.kmwstudios.xyz:28106", "mind.kmwstudios.xyz:28107"]
   },
   {
     "name": "XCore",

From 0f3b5d155e6b536422545b2a5078ebb1212b6cb2 Mon Sep 17 00:00:00 2001
From: summoner001 <summoner001@users.noreply.github.com>
Date: Wed, 3 Jan 2024 23:02:44 +0100
Subject: [PATCH 109/369] Update bundle_hu.properties (#9340)

* Update bundle_hu.properties

Translations, and follow the updates

* Update contributors

I'm Here :)

* Update bundle_hu.properties

add missing charachters

* Update bundle_hu.properties

update

* Update bundle_hu.properties

updates

* Update bundle_hu.properties

correction of uppercase and lowercase letters
other reformulations
filling in missing texts and words

* Update bundle_hu.properties

fixing mistakes from the previous updates
---
 core/assets/bundles/bundle_hu.properties | 1297 +++++++++++-----------
 core/assets/contributors                 |    1 +
 2 files changed, 650 insertions(+), 648 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 39b911bc3b..3667e7a7a1 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1,6 +1,6 @@
 credits.text = Készítette: [royal]Anuken[] - [sky]anukendev@gmail.com[]
 credits = Készítők
-contributors = Fordítók és készítők
+contributors = Közreműködők És Fordítók
 discord = Csatlakozz a Mindustry Discord szerverhez!
 link.discord.description = Az eredeti Mindustry Discord csevegőszoba
 link.reddit.description = A Mindustry subreddit
@@ -13,7 +13,7 @@ link.google-play.description = Google Play áruház listázás
 link.f-droid.description = F-Droid katalógus listázás
 link.wiki.description = Hivatalos Mindustry wiki
 link.suggestions.description = Új funkciók ajánlása
-link.bug.description = Találtál egy szoftver hibát? Itt jelentheted.
+link.bug.description = Találtál egy szoftver hibát? Itt jelentheted
 linkopen = Ez a szerver egy linket küldött neked. Biztos vagy benne, hogy megnyitod?\n\n[sky]{0}
 linkfail = Nem sikerült megnyitni a linket!\nAz URL a vágólapra lett másolva.
 screenshot = Képernyőkép mentve ide: {0}
@@ -38,19 +38,19 @@ be.update = Új Bleeding Edge verzió áll rendelkezésre:
 be.update.confirm = Letöltöd és újraindítod?
 be.updating = Frissítés...
 be.ignore = Most nem
-be.noupdates = Nem találtunk frissítést.
-be.check = Frissítések keresése.
+be.noupdates = Nem található frissítés.
+be.check = Frissítések keresése
 
 mods.browser = Mod választó
 mods.browser.selected = Mod kiválasztása
 mods.browser.add = Letöltés
 mods.browser.reinstall = Újratelepítés
 mods.browser.view-releases = Kiadások megtekintése
-mods.browser.noreleases = [scarlet]Nem találhatóak a kiadások.\n[accent]Nem lehet kiadásokat találni ehhez a modhoz. Nézd meg a tárolóját, hogy vannak-e kiadásai.
-mods.browser.latest = <Legújabb>
+mods.browser.noreleases = [scarlet]Nem találhatóak a kiadások\n[accent]Nem lehet kiadásokat találni ehhez a Modhoz. Nézd meg a tárolóját, hogy vannak-e kiadásai.
+mods.browser.latest = [lightgray][Legújabb]
 mods.browser.releases = Kiadások
-mods.github.open = Megtekintés
-mods.github.open-release = Kiadások oldala
+mods.github.open = Tároló
+mods.github.open-release = Kiadások Oldala
 mods.browser.sortdate = Rendezés dátum szerint
 mods.browser.sortstars = Rendezés értékelés szerint
 
@@ -62,7 +62,7 @@ schematic.replace = Már van ilyen nevű vázlat. Lecseréled?
 schematic.exists = Már van ilyen nevű vázlat.
 schematic.import = Vázlat importálása...
 schematic.exportfile = Exportálás fájlba
-schematic.importfile = Importálás fájlba
+schematic.importfile = Importálás fájlból
 schematic.browseworkshop = Steam Műhely megtekintése
 schematic.copy = Másolás a vágólapra
 schematic.copy.import = Importálás a vágólapról
@@ -73,39 +73,39 @@ schematic.delete.confirm = Ez a vázlat törölve lesz.
 schematic.edit = Vázlat szerkesztése
 schematic.info = {0}x{1}, {2} blokk
 schematic.disabled = [scarlet]Vázlatok letiltva[]\nNem használhatsz vázlatokat ezen a [accent]pályán[], vagy [accent]szerveren.
-schematic.tags = Vázlat Címkék:
-schematic.edittags = Címkék szerkesztése
-schematic.addtag = Címke hozzáadása
-schematic.texttag = Következő címke
+schematic.tags = Címkék:
+schematic.edittags = Címkék Szerkesztése
+schematic.addtag = Címke Hozzáadása
+schematic.texttag = Szöveg Címke
 schematic.icontag = Ikon címke
-schematic.renametag = Címke átnevezése
+schematic.renametag = Címke Átnevezése
 schematic.tagged = {0} Címkézve
 schematic.tagdelconfirm = Teljesen törlöd ezt a címkét?
 schematic.tagexists = Ez a címke már létezik.
 
 stats = Statisztika
-stats.wave = Hullámok legyőzve
-stats.unitsCreated = Egységek létrehozva
-stats.enemiesDestroyed = Ellenségek megsemmisítve
-stats.built = Építmények építve
-stats.destroyed = Építmények elpusztítva
-stats.deconstructed = Építmények lebontva
-stats.playtime = Játszott idő
+stats.wave = Hullámok Legyőzve
+stats.unitsCreated = Egységek Létrehozva
+stats.enemiesDestroyed = Ellenségek Megsemmisítve
+stats.built = Építmények Építve
+stats.destroyed = Építmények Elpusztítva
+stats.deconstructed = Építmények Lebontva
+stats.playtime = Játszott Idő
 
-globalitems = [accent]Összes nyersanyag
+globalitems = [accent]Bolygó Nyersanyagai
 map.delete = Biztosan törölni akarod a "[accent]{0}[]" pályát?
-level.highscore = Legmagasabb pontszám: [accent]{0}
-level.select = Szint kiválasztása
+level.highscore = Legmagasabb Pontszám: [accent]{0}
+level.select = Szint Kiválasztása
 level.mode = Játékmód:
 coreattack = < A Mag támadás alatt van! >
 nearpoint = [[ [scarlet]AZONNAL HAGYD EL A LEDOBÁSI PONTOT![] ]\nA megsemmisülés fenyeget!
 database = Mag Adatbázis
 database.button = Adatbázis
-savegame = Játék mentése
-loadgame = Játék betöltése
-joingame = Csatlakozás játékhoz
-customgame = Egyedi játék
-newgame = Új játék
+savegame = Játék Mentése
+loadgame = Játék Betöltése
+joingame = Csatlakozás Játékhoz
+customgame = Egyedi Játék
+newgame = Új Játék
 none = <semmi>
 none.found = [lightgray]<nincs találat>
 none.inmap = [lightgray]<nincs a pályán>
@@ -114,97 +114,97 @@ position = Pozíció
 close = Bezárás
 website = Weboldal
 quit = Kilépés
-save.quit = Mentés és kilépés
+save.quit = Mentés & Kilépés
 maps = Pályák
-maps.browse = Pályák keresése
+maps.browse = Pályák Böngészése
 continue = Folytatás
-maps.none = [lightgray]Nem találtunk ilyen pályát!
+maps.none = [lightgray]Nem található ilyen pálya!
 invalid = Érvénytelen
-pickcolor = Válassz színt
-preparingconfig = Konfiguráció előkészítése
-preparingcontent = Tartalom előkészítése
-uploadingcontent = Tartalom feltöltése
-uploadingpreviewfile = Előnézet feltöltése
-committingchanges = Változások mentése
+pickcolor = Válassz Színt
+preparingconfig = Konfiguráció Előkészítése
+preparingcontent = Tartalom Előkészítése
+uploadingcontent = Tartalom Feltöltése
+uploadingpreviewfile = Előnézeti Fájl Feltöltése
+committingchanges = Változások Rögzítése
 done = Kész
-feature.unsupported = Az eszköz nem támogatja ezt a funkciót.
+feature.unsupported = Ez az eszköz nem támogatja ezt a funkciót.
 
-mods.initfailed = [red]⚠[] Az előző Mindustry munkamenet nem tudott inicializálódni. Ez valószínű egy rosszúl működő mod miatt történt.\n\nAz "összeomlások" elkerülése érdekében, [red]minden mod le lett tiltva.[]
+mods.initfailed = [red]\u26A0[] Az előző Mindustry munkamenet nem tudott inicializálódni. Ez valószínű egy rosszúl működő Mod miatt történt.\n\nAz "összeomlások" elkerülése érdekében, [red]minden Mod le lett tiltva.[]
 mods = Modok
-mods.none = [lightgray]Nem találhatóak modok!
-mods.guide = Mod készítési útmutató
-mods.report = Hiba jelentése
-mods.openfolder = Megnyitás mappából
-mods.viewcontent = Tartalom megtekintése
+mods.none = [lightgray]Nem találhatóak Modok!
+mods.guide = Mod Készítési Útmutató
+mods.report = Hiba Jelentése
+mods.openfolder = Mappa Megnyitása
+mods.viewcontent = Tartalom Megtekintése
 mods.reload = Újratöltés
-mods.reloadexit = A játék újraindul, hogy betöltődjenek a modok.
+mods.reloadexit = A játék újraindul, hogy betöltődjenek a Modok.
 mod.installed = [[Telepítve]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aktív
 mod.disabled = [red]Inaktív
-mod.multiplayer.compatible = [gray]Többjátékos kompatibilis
+mod.multiplayer.compatible = [gray]Többjátékos Kompatibilis
 mod.disable = Letiltás
 mod.content = Tartalom:
 mod.delete.error = Nem lehet törölni a Modot. Lehet, hogy egy másik folyamat használja.
 
-mod.incompatiblegame = [red]Elavult játék
-mod.incompatiblemod = [red]A mod nem kompatibilis ezzel a játékverzióval
-mod.blacklisted = [red]Nem támogatott
-mod.unmetdependencies = [red]Összeférhetetlen függőségek
-mod.erroredcontent = [red]Tartalom hiba
-mod.circulardependencies = [red]Körkörös függőségek
-mod.incompletedependencies = [red]Befejezetlen függőségek
+mod.incompatiblegame = [red]Elavult Játék
+mod.incompatiblemod = [red]Inkompatibilis
+mod.blacklisted = [red]Nem Támogatott
+mod.unmetdependencies = [red]Teljesítetlen Függőségek
+mod.erroredcontent = [red]Hibás Tartalom
+mod.circulardependencies = [red]Körkörös Függőségek
+mod.incompletedependencies = [red]Hiányos Függőségek
 
-mod.requiresversion.details = [accent]{0}[] játékverzió szükséges.\nA letöltésed elavult. Ez a mod egy újabb verziót kíván (velószínű, egy beta/alpha kiadást) a működéshez.
-mod.outdatedv7.details = Ez a mod nem kompatibilis a játék legújabb verziójával. A készítőjének frissítenie kell azt, és hozzá kell adnia a [accent]minGameVersion: 136[]-t a [accent]mod.json[] fájlhoz.
-mod.blacklisted.details = Ez a mod manuálisan a feketelistára került, mert a játék összeomlott tőle, vagy más probléma miatt. Ne használd!
-mod.missingdependencies.details = Ez a mod függőségeket hiányol: {0}
-mod.erroredcontent.details = Ez a mod hibákat okozott betöltésnél. Kérd meg a mod készítőjét hogy javítsa ki őket.
-mod.circulardependencies.details = Ennek a modnak egymástól függő függőségei vannak.
-mod.incompletedependencies.details = Ez a mod nem tudott betölteni hiányzó, vagy rossz függőségek miatt: {0}.
+mod.requiresversion.details = Szükséges játékverzió: [accent]{0}[]\nA játék ezen verzója elavult! Ez a Mod egy újabb verziót kíván (valószínűleg egy Béta, vagy egy Alfa kiadást) a működéshez.
+mod.outdatedv7.details = Ez a Mod nem kompatibilis a játék legújabb verziójával! A Mod készítőjének frissítenie kell azt és hozzá kell adnia a [accent]minGameVersion: 136[]-t a [accent]mod.json[] fájlhoz.
+mod.blacklisted.details = Ez a Mod manuálisan a feketelistára került, mert a játék összeomlott tőle, vagy más probléma miatt. Ne használd!
+mod.missingdependencies.details = Ez a Mod függőségeket hiányol: {0}
+mod.erroredcontent.details = Ez a Mod hibákat okozott a betöltésnél. Kérd meg a Mod készítőjét, hogy javítsa ki a hibákat.
+mod.circulardependencies.details = Ennek a Modnak egymástól függő függőségei vannak.
+mod.incompletedependencies.details = Ez a Mod nem tudott betölteni a hiányzó, vagy a rossz függőségek miatt: {0}.
 
-mod.requiresversion = [red]{0}[] játékverzió szükséges.
+mod.requiresversion = Szükséges játékverzó: [red]{0}[]
 
 mod.errors = Hiba történt a tartalom betöltése közben.
 mod.noerrorplay = [red]Vannak hibás Modok.[] Kapcsold ki, vagy javítsd ki őket a játék előtt.
 mod.nowdisabled = [red]A '{0}' Modnak nincs megfelelő függősége:[accent] {1}\n[lightgray]Ezeket előbb le kell tölteni.\nEz a Mod automatikusan törölve lesz.
 mod.enable = Engedélyezés
 mod.requiresrestart = A játék kilép a módosítások alkalmazásához.
-mod.reloadrequired = [red]Újratöltés szükséges
-mod.import = Mod importálása
-mod.import.file = Fájl importálása
-mod.import.github = GitHub Mod importálása
-mod.jarwarn = [scarlet]A JAR modok eredendően nem biztonságosak.[]\nGyőződj meg arról, hogy ezt a modot megbízható forrásból importálod!
-mod.item.remove = Ez az elem része a(z) [accent] '{0}'[] modnak. A törléshez távolítsd el a Modot.
+mod.reloadrequired = [red]Újratöltés Szükséges
+mod.import = Mod Importálása
+mod.import.file = Fájl Importálása
+mod.import.github = Importálás GitHub-ról
+mod.jarwarn = [scarlet]A JAR Modok eredendően nem biztonságosak.[]\nGyőződj meg arról, hogy ezt a Modot megbízható forrásból importálod!
+mod.item.remove = Ez az elem része a(z) [accent] '{0}'[] Modnak. A törléshez távolítsd el a Modot.
 mod.remove.confirm = Ez a Mod törölve lesz.
-mod.author = [LIGHT_GRAY]Készítő:[] {0}
-mod.missing = Ez a mentés nemrég törölt, vagy frissített modokat tartalmaz. Elképzelhető, hogy nem fog működni. Biztosan betöltöd?\n[lightgray]Modok:\n{0}
-mod.preview.missing = Mielőtt publikálod ezt a modot a Steam Műhelyben, adj hozzá egy borítóképet.\nKészíts egy[accent] preview.png[] nevű képet a mod mappájába, majd próbáld újra.
-mod.folder.missing = Csak mappa formában lehet feltölteni a Steam Műhelybe.\nHogy átalakítsd, csomagold ki a ZIP fájlt egy mappába és töröld le a régit, majd indítsd újra a játékot, vagy töltsd újra a modot.
-mod.scripts.disable = Az eszköz nem támogatja a szkriptekkel rendelkező modokat.\nA játékhoz tiltsd le ezeket a modokat.
+mod.author = [lightgray]Készítő:[] {0}
+mod.missing = Ez a mentés nemrég törölt, vagy frissített Modokat tartalmaz. Elképzelhető, hogy nem fog működni. Biztosan betöltöd?\n[lightgray]Modok:\n{0}
+mod.preview.missing = Mielőtt publikálod ezt a Modot a Steam Műhelyben, adj hozzá egy borítóképet.\nKészíts egy[accent] preview.png[] nevű képet a Mod mappájába, majd próbáld újra.
+mod.folder.missing = Csak mappa formában lehet feltölteni a Steam Műhelybe.\nHogy átalakítsd, csomagold ki a ZIP fájlt egy mappába és töröld le a régit, majd indítsd újra a játékot, vagy töltsd újra a Modot.
+mod.scripts.disable = Ez az eszköz nem támogatja a szkriptekkel rendelkező Modokat.\nA játékhoz tiltsd le ezeket a Modokat.
 
 about.button = Rólunk
 name = Név:
 noname = Előbb válassz egy[accent] nevet[].
 search = Keresés:
-planetmap = Bolygó térkép
-launchcore = Mag kilövése
-filename = Fájl név:
+planetmap = Bolygó Térkép
+launchcore = Mag Indítása
+filename = Fájl Név:
 unlocked = Új tartalom kinyitva!
 available = Új kutatás áll rendelkezésre!
-unlock.incampaign = < Oldd fel kampány módban a részletekért >
-campaign.select = Válassz kezdő kampányt!
+unlock.incampaign = < Oldd fel a kampányban a részletekért >
+campaign.select = Válassz Kezdő Kampányt
 campaign.none = [lightgray]Válassz egy bolygót a kezdéshez.\nEzt bármikor megváltoztathatod.
-campaign.erekir = Újabb, csiszoltabb tartalom. Általában lineáris kampány.\n\nMagasabb minőségű pályák és élmények.
+campaign.erekir = Újabb, csiszoltabb tartalom. Általában lineáris kampány.\n\nSokkal bonyolultabb. Magasabb minőségű pályák és élmények.
 campaign.serpulo = Régebbi tartalom. A klasszikus élmények. Nyíltabb végű.\n\nPotenciálisan kiegyensúlyozatlan pályák és kampány. Kevésbé csiszolt.
 completed = [accent]Kész
-techtree = Fejlődési fa
-techtree.select = Fejlődési fa kiválasztás
+techtree = Fejlődési Fa
+techtree.select = Fejlődési Fa Kiválasztás
 techtree.serpulo = Serpulo
 techtree.erekir = Erekir
 research.load = Betöltés
 research.discard = Eldobás
-research.list = [lightgray]Fedezd fel:
+research.list = [lightgray]Fedezd Fel:
 research = Felfedezés
 researched = [lightgray]{0} felfedezve.
 research.progress = {0}% kész
@@ -217,152 +217,152 @@ server.kicked.kick = Ki lettél rúgva a szerverről!
 server.kicked.whitelist = Nem vagy a fehérlistán.
 server.kicked.serverClose = A szerver be lett zárva.
 server.kicked.vote = Ki lettél szavazva. Viszlát!
-server.kicked.clientOutdated = Elavult verziót használsz! Frissítsd a játékot!
+server.kicked.clientOutdated = Elavult játékverziót használsz! Frissítsd a játékot!
 server.kicked.serverOutdated = Elavult a szerver! Kérd meg a tulajdonost, hogy frissítse!
-server.kicked.banned = Ki vagy tiltva a szerverről.
-server.kicked.typeMismatch = Ez a szerver nem kompatibilis a jelenlegi verzióddal.
+server.kicked.banned = Ki vagy tiltva erről a szerverről.
+server.kicked.typeMismatch = Ez a szerver nem kompatibilis a jelenlegi játékverzióddal.
 server.kicked.playerLimit = Ez a szerver tele van. Várd ki a sorodat.
-server.kicked.recentKick = Nemrég ki lettél rúgva.\nVárj egy kicsit.
-server.kicked.nameInUse = Már van egy ilyen nevű játékos.
+server.kicked.recentKick = Nemrég lettél kirúgva.\nVárj egy kicsit az újbóli csatlakozáshoz.
+server.kicked.nameInUse = Már van egy ilyen nevű játékos\nezen a szerveren.
 server.kicked.nameEmpty = A kiválasztott név érvénytelen.
-server.kicked.idInUse = Már csatlakozva vagy erre a szerverre! Nem lehet egyszerre két fiókot használni.
-server.kicked.customClient = Ez a szerver nem támogatja a saját készítésű játékösszzeállításokat. Használj egy hivatalos változatot.
+server.kicked.idInUse = Már csatlakozva vagy ehhez a szerverhez! Nem lehet egyszerre két fiókot használni.
+server.kicked.customClient = Ez a szerver nem támogatja a saját készítésű játék-összzeállításokat. Használj egy hivatalos változatot.
 server.kicked.gameover = Vége a játéknak!
 server.kicked.serverRestarting = Ez a szerver újraindul.
-server.versions = Te verziód:[accent] {0}[]\nSzerver verzió:[accent] {1}[]
-host.info = A [accent]Hosztolás[] gomb szervert nyit a [scarlet]6567[] porton.\nEzen a [lightgray] wifin vagy a helyi hálózaton [] bárki láthatja a szervert a szerverlistáján.\n\nHa azt szeretnéd, hogy az emberek bárhonnan, IP-címmel csatlakozhassanak, [accent] port továbbítás [] szükséges.\n\n[lightgray]Megjegyzés: Ha valakinek problémái vannak a LAN-játékhoz való csatlakozással, győződj meg arról, hogy a tűzfal beállításaiban engedélyezted-e a Mindustry hozzáférését a helyi hálózathoz. Ne feledd, hogy a nyilvános hálózatok néha nem teszik lehetővé a szerverek felderítését.
-join.info = Itt megadhatsz egy [accent]szerver IP[]-címet a csatlakozáshoz, vagy felfedezhetsz [accent]helyi hálózati[], vagy [accent]globális[] szervereket a csatlakozáshoz.\nA LAN és WAN többjátékos mód is támogatott.\n\n[lightgray]Ha valakihez IP alapján szeretnél csatlakozni, akkor meg kell tudnod a partnered IP címét. Az IP-címeteket az interneten a "mi az IP-címem?" szövegre való kereséssel is megtaláljátok.
-hostserver = Többjátékos játék hosztolása
-invitefriends = Barátok meghívása
-hostserver.mobile = Játék hosztolása
+server.versions = A te játékverziód:[accent] {0}[]\nA szerver verziója:[accent] {1}[]
+host.info = A [accent]hosztolás[] gomb szervert nyit a [scarlet]6567[] porton.\nEzen a [lightgray] wifin vagy a helyi hálózaton [] bárki láthatja a szervert a szerverlistáján.\n\nHa azt szeretnéd, hogy az emberek bárhonnan, IP-címmel csatlakozhassanak, [accent]port továbbítás[] szükséges.\n\n[lightgray]Megjegyzés: Ha valakinek problémái vannak a LAN-játékhoz való csatlakozással, győződj meg arról, hogy a tűzfal beállításaiban engedélyezted-e a Mindustry hozzáférését a helyi hálózathoz. Ne feledd, hogy a nyilvános hálózatok néha nem teszik lehetővé a szerverek felderítését.
+join.info = Itt megadhatsz egy [accent]szerver IP[]-címet a csatlakozáshoz, vagy felfedezhetsz [accent]helyi hálózati[], vagy [accent]globális[] szervereket a csatlakozáshoz.\nA LAN és WAN többjátékos mód is támogatott.\n\n[lightgray]Ha valakihez IP alapján szeretnél csatlakozni, akkor meg kell tudnod a partnered IP címét. Az IP-címeteket az interneten a "mi az IP-címem?" szövegre való kereséssel is megtalálhatjátok.
+hostserver = Többjátékos Játék Hosztolása
+invitefriends = Barátok Meghívása
+hostserver.mobile = Játék Hosztolása
 host = Hosztolás
 hosting = [accent]Szerver megnyitása...
 hosts.refresh = Frissítés
-hosts.discovering = LAN játék keresése
-hosts.discovering.any = Játék keresése
+hosts.discovering = LAN játékok felderítése
+hosts.discovering.any = Játékok felderítése
 server.refreshing = Szerver frissítése
-hosts.none = [lightgray]Nincs helyi játék!
-host.invalid = [scarlet]Nem sikerült csatlakozni.
+hosts.none = [lightgray]Nem található helyi játék!
+host.invalid = [scarlet]Nem sikerült csatlakozni a hoszthoz.
 
-servers.local = Helyi szerverek
-servers.local.steam = Nyitott játékok és helyi szerverek
-servers.remote = Távoli szerverek
-servers.global = Közösségi szerverek
+servers.local = Helyi Szerverek
+servers.local.steam = Nyitott Játékok & Helyi Szerverek
+servers.remote = Távoli Szerverek
+servers.global = Közösségi Szerverek
 
 servers.disclaimer = A közösségi szervereket [accent]nem[] a fejlesztő birtokolja és ellenőrzi.\n\nA szerverek tartalmazhatnak olyan felhasználók által létrehozott tartalmat, amely nem minden korosztály számára megfelelő.
-servers.showhidden = Rejtett szerverek megjelenítése
+servers.showhidden = Rejtett Szerverek Megjelenítése
 server.shown = Látható
 server.hidden = Rejtett
 
-viewplayer = Játékos figyelése: [accent]{0}
-trace = Játékos követése
+viewplayer = Játékos Figyelése: [accent]{0}
+trace = Játékos Követése
 trace.playername = Játékos neve: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Azonosító: [accent]{0}
 trace.language = Nyelv: [accent]{0}
-trace.mobile = Mobil kliens: [accent]{0}
-trace.modclient = Nem hivatalos kliens: [accent]{0}
-trace.times.joined = Csatlakozások száma: [accent]{0}
-trace.times.kicked = Kirúgások száma: [accent]{0}
-trace.ips = IPs:
+trace.mobile = Mobil Kliens: [accent]{0}
+trace.modclient = Nem Hivatalos Kliens: [accent]{0}
+trace.times.joined = Csatlakozások Száma: [accent]{0}
+trace.times.kicked = Kirúgások Száma: [accent]{0}
+trace.ips = IP-k:
 trace.names = Nevek:
 invalidid = Érvénytelen kliens azonosító (ID)! Küldj hibajelentést.
 
 player.ban = Kitiltás
 player.kick = Kirúgás
 player.trace = Követés
-player.admin = Admin választás
-player.team = Csapat váltás
+player.admin = Admin Választás
+player.team = Csapat Váltás
 
 server.bans = Tiltások
 server.bans.none = Nincsenek tiltott játékosok!
 server.admins = Adminok
-server.admins.none = Nincsen admin!
-server.add = Szerver hozzáadása
+server.admins.none = Nem található admin!
+server.add = Szerver Hozzáadása
 server.delete = Biztosan törlöd ezt a szervert?
-server.edit = Szerver szerkesztése
-server.outdated = [scarlet]Elavult szerver![]
-server.outdated.client = [scarlet]Elavult kliens![]
+server.edit = Szerver Szerkesztése
+server.outdated = [scarlet]Elavult Szerver![]
+server.outdated.client = [scarlet]Elavult Kliens![]
 server.version = [gray]v{0} {1}
-server.custombuild = [accent]Saját Build
-confirmban = Biztosan tiltod ezt a játékost?
-confirmkick = Biztosan kirúgod ezt a játékost?
+server.custombuild = [accent]Saját Összeállítás
+confirmban = Biztosan tiltod "{0}[white]" játékost?
+confirmkick = Biztosan kirúgod "{0}[white]" játékost?
 confirmunban = Biztosan újra engedélyezed ezt a játékost?
-confirmadmin = Biztosan hozzá akarod adni ezt a játékost az adminokhoz?
-confirmunadmin = Biztosan meg akarod szüntetni ennek a játékosnak az adminisztrátori státuszát?
-votekick.reason = Kiszavazás oka
+confirmadmin = Biztosan előlépteted "{0}[white]" játékost adminná?
+confirmunadmin = Biztosan meg akarod szüntetni "{0}[white]" játékosnak az adminisztrátori státuszát?
+votekick.reason = Kiszavazás Oka
 votekick.reason.message = Valóban kiakarod szavazni "{0}[white]"-t?\nHa igen, írd le miért:
-joingame.title = Csatlakozás
+joingame.title = Csatlakozás A Játékhoz
 joingame.ip = Cím:
-disconnect = Leválasztva.
+disconnect = Lecsatlakozva.
 disconnect.error = Csatlakozási hiba.
 disconnect.closed = Kapcsolat bontva.
 disconnect.timeout = Időtúllépés.
-disconnect.data = Nem sikerült betölteni az adatokat!
-cantconnect = Nem sikerült csatlakozni a ([accent]{0}[]) játékhoz.
+disconnect.data = Nem sikerült betölteni a világ adatot!
+cantconnect = Nem sikerült csatlakozni a(z) ([accent]{0}[]) játékhoz.
 connecting = [accent]Csatlakozás...
 reconnecting = [accent]Újracsatlakozás...
-connecting.data = [accent]Betöltés...
+connecting.data = [accent]Világ Adat Betöltése...
 server.port = Port:
 server.addressinuse = A cím már használatban van!
 server.invalidport = Érvénytelen port!
-server.error = [scarlet]Nem sikerült megnyitni a szervert.
-save.new = Új mentés
+server.error = [scarlet]Hosztolási szerver hiba.
+save.new = Új Mentés
 save.overwrite = Biztosan felülírod\nezt a mentést?
-save.nocampaign = Nem lehet importálni különálló kampány mentés fájlokat.
+save.nocampaign = A kampányból származó egyes mentési fájlok nem importálhatók.
 overwrite = Felülírás
 save.none = Nem található mentés!
-savefail = Nem sikerült menteni!
+savefail = Nem sikerült elmenteni a játékot!
 save.delete.confirm = Biztosan törlöd ezt a mentést?
 save.delete = Törlés
-save.export = Exportálás
+save.export = Mentés Exportálása
 save.import.invalid = [accent]Ez a mentés érvénytelen!
-save.import.fail = [scarlet]Nem sikerült importálni a [accent]{0}[] mentést
-save.export.fail = [scarlet]Nem sikerült exportálni a [accent]{0}[] mentést
-save.import = Importálás
-save.newslot = Név:
+save.import.fail = [scarlet]Nem sikerült importálni a(z) [accent]{0}[] mentést
+save.export.fail = [scarlet]Nem sikerült exportálni a(z) [accent]{0}[] mentést
+save.import = Mentés Importálása
+save.newslot = Mentés neve:
 save.rename = Átnevezés
 save.rename.text = Új név:
 selectslot = Válassz ki egy mentést.
 slot = [accent]Rekesz {0}
-editmessage = Üzenet szerkesztése
-save.corrupted = Érvénytelen fájl!
+editmessage = Üzenet Szerkesztése
+save.corrupted = A mentési fájl sérült vagy érvénytelen!
 empty = <üres>
 on = Be
 off = Ki
 save.search = Keresés a mentett játékok között...
-save.autosave = Automatikus mentés: {0}
+save.autosave = Automatikus Mentés: {0}
 save.map = Térkép: {0}
 save.wave = Hullám: {0}
 save.mode = Játékmód: {0}
 save.date = Utolsó Mentés: {0}
 save.playtime = Játékidő: {0}
 warning = Figyelmeztetés.
-confirm = Rendben
+confirm = Megerősítés
 delete = Törlés
 view.workshop = Megtekintés a Steam Műhelyben
 workshop.listing = Steam Műhely listázás szerkesztése
 ok = OK
 open = Megnyitás
-customize = Szabályok módosítása
+customize = Szabályok Módosítása
 cancel = Mégse
 command = Parancs
 command.queue = Sorbaállít
 command.mine = Bányászás
 command.repair = Javítás
 command.rebuild = Újraépítés
-command.assist = Segítség játékosnak
+command.assist = Segítség Játékosnak
 command.move = Mozgás
 command.boost = Erősítés
-command.enterPayload = Berakodás a rakományszállítóba
-command.loadUnits = Egységek felvétele
-command.loadBlocks = Blokkok felvétele
-command.unloadPayload = Kirakodás a rakományszállítóból
-stance.stop = Parancsok visszavonása
+command.enterPayload = Berakodás Rakományszállítóba
+command.loadUnits = Egységek Felvétele
+command.loadBlocks = Blokkok Felvétele
+command.unloadPayload = Kirakodás Rakományszállítóból
+stance.stop = Parancsok Visszavonása
 stance.shoot = Magatartás: Lövés
-stance.holdfire = Magatartás: Tüzet szüntess
-stance.pursuetarget = Magatartás: Célpont követése
-stance.patrol = Magatartás: Járőrözési útvonal
+stance.holdfire = Magatartás: Tüzet Szüntess
+stance.pursuetarget = Magatartás: Célpont Követése
+stance.patrol = Magatartás: Járőrözési Útvonal
 stance.ram = Magatartás: Ütközés\n[lightgray]Egyenes vonalú mozgás, nincs útkeresés
 openlink = Link megnyitása
 copylink = Link másolása
@@ -372,12 +372,12 @@ objective = A pálya célja
 crash.export = Összeomlási napló exportálása
 crash.none = Nem található összeomlási napló.
 crash.exported = Összeomlási napló exportálva.
-data.export = Adatok Exportálása
-data.import = Adatok Importálása
-data.openfolder = Adat mappa megnyitása
+data.export = Adat Exportálása
+data.import = Adat Importálása
+data.openfolder = Adat Mappa Megnyitása
 data.exported = Adat exportálva.
-data.invalid = Érvénytelen adatok.
-data.import.confirm = Külső adat importálása felülírja[scarlet] minden[] jelenlegi adatodat.\n[accent]Nem lehet visszavonni![]\n\nAmint kész az importálás, kilép a játék.
+data.invalid = Ez nem érvényes játékadat.
+data.import.confirm = Külső adat importálása felülírja[scarlet] minden[] jelenlegi játékadatodat.\n[accent]Nem vonható vissza![]\n\nAmint kész az importálás, a játék azonnal kilép.
 quit.confirm = Biztosan kilépsz?
 loading = [accent]Betöltés...
 downloading = [accent]Letöltés...
@@ -387,40 +387,40 @@ cancelbuilding = Használd a(z) [accent][[{0}][] gombot, hogy töröld a tervraj
 selectschematic = Használd a(z) [accent][[{0}][] gombot, hogy kijelölj és másolj.
 pausebuilding = Használd a(z) [accent][[{0}][] gombot, hogy megállítsd az építkezést.
 resumebuilding = Használd a(z) [scarlet][[{0}][] gombot, hogy folytasd az építkezést.
-enablebuilding = Használd a(z) [scarlet][[{0}][] gombot, hogy jóváhagyd az építést.
-showui = A kezelőfelület elrejtve.\nNyomd meg a(z) [accent][[{0}][] gombot a megjelenítéséhez.
+enablebuilding = Használd a(z) [scarlet][[{0}][] gombot, hogy jóváhagyd az építkezést.
+showui = A kezelőfelület elrejtve.\nNyomd meg a(z) [accent][[{0}][] gombot a kezelőfelület megjelenítéséhez.
 commandmode.name = [accent]Parancs Mód
 commandmode.nounits = [nincs egység]
-wave = [accent]{0}. hullám
-wave.cap = [accent]{0}./{1} hullám
+wave = [accent]{0}. Hullám
+wave.cap = [accent]{0}./{1} Hullám
 wave.waiting = [lightgray]Következő hullám {0}
 wave.waveInProgress = [lightgray]Hullám folyamatban
 waiting = [lightgray]Várakozás...
 waiting.players = Várakozás a játékosokra...
-wave.enemies = [lightgray]{0} Megmaradt ellenség
-wave.enemycores = [accent]{0}[lightgray] Ellenséges Magok
+wave.enemies = [lightgray]{0} Megmaradt Ellenség
+wave.enemycores = [accent]{0}[lightgray] Ellenséges Mag
 wave.enemycore = [accent]{0}[lightgray] Ellenséges Mag
-wave.enemy = [lightgray]{0} Megmaradt ellenség
+wave.enemy = [lightgray]{0} Megmaradt Ellenség
 wave.guardianwarn = Egy Őrző érkezik [accent]{0}[] hullám múlva.
 wave.guardianwarn.one = Egy Őrző érkezik [accent]{0}[] hullám múlva.
-loadimage = Fénykép betöltése
-saveimage = Fénykép mentése
+loadimage = Kép Betöltése
+saveimage = Kép Mentése
 unknown = Ismeretlen
 custom = Egyedi
 builtin = Beépített
-map.delete.confirm = Biztosan törlöd ezt a pályát? Ez a művelet nem visszavonható!
-map.random = [accent]Véletlenszerű pálya
-map.nospawn = Ez a pálya nem rendelkezik Maggal, amelyen a játékos kezdhet! Adj hozzá egy {0} Magot ehhez a pályához a szerkesztőben!
-map.nospawn.pvp = Ezen a pályán nincs ellenséges Mag, amelyen a másik csapat kezdhet! Adj hozzá egy [scarlet]nem narancssárga[] Magot ehhez a pályához a szerkesztőben!
+map.delete.confirm = Biztosan törlöd ezt a pályát? Ez a művelet nem vonható vissza!
+map.random = [accent]Véletlenszerű Pálya
+map.nospawn = Ez a pálya nem rendelkezik Maggal, amellyel a játékos kezdhet! Adj hozzá egy {0} Magot ehhez a pályához a szerkesztőben!
+map.nospawn.pvp = Ezen a pályán nincs ellenséges Mag, amellyel a másik csapat kezdhet! Adj hozzá egy [scarlet]nem narancssárga[] Magot ehhez a pályához a szerkesztőben!
 map.nospawn.attack = Ezen a pályán nincs ellenséges Mag! Adj hozzá egy {0} Magot ehhez a pályához a szerkesztőben!
 map.invalid = Hiba történt a pálya betöltésekor: sérült vagy érvénytelen fájl.
-workshop.update = Elem frissítése
+workshop.update = Elem Frissítése
 workshop.error = Hiba történt a Steam Műhely részleteinek lekérdezésekor: {0}
 map.publish.confirm = Biztos, hogy közzéteszed ezt a pályát?\n\n[lightgray]Győződj meg róla, hogy elfogadtad a Steam Műhely EULA-t, különben a pályáid nem jelennek meg!
 workshop.menu = Válaszd ki, hogy mit szeretnél csinálni ezzel az elemmel.
-workshop.info = Elem infó
-changelog = Változtatási napló (opcionális):
-updatedesc = Cím és leírás felülírása
+workshop.info = Elem Infó
+changelog = Változásnapló (opcionális):
+updatedesc = Cím & Leírás Felülírása
 eula = Steam EULA
 missing = Ezt az elemet törölték vagy áthelyezték.\n[lightgray]A Steam Műhely adatait automatikusan leválasztották.
 publishing = [accent]Publikálás...
@@ -431,11 +431,11 @@ steam.error = Nem sikerült inicializálni a Steam szolgáltatásokat.\nHiba: {0
 editor.planet = Bolygó:
 editor.sector = Szektor:
 editor.seed = Seed:
-editor.cliffs = Falak sziklákká
+editor.cliffs = Falak Sziklákká
 editor.brush = Méret
-editor.openin = Megnyitás a szerkesztőben
-editor.oregen = Érc generálás
-editor.oregen.info = Érc generálás:
+editor.openin = Megnyitás A Szerkesztőben
+editor.oregen = Érc Generálás
+editor.oregen.info = Érc Generálás:
 editor.mapinfo = Általános
 editor.author = Készítő:
 editor.description = Leírás:
@@ -444,17 +444,17 @@ editor.waves = Hullámok:
 editor.rules = Szabályok:
 editor.generation = Generálás:
 editor.objectives = Célok
-editor.locales = Locale Bundles
-editor.ingame = Szerkesztés a játékban
-editor.playtest = Teszt játékban
-editor.publish.workshop = Közzététel Steam Műhelyben
+editor.locales = Helyi Csomagok
+editor.ingame = Szerkesztés A Játékban
+editor.playtest = Teszt A Játékban
+editor.publish.workshop = Közzététel A Steam Műhelyben
 editor.newmap = Új Pálya
 editor.center = Ugrás középre
 editor.search = Pályák keresése...
-editor.filters = Pályák szűrése
+editor.filters = Pályák Szűrése
 editor.filters.mode = Játékmódok:
-editor.filters.type = Pálya típus:
-editor.filters.search = Keresés ebben:
+editor.filters.type = Pálya Típus:
+editor.filters.search = Keresés Ebben:
 editor.filters.author = Készítő
 editor.filters.description = Leírás
 editor.shiftx = X eltolás
@@ -465,13 +465,13 @@ waves.remove = Eltávolítás
 waves.every = minden
 waves.waves = hullámonként
 waves.health = élet: {0}%
-waves.perspawn = per kezdőpont
+waves.perspawn = kezdőpontonként
 waves.shields = pajzs/hullám
 waves.to = -
 waves.spawn = Kezdőpont:
 waves.spawn.all = <mind>
-waves.spawn.select = Kezdőpont kiválasztása
-waves.spawn.none = [scarlet]Nem találhatóak kezdőpontok a pályán
+waves.spawn.select = Kezdőpont Kiválasztása
+waves.spawn.none = [scarlet]nem találhatóak kezdőpontok a pályán
 waves.max = max egységek
 waves.guardian = Őrző
 waves.preview = Előnézet
@@ -481,111 +481,111 @@ waves.copy = Másolás a vágólapra
 waves.load = Másolás a vágólapról
 waves.invalid = Nem lehet beilleszteni a vágólapról.
 waves.copied = Hullámok másolva.
-waves.none = Nincs ellenség megadva.\nAz üresen hagyott tervek automatikusan lecserélődnek az alapbeállításra.
-waves.sort = Rendezési szempont
-waves.sort.reverse = Rendezés visszafelé
+waves.none = Nincs ellenség megadva.\nVedd figyelembe, hogy az üresen hagyott hullám elrendezések automatikusan lecserélődnek az alapértelmezett elrendezésre.
+waves.sort = Rendezési Szempont
+waves.sort.reverse = Rendezés Visszafelé
 waves.sort.begin = Indul
 waves.sort.health = Élet
 waves.sort.type = Típus
 waves.search = Hullám keresése...
-waves.filter = Egység szűrő
-waves.units.hide = Mindent elrejt
-waves.units.show = Mindent mutat
+waves.filter = Egység Szűrő
+waves.units.hide = Mindent Elrejt
+waves.units.show = Mindent Mutat
 
 #these are intentionally in lower case
-wavemode.counts = Típusokra bontva
-wavemode.totals = Összesítés
-wavemode.health = Életpontok
+wavemode.counts = típusokra bontva
+wavemode.totals = összesítés
+wavemode.health = életpontok
 
 editor.default = [lightgray]<Alapbeállítás>
 details = Részletek...
 edit = Szerkesztés...
 variables = Változók
 editor.name = Név:
-editor.spawn = Egység megidézése
-editor.removeunit = Egység eltávolítása
+editor.spawn = Egység Megidézése
+editor.removeunit = Egység Eltávolítása
 editor.teams = Csapatok
 editor.errorload = Hiba a fájl betöltése közben.
 editor.errorsave = Hiba a fájl mentése közben.
-editor.errorimage = Ez egy kép, nem egy pálya.\n\nHa egy 3.5/build 40 Pályát szeretnél betölteni, használd a "Régi pálya betöltése" gombot a szerkesztőben.
-editor.errorlegacy = Ez a pálya túl régi, és már nem támogatott formátumot használ.
-editor.errornot = Ez nem egy pálya fájl.
-editor.errorheader = Ez a pálya fájl vagy érvénytelen vagy sérült.
+editor.errorimage = Ez egy kép, nem pedig egy pálya.
+editor.errorlegacy = Ez a pálya túl régi és olyan régi pálya formátumot használ, amely már nem támogatott.
+editor.errornot = Ez nem egy pálya-fájl.
+editor.errorheader = Ez a pálya-fájl vagy érvénytelen, vagy sérült.
 editor.errorname = A pályának nincs neve. Mentést próbálsz betölteni?
-editor.errorlocales = Error reading invalid locale bundles.
+editor.errorlocales = Hiba az érvénytelen Helyi Csomagok beolvasásakor.
 editor.update = Frissítés
 editor.randomize = Véletlenszerű
-editor.moveup = Mozgás fel
-editor.movedown = Mozgás le
+editor.moveup = Mozgás Fel
+editor.movedown = Mozgás Le
 editor.copy = Másolás
 editor.apply = Alkalmazás
-editor.generate = Haladó funkciók
-editor.sectorgenerate = Szektor generálása
+editor.generate = Generálás
+editor.sectorgenerate = Szektor Generálása
 editor.resize = Átméretezés
-editor.loadmap = pálya betöltése
-editor.savemap = Mentés
-editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
+editor.loadmap = Pálya Betöltése
+editor.savemap = Pálya Mentése
+editor.savechanges = [scarlet]Nem mentett módosításaid vannak!\n\n[]Szeretnéd elmenteni őket?
 editor.saved = Mentve!
-editor.save.noname = Nem adtál meg nevet! Állíts be egyet az "Általános" menüpont alatt!
-editor.save.overwrite = A pályád felülír egy már létező pályát! Válassz egy másik nevet az "Általános" menüpont alatt!
-editor.import.exists = [scarlet]Nem lehet importálni:[] Már létezik "{0}" nevű pálya!
-editor.import = Importálás
-editor.importmap = Pálya importálása
+editor.save.noname = A pályádnak nincs neve! Állíts be egyet a 'pálya infó' menüben.
+editor.save.overwrite = A pályád felülír egy beépített pályát! Válassz egy másik nevet az 'pálya infó' menüben!
+editor.import.exists = [scarlet]Nem lehet importálni:[] Már létezik "{0}" nevű beépített pálya!
+editor.import = Importálás...
+editor.importmap = Pálya Importálása
 editor.importmap.description = Létező pálya importálása
-editor.importfile = Fájl importálása
-editor.importfile.description = Külső pálya fájl importálása
-editor.importimage = Képfájl importálása
-editor.importimage.description = Külső pálya képfájl importálása
-editor.export = Exportálás
-editor.exportfile = Fájl exportálása
-editor.exportfile.description = Exportálás pálya fájlba
-editor.exportimage = Domborzat exportálása
-editor.exportimage.description = Domborzat exportálása képfájlba
-editor.loadimage = Domborzat importálása
-editor.saveimage = Domborzat exportálása
+editor.importfile = Fájl Importálása
+editor.importfile.description = Egy külső pálya fájl importálása
+editor.importimage = Képfájl Importálása
+editor.importimage.description = Egy külső pálya képfájl importálása
+editor.export = Exportálás...
+editor.exportfile = Fájl Exportálása
+editor.exportfile.description = Exportálás egy pálya fájlba
+editor.exportimage = Domborzat Kép Exportálása
+editor.exportimage.description = Csak alapvető domborzatot tartalmazó képfájl exportálása
+editor.loadimage = Domborzat Importálása
+editor.saveimage = Domborzat Exportálása
 editor.unsaved = Biztos ki akarsz lépni?\n[scarlet]A nem mentett módosításaid elvesznek!
-editor.resizemap = Átméretezés
-editor.mapname = Pálya neve:
+editor.resizemap = Pálya Átméretezése
+editor.mapname = Pálya Neve:
 editor.overwrite = [accent]Vigyázz!\nEzzel felülírsz egy már létező pályát.
 editor.overwrite.confirm = [scarlet]Vigyázz![] Ilyen nevű pálya már létezik:\n"[accent]{0}[]"\nBiztosan felülírod?
 editor.exists = Ilyen nevű pálya már létezik.
-editor.selectmap = Válassz ki egy pályát:
+editor.selectmap = Válassz ki egy pályát a betöltéshez:
 
 toolmode.replace = Csere
-toolmode.replace.description = Csak szilárd tömbökre rajzol.
-toolmode.replaceall = Összes cseréje
-toolmode.replaceall.description = Összes cseréje
+toolmode.replace.description = Csak szilárd blokkokra rajzol.
+toolmode.replaceall = Összes Cseréje
+toolmode.replaceall.description = Az összes blokkot lecseréli a pályán.
 toolmode.orthogonal = Merőleges
 toolmode.orthogonal.description = Csak merőleges vonalakat rajzol.
 toolmode.square = Négyzet
 toolmode.square.description = Négyzet ecset
 toolmode.eraseores = Ércradír
 toolmode.eraseores.description = Csak az érceket törli.
-toolmode.fillteams = Csoportok kitöltése
-toolmode.fillteams.description = Töltse ki a csoportokat a tömbök helyett.
-toolmode.fillerase = Kitöltés törlése
-toolmode.fillerase.description = Törölje az azonos típusú tömböket.
-toolmode.drawteams = Csoportok rajzolása
-toolmode.drawteams.description = Csoportok rajzolása tömbök helyett.
+toolmode.fillteams = Csoportok Kitöltése
+toolmode.fillteams.description = Töltse ki a csoportokat a blokkok helyett.
+toolmode.fillerase = Kitöltés Törlése
+toolmode.fillerase.description = Törölje az azonos típusú blokkokat.
+toolmode.drawteams = Csoportok Rajzolása
+toolmode.drawteams.description = Csoportok rajzolása blokkok helyett.
 #unused
-toolmode.underliquid = Folyadékok alá
+toolmode.underliquid = Folyadékok Alá
 toolmode.underliquid.description = Padlók rajzolása a folyadék blokkok alá.
 
 filters.empty = [lightgray]Még nincs szűrő! Adj hozzá egyet a lenti gombra kattintva!
 
 filter.distort = Torzítás
 filter.noise = Zaj
-filter.enemyspawn = Ellenséges kezdőpont Kiválasztása
-filter.spawnpath = Útvonal a kezdőponthoz
-filter.corespawn = Mag kezdőpont kiválasztása
+filter.enemyspawn = Ellenséges Kezdőpont Kiválasztása
+filter.spawnpath = Útvonal A Kezdőponthoz
+filter.corespawn = Mag Kiválasztása
 filter.median = Medián
-filter.oremedian = Érc medián
+filter.oremedian = Érc Medián
 filter.blend = Vegyes
-filter.defaultores = Alapértelmezett ércek
+filter.defaultores = Alapértelmezett Ércek
 filter.ore = Érc
-filter.rivernoise = Vízfolyás zaj
+filter.rivernoise = Vízfolyás Zaj
 filter.mirror = Tükrözés
-filter.clear = Tömbök törlése
+filter.clear = Blokkok Törlése
 filter.option.ignore = Elutasít
 filter.scatter = Szórás
 filter.terrain = Domborzat
@@ -601,34 +601,35 @@ filter.option.angle = Szög
 filter.option.tilt = Döntés
 filter.option.rotate = Forgatás
 filter.option.amount = Mennyiség
-filter.option.block = Tömb
+filter.option.block = Blokk
 filter.option.floor = Talaj
-filter.option.flooronto = Jelenlegi mező
-filter.option.target = Jelenlegi mező
+filter.option.flooronto = Cél Talaj
+filter.option.target = Cél
 filter.option.replacement = Csere
 filter.option.wall = Fal
 filter.option.ore = Érc
-filter.option.floor2 = Másodlagos Szint
+filter.option.floor2 = Másodlagos Talaj
 filter.option.threshold2 = Másodlagos Küszöbérték
 filter.option.radius = Sugár
 filter.option.percentile = Arány
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
-locales.deletelocale = Are you sure you want to delete this locale bundle?
-locales.applytoall = Apply Changes To All Locales
-locales.addtoother = Add To Other Locales
-locales.rollback = Rollback to last applied
-locales.filter = Property filter
-locales.searchname = Search name...
-locales.searchvalue = Search value...
-locales.searchlocale = Search locale...
-locales.byname = By name
-locales.byvalue = By value
-locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
-locales.showmissing = Show properties that are missing in some locales
-locales.showsame = Show properties that have same values in different locales
-locales.viewproperty = View in all locales
-locales.viewing = Viewing property "{0}"
-locales.addicon = Add Icon
+
+locales.info = Itt adhatsz hozzá különböző Helyi Csomagokat a térképedhez. A Helyi Csomagok minden tulajdonságának van egy neve és egy értéke. Ezeket a tulajdonságokat a Világ Processzorok és a Célkitűzések azok neveivel használhatják. Támogatják a szövegformázást (a helyőrzőket az aktuális értékükkel helyettesítik).\n\n[cyan]Példa tulajdonság:\n[]name: [accent]időzítő[]\nvalue: [accent]Példa időzítő, hátralévő idő: @[]\n\n[cyan]Használat:\n[]Beállítás Célkitűzés szövegeként: [accent]@időzítő\n\n[]Írja be egy Világ Processzorba:\n[accent]localeprint "időzítő"\nformat time\n[gray](ahol az idő egy külön kiszámított változó)
+locales.deletelocale = Biztos, hogy törölni akarod ezt a Helyi Csomagot?
+locales.applytoall = Változások alkalmazása az összes Helyi Csomagra
+locales.addtoother = Hozzáadás más Helyi Csomaghoz
+locales.rollback = Visszaállítás az utoljára elfogadottra
+locales.filter = Tulajdonság szűrő
+locales.searchname = Név keresés...
+locales.searchvalue = Érték keresés...
+locales.searchlocale = Helyi Csomag keresés...
+locales.byname = Név szerint
+locales.byvalue = Érték szerint
+locales.showcorrect = Azon tulajdonságok megjelenítése, amelyek mindenhol egyedi értékekkel rendelkeznek és jelen vannak minden Helyi Csomagban.
+locales.showmissing = Azon tulajdonságok megjelenítése, amelyek hiányoznak Bizonyos Helyi Csomagokból
+locales.showsame = Azon tulajdonságok megjelenítése, amelyek azonos értékekkel rendelkeznek bizonyos Helyi Csomagokban
+locales.viewproperty = Megtekintés minden Helyi Csomagban
+locales.viewing = "{0}" tulajdonság megtekintése
+locales.addicon = Ikon Hozzáadása
 
 width = Szélesség:
 height = Magasság:
@@ -644,39 +645,39 @@ memory = Mem: {0}MB
 memory2 = Mem:\n {0}MB +\n {1}MB
 language.restart = Indítsd újra a játékot, hogy betöltődjenek a nyelvi beállítások!
 settings = Beállítások
-tutorial = Bevezető
-tutorial.retake = Bevezető újrajátszása
+tutorial = Oktatóanyag
+tutorial.retake = Oktatóanyag újrajátszása
 editor = Szerkesztő
-mapeditor = Pálya szerkesztő
+mapeditor = Pálya Szerkesztő
 
 abandon = Feladás
 abandon.text = Ez a szektor és minden nyersanyaga az ellenség kezére kerül.
 locked = Lezárva
 complete = [lightgray]Feltételek:
-requirement.wave = Juss el a {0}. hullámig a {1} szektorban
-requirement.core = Pusztítsd el az ellenséges Magot a {0} szektorban
-requirement.research = Fedezd fel: {0}
-requirement.produce = Gyártsd le: {0}
+requirement.wave = Juss el a {0}. hullámig a(z) {1} szektorban
+requirement.core = Pusztítsd el az ellenséges Magot a(z) {0} szektorban
+requirement.research = Fedezd Fel: {0}
+requirement.produce = Gyártsd Le: {0}
 requirement.capture = Foglald el a(z) {0} szektort
 requirement.onplanet = Szektor elfoglalása a(z) {0}-n
-requirement.onsector = Landolj a szektorban: {0}
+requirement.onsector = Landolj a(z) {0} szektorban
 launch.text = Indítás
 research.multiplayer = Csak a hoszt fedezhet fel nyersanyagokat.
 map.multiplayer = Csak a hoszt tekintheti meg a szektorokat.
 uncover = Felfedés
-configure = Rakomány szerkesztése
+configure = Rakomány Szerkesztése
 
 objective.research.name = Kutatás
 objective.produce.name = Megszerzés
-objective.item.name = Nyersanyag megszerzése
-objective.coreitem.name = Mag nyersanyag
-objective.buildcount.name = Építés számláló
-objective.unitcount.name = Egység számláló
-objective.destroyunits.name = Egység megsemmisítése
+objective.item.name = Nyersanyag Megszerzése
+objective.coreitem.name = Mag Nyersanyag
+objective.buildcount.name = Építés Számláló
+objective.unitcount.name = Egység Számláló
+objective.destroyunits.name = Egység Megsemmisítése
 objective.timer.name = Időzítő
-objective.destroyblock.name = Blokk megsemmisítése
-objective.destroyblocks.name = Blokkok megsemmisítése
-objective.destroycore.name = Mag megsemmisítése
+objective.destroyblock.name = Blokk Megsemmisítése
+objective.destroyblocks.name = Blokkok Megsemmisítése
+objective.destroycore.name = Mag Megsemmisítése
 objective.commandmode.name = Parancs Mód
 objective.flag.name = Jelölő
 
@@ -689,36 +690,36 @@ marker.line.name = Vonal
 marker.background = Háttér
 marker.outline = Körvonal
 
-objective.research = [accent]Kutatás:\n[]{0}[lightgray]{1}
+objective.research = [accent]Fejlesztés:\n[]{0}[lightgray]{1}
 objective.produce = [accent]Megszerzés:\n[]{0}[lightgray]{1}
-objective.destroyblock = [accent]Gyártás:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Megsemmisítés:\n[]{0}[lightgray]{1}
 objective.destroyblocks = [accent]Megsemmisítés: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
 objective.item = [accent]Megszerzés: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
 objective.coreitem = [accent]Szállítás a Magba:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
 objective.build = [accent]Építés: [][lightgray]{0}[]x\n{1}[lightgray]{2}
 objective.buildunit = [accent]Egység Építés: [][lightgray]{0}[]x\n{1}[lightgray]{2}
 objective.destroyunits = [accent]Megsemmisítés: [][lightgray]{0}[]x Units
-objective.enemiesapproaching = [accent]Ellenség érkezik: [lightgray]{0}[]
-objective.enemyescelating = [accent]Az ellenséges termelés fokozódik: [lightgray]{0}[]
-objective.enemyairunits = [accent]Az ellenséges légi egységek termelése elkezdődik: [lightgray]{0}[]
+objective.enemiesapproaching = [accent]Ellenség érkezik: [lightgray]{0}[] múlva
+objective.enemyescelating = [accent]Az ellenséges termelés fokozódik: [lightgray]{0}[] múlva
+objective.enemyairunits = [accent]Az ellenséges légi egységek termelése elkezdődik: [lightgray]{0}[] múlva
 objective.destroycore = [accent]Ellenséges Mag Megsemmisítése
-objective.command = [accent]Egységek irányítása
-objective.nuclearlaunch = [accent]⚠ Nukleáris kilövés észlelve: [lightgray]{0}
+objective.command = [accent]Egységek Irányítása
+objective.nuclearlaunch = [accent]\u26A0 Nukleáris kilövés észlelve: [lightgray]{0}
 
-announce.nuclearstrike = [red]⚠ BEÉRKEZŐ NUKLEÁRIS CSAPÁS ⚠\n[lightgray]Építs azonnal tartalék Magokat!
+announce.nuclearstrike = [red]\u26A0 BEÉRKEZŐ NUKLEÁRIS CSAPÁS \u26A0\n[lightgray]Azonnal építs tartalék Magokat!
 
 loadout = Rakomány
 resources = Nyersanyagok
 resources.max = Maximum
-bannedblocks = Tiltott blokkok
-objectives = Célok
-bannedunits = Tiltott egységek
-bannedunits.whitelist = Tiltott egységek fehérlistára
-bannedblocks.whitelist = Tiltott blokkok fehérlistára
-addall = Összes hozzáadása
-launch.from = Indítás: [accent]{0}
-launch.capacity = Nyersanyag kapacitás az indításhoz: [accent]{0}
-launch.destination = Irány: {0}
+bannedblocks = Tiltott Blokkok
+objectives = Feladatok
+bannedunits = Tiltott Egységek
+bannedunits.whitelist = Tiltott Egységek Fehérlistára
+bannedblocks.whitelist = Tiltott Blokkok Fehérlistára
+addall = Összes Hozzáadása
+launch.from = Indítás a(z) [accent]{0} szektorból
+launch.capacity = Nyersanyag Kapacitás Az Indításhoz: [accent]{0}
+launch.destination = Úticél: {0}
 configure.invalid = A mennyiségnek 0 és {0} között kell lennie.
 add = Hozzáadás...
 guardian = Őrző
@@ -741,13 +742,13 @@ weather.sporestorm.name = Spóravihar
 weather.fog.name = Köd
 
 campaign.playtime = \uf129 [lightgray]Szektor Játékidő: {0}
-campaign.complete = [accent]Gratuláció.\n\nAz ellenség a {0}-n legyőzve.\n[lightgray]Az utolsó szektor meghódítása megtörtént.
+campaign.complete = [accent]Gratuláció.\n\nAz ellenség a(z) {0}-n legyőzve.\n[lightgray]Az utolsó szektor meghódítása megtörtént.
 
 sectorlist = Szektorok
 sectorlist.attacked = {0} támadás alatt
 sectors.unexplored = [lightgray]Felderítetlen
 sectors.resources = Nyersanyagok:
-sectors.production = Gyártás:
+sectors.production = Termelés:
 sectors.export = Export:
 sectors.import = Import:
 sectors.time = Idő:
@@ -758,26 +759,26 @@ sectors.resume = Folytatás
 sectors.launch = Indítás
 sectors.select = Kiválasztás
 sectors.nonelaunch = [lightgray]semmi (nap)
-sectors.rename = Szektor átnevezése
-sectors.enemybase = [scarlet]Ellenséges bázis
+sectors.rename = Szektor Átnevezése
+sectors.enemybase = [scarlet]Ellenséges Bázis
 sectors.vulnerable = [scarlet]Sebezhető
 sectors.underattack = [scarlet]Támadás alatt! [accent]{0}% sérült
-sectors.underattack.nodamage = [scarlet]Nincs megszerezve
+sectors.underattack.nodamage = [scarlet]Nincs meghódítva
 sectors.survives = [accent]Túlél {0} hullámot
 sectors.go = Utazás
 sector.abandon = Elhagy
 sector.abandon.confirm = Ennek a szektornak a Magja(i) önmegsemmisítésre kerülnek.\nFolytatod?
-sector.curcapture = Szektor megszerezve
-sector.curlost = A szektor elveszett
+sector.curcapture = A Szektor Meghódítva
+sector.curlost = A szektor Elveszett
 sector.missingresources = [scarlet]Nincs elég nyersanyag
 sector.attacked = A(z) [accent]{0}[white] szektor támadás alatt áll!
 sector.lost = A(z) [accent]{0}[white] szektor elveszett!
 #note: the missing space in the line below is intentional
-sector.captured = A(z) [accent]{0}[white] szektor megvédve!
-sector.changeicon = Ikon módosítása
-sector.noswitch.title = A szektorváltás nem lehetséges
-sector.noswitch = Nem válthatsz szektort, amíg egy meglévő szektor támadás alatt áll.\n\nSzektor: [accent]{0}[] on [accent]{1}[]
-sector.view = Szektor megtekintése
+sector.captured = A(z) [accent]{0}[white]szektor megvédve!
+sector.changeicon = Ikon Módosítása
+sector.noswitch.title = A szektorváltás Nem Lehetséges
+sector.noswitch = Nem válthatsz szektort, amíg egy meglévő szektor támadás alatt áll.\n\nSzektor: [accent]{0}[] a(z) [accent]{1}[]-n
+sector.view = Szektor Megtekintése
 
 threat.low = Alacsony
 threat.medium = Közepes
@@ -812,20 +813,20 @@ sector.navalFortress.name = Tengerészeti Erőd
 
 sector.groundZero.description = Az ideális helyszín, hogy ismét belekezdjünk. Alacsony ellenséges fenyegetés. Némi nyersanyag.\nGyűjts annyi Rezet és Ólmot, amennyit csak tudsz.\nHaladj tovább.
 sector.frozenForest.description = Még itt, a hegyekhez közel is elterjedtek a spórák. A fagypont alatti hőmérséklet nem tudja örökké fogva tartani őket.\n\nFedezd fel az elektromosság erejét! Építs Belső Égetésű Erőművet! Használj Foltozót!
-sector.saltFlats.description = A sivatag peremén terül el a Salt Flats néven ismert síkság. Kevés nyersanyag található errefelé.\n\nAz ellenség egy raktárkomplexumot létesített itt. Pusztítsd el a Magot! Kő kövön ne maradjon!
+sector.saltFlats.description = A sivatag peremén terül el a Sós Síkságok néven ismert síkság. Kevés nyersanyag található errefelé.\n\nAz ellenség egy raktárkomplexumot létesített itt. Pusztítsd el a Magot! Kő kövön ne maradjon!
 sector.craters.description = Régen háborúk folytak ezen a helyen és csak egy kráter maradt utánuk. De szerencsédre az évezredek alatt feltöltődött Vízzel így letudod hűteni vele a Fúróidat és Lövegeidet. Persze előtte használd a Homokot, hogy legyen üveged!
 sector.ruinousShores.description = A romokon túl fekszik a vízpart. Egykor itt állt egy parti védelmi vonal. Mára nem sok maradt belőle. Csak a legegyszerűbb védelmi épületek maradtak sértetlenek, bármi más csak törmelékként van jelen.\nFolytasd a terjeszkedést! Fedezd fel a régi technológiákat!
 sector.stainedMountains.description = Mélyebben benn a szárazföldön fekszenek a hegyek, a spóráktól még érintetlenül.\nTermeld ki a bőséges Titán készleteket a körzetben. Tanuld meg felhasználni!.\n\nAz ellenség itt nagyobb létszámban van jelen. Ne hagyj nekik időt, hogy a legerősebb egységeiket hadba állíthassák!
-sector.overgrowth.description = Ez a terület közelebb esik a spórák forrásához, a spórák már kinőtték.\nAz ellenség egy helyőrséget létesített itt. Építs Mace egységeket! Pusztítsd el!
-sector.tarFields.description = Egy Olajtermelő övezet peremvidéke a hegyek és a sivatag között. Egy a kevés térség közül, ahol még hasznosítható kátránykészletek találhatók.\nBár a terület elhagyatott, veszélyes ellenséges erők fészkelnek a közelben. Ne becsüld alá őket!\n\n[lightgray]Fedezd fel az Olajfeldolgozási lehetőségeket, ha tudod!
+sector.overgrowth.description = Ez a terület közelebb esik a spórák forrásához, a spórák már kinőtték.\nAz ellenség egy helyőrséget létesített itt. Építs Mace egységeket! Pusztítsd el a bázist!
+sector.tarFields.description = Egy Olajtermelő övezet peremvidéke a hegyek és a sivatag között. Egy azon kevés szektorok közül, ahol még hasznosítható kátránykészletek találhatóak.\nBár a terület elhagyatott, veszélyes ellenséges erők fészkelnek a közelben. Ne becsüld alá őket!\n\n[lightgray]Fedezd fel az Olajfeldolgozási lehetőségeket, ha tudod!
 sector.desolateRift.description = Egy extrém veszélyes zóna. Nyersanyagokban gazdag, de szűkös a hely. Magas kockázat. Hagyd el, amint lehet! Ne tévesszen meg a hosszú szünet az ellenség támadásai között!
-sector.nuclearComplex.description = Egy néhai létesítmény Tórium kitermelésére és feldolgozására, romokban.\n[lightgray]Fedezd fel a Tóriumot és sokrétű felhasználását!\n\nAz ellenség nagy létszámban van jelen, és folyamatosan megfigyelés alatt tartják a környéket.
+sector.nuclearComplex.description = Egy néhai létesítmény a Tórium kitermelésére és feldolgozására, romokban.\n[lightgray]Fedezd fel a Tóriumot és sokrétű felhasználását!\n\nAz ellenség nagy létszámban van jelen, és folyamatosan megfigyelés alatt tartják a környéket.
 sector.fungalPass.description = Átmenet a magas hegyek és a mélyebben fekvő, spórák uralta lapály között. Egy kisebb ellenséges megfigyelő állomás található itt.\nSemmisítsd meg!.\nHasználj Dagger és Crawler egységeket! Pusztítsd el a két Magot!
 sector.biomassFacility.description = A Spórák származási helye. Ebben a létesítményben fejlesztették ki őket és eredetileg itt került sor a gyártásukra.\nFejlszd ki az itt található technológiákat! Használd a Spórákat üzemanyag és Műanyagok gyártására!\n\n[lightgray]A létesítmény pusztulása nyomán a spórák elszabadultak. A helyi ökoszisztémában semmi sem tudta felvenni a versenyt egy ennyire invazív életformával.
 sector.windsweptIslands.description = Távolabb a partvonalon túl fekszik ez az elszigetelt szigetcsoport. Feljegyzések szerint egykor [accent]Műanyag[] gyártása zajlott itt.\n\nVerd vissza az ellenség vízi egységeit! Állíts fel egy bázist a szigeteken! Fejleszd ki az itt talált gyárakat!
 sector.extractionOutpost.description = Egy távoli ellenséges támaszpont, amelyet az ellenség azért épített, hogy nyersanyagokat juttasson el más szektorokba.\n\nA szektorok közötti szállítási technológia elengedhetetlen a további hódításhoz. Pusztítsd el a bázist. Fedezd fel a Kilövő Állást.
 sector.impact0078.description = Itt fekszenek a roncsai az első csillagközi űrhajónak, amely a csillagrendszerbe érkezett.\n\nMents ki a romokból amit csak tudsz! Fedezd fel az épen maradt technológiákat.
-sector.planetaryTerminal.description = A végső célpont.\n\nEzen a vízparti bázison található egy olyan építmény, amely képes Magokat kilőni közeli bolygókra. Folyamatosan őrzik.\n\nKészíts vízi egységeket! Ártalmatlanítsd az ellenséget amilyen gyorsan tudod! Fedezd fel a kilövőszerkezetet!
+sector.planetaryTerminal.description = A végső célpont.\n\nEzen a vízparti bázison található egy olyan építmény, amely képes Magokat kilőni közeli bolygókra. Folyamatosan őrzik.\n\nKészíts vízi egységeket! Ártalmatlanítsd az ellenséget amilyen gyorsan csak tudod! Fedezd fel a kilövőszerkezetet!
 sector.coastline.description = Ezen a helyen egy haditengerészeti egység technológiájának maradványait fedezték fel. Verd vissza az ellenséges támadásokat, foglald el ezt a szektort, és szerezd meg a technológiát.
 sector.navalFortress.description = Az ellenség bázist létesített egy távoli, természetesen-megerősített szigeten. Pusztítsd el ezt az előőrsöt. Szerezd meg a fejlett hadihajó-technológiájukat, és fedezd fel.
 
@@ -850,20 +851,20 @@ sector.origin.name = Eredet
 sector.onset.description = Kezdd meg az Erekir meghódítását. Gyűjts nyersanyagokat, állíts elő egységeket, és kezdd el a technológiai kutatásokat.
 sector.aegis.description = Ez a szektor Volfrám lelőhelyeket tartalmaz.\nFedezd fel az [accent]Ütve Fúró[]t, hogy ki tudd bányászni ezt a nyersanyagot, és elpusztítani az ellenséges bázist a szektorban.
 sector.lake.description = Az Ebben a szektorban lévő Salakos tó nagymértékben korlátozza az ütőképes egységek használatát. A lebegőegységek az egyetlen lehetőség.\nFedezd fel a [accent]Repülőgép Gyár[]at és állíts elő egy [accent]Elude[] egységet, amilyen hamar csak lehet.
-sector.intersect.description = A letapogatások arra utalnak, hogy ezt a szektort a leszállás után hamarosan több oldalról is megtámadják.\nÁllítsd fel gyorsan s védelmedet, és terjeszkedj minél hamarabb.\n[accent]Mech[] egységekre lesz szükség a terület zord terepviszonyai miatt.
-sector.atlas.description = Ez a szektor változatos terepet tartalmaz, és az ütőképes támadáshoz többféle egységre lesz szükség.\nAz itt felfedezett nehezebb ellenséges bázisok némelyikén való átjutáshoz is szükség lehet továbbfejlesztett egységekre.\nFedezd fel az [accent]Elektrolizátor[]t és a [accent]Tank Újratervező[]t.
+sector.intersect.description = A letapogatások arra utalnak, hogy ezt a szektort a leszállás után hamarosan több oldalról is megtámadják.\nÁllítsd fel gyorsan a védelmedet, és terjeszkedj minél hamarabb.\n[accent]Mech[] egységekre lesz szükség a terület zord terepviszonyai miatt.
+sector.atlas.description = Ez a szektor változatos terepet tartalmaz, és az ütőképes támadáshoz többféle egységre lesz szükség.\nAz itt felfedezett ellenséges bázisok némelyikén való átjutáshoz is szükség lehet továbbfejlesztett egységekre.\nFedezd fel az [accent]Elektrolizátor[]t és a [accent]Tank Újratervező[]t.
 sector.split.description = A minimális ellenséges jelenlét miatt ez a szektor tökéletes az új nyersanyagszállító technológiák tesztelésére.
 sector.basin.description = Jelentős ellenséges jelenlét lett érzékelve ebben a szektorban.\nÉpíts gyorsan egységeket, és foglalj el ellenséges Magokat, hogy megvethesd a lábad.
 sector.marsh.description = Ebben a szektorban rengeteg Arkycit található, de kevés a Víznyelő.\nÉpíts [accent]Kémiai Égető Kamra[]t az áramfejlesztéshez.
 sector.peaks.description = A hegyvidéki terep ebben a szektorban a legtöbb egységet használhatatlanná teszi. Repülő egységekre lesz szükség.\nVigyázz az ellenséges légvédelmi létesítményekkel. Lehetséges, hogy az ilyen létesítményeket hatástalanítani lehet a támogató épületeik célba vételével.
 sector.ravine.description = A szektorban nincs észlelve ellenséges Mag, bár ez egy fontos szállítási útvonal az ellenség számára. Várhatóan változatos ellenséges erőkkel kell számolni.Gyárts [accent]Elektrometál[]t. Építs [accent]Afflict[] lövegtornyokat.
-sector.caldera-erekir.description = Ebben a szektorban a feltárható nyersanyagok több szigeten szétszóródva találhatók.\nFedezd fel és helyezd üzembe a drónalapú szállítmányozást.
+sector.caldera-erekir.description = Ebben a szektorban a feltárható nyersanyagok több szigeten szétszóródva találhatóak.\nFedezd fel és helyezd üzembe a drónalapú szállítmányozást.
 sector.stronghold.description = A nagy ellenséges tábor ebben a szektorban jelentős [accent]Tórium[] készleteket őriz.\nHasználd magasabb szintű egységek és lövegtornyok fejlesztésére.
-sector.crevice.description = Az ellenség kegyetlen támadóerőket fog küldeni, hogy kiiktassa a bázisodat ebben a szektorban.\nGyűjts [accent]Karbid[]ot, majd fedezd fel és építs [accent]Pirolízis Erőmű[]vet mert lehet, hogy nélkülözhetetlenek a túléléshez.
-sector.siege.description = Ebben a szektorban két párhuzamos kanyon található, amelyek kétirányú támadást kényszerítenek ki.\nFedezd fel a [accent]Cianogén[]t, hogy még erősebb tankegységeket hozhass létre.\nVigyázat: ellenséges nagy hatótávolságú rakéták észlelve. A rakéták a becsapódásuk előtt megsemmisíthetők.
+sector.crevice.description = Az ellenség kegyetlen támadóerőket fog küldeni, hogy kiiktassa a bázisodat ebben a szektorban.\nGyűjts [accent]Karbid[]ot, majd fedezd fel és építs [accent]Pirolízis Erőmű[]vet, mert lehet, hogy nélkülözhetetlenek a túléléshez.
+sector.siege.description = Ebben a szektorban két párhuzamos kanyon található, amelyek két irányból érkező támadásokat tesznek lehetővé.\nFedezd fel a [accent]Cianogén[]t, hogy még erősebb tankegységeket hozhass létre.\nVigyázat: Ellenséges, nagy hatótávolságú rakéták észlelve. A rakéták a becsapódásuk előtt megsemmisíthetők.
 sector.crossroads.description = Az ellenséges támaszpontok ebben a szektorban változó terepviszonyok között alakultak ki. Ahhoz, hogy alkalmazkodni tudj kutass különböző egységek után.\nEzenkívül egyes bázisokat pajzsok védenek. Találd ki, hogyan táplálják őket.
-sector.karst.description = Ez a szektor gazdag a nyersanyagokban, de amint egy új Mag leszáll, az ellenség megtámadja azt.\nHasználd ki az nyersanyagokat és fedezd fel a [accent]Tóritkvarc[]ot.
-sector.origin.description = Az utolsó szektor, jelentős ellenséges jelenléttel.\nNem valószínű, hogy maradt további kutatási vagy fejlesztési lehetőség - koncentrálj az ellenséges Magok elpusztítására.
+sector.karst.description = Ez a szektor gazdag a nyersanyagokban, de amint egy új Mag leszáll, az ellenség megtámadja azt.\nHasználd ki a nyersanyagokat és fedezd fel a [accent]Tóritkvarc[]ot.
+sector.origin.description = Az utolsó szektor, jelentős ellenséges jelenléttel.\nNem valószínű, hogy maradt további kutatási-, vagy fejlesztési lehetőség - koncentrálj az ellenséges Magok elpusztítására.
 
 status.burning.name = Égő
 status.freezing.name = Fagyasztó
@@ -882,22 +883,22 @@ status.unmoving.name = Mozdulatlan
 status.boss.name = Őrző
 
 settings.language = Nyelvek
-settings.data = Játék adatok
+settings.data = Játék Adatok
 settings.reset = Alapértelmezett
-settings.rebind = Módosítás
+settings.rebind = Újrakötés
 settings.resetKey = Visszaállítás
 settings.controls = Irányítás
 settings.game = Játék
 settings.sound = Hangok
 settings.graphics = Grafika
-settings.cleardata = Játék adatok törlése...
+settings.cleardata = Játék Adatok Törlése...
 settings.clear.confirm = Biztosan törlöd ezeket az adatokat?\nA műveletet nem lehet visszavonni!
 settings.clearall.confirm = [scarlet] FIGYELEM! []\nEz törli az összes adatot, beleértve a mentéseket, pályákat, felfedezéseket és a billentyű beállításokat.\nAz 'OK' gomb megnyomásával a játék minden adatot töröl és automatikusan kilép.
 settings.clearsaves.confirm = Biztosan törlöd az összes mentést?
-settings.clearsaves = Mentések törlése
-settings.clearresearch = Kutatás törlése
+settings.clearsaves = Mentések Törlése
+settings.clearresearch = Kutatás Törlése
 settings.clearresearch.confirm = Biztosan törlöd az összes kutatást?
-settings.clearcampaignsaves = Kampány mentések törlése
+settings.clearcampaignsaves = Kampány Mentések Törlése
 settings.clearcampaignsaves.confirm = Biztosan törlöd az összes kampány mentést?
 paused = [accent]< Megállítva >
 clear = Törlés
@@ -914,62 +915,62 @@ lastcommanded = [lightgray]Utoljára irányítva: {0}
 block.unknown = [lightgray]???
 
 stat.showinmap = <pálya betöltése a megtekintéshez>
-stat.description = Célja
+stat.description = Rendeltetés
 stat.input = Bemenet
 stat.output = Kimenet
-stat.maxefficiency = Maximális hatékonyság
+stat.maxefficiency = Maximális Hatékonyság
 stat.booster = Erősítő
-stat.tiles = Szükséges talaj
-stat.affinities = Módosító körülmények
+stat.tiles = Szükséges Talaj
+stat.affinities = Módosító Körülmények
 stat.opposites = Eltérések
-stat.powercapacity = Elektromos kapacitás
+stat.powercapacity = Elektromos Kapacitás
 stat.powershot = Áram/Lövés
 stat.damage = Sebzés
-stat.targetsair = Repülő célpontok
-stat.targetsground = Földi célpontok
-stat.itemsmoved = Hozam
-stat.launchtime = Kilövések közti idő
+stat.targetsair = Repülő Célpontok
+stat.targetsground = Földi Célpontok
+stat.itemsmoved = Haladási Sebesség
+stat.launchtime = Kilövések Közti Idő
 stat.shootrange = Hatótáv
 stat.size = Méret
 stat.displaysize = Felbontás
-stat.liquidcapacity = Folyadék kapacitás
-stat.powerrange = Áram hatótáv
-stat.linkrange = Kapcsolat hatótáv
-stat.instructions = Műveletek
-stat.powerconnections = Maximális kapcsolat
+stat.liquidcapacity = Folyadék Kapacitás
+stat.powerrange = Áram Hatótáv
+stat.linkrange = Kapcsolat Hatótáv
+stat.instructions = Instrukciók
+stat.powerconnections = Maximális Kapcsolat
 stat.poweruse = Áramhasználat
 stat.powerdamage = Áram/Sebzés
-stat.itemcapacity = Nyersanyag kapacitás
-stat.memorycapacity = Memória méret
-stat.basepowergeneration = Alap áramtermelés
-stat.productiontime = Gyártás hossza
-stat.repairtime = Teljes javítás hossza
-stat.repairspeed = Javítási sebesség
+stat.itemcapacity = Nyersanyag Kapacitás
+stat.memorycapacity = Memória Méret
+stat.basepowergeneration = Alap Áramtermelés
+stat.productiontime = Gyártás Hossza
+stat.repairtime = Teljes Javítás Hossza
+stat.repairspeed = Javítási Sebesség
 stat.weapons = Fegyverek
 stat.bullet = Töltény
-stat.moduletier = Modul szintje
-stat.unittype = Egység típus
+stat.moduletier = Modul Szintje
+stat.unittype = Egység Típus
 stat.speedincrease = Gyorsítás
 stat.range = Hatótáv
 stat.drilltier = Kitermelhető
-stat.drillspeed = Alap kitermelési sebesség
-stat.boosteffect = Erősítés hatása
-stat.maxunits = Maximális aktív egység
+stat.drillspeed = Alap Kitermelési Sebesség
+stat.boosteffect = Erősítés Hatása
+stat.maxunits = Maximális Aktív Egység
 stat.health = Életpontok
 stat.armor = Páncél
-stat.buildtime = Építés időtartama
-stat.maxconsecutive = Maximum egymást követő
-stat.buildcost = Építés ára
+stat.buildtime = Építés Időtartama
+stat.maxconsecutive = Maximum Egymást Követő
+stat.buildcost = Építés Ára
 stat.inaccuracy = Pontatlanság
-stat.shots = Lövés
-stat.reload = Lövés/sec
+stat.shots = Lövések
+stat.reload = Tüzelési Ráta
 stat.ammo = Lőszer
-stat.shieldhealth = Pajzs élete
-stat.cooldowntime = Újratöltés időtartama
+stat.shieldhealth = Pajzs Élete
+stat.cooldowntime = Újratöltés Időtartama
 stat.explosiveness = Robbanékonyság
-stat.basedeflectchance = Alap hárítási esély
-stat.lightningchance = Villámlás esélye
-stat.lightningdamage = Villámlás sebzése
+stat.basedeflectchance = Alap Hárítási Esély
+stat.lightningchance = Villámlás Esélye
+stat.lightningdamage = Villámlás Sebzése
 stat.flammability = Éghetőség
 stat.radioactivity = Radioaktivitás
 stat.charge = Töltés
@@ -984,12 +985,12 @@ stat.payloadcapacity = Rakomány kapacitás
 stat.abilities = Képességek
 stat.canboost = Erősíthető
 stat.flying = Repül
-stat.ammouse = Lőszer használat
-stat.damagemultiplier = Sebzés szorzó
-stat.healthmultiplier = Életerő szorzó
-stat.speedmultiplier = Sebesség szorzó
-stat.reloadmultiplier = Újratöltés szorzó
-stat.buildspeedmultiplier = Építési sebesség szorzó
+stat.ammouse = Lőszer Használat
+stat.damagemultiplier = Sebzés Szorzó
+stat.healthmultiplier = Életerő Szorzó
+stat.speedmultiplier = Sebesség Szorzó
+stat.reloadmultiplier = Újratöltés Szorzó
+stat.buildspeedmultiplier = Építési Sebesség Szorzó
 stat.reactive = Reakciók
 stat.immunities = Immunitások
 stat.healing = Gyógyulás
@@ -1003,16 +1004,16 @@ ability.movelightning = Villámcsapás
 ability.shieldarc = Pajzs Ív
 ability.suppressionfield = Javítás Elnyomás
 ability.energyfield = Energia Mező
-ability.energyfield.sametypehealmultiplier = [lightgray]Azonos típusú gyógyítás: [white]{0}%
+ability.energyfield.sametypehealmultiplier = [lightgray]Azonos Típusú Gyógyítás: [white]{0}%
 ability.energyfield.maxtargets = [lightgray]Célpontok Maximális Száma: [white]{0}
 ability.regen = Regeneráció
 
 bar.onlycoredeposit = Csak A Mag Elhelyezése Megengedett
-bar.drilltierreq = Erősebb Fúró/Vágó szükséges
-bar.noresources = Nincs elég nyersanyag
-bar.corereq = Mag szükséges
-bar.corefloor = Mag zónacsempe szükséges
-bar.cargounitcap = A rakományszállító egység teljes kapacitáson
+bar.drilltierreq = Erősebb Fúró/Vágó Szükséges
+bar.noresources = Hiányzó Nyersanyagok
+bar.corereq = Mag Szükséges
+bar.corefloor = Mag Zónacsempe Szükséges
+bar.cargounitcap = A Rakományszállító Egység Teljes Kapacitáson
 bar.drillspeed = Termelési Sebesség: {0}/s
 bar.pumpspeed = Termelési Sebesség: {0}/s
 bar.efficiency = Hatásfok: {0}%
@@ -1033,19 +1034,19 @@ bar.heatpercent = Hő: {0} ({1}%)
 bar.power = Áram
 bar.progress = Építés állapota
 bar.loadprogress = Állapot
-bar.launchcooldown = Lehűlés indítása
+bar.launchcooldown = Lehűlés Indítása
 bar.input = Bemenet
 bar.output = Kimenet
 bar.strength = [stat]{0}[lightgray]x erő
 
-units.processorcontrol = [lightgray]Processzor vezérelt
+units.processorcontrol = [lightgray]Processzor Vezérelt
 
 bullet.damage = [stat]{0}[lightgray] sebzés
 bullet.splashdamage = [stat]{0}[lightgray] területi sebzés ~[stat] {1}[lightgray] mező
 bullet.incendiary = [stat]gyújtó
 bullet.homing = [stat]nyomkövető
 bullet.armorpierce = [stat]páncéltörő
-bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.maxdamagefraction = [stat]{0}%[lightgray] sebzés határérték
 bullet.suppression = [stat]{0} sec[lightgray] javítás elnyomás ~ [stat]{1}[lightgray] csempe
 bullet.interval = [stat]{0}/sec[lightgray] időszakos töltények:
 bullet.frags = [stat]{0}[lightgray]x repesz lövedékek:
@@ -1061,7 +1062,7 @@ bullet.reload = [stat]{0}[lightgray]x tüzelési sebesség
 bullet.range = [stat]{0}[lightgray] csempe tartomány
 
 unit.blocks = blokk
-unit.blockssquared = blokk²
+unit.blockssquared = blokk\u00B2
 unit.powersecond = áram egység/sec
 unit.tilessecond = csempe/sec
 unit.liquidsecond = folyadék egység/sec
@@ -1089,87 +1090,87 @@ category.liquids = Folyadékok
 category.items = Nyersanyagok
 category.crafting = Bemenet/Kimenet
 category.function = Funkció
-category.optional = Lehetséges erősítés
+category.optional = Lehetséges Erősítés
 setting.skipcoreanimation.name = Mag Indítás/Leszállás Animáció Kihagyása
-setting.landscape.name = Fekvő mód zárolása
+setting.landscape.name = Fekvő Mód Zárolása
 setting.shadows.name = Árnyékok
-setting.blockreplace.name = Automatikus blokk javaslatok
-setting.linear.name = Lineáris szűrés
+setting.blockreplace.name = Automatikus Blokk Javaslatok
+setting.linear.name = Lineáris Szűrés
 setting.hints.name = Tanácsok
-setting.logichints.name = Logikai tanácsok
-setting.backgroundpause.name = Szüneteltetés a háttérben
-setting.buildautopause.name = Automatikus szünet építéskor
-setting.doubletapmine.name = Bányászás dupla-koppintással
-setting.commandmodehold.name = Tartsd lenyomva a parancs módhoz
-setting.distinctcontrolgroups.name = Egységenként legfeljebb egy ellenőrző csoport
-setting.modcrashdisable.name = Modok letiltása indítási összeomláskor
-setting.animatedwater.name = Animált felületek
-setting.animatedshields.name = Animált pajzsok
-setting.playerindicators.name = Játékos mutató
-setting.indicators.name = Ellenség mutató
-setting.autotarget.name = Automatikus célzás
-setting.keyboard.name = Irányítás egérrel és billentyűzettel
-setting.touchscreen.name = Irányítás érintőképernyővel
+setting.logichints.name = Logikai Tanácsok
+setting.backgroundpause.name = Szüneteltetés A Háttérben
+setting.buildautopause.name = Automatikus Szünet Építéskor
+setting.doubletapmine.name = Bányászás Dupla-Koppintással
+setting.commandmodehold.name = Tartsd Lenyomva A Parancs Módhoz
+setting.distinctcontrolgroups.name = Egységenként Legfeljebb Egy Ellenőrző Csoport
+setting.modcrashdisable.name = Modok Letiltása Indítási Összeomláskor
+setting.animatedwater.name = Animált Felületek
+setting.animatedshields.name = Animált Pajzsok
+setting.playerindicators.name = Játékos Mutató
+setting.indicators.name = Ellenség Mutató
+setting.autotarget.name = Automatikus Célzás
+setting.keyboard.name = Irányítás Egérrel És Billentyűzettel
+setting.touchscreen.name = Irányítás Érintőképernyővel
 setting.fpscap.name = Max FPS
 setting.fpscap.none = Nincs
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI mérete
+setting.uiscale.name = UI Méretezése
 setting.uiscale.description = A módosítások alkalmazásához újraindítás szükséges.
-setting.swapdiagonal.name = Mindig átlós elhelyezés
+setting.swapdiagonal.name = Mindig Átlós Elhelyezés
 setting.difficulty.training = Kiképzés
 setting.difficulty.easy = Könnyű
 setting.difficulty.normal = Normál
 setting.difficulty.hard = Nehéz
 setting.difficulty.insane = Őrült
 setting.difficulty.name = Nehézség:
-setting.screenshake.name = Képernyő rázkódása
+setting.screenshake.name = Képernyő Rázkódása
 setting.bloomintensity.name = Bloom Intenzitás
 setting.bloomblur.name = Bloom Blur
-setting.effects.name = Effektek
-setting.destroyedblocks.name = Elpusztított épületek megjelenítése
-setting.blockstatus.name = Blokk állapotának megjelenítése
-setting.conveyorpathfinding.name = Szállítószalag útvonalkeresés építéskor
-setting.sensitivity.name = Kontroller érzékenység
-setting.saveinterval.name = Mentési időköz
+setting.effects.name = Effektek Megjelenítése
+setting.destroyedblocks.name = Elpusztított Épületek Megjelenítése
+setting.blockstatus.name = Blokk Állapotának Megjelenítése
+setting.conveyorpathfinding.name = Szállítószalag Útvonalkeresés Építéskor
+setting.sensitivity.name = Kontroller Érzékenység
+setting.saveinterval.name = Mentési Időköz
 setting.seconds = {0} másodperc
 setting.milliseconds = {0} ezredmásodperc
-setting.fullscreen.name = Teljes képernyő
-setting.borderlesswindow.name = Keret nélküli ablak
-setting.borderlesswindow.name.windows = Keret nélküli teljes képernyő
+setting.fullscreen.name = Teljes Képernyő
+setting.borderlesswindow.name = Keret Nélküli Ablak
+setting.borderlesswindow.name.windows = Keret Nélküli Teljes Képernyő
 setting.borderlesswindow.description = A változások alkalmazásához újraindításra lehet szükség.
-setting.fps.name = FPS és Ping mutatása
-setting.console.name = Konzol engedélyezése
-setting.smoothcamera.name = Egyenletes kamera
+setting.fps.name = FPS & Ping mutatása
+setting.console.name = Konzol Engedélyezése
+setting.smoothcamera.name = Egyenletes Kamera
 setting.vsync.name = VSync
 setting.pixelate.name = Pixeles
-setting.minimap.name = Minitérkép mutatása
-setting.coreitems.name = A Magban lévő nyersanyagok megjelenítése
-setting.position.name = A játékos pozíciójának megjelenítése
+setting.minimap.name = Minitérkép Mutatása
+setting.coreitems.name = A Magban Lévő Nyersanyagok Megjelenítése
+setting.position.name = A Játékos Pozíciójának Megjelenítése
 setting.mouseposition.name = Egér Pozíciójának Megjelenítése
-setting.musicvol.name = Zene hangerő
-setting.atmosphere.name = Mutassa a bolygó atmoszférát
-setting.drawlight.name = Sötét/Világos fényhatások
-setting.ambientvol.name = Környezeti hangerő
-setting.mutemusic.name = Zene némítása
-setting.sfxvol.name = SFX hangerő
-setting.mutesound.name = Hang némítása
-setting.crashreport.name = Névtelen összeomlási jelentések
-setting.savecreate.name = Automatikus mentés
-setting.steampublichost.name = Public Game Visibility
-setting.playerlimit.name = Játékos limit
-setting.chatopacity.name = Csevegő átlátszatlansága
-setting.lasersopacity.name = Villanyvezeték átlátszatlansága
-setting.bridgeopacity.name = Híd átlátszatlansága
-setting.playerchat.name = Játékos szóbuborékok megjelenítése
-setting.showweather.name = Időjárás grafika megjelenítése
-setting.hidedisplays.name = Logikai kijelzők elrejtése
+setting.musicvol.name = Zene Hangerő
+setting.atmosphere.name = Mutassa A Bolygó Atmoszférát
+setting.drawlight.name = Sötét/Világos Fényhatások
+setting.ambientvol.name = Környezeti Hangerő
+setting.mutemusic.name = Zene Némítása
+setting.sfxvol.name = SFX Hangerő
+setting.mutesound.name = Hang Némítása
+setting.crashreport.name = Névtelen Összeomlási Jelentések
+setting.savecreate.name = Automatikus Mentés
+setting.steampublichost.name = Nyilvános Játék Láthatósága
+setting.playerlimit.name = Játékos Limit
+setting.chatopacity.name = Csevegő Átlátszatlansága
+setting.lasersopacity.name = Villanyvezeték Átlátszatlansága
+setting.bridgeopacity.name = Híd Átlátszatlansága
+setting.playerchat.name = Játékos Szóbuborékok Megjelenítése
+setting.showweather.name = Időjárás Grafika Megjelenítése
+setting.hidedisplays.name = Logikai Kijelzők Elrejtése
 setting.macnotch.name = A felület igazítása a bevágás megjelenítéséhez
 setting.macnotch.description = A változtatások alkalmazásához újra kell indítani
 steam.friendsonly = Csak Barátok
 steam.friendsonly.tooltip = Csak a Steam-barátok tudnak csatlakozni a játékodhoz.\nHa nem jelölöd be ezt a négyzetet, a játékod nyilvános lesz - bárki csatlakozhat hozzá.
 public.beta = Ne feledd, hogy a játék béta verziójában nem tudsz nyilvános szobát nyitni.
 uiscale.reset = Az UI mérete megváltozott.\nAz "OK" gombbal megerősítheted ezt a méretet.\n[scarlet]Visszavonás és kilépés [accent] {0}[] másodperc múlva...
-uiscale.cancel = Mégse és Kilépés
+uiscale.cancel = Mégse & Kilépés
 setting.bloom.name = Bloom
 keybind.title = Gyorsbillentyűk
 keybinds.mobile = [scarlet]A legtöbb billentyűfunkció mobilon nem működik. Csak a mozgás támogatott.
@@ -1177,25 +1178,25 @@ category.general.name = Általános
 category.view.name = Nézet
 category.command.name = Egység Parancs
 category.multiplayer.name = Többjátékos
-category.blocks.name = Blokk választás
+category.blocks.name = Blokk Választás
 placement.blockselectkeys = \n[lightgray]Kulcs: [{0},
 keybind.respawn.name = Újraéledés
-keybind.control.name = Egység irányítása
-keybind.clear_building.name = Építési terv törlése
+keybind.control.name = Egység Irányítása
+keybind.clear_building.name = Épület Törlése
 keybind.press = Nyomj meg egy gombot...
 keybind.press.axis = Nyomj meg egy kart, vagy gombot...
-keybind.screenshot.name = Pálya képernyőkép
+keybind.screenshot.name = Pálya Képernyőkép
 keybind.toggle_power_lines.name = Villanyvezetékek be/ki
 keybind.toggle_block_status.name = Blokk állapot be/ki
 keybind.move_x.name = Mozgás vízszintesen
 keybind.move_y.name = Mozgás függőlegesen
-keybind.mouse_move.name = Egér követése
+keybind.mouse_move.name = Egér Követése
 keybind.pan.name = Felderítés
 keybind.boost.name = Erősítés
 keybind.command_mode.name = Parancs Mód
-keybind.command_queue.name = Egység parancsok sorba állítása
-keybind.create_control_group.name = Vezérlő csoport készítése
-keybind.cancel_orders.name = Parancsok visszavonása
+keybind.command_queue.name = Egység Parancsok Sorba Állítása
+keybind.create_control_group.name = Vezérlő Csoport Készítése
+keybind.cancel_orders.name = Parancsok Visszavonása
 
 keybind.unit_stance_shoot.name = Egység Magatartása: Lövés
 keybind.unit_stance_hold_fire.name = Egység Magatartása: Tüzet Szüntess
@@ -1209,123 +1210,123 @@ keybind.unit_command_rebuild = Egység Parancs: Újraépítés
 keybind.unit_command_assist = Egység Parancs: Támogatás
 keybind.unit_command_mine = Egység Parancs: Bányászás
 keybind.unit_command_boost = Egység Parancs: Erősítés
-keybind.unit_command_load_units = Egység Parancs: Egységek bepakolása a rakományszállítóba
-keybind.unit_command_load_blocks = Egység Parancs: Blokkok bepakolása a rakományszállítóba
-keybind.unit_command_unload_payload = Egység Parancs: Kirakodás a rakományszállítóból
+keybind.unit_command_load_units = Egység Parancs: Egységek Berakodása
+keybind.unit_command_load_blocks = Egység Parancs: Blokkok Berakodása
+keybind.unit_command_unload_payload = Egység Parancs: Kirakodás A Rakományszállítóból
 
-keybind.rebuild_select.name = Régió újjáépítése
-keybind.schematic_select.name = Terület kijelölése
-keybind.schematic_menu.name = Vázlat menü
-keybind.schematic_flip_x.name = Vázlat tükrözése vízszintesen
-keybind.schematic_flip_y.name = Vázlat tükrözése függőlegesen
-keybind.category_prev.name = Előző kategória
-keybind.category_next.name = Következő kategória
-keybind.block_select_left.name = Blokk váltás balra
-keybind.block_select_right.name = Blokk váltás jobbra
-keybind.block_select_up.name = Blokk váltás fel
-keybind.block_select_down.name = Blokk váltás le
-keybind.block_select_01.name = Blokk kategória 1
-keybind.block_select_02.name = Blokk kategória 2
-keybind.block_select_03.name = Blokk kategória 3
-keybind.block_select_04.name = Blokk kategória 4
-keybind.block_select_05.name = Blokk kategória 5
-keybind.block_select_06.name = Blokk kategória 6
-keybind.block_select_07.name = Blokk kategória 7
-keybind.block_select_08.name = Blokk kategória 8
-keybind.block_select_09.name = Blokk kategória 9
-keybind.block_select_10.name = Blokk kategória 10
-keybind.fullscreen.name = Teljes képernyő be/ki
+keybind.rebuild_select.name = Régió Újjáépítése
+keybind.schematic_select.name = Terület Kijelölése
+keybind.schematic_menu.name = Vázlat Menü
+keybind.schematic_flip_x.name = Vázlat Tükrözése Vízszintesen
+keybind.schematic_flip_y.name = Vázlat Tükrözése Függőlegesen
+keybind.category_prev.name = Előző Kategória
+keybind.category_next.name = Következő Kategória
+keybind.block_select_left.name = Blokk Váltás Balra
+keybind.block_select_right.name = Blokk Váltás Jobbra
+keybind.block_select_up.name = Blokk Váltás Fel
+keybind.block_select_down.name = Blokk Váltás Le
+keybind.block_select_01.name = Kategória/Blokk Választás 1
+keybind.block_select_02.name = Kategória/Blokk Választás 2
+keybind.block_select_03.name = Kategória/Blokk Választás 3
+keybind.block_select_04.name = Kategória/Blokk Választás 4
+keybind.block_select_05.name = Kategória/Blokk Választás 5
+keybind.block_select_06.name = Kategória/Blokk Választás 6
+keybind.block_select_07.name = Kategória/Blokk Választás 7
+keybind.block_select_08.name = Kategória/Blokk Választás 8
+keybind.block_select_09.name = Kategória/Blokk Választás 9
+keybind.block_select_10.name = Kategória/Blokk Választás 10
+keybind.fullscreen.name = Teljes Képernyő be/ki
 keybind.select.name = Kiválasztás/Lövés
-keybind.diagonal_placement.name = Átlós elhelyezés
-keybind.pick.name = Blokk másolása
-keybind.break_block.name = Blokk törlése
-keybind.select_all_units.name = Minden egység kijelölése
-keybind.select_all_unit_factories.name = Minden egységgyár kijelölése
-keybind.deselect.name = Blokk választás törlése
-keybind.pickupCargo.name = Rakomány felvétele
-keybind.dropCargo.name = Rakomány lerakása
+keybind.diagonal_placement.name = Átlós Élhelyezés
+keybind.pick.name = Blokk Másolása
+keybind.break_block.name = Blokk Törlése
+keybind.select_all_units.name = Minden Egység Kijelölése
+keybind.select_all_unit_factories.name = Minden Egységgyár Kijelölése
+keybind.deselect.name = Blokk Választás Törlése
+keybind.pickupCargo.name = Rakomány Felvétele
+keybind.dropCargo.name = Rakomány Lerakása
 keybind.shoot.name = Lövés
 keybind.zoom.name = Nagyítás
 keybind.menu.name = Menü
 keybind.pause.name = Szünet
-keybind.pause_building.name = Építés szüneteltetése/folytatása
+keybind.pause_building.name = Építés Szüneteltetése/Folytatása
 keybind.minimap.name = Minitérkép
-keybind.planet_map.name = Bolygó térkép
+keybind.planet_map.name = Bolygó Térkép
 keybind.research.name = Kutatás
-keybind.block_info.name = Blokk Információ
+keybind.block_info.name = Blokk Infó
 keybind.chat.name = Csevegés
-keybind.player_list.name = Játékos lista
+keybind.player_list.name = Játékos Lista
 keybind.console.name = Konzol
 keybind.rotate.name = Forgatás
-keybind.rotateplaced.name = Épület forgatása (tartsd nyomva)
+keybind.rotateplaced.name = Meglévő Forgatása (Tartsd Nyomva)
 keybind.toggle_menus.name = Menük Váltása
-keybind.chat_history_prev.name = Csevegés görgetés fel
-keybind.chat_history_next.name = Csevegés görgetés le
-keybind.chat_scroll.name = Csevegés görgetés
-keybind.chat_mode.name = Csevegés mód megváltoztatása
-keybind.drop_unit.name = Egység elengedése
-keybind.zoom_minimap.name = Zoom a  Minitérképen
-mode.help.title = Játékmódok leírása
+keybind.chat_history_prev.name = Csevegés Görgetése Felfelé
+keybind.chat_history_next.name = Csevegés Görgetése Lefelé
+keybind.chat_scroll.name = Csevegés Görgetés
+keybind.chat_mode.name = Csevegés Mód Megváltoztatása
+keybind.drop_unit.name = Egység Eldobása
+keybind.zoom_minimap.name = Zoom A Minitérképen
+mode.help.title = Játékmódok Leírása
 mode.survival.name = Túlélő
-mode.survival.description = A normál mód. Korlátozott nyersanyag és automatikusan érkező hullámok.\n[gray]Szükséges hozzá ellenséges kezdőpont a pályán.
+mode.survival.description = A normál mód. Korlátozott nyersanyag és automatikusan érkező hullámok.\n[gray]Szükséges hozzá egy ellenséges kezdőpont a pályán.
 mode.sandbox.name = Homokozó
 mode.sandbox.description = Végtelen nyersanyagforrás, nincs időzítés a hullámokhoz.
 mode.editor.name = Szerkesztő
 mode.pvp.name = PvP
-mode.pvp.description = Harcolj más játékosok ellen.\n[gray]Szükséges hozzá legalább két különböző színű Mag a Pályán.
+mode.pvp.description = Harcolj más játékosok ellen.\n[gray]Szükséges hozzá legalább két különböző színű Mag a pályán.
 mode.attack.name = Támadás
 mode.attack.description = Pusztítsd el az ellenség bázisát. \n[gray]Szükséges hozzá egy piros Mag a pályán.
-mode.custom = Egyéni szabályok
+mode.custom = Egyéni Szabályok
 
 rules.invaliddata = Érvénytelen adatok a vágólapon.
-rules.hidebannedblocks = Tiltott blokkok elrejtése
-rules.infiniteresources = Végtelen nyersanyagforrás
-rules.onlydepositcore = Csak Magok elhelyezése engedélyezett
-rules.derelictrepair = Az Elhagyatott blokkok javításának engedélyezése
-rules.reactorexplosions = Reaktor robbanás
-rules.coreincinerates = Többlet nyersanyagok megsemmisítése a Magban
-rules.disableworldprocessors = Világprocesszorok letiltása
-rules.schematic = Vázlatok
-rules.wavetimer = Hullám időzítő
-rules.wavesending = Hullám küldése
+rules.hidebannedblocks = Tiltott Blokkok Elrejtése
+rules.infiniteresources = Végtelen Nyersanyagforrás
+rules.onlydepositcore = Csak Magok Elhelyezése Engedélyezett
+rules.derelictrepair = Az Elhagyatott Blokkok Javításának Engedélyezése
+rules.reactorexplosions = Reaktor Robbanás
+rules.coreincinerates = Többlet Nyersanyagok Megsemmisítése A Magban
+rules.disableworldprocessors = Világprocesszorok Letiltása
+rules.schematic = Vázlatok Engedélyezése
+rules.wavetimer = Hullám Időzítő
+rules.wavesending = Hullám Küldése
 rules.waves = Hullámok
-rules.attack = Támadás mód
-rules.buildai = Épületalkotó intelligencia
-rules.buildaitier = Épületalkotó intelligencia szintje
-rules.rtsai = Stratégia alkotó Intelligencia
-rules.rtsminsquadsize = Minimális osztag méret
-rules.rtsmaxsquadsize = Maximális osztag méret
-rules.rtsminattackweight = Minimális támadási "lépéselőny"
-rules.cleanupdeadteams = A legyőzött csapatépületek törlése (PvP)
-rules.corecapture = Mag elfoglalása megsemmisítéskor
-rules.polygoncoreprotection = Poligonális Mag védelem
-rules.placerangecheck = Elhelyezési tartomány ellenőrzése
-rules.enemyCheat = Végtelen AI (Piros csapat) nyersanyagforrás
-rules.blockhealthmultiplier = Épület életpont szorzó
-rules.blockdamagemultiplier = Épület sebzés szorzó
-rules.unitbuildspeedmultiplier = Egység yyártási sebesség szorzó
-rules.unitcostmultiplier = Egységköltség szorzó
-rules.unithealthmultiplier = Egység életpont szorzó
-rules.unitdamagemultiplier = Egység sebzés szorzó
-rules.unitcrashdamagemultiplier = Egység ütközési sebzés szorzó
-rules.solarmultiplier = Napenergia szorzó
-rules.unitcapvariable = A Magok befolyásolják a legyártható egységek darabszámát
-rules.unitcap = Alap egység-darabszám
-rules.limitarea = Játékterület korlátozása a pályán
-rules.enemycorebuildradius = Ellenséges Mag körüli tiltott zóna sugara:[lightgray] (mező)
-rules.wavespacing = Hullámok közötti szünet időzítés:[lightgray] (sec)
-rules.initialwavespacing = Az első hullám előtti szünet időrtama:[lightgray] (sec)
-rules.buildcostmultiplier = Építési költség szorzó
-rules.buildspeedmultiplier = Építési sebesség szorzó
-rules.deconstructrefundmultiplier = Bontási visszatérítés szorzó
-rules.waitForWaveToEnd = Az ellenség kivárja a korábbi hullám végét
-rules.wavelimit = Az utolsó hullám után legyen vége a játéknak
-rules.dropzoneradius = Ledobási zóna sugara:[lightgray] (mező)
-rules.unitammo = Az egységeknek lőszer kell
-rules.enemyteam = Elenséges csapat
-rules.playerteam = Saját csapat
+rules.attack = Támadás Mód
+rules.buildai = Épületalkotó AI
+rules.buildaitier = Épületalkotó AI Szintje
+rules.rtsai = RTS AI [red](WIP)
+rules.rtsminsquadsize = Minimális Osztag Méret
+rules.rtsmaxsquadsize = Maximális Osztag Méret
+rules.rtsminattackweight = Minimális Támadási "lépéselőny"
+rules.cleanupdeadteams = A legyőzött Csapatépületek Törlése (PvP)
+rules.corecapture = Mag Elfoglalása Megsemmisítéskor
+rules.polygoncoreprotection = Poligonális Mag Védelem
+rules.placerangecheck = Elhelyezési Tartomány Ellenőrzése
+rules.enemyCheat = Végtelen Ellenséges Csapat Erőforrások
+rules.blockhealthmultiplier = Épület Életpont Szorzó
+rules.blockdamagemultiplier = Épület Sebzés Szorzó
+rules.unitbuildspeedmultiplier = Egység Gyártási Sebesség Szorzó
+rules.unitcostmultiplier = Egységköltség Szorzó
+rules.unithealthmultiplier = Egység Életpont Szorzó
+rules.unitdamagemultiplier = Egység Sebzés Szorzó
+rules.unitcrashdamagemultiplier = Egység Ütközési Sebzés Szorzó
+rules.solarmultiplier = Napenergia Szorzó
+rules.unitcapvariable = A Magok Befolyásolják A Legyártható Egységek Darabszámát
+rules.unitcap = Alap Egység-Darabszám
+rules.limitarea = Játékterület Korlátozása A Pályán
+rules.enemycorebuildradius = Ellenséges Mag Körüli Tiltott Zóna Sugara:[lightgray] (mező)
+rules.wavespacing = Hullámok Közötti Szünet Időzítés:[lightgray] (sec)
+rules.initialwavespacing = Az Első Hullám Előtti Szünet Időrtama:[lightgray] (sec)
+rules.buildcostmultiplier = Építési Költség Szorzó
+rules.buildspeedmultiplier = Építési Sebesség Szorzó
+rules.deconstructrefundmultiplier = Bontási Visszatérítés Szorzó
+rules.waitForWaveToEnd = Az Ellenség Kivárja A Korábbi Hullám Végét
+rules.wavelimit = Az Utolsó Hullám Után Legyen Vége A Játéknak
+rules.dropzoneradius = Ledobási Zóna Sugara:[lightgray] (mező)
+rules.unitammo = Az Egységeknek Lőszer Kell [red](törölhető)
+rules.enemyteam = Elenséges Csapat
+rules.playerteam = Saját Csapat
 rules.title.waves = Hullámok
-rules.title.resourcesbuilding = Nyersanyagforrások és épületek
+rules.title.resourcesbuilding = Nyersanyagforrások & Épületek
 rules.title.enemy = Ellenségek
 rules.title.unit = Egységek
 rules.title.experimental = Kísérleti
@@ -1336,7 +1337,7 @@ rules.lighting = Világítás
 rules.fog = Köd
 rules.fire = Tűz
 rules.anyenv = <Bármelyik>
-rules.explosions = Épület/Egység robbanás sebzés
+rules.explosions = Épület/Egység Robbanás Sebzés
 rules.ambientlight = Háttérvilágítás
 rules.weather = Időjárás
 rules.weather.frequency = Gyakoriság:
@@ -1381,7 +1382,7 @@ liquid.slag.name = Salak
 liquid.oil.name = Olaj
 liquid.cryofluid.name = Hűtőfolyadék
 liquid.neoplasm.name = Neoplazma
-liquid.arkycite.name = Arkycite
+liquid.arkycite.name = Arkycit
 liquid.gallium.name = Gallium
 liquid.ozone.name = Ózon
 liquid.hydrogen.name = Hidrogén
@@ -1480,8 +1481,8 @@ block.scrap-wall-huge.name = Hatalmas Törmelék Fal
 block.scrap-wall-gigantic.name = Gigantikus Törmelék Fal
 block.thruster.name = Hajtómű
 block.kiln.name = Kemence
-block.graphite-press.name = Grafit Sajtoló
-block.multi-press.name = Multi Sajtoló
+block.graphite-press.name = Grafit Préselő
+block.multi-press.name = Grafit Sajtoló
 block.constructing = {0} [lightgray](Építés)
 block.spawn.name = Ellenséges Kezdőpont
 block.core-shard.name = Szilánk
@@ -1605,7 +1606,7 @@ block.tsunami.name = Tsunami
 block.swarmer.name = Swarmer
 block.salvo.name = Salvo
 block.ripple.name = Ripple
-block.phase-conveyor.name = Tóritkvarc Szállítószalag
+block.phase-conveyor.name = Tóritkvarc Szállítószalag Híd
 block.bridge-conveyor.name = Szállítószalag Híd
 block.plastanium-compressor.name = Műanyag Sűrítő
 block.pyratite-mixer.name = Piratit Keverő
@@ -1617,7 +1618,7 @@ block.repair-point.name = Javítási Pont
 block.repair-turret.name = Javító Löveg
 block.pulse-conduit.name = Impulzus Csővezeték
 block.plated-conduit.name = Lemezelt Csővezeték
-block.phase-conduit.name = Tóritkvarc Csővezeték
+block.phase-conduit.name = Tóritkvarc Csővezeték Híd
 block.liquid-router.name = Folyadék Elosztó
 block.liquid-tank.name = Folyadék Tartály
 block.liquid-container.name = Folyadék Tároló
@@ -1695,7 +1696,7 @@ block.yellow-stone-plates.name = Sárga Kőlemezek
 block.red-stone.name = Vörös Kő
 block.dense-red-stone.name = Sűrű Vörös Kő
 block.red-ice.name = Vörös Jég
-block.arkycite-floor.name = Arkycite
+block.arkycite-floor.name = Arkycit
 block.arkyic-stone.name = Arkycites Kő
 block.rhyolite-vent.name = Riolit Kürtő
 block.carbon-vent.name = Szén Kürtő
@@ -1770,8 +1771,8 @@ block.armored-duct.name = Páncélozott Szállítószalag
 block.overflow-duct.name = Túlfolyó Szállítószalag
 block.underflow-duct.name = Alulfolyó Szállítószalag
 block.duct-unloader.name = Kirakodó Szállítószalag
-block.surge-conveyor.name = Tóritkvarc Szállítószalag
-block.surge-router.name = Tóritkvarc Elosztó
+block.surge-conveyor.name = Elektrometál Szállítószalag
+block.surge-router.name = Elektrometál Elosztó
 block.unit-cargo-loader.name = Egység Rakomány Berakodó
 block.unit-cargo-unload-point.name = Egység Rakomány Kirakodó Pont
 block.reinforced-pump.name = Megerősített Szivattyú
@@ -1832,65 +1833,65 @@ block.neoplasia-reactor.name = Neoplázia Reaktor
 
 block.switch.name = Kapcsoló
 block.micro-processor.name = Mikroprocesszor
-block.logic-processor.name = Logikai Processzor
-block.hyper-processor.name = Hiper Processzor
+block.logic-processor.name = Logikaiprocesszor
+block.hyper-processor.name = Hiperprocesszor
 block.logic-display.name = Logikai Kijelző
 block.large-logic-display.name = Nagy Logikai Kijelző
 block.memory-cell.name = Memória Cella
 block.memory-bank.name = Memória Bank
 
-team.malis.name = lila
-team.crux.name = piros
-team.sharded.name = narancssárga
-team.derelict.name = szürke
-team.green.name = zöld
-team.blue.name = kék
+team.malis.name = Lila
+team.crux.name = Piros
+team.sharded.name = Narancssárga
+team.derelict.name = Szürke
+team.green.name = Zöld
+team.blue.name = Kék
 
-hint.skip = Átugrás
+hint.skip = Kihagyás
 hint.desktopMove = Használd a [accent][[WASD][] gombokat a mozgáshoz.
-hint.zoom = Használd a [accent]görgőt[] a zoomhoz..
-hint.desktopShoot = Használd a [accent]bal egérgombot[] a lövéshez.
-hint.depositItems = A nyersanyagokat áthelyezheted húzással a hajóról a Magba.
-hint.respawn = Hogy hajóként újraéledj, nyomd meg a [accent][[V][] gombot.
-hint.respawn.mobile = Átvetted az irányítást egy egység, vagy lövegtorony felett. Hogy újraéledj hajóként, [accent]érintsd meg az avatárt a bal felső sarokban.[]
-hint.desktopPause = Nyomd meg a [accent][[Space][]t, hogy szüneteltesd vagy folytasd a játékot.
-hint.breaking = [accent]Jobb gombot[] nyomva kijelölhetsz lebontandó épületeket.
-hint.breaking.mobile = Használd a \ue817 [accent]kalapácsot[] jobb lent és töröld vele az útban lévő épületeket.\n\nTartsd lenyomva az ujjad és húzd, hogy nagyobb területet kijelölj.
+hint.zoom = Használd az egér [accent]Görgőjét[] a zoomhoz..
+hint.desktopShoot = Használd a [accent]Bal-Egérgomb[]ot a lövéshez.
+hint.depositItems = A nyersanyagokat áthelyezheted húzással a drónból a Magba.
+hint.respawn = Ahhoz, hogy drónként újraéledj, nyomd meg a [accent][[V][] gombot.
+hint.respawn.mobile = Átvetted az irányítást egy egység, vagy lövegtorony felett. Ahhoz, hogy drónként újraéledj, [accent]érintsd meg az avatárt a bal felső sarokban.[]
+hint.desktopPause = Nyomd meg a [accent][[Szóköz][]t, hogy szüneteltesd, vagy folytasd a játékot.
+hint.breaking = [accent]Jobb-Egérgomb[]ot nyomva kijelölheted az útban lévő épületeket a lebontásukhoz.
+hint.breaking.mobile = Használd a \ue817 [accent]Kalapács[] gombot jobb lent és töröld vele az útban lévő épületeket.\n\nTartsd lenyomva az ujjad és húzd, hogy nagyobb területet tudj kijelölni.
 hint.blockInfo = Egy blokk információinak megtekintéséhez válaszd ki a blokkot az [accent]Építés menüben[], majd válaszd a [accent][[?][] gombot a jobb oldalon.
 hint.derelict = Az [accent]Elhagyatott[] szerkezetek régi bázisok maradványai, amelyek már nem működnek.\n\nEzeket a maradványokat le lehet [accent]bontani[] nyersanyagokért, vagy megjavítani őket.
-hint.research = Használd a \ue875 [accent]Kutatás[] gombot, hogy felfedezz új technológiákat.
-hint.research.mobile = Használd a \ue875 [accent]Kutatás[] gombot a \ue88c [accent]Menü[]ben, hogy felfedezz új technológiákat.
-hint.unitControl = Nyomd le a [accent][[L-ctrl][] gombot és [accent]kattints[], hogy átvedd az irányítást szövetséges egységek vagy lövegtornyok felett.
-hint.unitControl.mobile = [accent][[Dupla koppintás][]sal átveheted az irányítást szövetséges egységek és lövegtornyok felett.
-hint.unitSelectControl = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, nyomd hosszan a [accent]L-shift.[]el\nParancs Módban az egységek kiválasztásához kattints és húzd az egeret. [accent]Jobb-Klikk[] az egységek mozgatásához egy helyszínre, vagy az ellenséges célpontra.
-hint.unitSelectControl.mobile = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, nyomd meg a [accent]Parancs Mód[] gombot a bal alsó sarokban.\nParancsn módban az egységek kiválasztásához érintsd meg a kijelzőt és húzással jelöld ki az egységeket. Koppints az egységek mozgatásához egy helyszínre, vagy ellenséges az célpontra.
+hint.research = Használd a \ue875 [accent]Fejlődési Fa[] gombot, hogy felfedezz új technológiákat.
+hint.research.mobile = Használd a \ue875 [accent]Fejlődési Fa[] gombot a \ue88c [accent]Menü[]ben, hogy felfedezz új technológiákat.
+hint.unitControl = Nyomd le a [accent][[Bal-CTRL][] gombot és kattints [accent]Jobb-Egérgomb[]al az irányítani kívánt szövetséges egységre, vagy -lövegtoronyra, hogy átvedd fölötte az irányítást.
+hint.unitControl.mobile = [accent][[Dupla koppintás][]sal átveheted az irányítást szövetséges egységek, vagy -lövegtornyok felett.
+hint.unitSelectControl = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd hosszan a [accent]Bal-SHIFT[] gombot.\nParancs Módban az egységek kijelöléséhez kattints és húzd az egeret. [accent]Jobb-Egérgomb[]-al kattints az egységek mozgatásához egy helyszínre, vagy az ellenséges célpontra.
+hint.unitSelectControl.mobile = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd meg a [accent]Parancs Mód[] gombot a bal alsó sarokban.\nParancs módban az egységek kiválasztásához érintsd meg a kijelzőt és húzással jelöld ki az egységeket. Koppints az egységek mozgatásához egy helyszínre, vagy ellenséges az célpontra.
 hint.launch = Ha elegendő nyersanyagot gyűjtöttél, [accent]Kilőhetsz[] egy közeli szektorba. Ezt lent a jobb oldalon látható \ue827 [accent]Térkép[]en teheted meg.
 hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél, [accent]Kilőhetsz[] egy közeli szektorba. Ezt a \ue88c [accent]Menü[]ből elérhető \ue827 [accent]Térkép[]en teheted meg.
 hint.schematicSelect = Az [accent][[F][] nyomva tartásával kijelölhetsz és másolhatsz épületeket.\n\nKattints a [accent][[görgővel][], hogy egy épületet lemásolj.
 hint.rebuildSelect = Tartsd nyomva a [accent][[B][] és húzással jelöld ki a megsemmisített blokkterveket.\nEz automatikusan újraépíti őket.
 hint.rebuildSelect.mobile = Válaszd a \ue874 másolás gombot, majd koppints \ue80f újjáépítés gombra, és húzd a megsemmisült blokktervek kijelöléséhez.\nEz automatikusan újraépíti őket.
-hint.conveyorPathfind = Tartsd nyomva a [accent][[L-Ctrl][] gombot a szállítószalagok lerakása közben, hogy a játék útvnalat generáljon.
-hint.conveyorPathfind.mobile = Engedélyezd az \ue844 [accent]átlós mód[]ot és tegyél le egyszerre több szállítószalagot, hogy a játék útvonalat generáljon.
-hint.boost = Tartsd nyomva a [accent][[L-Shift][] gombot, hogy átrepülj az akadályok felett.\n\nErre nem minden földi egység képes.
+hint.conveyorPathfind = Tartsd nyomva a [accent][[Bal-CTRL][] gombot a szállítószalagok lerakása közben, hogy a játék útvnalat generáljon.
+hint.conveyorPathfind.mobile = Engedélyezd az \ue844 [accent]Átlós Mód[]ot és tegyél le egyszerre több szállítószalagot, hogy a játék útvonalat generáljon.
+hint.boost = Tartsd nyomva a [accent][[Bal-SHIFT][] gombot, hogy átrepülj az akadályok felett.\n\nErre nem minden földi egység képes.
 hint.payloadPickup = A [accent][[[] gombbal kis épületeket vagy egységeket emelhetsz fel.
 hint.payloadPickup.mobile = [accent]Tartsd nyomva az ujjad[] egy kis épületen vagy egységen, hogy felemeld.
 hint.payloadDrop = A [accent]][] megnyomásával lerakhatod a rakományodat.
 hint.payloadDrop.mobile = [accent]Tartsd hosszan az ujjad[] egy üres területen, hogy letedd a rakományodat.
 hint.waveFire = A [accent]Wave[] lövegtornyok, ha Víz van bennük, automatikusan eloltják a közeli tüzeket.
 hint.generator = \uf879 A [accent]Belső-égetésű Erőmű[] Szenet éget, és átadja az Áramot a vele érintkező épületeknek.\n\nÁramot nagyobb távolságra is szállíthatsz \uf87f [accent]Villanyoszlop[]ok segítségével.
-hint.guardian = Az [accent]Őrző[]knek páncélja van. A gyenge lövedékeknek, mint a [accent]Copper[] vagy a [accent]Lead[] [scarlet]nincs hatásuk[].\n\nHasználj magasabb szintű lövegtornyokat vagy \uf835 [accent]Grafit[] lövedéket a \uf861Duo/\uf859Salvo tornyokba, hogy leszedd az Őrzőket.
+hint.guardian = Az [accent]Őrző[]knek páncélja van. A gyenge lövedékeknek, mint a [accent]Réz[], vagy az [accent]Ólom[] [scarlet]nincs hatásuk[] az Őrző páncéljára.\n\nHasználj magasabb szintű lövegtornyokat, vagy \uf835 [accent]Grafit[] lövedéket a \uf861Duo/\uf859Salvo lövegtornyokban, hogy leszedd az Őrzőket.
 hint.coreUpgrade = A Magot fejlesztheted, ha [accent]magasabb szintű Magot teszel rá[].\n\nHelyezz egy [accent]Alapítvány[] Magot a [accent]Szilánk[] Magra. Figyelj rá, hogy ne legyenek az új Mag területén épületek.
 hint.presetLaunch = A szürke [accent]kampány szektorok[]ba, amilyen például a [accent]Fagyott Erdő[], bárhonnan kilőhetsz. Nem kell szomszédos területtel rendelkezned.\n\nA [accent]számozott szektorok[], mint ez is, [accent]opcionálisak[].
 hint.presetDifficulty = Ebben a szektorban [scarlet]magas az ellenséges fenyegetettségi szint[].\nAz ilyen szektorokba való indulás [accent]nem ajánlott[] megfelelő technológia és felkészülés nélkül.
 hint.coreIncinerate = Ha a Magodban egy nyersanyag elérte a maximumot, a beérkező ilyen nyersanyagaid azonnal [accent]megsemmisítésre kerülnek[].
-hint.factoryControl = Egy egységgyár [accent]kimeneti célpontjának[] beállításához Parancs Módban kattintson egy gyárblokkra, majd kattintson a jobb gombbal egy helyre.\nAz előállított egységek automatikusan odamennek.
-hint.factoryControl.mobile = Egy egységgyár [accent]kimeneti célpontjának[] beállításához parancs módban koppints egy gyárblokkra, majd koppintson egy helyre.\nAz előállított egységek automatikusan odamennek.
+hint.factoryControl = Egy egységgyár [accent]kimeneti célpontjának[] beállításához Parancs Módban kattints egy gyárblokkra, majd kattints a Jobb-Egérgombbal egy helyre.\nAz előállított egységek automatikusan odamennek.
+hint.factoryControl.mobile = Egy egységgyár [accent]kimeneti célpontjának[] beállításához Parancs Módban koppints egy gyárblokkra, majd koppints egy helyre.\nAz előállított egységek automatikusan odamennek.
 
 gz.mine = Menj a földön lévő \uf8c4 [accent]Rézérc[] közelébe, és kattints a bányászat megkezdéséhez.
 gz.mine.mobile = Menj a földön lévő \uf8c4 [accent]Rézérc[] közelébe, és koppints a bányászat megkezdéséhez.
 gz.research = Nyisd meg a \ue875 Fejlődési Fát.\nFedezd fel a \uf870 [accent]Mechanikus Fúró[]t, majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy Rézfoltra, hogy elhelyezd.
 gz.research.mobile = Nyisd meg a \ue875 Fejlődési Fát.\nFedezd fel a \uf870 [akcentus]Mechanikus Fúró[]t, majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy Rézfoltra, hogy elhelyezd.\n\nNyomd meg a \ue800 [accent]Pipa[]t a jobb alsó sarokban a megerősítéshez.
-gz.conveyors = Fedezd fel és építs \uf896 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól a Magba.\n\nKattints és húzd az egeret bármely irányba, hogy hosszabb Szállítószalagot készíthess.\n[accent]Görgővel[] a szállítás irányát tudod megváltoztatni.
+gz.conveyors = Fedezd fel és építs \uf896 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Magba.\n\nKattints és húzd az egeret bármely irányba, hogy hosszabb Szállítószalagot készíthess.\n[accent]Görgővel[] a szállítás irányát tudod megváltoztatni.
 gz.conveyors.mobile = Fedezd fel és építs \uf896 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Magba.\n\nTartsd rajta az ujjad egy másodpercig, és húzd bármely irányba, hogy hosszabb Szállítószalagot készíthess.
 gz.drills = Bővítsd a bányászati kapacitást.\nÉpíts több Mechanikus Fúrót.\nBányássz 100 Rezet.
 gz.lead = \uf837 [accent]Ólom[] egy másik gyakran használt nyersanyag.\nÉpíts fúrókat az Ólom kitermelésére.
@@ -1907,9 +1908,9 @@ gz.zone2 = Bármi, ami a hatósugarában épült, elpusztul, amikor egy hullám
 gz.zone3 = Egy hullám most kezdődik.\nKészülj fel.
 gz.finish = Építs több lövegtornyot, bányássz több nyersanyagot\nés védekezz az ellenséges hullámok ellen, hogy [accent]elfoglald a szektort[].
 
-onset.mine = Kattints a \uf748 [accent]Berillium[] kibányászásához a falakból.\n\nHasználd a [accent][[WASD] gombokat a mozgáshoz.
-onset.mine.mobile = Koppints a \uf748 [accent]Berillium[] kibányászásához a falakból.
-onset.research = Nyisd meg a \ue875 fejlődési fát.\nFedezd fel és építs egy \uf73e [accent]Kondenzációs Turbina[]t a kürtőn.\nEz [accent]Áram[]ot fog generálni.
+onset.mine = Kattints Bal-Egérgommbal a \uf748 [accent]Berillium[]ra, hogy kibányászd a falakból.\n\nHasználd a [accent][[WASD] gombokat a mozgáshoz.
+onset.mine.mobile = Koppints a \uf748 [accent]Berillium[]ra, hogy kibányászd a falakból.
+onset.research = Nyisd meg a \ue875 Fejlődési Fát.\nFedezd fel és építs egy \uf73e [accent]Kondenzációs Turbina[]t a kürtőn.\nEz [accent]Áram[]ot fog generálni.
 onset.bore = Fedezd fel és építs \uf741 [accent]Plazma Vágó[]t.\nEz automatikusan bányássza ki a nyersanyagokat a falakból.
 onset.power = Ahhoz, hogy [accent]Áram[]mal lásd el a Plazma Fúrót, Fedezd fel és építs \uf73d [accent]Sugár Csomópont[]okat.\nSegítségükkel összekötheted a Kondenzációs Turbinát a Plazma Vágóval.
 onset.ducts = Fedezd fel és építs \uf799 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat eljuttasd a fúróktól/vágóktól a Magba\nKattints és húzd az egeret bármely irányba, hogy hosszabb Szállítószalagot készíthess.\n[accent]Görgővel[] a szállítás irányát tudod megváltoztatni.
@@ -1951,7 +1952,7 @@ item.titanium.description = Folyadékok szállítására, fúrókban és légi j
 item.thorium.description = Strapabíró szerkezetekben használható nukleáris tüzelőanyagként.
 item.scrap.description = Olvasztással és porítással finom nyersanyagok nyerhetők ki belőle.
 item.scrap.details = Ősi építmények és egységek hátrahagyott maradványai.
-item.silicon.description = Napelemek, összetett áramkörök és nyomkövető lövedékek fontos alapanyaga. Sosincs elég.
+item.silicon.description = Napelemek, összetett áramkörök és nyomkövető lövedékek fontos alapanyaga. Sosincs belőle elég.
 item.plastanium.description = Fejlett egységek alapanyagaként, hőszigetelésre és repeszes lövedékekhez használható.
 item.phase-fabric.description = Fejlett elektromos eszközökben és önjavító szerkezetekben használható.
 item.surge-alloy.description = Magas szintű fegyverzetekben és aktív védelemhez használható.
@@ -1961,7 +1962,7 @@ item.blast-compound.description = Bombák és robbanó lövedékek része.
 item.pyratite.description = Gyújtó lövedékekben és tüzelőanyag-alapú generátorokban használható.
 
 #Erekir
-item.beryllium.description = Sokféle építési és lőszertípushoz használják Erekiren.
+item.beryllium.description = Sokféle épület- és lőszertípushoz használják Erekiren.
 item.tungsten.description = Fúrókban/vágókban, páncélokban és lőszerekben használatos. A fejlettebb szerkezetek építéséhez szükséges.
 item.oxide.description = Hővezetőként és Áramszigetelőként használják.
 item.carbide.description = Korszerű szerkezetekben, nehezebb egységekben és lőszerekben használatos.
@@ -1975,9 +1976,9 @@ liquid.cryofluid.description = Hűtőfolyadék az erőművek, reaktorok, lövegt
 liquid.arkycite.description = Kémiai reakciókban használják energiatermelésre és anyagszintézisre.
 liquid.ozone.description = Oxidálószerként használják az anyaggyártásban és üzemanyagként. Mérsékelten robbanékony.
 liquid.hydrogen.description = A nyersanyagok kitermelésében, egységgyártásban és szerkezetjavításban használatos. Gyúlékony.
-liquid.cyanogen.description = Lőszerekhez, fejlett egységek építéséhez és különböző reakciókhoz használják a fejlett blokkokban. Erősen gyúlékony.
+liquid.cyanogen.description = Lőszerekhez, fejlett egységek építéséhez és különböző reakciókhoz használják a fejlett épületekben. Erősen gyúlékony.
 liquid.nitrogen.description = A nyersanyagok kitermelésében, gáztermelésnél és egységgyártásnál használják. Semleges gáz.
-liquid.neoplasm.description = A Neoplazma reaktor veszélyes biológiai mellékterméke. Gyorsan átterjed minden szomszédos víztartalmú blokkra, amelyhez hozzáér és közben károsítja azokat. Sűrű folyadék.
+liquid.neoplasm.description = A Neoplazma reaktor veszélyes biológiai mellékterméke. Gyorsan átterjed minden szomszédos víztartalmú épületre, amelyhez hozzáér és közben károsítja azokat. Sűrű folyadék.
 liquid.neoplasm.details = Neoplazma. Egy kontrollálhatatlan, gyorsan osztódó, iszap állagú, szintetikus sejtmassza. Hőálló. Rendkívül veszélyes minden Vízzel kapcsolatos szerkezetre.\n\nTúl összetett és instabil a szabványos elemzésekhez. Potenciális alkalmazási területe ismeretlen. Ajánlott a Salak medencékben való elégetése.
 
 block.derelict = \uf77e [lightgray]Elhagyatott
@@ -2014,8 +2015,8 @@ block.copper-wall.description = Megvédi az épületeket az ellenséges lövedé
 block.copper-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől.
 block.titanium-wall.description = Megvédi az épületeket az ellenséges lövedékektől.
 block.titanium-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől.
-block.plastanium-wall.description = Megvédi az épületeket az ellenséges lövedékektől. Elnyeli a lézereket és elektromos szikrákat. Gátolja a villanyvezetékek automatikus kapcsolódását.
-block.plastanium-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől. Elnyeli a lézereket és elektromos szikrákat. Gátolja a villanyvezetékek automatikus kapcsolódását.
+block.plastanium-wall.description = Megvédi az épületeket az ellenséges lövedékektől. Elnyeli a lézereket és az elektromos szikrákat. Gátolja a villanyvezetékek automatikus kapcsolódását.
+block.plastanium-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől. Elnyeli a lézereket és az elektromos szikrákat. Gátolja a villanyvezetékek automatikus kapcsolódását.
 block.thorium-wall.description = Megvédi az épületeket az ellenséges lövedékektől.
 block.thorium-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől.
 block.phase-wall.description = Megvédi az épületeket az ellenséges lövedékektől, a legtöbb lövedék visszapattan róla.
@@ -2026,7 +2027,7 @@ block.door.description = Fal, amit nyitni és zárni lehet.
 block.door-large.description = Fal, amit nyitni és zárni lehet. De ez nagyobb.
 block.mender.description = Javítja az épületeket a hatókörén belül.\nSzilíciummal növelhető a hatósugara és hatékonysága.
 block.mend-projector.description = Javítja az épületeket a hatókörén belül.\nTóritkvarccal növelhető a hatósugara és hatékonysága.
-block.overdrive-projector.description = Növeli a közeli épületek sebességét.\nTóritkvarccal növelhető a hatósugara és hatékonysága.
+block.overdrive-projector.description = Növeli a közeli épületek termelési sebességét.\nTóritkvarccal növelhető a hatósugara és hatékonysága.
 block.force-projector.description = Hatszögletű erőteret hoz létre maga körül, amely megvédi az épületeket és a benne lévő egységeket a sérüléstől.\nTúlmelegszik, ha túl sok sérülést szenved. Opcionálisan Hűtőfolyadékot használ a túlmelegedés megakadályozására. A Tóritkvarc növeli a pajzs méretét.
 block.shock-mine.description = Elektromos kisülést hoz létre, ha ellenséggel érintkezik.
 block.conveyor.description = Szállítószalag. Nyersanyagokat szállít.
@@ -2042,10 +2043,10 @@ block.router.details = Pokoli masina. Ne tedd közvetlenül gyárak mellé, mert
 block.distributor.description = Hétfelé osztja szét a beérkező nyersanyagokat.
 block.overflow-gate.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud. Nem használható közvetlenül Túlfolyó Kapu, vagy Alulfolyó Kapu mellett.
 block.underflow-gate.description = Csak akkor enged tovább nyersanyagokat előre, ha oldalra már nem tudja kiadni őket. Nem használható közvetlenül Túlfolyó Kapu, vagy Alulfolyó Kapu mellett.
-block.mass-driver.description = Nagy hatótávolságú nyersanyagszállító eszköz. Rakományokban lő át nyersanyagokat egy másik Tömegmozgatónak.
+block.mass-driver.description = Nagy hatótávolságú nyersanyagszállító eszköz. Rakományokban lő át nyersanyagokat egy másik, hozzákapcsolt Tömegmozgatónak.
 block.mechanical-pump.description = Folyadékot szivattyúz. Nem igényel Áramot.
 block.rotary-pump.description = Folyadékot szivattyúz. Árammal működik.
-block.impulse-pump.description = Folyadékot szivattyúz. Sokat termel, sok Áramot fogyaszt.
+block.impulse-pump.description = Folyadékot szivattyúz. Sokat termel, de sok Áramot fogyaszt.
 block.conduit.description = Folyadékot szállít.
 block.pulse-conduit.description = Folyadékot szállít. Gyorsabb és nagyobb tárolókapacitású, mint a sima Csővezeték.
 block.plated-conduit.description = Folyadékot szállít. Nem fogad el folyadékot oldalról. Nem önti ki a folyadékot, ha nincs a végén semmi.
@@ -2068,13 +2069,13 @@ block.differential-generator.description = Egy lórúgásnyi Áramot termel. Has
 block.rtg-generator.description = A radioaktív bomlás energiáját hasznosítja, hogy lassan de biztosan Áramot termeljen.
 block.solar-panel.description = Napfényből állít elő kevés Áramot.
 block.solar-panel-large.description = Napfényből állít elő kevés Áramot. Hatékonyabb a sima Napelemnél.
-block.thorium-reactor.description = Jelentős Áramot állít elő Tóriumból. Állandó hűtést igényel. Ha túlmelegszik, felrobban.
-block.impact-reactor.description = Csúcsra járatva rengeteg Áramot termel. Jelentős Árambefektetést igényel a reakció beindításához.
+block.thorium-reactor.description = Jelentős Áramot állít elő Tóriumból. Állandó hűtést igényel. Ha túlmelegszik, akkor felrobban.
+block.impact-reactor.description = Csúcsra járatva rengeteg Áramot termel. Jelentős Árambefektetést igényel a reakció beindítása.
 block.mechanical-drill.description = Ércre helyezve kis tempóban termeli ki az adott nyersanyagot. Csak alapvető nyersanyagok kitermelésére képes.
 block.pneumatic-drill.description = Egy fejlettebb fúró, képes Titán kitermelésére. Gyorsabban dolgozik a Mechanikus Fúrónál.
 block.laser-drill.description = Lézerek használatával még gyorsabban tud dolgozni, de Áramot használ. Képes Tóriumot kitermelni.
 block.blast-drill.description = A technológia csúcsa. Rengeteg Áramot használ.
-block.water-extractor.description = Képes a talajvíz kiszívására. Használd, ha nincs elérhető Víz a felszínen.
+block.water-extractor.description = Képes a talajvíz kiszívattyúzására. Akkor használd, ha nincs elérhető Víz a felszínen.
 block.cultivator.description = A légkörben szálló spórákat kapszulákba sűríti.
 block.cultivator.details = Visszaszerzett technológia. Hatalmas tömegű biomassza gyártására alkalmas a lehető leghatékonyabban. Valószínűleg a Serpulot ma borító spórák kezdeti inkubátora.
 block.oil-extractor.description = Nagy mennyiségben használ Vizet, Homokot és Áramot, hogy Olajat nyerjen ki a földből.
@@ -2103,8 +2104,8 @@ block.ripple.description = Lövedékek csoportjával tüzel földi célpontokra
 block.cyclone.description = Robbanó lövedékeket lő közeli ellenségekre.
 block.spectre.description = Nagy, a páncélon is áthatoló lövedékekkel tüzel légi és földi célpontokra is.
 block.meltdown.description = Feltöltődés után folyamatos lézersugarat lő a közeli ellenségekre. Hűtést igényel.
-block.foreshadow.description = Nagy méretű villámot lő ki nagy távolságokra egyszerre egyetlen célpontra.
-block.repair-point.description = Folyamatosan gyógyítja a legközelebbi sérült egységet a körzetében.
+block.foreshadow.description = Nagy méretű villámot lő ki nagy távolságokra, de egyszerre csak egyetlen célpontra.
+block.repair-point.description = Folyamatosan gyógyítja a legközelebbi sérült egységet a közelében.
 block.segment.description = Megsemmisíti a beérkező lövedékeket. A lézerrel szemben hatástalan.
 block.parallax.description = Vonónyalábot bocsát ki, amivel magához vonzza és sebzi a repülő egységeket.
 block.tsunami.description = Erős folyadékhullámokat lő az ellenségre. Eloltja a tüzet, ha Vízzel van feltöltve.
@@ -2113,29 +2114,29 @@ block.disassembler.description = Ritka ásványi elemeket választ ki Salakból.
 block.overdrive-dome.description = Megnöveli a környező gyárak termelési sebességét. Tóritkvarcot és Szilíciumot igényel.
 block.payload-conveyor.description = Képes egységeket szállítani.
 block.payload-router.description = Háromfelé osztja szét a beérkező egységeket.
-block.ground-factory.description = Földi egységeket gyárt. A kész egységek azonnal hadrafoghatóak, vagy Újratervezőkben tovább fejleszthetőek.
-block.air-factory.description = Légi egységeket gyárt. A kész egységek azonnal hadra foghatóak, vagy Újratervezőkben tovább fejleszthetőek.
-block.naval-factory.description = Vízi egységeket gyárt. A kész egységek azonnal hadra foghatóak, vagy Újratervezőkben tovább fejleszthetőek.
+block.ground-factory.description = Földi egységeket gyárt. A kész egységek azonnal hadra-foghatóak, vagy Újratervezőkben tovább fejleszthetőek.
+block.air-factory.description = Légi egységeket gyárt. A kész egységek azonnal hadra-foghatóak, vagy Újratervezőkben tovább fejleszthetőek.
+block.naval-factory.description = Vízi egységeket gyárt. A kész egységek azonnal hadra-foghatóak, vagy Újratervezőkben tovább fejleszthetőek.
 block.additive-reconstructor.description = Kettes szintre fejleszti a beérkező egységeket.
 block.multiplicative-reconstructor.description = Hármas szintre fejleszti a beérkező egységeket.
 block.exponential-reconstructor.description = Négyes szintre fejleszti a beérkező egységeket.
 block.tetrative-reconstructor.description = Ötös szintre fejleszti a beérkező egységeket.
 block.switch.description = Kétállású kapcsoló. Az állapota leolvasható és módosítható processzorokkal.
-block.micro-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek vagy épületek irányítására is.
-block.logic-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek vagy épületek irányítására is. Gyorsabb mint a mikroprocesszor.
-block.hyper-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek vagy épületek irányítására is. Gyorsabb mint a logikai processzor.
+block.micro-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek, vagy épületek irányítására is.
+block.logic-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek, vagy épületek irányítására is. Gyorsabb mint a Mikroprocesszor.
+block.hyper-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek, vagy épületek irányítására is. Gyorsabb mint a Logikai-Processzor.
 block.memory-cell.description = Információt tárol processzorok számára.
 block.memory-bank.description = Információt tárol processzorok számára. Nagyobb kapacitású.
 block.logic-display.description = Ábrák rajzolhatók rá processzorral.
 block.large-logic-display.description = Ábrák rajzolhatók rá processzorral.
 block.interplanetary-accelerator.description = Hatalmas elektromágneses gyorsítótorony. Képes Magokat szökési sebességre gyorsítani bolygóközi bevetéshez.
-block.repair-turret.description = Folyamatosan javítja a környezetében lévő legközelebbi sérült egységet. Opcionálisan elfogadja a Hűtőfolyadékot.
+block.repair-turret.description = Folyamatosan javítja a közelében lévő legközelebbi sérült egységet. Opcionálisan elfogadja a Hűtőfolyadékot.
 
 #Erekir
 block.core-bastion.description = Mag. Páncélozott. Ha elpusztul, a szektor elveszett.
 block.core-citadel.description = Mag. Nagyon jól páncélozott. Több nyersanyagot tárol, mint a Bástya.
 block.core-acropolis.description = Mag. Kivételesen jól páncélozott. Több nyersanyagot tárol, mint a Citadella.
-block.breach.description = Átütő erejű Berillium- vagy Volfrámlövedékeket lő ki az ellenséges célpontokra.
+block.breach.description = Átütő erejű Berillium-, vagy Volfrámlövedékeket lő ki az ellenséges célpontokra.
 block.diffuse.description = Széles kúpban lövi ki a lövedékeket. Visszalöki az ellenséges célpontokat.
 block.sublimate.description = Folyamatos lángcsóvát lő ki az ellenséges célpontokra. Átüti a páncélt.
 block.titan.description = Hatalmas robbanó ágyúlövedéket lő ki földi célpontokra. Hidrogént igényel.
@@ -2144,32 +2145,32 @@ block.disperse.description = Égő repeszlövedékeket lő ki légi célpontokra
 block.lustre.description = Lassan mozgó, egyszerre egy célpontra ható lézert lő ki az ellenséges célpontokra.
 block.scathe.description = Nagy erejű rakétát indít jelentős távolságokra lévő földi célpontok ellen.
 block.smite.description = Átütő erejű, villámló lövedékeket lő ki.
-block.malign.description = Lézer töltetekből álló célzott sortüzet zúdít az ellenséges célpontokra. Nagymértékű fűtést igényel.
+block.malign.description = Lézer töltetekből álló célzott sortüzet zúdít az ellenséges célpontokra. Nagymennyiségű Hőt igényel.
 block.silicon-arc-furnace.description = Szilíciumot finomít Homokból és Grafitból.
 block.oxidation-chamber.description = A Berilliumot és az Ózont Oxiddá alakítja. Melléktermékként Hőt bocsát ki.
-block.electric-heater.description = Fűti a vele szemben álló blokkokat. Nagy mennyiségű energiát igényel.
+block.electric-heater.description = Fűti a vele szemben álló blokkokat. Nagy mennyiségű Áramot igényel.
 block.slag-heater.description = Fűti a vele szemben álló blokkokat. Salakot igényel.
 block.phase-heater.description = Fűti a vele szemben álló blokkokat. Tóritkvarcot igényel.
 block.heat-redirector.description = Átirányítja a felgyülemlett Hőt más blokkokba.
 block.heat-router.description = A felgyülemlett Hőt három kimeneti irányba terjeszti.
 block.electrolyzer.description = A Vizet Hidrogén- és Ózongázzá alakítja.
-block.atmospheric-concentrator.description = Koncentrálja a Nitrogént a légkörből. Hőt igényel.
+block.atmospheric-concentrator.description = Kondenzálja a Nitrogént a légkörből. Hőt igényel.
 block.surge-crucible.description = A Salakból és a Szilíciumból Elektrometált képez. Hőt igényel.
 block.phase-synthesizer.description = Tóriumból, Homokból és Ózonból Tóritkvarcot szintetizál. Hőt igényel.
-block.carbide-crucible.description = Grafitot és Volfrámot Karbiddá olvaszt. Hőt igényel.
+block.carbide-crucible.description = A Grafitot és a Volfrámot Karbiddá olvasztja. Hőt igényel.
 block.cyanogen-synthesizer.description = Cianogént szintetizál Arkycitből és Grafitból. Hőt igényel.
-block.slag-incinerator.description = Elégeti a nem illékony tárgyakat vagy folyadékokat. Salakot igényel.
+block.slag-incinerator.description = Elégeti a nem illékony tárgyakat, vagy folyadékokat. Salakot igényel.
 block.vent-condenser.description = A kürtőkből kiáramló gázokat Vízzé kondenzálja. Áramot igényel.
 block.plasma-bore.description = Ércfallal szemben elhelyezve, korlátlanul termeli ki a nyersanyagokat. Kis mennyiségű Áramot igényel.
 block.large-plasma-bore.description = Egy nagyobb plazma vágó. Képes a Volfrám és a Tórium bányászatára. Hidrogént és Áramot igényel.
 block.cliff-crusher.description = Felőrli a Homokfalakat és korlátlan ideig Homokot termel. Áramot igényel. A hatékonysága a fal típusától függően változik.
-block.impact-drill.description = Ha ércre helyezik, korlátlan ideig, sorozatban termeli ki a nyersanyagokat. Áramot és Vizet igényel.
+block.impact-drill.description = Ha ércre helyezik, korlátlan ideig, sorozatokban termeli ki a nyersanyagokat. Áramot és Vizet igényel.
 block.eruption-drill.description = Továbbfejlesztett ütvefúró. Képes Tóriumot bányászni. Hidrogént igényel.
 block.reinforced-conduit.description = Előre szállítja a folyadékokat. Nem fogadja el a nem csővezetékes bemeneteket oldalról.
 block.reinforced-liquid-router.description = Egyenletesen osztja el a folyadékokat minden oldalra.
 block.reinforced-liquid-tank.description = Nagy mennyiségű folyadékot tárol.
 block.reinforced-liquid-container.description = Jelentős mennyiségű folyadékot tárol.
-block.reinforced-bridge-conduit.description = Folyadékok szállítása szerkezeteken és terepen keresztül.
+block.reinforced-bridge-conduit.description = Folyadékok szállítására alkalmas épületek és terepakadályok fölött.
 block.reinforced-pump.description = Folyadékokat szivattyúz és ad ki. Hidrogént igényel.
 block.beryllium-wall.description = Megvédi az építményeket az ellenséges lövedékektől.
 block.beryllium-wall-large.description = Megvédi az építményeket az ellenséges lövedékektől.
@@ -2180,15 +2181,15 @@ block.carbide-wall-large.description = Megvédi az építményeket az ellensége
 block.reinforced-surge-wall.description = Megvédi az építményeket az ellenséges lövedékektől, a lövedékekkel való érintkezésekor időszakosan elektromos íveket bocsát ki.
 block.reinforced-surge-wall-large.description = Megvédi az építményeket az ellenséges lövedékektől, a lövedékekkel való érintkezésekor időszakosan elektromos íveket bocsát ki.
 block.shielded-wall.description = Megvédi az építményeket az ellenséges lövedékektől. Olyan pajzsot képez, amely a legtöbb lövedéket elnyeli, ha Áramot kap. Vezeti az Áramot.
-block.blast-door.description = Egy fal, amely kinyílik, ha a szövetséges földi egységek hatótávolságon belül vannak. Kézzel nem irányítható.
+block.blast-door.description = Egy fal, amely kinyílik, ha a szövetséges földi egységek vannak a közelében. Kézzel nem irányítható.
 block.duct.description = Előre mozgatja a nyersanyagokat. Csak egyetlen nyersanyag tárolására alkalmas.
 block.armored-duct.description = Előre mozgatja a nyersanyagokat. Nem fogad el nem-szállító szalagos bemeneteket oldalról.
 block.duct-router.description = A nyersanyagokat egyenlően osztja el három irányba. Csak a hátsó oldalról fogadja be a tárgyakat. Nyersanyag Válogatóként is konfigurálható.
-block.overflow-duct.description = Csak akkor adja ki az nyersanyagokat oldalra, ha az elülső útvonal el van zárva.
-block.duct-bridge.description = Szerkezeteken és a terepen keresztül szállítja a nyersanyagokat.
+block.overflow-duct.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud. Nem használható közvetlenül Túlfolyó Kapu, vagy Alulfolyó Kapu mellett.
+block.duct-bridge.description = Nyersanyagok szállítására alkalmas épületek és terepakadályok fölött.
 block.duct-unloader.description = A kiválasztott nyersanyagokat kirakodja a mögötte lévő blokkból. Magokból nem lehet kirakodni.
-block.underflow-duct.description = A túlfolyó ellentéte. Előre távozik a nyersanyag, ha a bal és a jobb oldali útvonal el van zárva.
-block.reinforced-liquid-junction.description = Két egymást keresztező vezeték közötti csomópontként működik.
+block.underflow-duct.description = Csak akkor enged tovább nyersanyagokat előre, ha oldalra már nem tudja kiadni őket. Nem használható közvetlenül Túlfolyó Kapu, vagy Alulfolyó Kapu mellett.
+block.reinforced-liquid-junction.description = Két egymást keresztező csővezeték közötti csomópontként működik.
 block.surge-conveyor.description = A nyersanyagokat rakományokban mozgatja. Árammal felgyorsítható. Vezeti az Áramot.
 block.surge-router.description = Egyenletesen osztja el a nyersanyagokat három irányba a Szállítószalagról. Árammal felgyorsítható. Vezeti az Áramot.
 block.unit-cargo-loader.description = Teherhordó drónokat épít. A drónok automatikusan szétosztják a nyersanyagokat a megfelelő szűrővel rendelkező kirakodási pontokra.
@@ -2197,28 +2198,28 @@ block.beam-node.description = Az Áramot merőlegesen vezeti a többi blokkhoz.
 block.beam-tower.description = Az Áramot merőlegesen vezeti a többi blokkhoz. Nagy mennyiségű energiát tárol. Nagy hatótávolságú.
 block.turbine-condenser.description = A kürtőkből kiáramló gázokból Áramot termel. Kis mennyiségű Vizet termel.
 block.chemical-combustion-chamber.description = Arkycitből és Ózonból termel Áramot.
-block.pyrolysis-generator.description = Nagy mennyiségű energiát termel Arkycitből és Salakból. Melléktermékként Vizet termel.
-block.flux-reactor.description = Nagy mennyiségű energiát termel Hő hatására. Stabilizátorként Cianogént igényel. Az Áramtermelés és a Cianogén igény arányos a Hőbevitellel.\nFelrobban, ha nem áll rendelkezésre elegendő Cianogén.
+block.pyrolysis-generator.description = Nagy mennyiségű Áramot termel Arkycitből és Salakból. Melléktermékként Vizet termel.
+block.flux-reactor.description = Nagy mennyiségű Áramot termel Hő hatására. Stabilizátorként Cianogént igényel. Az Áramtermelés és a Cianogén igény arányos a Hőbevitellel.\nFelrobban, ha nem áll rendelkezésre elegendő Cianogén.
 block.neoplasia-reactor.description = Arkycit, Víz és Tóritkvarc felhasználásával nagy mennyiségű Áramot termel. Melléktermékként Hőt és veszélyes Neoplazmát termel.\nHevesen robban, ha a Neoplazmát nem távolítják el a reaktorból a csővezetékeken keresztül.
 block.build-tower.description = Automatikusan újjáépíti a hatósugarában lévő építményeket, és segíti a többi egységet az építkezésben.
 block.regen-projector.description = Lassan javítja a szövetséges építményeket egy négyzet alakú kerületben. Hidrogént igényel.
 block.reinforced-container.description = Kis mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítsével nyerhető ki. Nem növeli a Mag tárolókapacitását.
 block.reinforced-vault.description = Nagy mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítsével nyerhető ki. Nem növeli a Mag tárolókapacitását.
-block.tank-fabricator.description = Stell egységeket épít. A kimeneti egységek közvetlenül felhasználhatók, vagy átvihetők újrafeldolgozókba fejlesztésre.
-block.ship-fabricator.description = Elude egységeket épít. A kimeneti egységek közvetlenül felhasználhatók, vagy átvihetők újrafeldolgozókba fejlesztésre.
-block.mech-fabricator.description = Merui egységeket épít. A kimeneti egységek közvetlenül felhasználhatók, vagy átvihetők újrafeldolgozókba fejlesztésre.
-block.tank-assembler.description = Nagy méretű tankokat állít össze a beadott blokkokból és egységekből. A kimeneti szint modulok hozzáadásával növelhető.
-block.ship-assembler.description = Nagy méretű hajókat állít össze a beadott blokkokból és egységekből. A kimeneti szint modulok hozzáadásával növelhető.
-block.mech-assembler.description = Nagy méretű Mech-eket állít össze a beadott blokkokból és egységekből. A kimeneti szint modulok hozzáadásával növelhető.
-block.tank-refabricator.description = Felfejleszti a bejuttatott tank egységeket a második szintre.
-block.ship-refabricator.description = Felfejleszti a bejuttatott repülő egységeket a második szintre.
-block.mech-refabricator.description = Felfejleszti a bejuttatott mech egységeket a második szintre.
-block.prime-refabricator.description = A bejuttatott egységeket a harmadik szintre fejleszti.
-block.basic-assembler-module.description = Növeli az összeszerelő szintjét, ha egy építési határvonal mellé helyezik. Áramot igényel. Használható nyersanyag-rakomány bemenetként.
+block.tank-fabricator.description = Stell egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Tank Újratervezőbe fejlesztésre.
+block.ship-fabricator.description = Elude egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Repülőgép Újratervezőbe fejlesztésre.
+block.mech-fabricator.description = Merui egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Mech Újratervezőbe fejlesztésre.
+block.tank-assembler.description = Nagy méretű tankokat állít össze a beadott blokkokból és egységekből. A kimeneti szint Összeszerelő Modulok hozzáadásával növelhető.
+block.ship-assembler.description = Nagy méretű hajókat állít össze a beadott blokkokból és egységekből. A kimeneti szint Összeszerelő Modulok hozzáadásával növelhető.
+block.mech-assembler.description = Nagy méretű Mech-eket állít össze a beadott blokkokból és egységekből. A kimeneti szint Összeszerelő Modulok hozzáadásával növelhető.
+block.tank-refabricator.description = Felfejleszti a bejuttatott tank tipusú egységeket a második szintre.
+block.ship-refabricator.description = Felfejleszti a bejuttatott repülőgép tipusú egységeket a második szintre.
+block.mech-refabricator.description = Felfejleszti a bejuttatott mech tipusú egységeket a második szintre.
+block.prime-refabricator.description = A bejuttatott tank-/repülőgép-/mech tipusú egységeket a harmadik szintre fejleszti.
+block.basic-assembler-module.description = Növeli a Tank-/Repülgép-/Mech Összeszerelő szintjét, ha annak az építési határvonala mellé helyezik. Áramot igényel. Használható nyersanyag-rakomány bemenetként.
 block.small-deconstructor.description = Lebontja a bevitt építményeket és egységeket. Visszaadja az építési költség 100%-át.
 block.reinforced-payload-conveyor.description = Előre mozgatja a rakományokat.
 block.reinforced-payload-router.description = A rakományokat szomszédos a blokkokba osztja szét. Szűrő beállítása esetén válogatóként is funkcionál.
-block.payload-mass-driver.description = Nagy hatótávolságú rakományszállító szerkezet. A fogadott rakományokat a hozzákapcsolt másik Tömegmozgatóra lövi.
+block.payload-mass-driver.description = Nagy hatótávolságú nyersanyagszállító eszköz. Rakományokban lő át nyersanyagokat egy másik, hozzákapcsolt Tömegmozgatónak.
 block.large-payload-mass-driver.description = Nagy hatótávolságú rakományszállító szerkezet. A fogadott rakományokat a hozzákapcsolt másik Tömegmozgatóra lövi.
 block.unit-repair-tower.description = Javítja a közelében lévő összes egységet. Ózont igényel.
 block.radar.description = Fokozatosan feltárja a terepet és az ellenséges egységeket egy nagy sugarú körben. Áramot igényel.
@@ -2231,11 +2232,11 @@ unit.fortress.description = Nagy hatótávú rakétákat lő földi célpontokra
 unit.scepter.description = Töltött lövedékek záporát lövi közeli ellenségekre.
 unit.reign.description = Méretes átütő erejű lövedékeket zúdít minden közeli ellenségre.
 unit.nova.description = Lézereket lő, amelyek az ellenséget sebzik, de gyógyítják a szövetségeseket. Repülésre alkalmas.
-unit.pulsar.description = Elektromos szikrákat indít, amelyek az ellenséget sebzik, de gyógyítják a szövetségeseket. Repülésre alkalmas.
+unit.pulsar.description = Elektromos szikrákat szór, amelyek az ellenséget sebzik, de gyógyítják a szövetségeseket. Repülésre alkalmas.
 unit.quasar.description = Átütő erejű lézersugarakat lő, amelyek az ellenséget sebzik, de gyógyítják a szövetségeseket. Repülésre alkalmas. Pajzsa van.
 unit.vela.description = Folyamatos lézernyalábot bocsát ki, ami sebzi az ellenséget, felgyújtja az épületeiket, de gyógyítja a szövetségeseket. Repülésre alkalmas.
-unit.corvus.description = Hatalmas lézersugarat lő, ami ami sebzi az ellenséget, de gyógyítja a szövetségeseket. A legtöbb terepakadályt átlépi.
-unit.crawler.description = Az ellenséghez rohan és nagy robbanásban megsemmisíti magát.
+unit.corvus.description = Hatalmas lézersugarat lő, amelyek sebzik az ellenséget, de gyógyítják a szövetségeseket. A legtöbb terepakadályt átlépi.
+unit.crawler.description = Az ellenséghez rohan és egy nagy robbanásban megsemmisíti önmagát, így sebezve az ellenséget.
 unit.atrax.description = Gyengítő Salakgolyókat lő a földi célpontokra. A legtöbb terepakadályt átlépi.
 unit.spiroct.description = Elszívja az ellenség életerejét, önmagát gyógyítva közben. A legtöbb terepakadályt átlépi.
 unit.arkyid.description = Nagy lézernyalábokkal elszívja az ellenség életerejét, önmagát gyógyítva közben. A legtöbb terepakadályt átlépi.
@@ -2270,16 +2271,16 @@ unit.locus.description = Változatos lövedékeket lő ki az ellenséges célpon
 unit.precept.description = Átütő erejű kazettás lövedékeket lő ki az ellenséges célpontokra.
 unit.vanquish.description = Nagy átütési képességű, hasítólövedékeket lő ki az ellenséges célpontokra.
 unit.conquer.description = Nagy átütési képességű golyózáport lő ki az ellenséges célpontokra.
-unit.merui.description = Nagy hatótávolságú ágyúkkal lövi az ellenséges szárazföldi célpontokat. A legtöbb terepfelületen képes átlépni.
-unit.cleroi.description = Kettős lövedékeket lő ki az ellenséges célpontokra. Célba veszi az ellenséges lövedékeket a pontvédelmi tornyokkal. A legtöbb terepfelületen képes átlépni.
-unit.anthicus.description = Nagy hatótávolságú célkövető rakétákat lő ki az ellenséges célpontokra. A legtöbb tereptárgyon át tud lépni.
-unit.tecta.description = Célkövető plazma rakétákat lő ki az ellenséges célpontokra. Irányított pajzzsal védi magát. A legtöbb terepfelületen képes átlépni.
-unit.collaris.description = Nagy hatótávolságú repesz-ágyúval lövi az ellenséges célpontokat. A legtöbb terepfelületen képes átlépni.
+unit.merui.description = Nagy hatótávolságú ágyúkkal lövi az ellenséges szárazföldi célpontokat. A legtöbb terepakadályt átlépi.
+unit.cleroi.description = Kettős lövedékeket lő ki az ellenséges célpontokra. Célba veszi az ellenséges lövedékeket a pontvédelmi tornyokkal. A legtöbb terepakadályt átlépi.
+unit.anthicus.description = Nagy hatótávolságú célkövető rakétákat lő ki az ellenséges célpontokra. A legtöbb terepakadályt átlépi.
+unit.tecta.description = Célkövető plazma rakétákat lő ki az ellenséges célpontokra. Irányított pajzzsal védi magát. A legtöbb terepakadályt átlépi.
+unit.collaris.description = Nagy hatótávolságú repesz-ágyúval lövi az ellenséges célpontokat. A legtöbb terepakadályt átlépi.
 unit.elude.description = Célkövető golyópárokat lő ki az ellenséges célpontokra. Képes folyadéktestek felett lebegni.
 unit.avert.description = Forgó lövedékpárokat lő ki az ellenséges célpontokra.
 unit.obviate.description = Forgó, páros-villámgömböket lő ki az ellenséges célpontokra.
-unit.quell.description = Nagy hatótávolságú célkövető rakétákat lő ki az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító blokkokat.
-unit.disrupt.description = Nagy hatótávolságú célkövető elnyomó rakétákat lő ki az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító blokkokat.
+unit.quell.description = Kettő darab, nagy hatótávolságú célkövető rakétát lő ki egyszerre az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító blokkokat.
+unit.disrupt.description = Három darab, nagy hatótávolságú célkövető rakétát lő ki egyszerre az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító blokkokat.
 unit.evoke.description = A Bástya védelmére szolgáló építményeket épít. Sugárral javítja az építményeket.
 unit.incite.description = A Citadella védelmére szolgáló építményeket épít. Sugárral javítja az építményeket.
 unit.emanate.description = Az Akropolisz védelmére szolgáló építményeket épít. Sugárral javítja az építményeket.
@@ -2287,9 +2288,9 @@ unit.emanate.description = Az Akropolisz védelmére szolgáló építményeket
 lst.read = Szám kiolvasása egy összekapcsolt memóriacellából.
 lst.write = Írj egy számot egy összekapcsolt memóriacellába.
 lst.print = Szöveg hozzáadása a nyomtatási pufferhez.\nNem jelenít meg semmit, amíg a [accent]Kiírási Művelet[] használatban van.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format = A szövegpufferben lévő következő helyőrzőt egy értékkel helyettesíti.\nNem csinál semmit, ha a helyőrző minta érvénytelen.\nHelyőrző minta: "{[accent]number 0-9[]}"\nPélda:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Művelet hozzáadása a rajzpufferhez.\nNem jelenít meg semmit, amíg a [accent]Rajzolási Művelet[] használatban van.
-lst.drawflush = Sorba állított [accent]rajz[]műveletek megjelenítése a kijelzőn.
+lst.drawflush = Sorba állított [accent]rajz[] műveletek megjelenítése a kijelzőn.
 lst.printflush = Sorba állított [accent]kiírási[] műveletek kiírása egy üzenetblokkba.
 lst.getlink = A processzor linkjének lekérdezése index szerint. 0-nál kezdődik.
 lst.control = Épület irányítása.
@@ -2302,14 +2303,14 @@ lst.wait = Várjon bizonyos számú másodpercet.
 lst.stop = A processzor program futtatásának leállítása.
 lst.lookup = Egy nyersanyag/folyadék/egység/blokk típus keresése azonosító alapján.\nAz egyes típusok összesített száma a következőkkel érhető el:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
 lst.jump = Feltételes ugrás egy másik utasításra.
-lst.unitbind = Összekapcsolás a következő egységtípussal és tárolja a(z) [accent]@unit[]ban.
+lst.unitbind = Összekapcsolás a következő egységtípussal és tárolja a(z) [accent]@unit[]-ban/-ben.
 lst.unitcontrol = Az aktuálisan összekapcsolt egység vezérlése.
 lst.unitradar = Egységek keresése az aktuálisan összekapcsolt egység körül.
 lst.unitlocate = Egy adott típusú pozíció/épület keresése bárhol a pályán.\nÖsszekapcsolt egységet igényel.
 lst.getblock = Csempeadatok lekérdezése tetszőleges helyen.
 lst.setblock = Csempeadatok beállítása tetszőleges helyen.
 lst.spawnunit = Egység lerakása egy helyen.
-lst.applystatus = Állapothatás alkalmazása vagy törlése egy egységről.
+lst.applystatus = Állapothatás alkalmazása, vagy törlése egy egységről.
 lst.spawnwave = Egy tetszőleges helyen keletkező hullám szimulálása.\nNem növeli a hullámszámlálót.
 lst.explosion = Robbanás létrehozása egy helyen.
 lst.setrate = A processzor végrehajtási sebességének beállítása utasítás/ütemben.
@@ -2325,7 +2326,7 @@ lst.effect = Létrehoz egy részecske-effektet.
 lst.sync = Egy változó szinkronizálása a hálózaton keresztül.\nMásodpercenként legfeljebb 10 alkalommal hívható meg.
 lst.makemarker = Új logikai jelölő létrehozása a világban.\nEgy azonosítót kell megadni a jelölő azonosításához.\nA jelölők száma jelenleg világonként 20 000-re van korlátozva.
 lst.setmarker = Egy jelölő tulajdonságának beállítása.\nA használt azonosítónak meg kell egyeznie a Jelölő Készítő utasításban megadottal.
-lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lst.localeprint = Hozzáadja a pálya Helyi Csomagjainak tulajdonság értékét a szövegpufferhez.\nA pálya Helyi Csomagjainak beállításait a térképszerkesztőben ellenőrízheted [accent]Pálya Infó > Helyi Csomagok[].\nHa a kliens egy mobileszköz, akkor először próbáld kiíratni a ".mobile" végződésű tulajdonságot.
 
 logic.nounitbuild = [red]Az egységépítési logika itt nem megengedett.
 
@@ -2360,7 +2361,7 @@ lcategory.world.description = A világ viselkedésének szabályozása.
 
 graphicstype.clear = A kijelző kitöltése egy színnel.
 graphicstype.color = Szín kiválasztása a következő rajzolási műveletekhez.
-graphicstype.col = A színnel egyenértékű, de csomagolva.\nA csomagolt színeket HEX kódként írják ki egy [accent]%[] előtaggal.\nPéldául: [accent]%ff0000[] piros lenne.
+graphicstype.col = A színnel egyenértékű, de csomagolva.\nA csomagolt színeket HEX kódként írja ki egy [accent]%[] előtaggal.\nPéldául: [accent]%ff0000[] piros lenne.
 graphicstype.stroke = Vonalszélesség beállítása.
 graphicstype.line = Rajzolj vonalszakaszt.
 graphicstype.rect = Téglalap kitöltése.
@@ -2368,8 +2369,8 @@ graphicstype.linerect = Rajzolj egy téglalap alakú körvonalat.
 graphicstype.poly = Egy szabályos sokszög kitöltése.
 graphicstype.linepoly = Rajzolj egy szabályos sokszög körvonalat.
 graphicstype.triangle = Töltsön ki egy háromszöget.
-graphicstype.image = Rajzolj egy képet valamilyen tartalomról.\nex: [accent]@router[] vagy [accent]@dagger[].
-graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+graphicstype.image = Rajzolj egy képet valamilyen tartalomról.\nPédául: [accent]@router[], vagy [accent]@dagger[].
+graphicstype.print = Szöveget rajzol a kiírási pufferből.\nTörli a kiírás puffert.
 
 lenum.always = Mindig igaz.
 lenum.idiv = Egész számok osztása.
@@ -2464,7 +2465,7 @@ lenum.unbind = A logikai vezérlés teljes kikapcsolása.\nSzokásos mestersége
 lenum.move = Mozgás a pontos pozícióba.
 lenum.approach = Közelítsen meg egy pozíciót egy sugárral.
 lenum.pathfind = Útkeresés az ellenséges kezdőponthoz.
-lenum.autopathfind = Automatikus útkeresés a legközelebbi ellenséges Maghoz vagy ledobási ponthoz.\nEz ugyanaz, mint a normál hullámos ellenséges útkeresés.
+lenum.autopathfind = Automatikus útkeresés a legközelebbi ellenséges Maghoz, vagy ledobási ponthoz.\nEz ugyanaz, mint a normál hullámos ellenséges útkeresés.
 lenum.target = Lőj egy helyet.
 lenum.targetp = Lőj egy célpontra sebesség-előrejelzéssel.
 lenum.itemdrop = Dobj le egy nyersanyagot.
diff --git a/core/assets/contributors b/core/assets/contributors
index b518f242ac..f3c6f10bfc 100644
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -160,5 +160,6 @@ WayZer
 SITUVNgcd
 Gabriel "red" Fondato
 Yoru Kitsune
+summoner
 OpalSoPL
 BalaM314

From 601efbf65f394d0d2602843000803c35acdd2c98 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az658-742.lxhe5nczbbeupcbb3gjj1uzxzg.dx.internal.cloudapp.net>
Date: Wed, 3 Jan 2024 22:03:33 +0000
Subject: [PATCH 110/369] Automatic bundle update

---
 core/assets/bundles/bundle_hu.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 3667e7a7a1..1f125341c4 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -129,7 +129,7 @@ committingchanges = Változások Rögzítése
 done = Kész
 feature.unsupported = Ez az eszköz nem támogatja ezt a funkciót.
 
-mods.initfailed = [red]\u26A0[] Az előző Mindustry munkamenet nem tudott inicializálódni. Ez valószínű egy rosszúl működő Mod miatt történt.\n\nAz "összeomlások" elkerülése érdekében, [red]minden Mod le lett tiltva.[]
+mods.initfailed = [red]⚠[] Az előző Mindustry munkamenet nem tudott inicializálódni. Ez valószínű egy rosszúl működő Mod miatt történt.\n\nAz "összeomlások" elkerülése érdekében, [red]minden Mod le lett tiltva.[]
 mods = Modok
 mods.none = [lightgray]Nem találhatóak Modok!
 mods.guide = Mod Készítési Útmutató
@@ -704,9 +704,9 @@ objective.enemyescelating = [accent]Az ellenséges termelés fokozódik: [lightg
 objective.enemyairunits = [accent]Az ellenséges légi egységek termelése elkezdődik: [lightgray]{0}[] múlva
 objective.destroycore = [accent]Ellenséges Mag Megsemmisítése
 objective.command = [accent]Egységek Irányítása
-objective.nuclearlaunch = [accent]\u26A0 Nukleáris kilövés észlelve: [lightgray]{0}
+objective.nuclearlaunch = [accent]⚠ Nukleáris kilövés észlelve: [lightgray]{0}
 
-announce.nuclearstrike = [red]\u26A0 BEÉRKEZŐ NUKLEÁRIS CSAPÁS \u26A0\n[lightgray]Azonnal építs tartalék Magokat!
+announce.nuclearstrike = [red]⚠ BEÉRKEZŐ NUKLEÁRIS CSAPÁS ⚠\n[lightgray]Azonnal építs tartalék Magokat!
 
 loadout = Rakomány
 resources = Nyersanyagok
@@ -1062,7 +1062,7 @@ bullet.reload = [stat]{0}[lightgray]x tüzelési sebesség
 bullet.range = [stat]{0}[lightgray] csempe tartomány
 
 unit.blocks = blokk
-unit.blockssquared = blokk\u00B2
+unit.blockssquared = blokk²
 unit.powersecond = áram egység/sec
 unit.tilessecond = csempe/sec
 unit.liquidsecond = folyadék egység/sec

From 0b6b9b4525ddfe6a1de9a0602790cb957c3d4fc1 Mon Sep 17 00:00:00 2001
From: Hahaa13 <108379326+Hahaa13@users.noreply.github.com>
Date: Thu, 4 Jan 2024 05:04:08 +0700
Subject: [PATCH 111/369] Add AZDustry (#9418)

Empty
Em ty
Em t
E T

Co-authored-by: Anuken <arnukren@gmail.com>
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index a959c074db..efb361d3cc 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -271,5 +271,9 @@
   {
     "name": "Duel.Server"
     "address":["160.251.41.148:6568","160.251.41.148:6569"]
+  },
+  {
+    "name": "AZDustry",
+    "address": ["118.127.8.162:25628"]
   }
 ]

From 9d62bd04220cf7115d111aa31bddf3aebeb65605 Mon Sep 17 00:00:00 2001
From: 112Hack <144626073+112Hack@users.noreply.github.com>
Date: Fri, 5 Jan 2024 16:10:14 +0300
Subject: [PATCH 112/369] Update servers_v7.json (#9434)

---
 servers_v7.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index efb361d3cc..1143aa8788 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -16,8 +16,8 @@
     "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"]
   },
   {
-    "name": "CMS",
-    "address": ["195.2.84.144","65.108.224.31:26165"]
+    "name": "CMS Empire",
+    "address": ["195.2.84.144","178.20.45.250"]
   },
   {
     "name": "ShardDustry Eventos",

From 61945e5ce79633b168313a03813c762905fb5c58 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 5 Jan 2024 08:22:12 -0500
Subject: [PATCH 113/369] Clearer sector capture notification

---
 core/assets/bundles/bundle.properties            | 4 ++--
 core/src/mindustry/game/Teams.java               | 2 +-
 core/src/mindustry/ui/fragments/HudFragment.java | 6 +++++-
 gradle.properties                                | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index e8394127ba..cf79d16140 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -774,7 +774,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 #note: the missing space in the line below is intentional
-sector.captured = Sector [accent]{0}[white]captured!
+sector.captured = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
@@ -1865,7 +1865,7 @@ hint.unitControl = Hold [accent][[L-ctrl][] and [accent]click[] to manually cont
 hint.unitControl.mobile = [accent][[Double-tap][] to manually control friendly units or turrets.
 hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
 hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
-hint.launch = Once enough resources are collected, you can [accent]Launch[] to the next sector by opening the \uE827 [accent]Map[] in the bottom right.
+hint.launch = Once enough resources are collected, you can [accent]Launch[] to the next sector by opening the \uE827 [accent]Map[] in the bottom right, and panning over to the new location.
 hint.launch.mobile = Once enough resources are collected, you can [accent]Launch[] by selecting nearby sectors from the \uE827 [accent]Map[] in the \uE88C [accent]Menu[].
 hint.schematicSelect = Hold [accent][[F][] and drag to select blocks to copy and paste.\n\n[accent][[Middle Click][] to copy a single block type.
 hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java
index 9abcf0b4e5..9fb472bf50 100644
--- a/core/src/mindustry/game/Teams.java
+++ b/core/src/mindustry/game/Teams.java
@@ -347,7 +347,7 @@ public class Teams{
             }
 
             for(var build : builds){
-                if(build.within(x, y, range) && !cores.contains(c -> c.within(x, y, range))){
+                if(build.within(x, y, range) && !cores.contains(c -> c.within(build, range))){
                     //TODO GPU driver bugs?
                     build.kill();
                     //Time.run(Mathf.random(0f, 60f * 6f), build::kill);
diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java
index b97b59f1b1..e964aa5fdf 100644
--- a/core/src/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/mindustry/ui/fragments/HudFragment.java
@@ -71,7 +71,11 @@ public class HudFragment{
         });
 
         Events.on(SectorCaptureEvent.class, e -> {
-            showToast(Core.bundle.format("sector.captured", e.sector.isBeingPlayed() ? "" : e.sector.name() + " "));
+            if(e.sector.isBeingPlayed()){
+                ui.announce(Core.bundle.format("sector.capture", ""), 5f);
+            }else{
+                showToast(Core.bundle.format("sector.capture", e.sector.name() + " "));
+            }
         });
 
         Events.on(SectorLoseEvent.class, e -> {
diff --git a/gradle.properties b/gradle.properties
index 4a66b15a49..5baefb5b6a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=d7512241d0
+archash=e5a3dd82b8

From 43e64c5205e305705c6385aeb9dcf596570e5a4a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 5 Jan 2024 08:29:35 -0500
Subject: [PATCH 114/369] Fixed missing comma

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 1143aa8788..2cf3ac0b29 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -269,7 +269,7 @@
     "address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568"]
   },
   {
-    "name": "Duel.Server"
+    "name": "Duel.Server",
     "address":["160.251.41.148:6568","160.251.41.148:6569"]
   },
   {

From fae167a91d3d9effa8c7bfa1b26a8837c8eacc24 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 6 Jan 2024 12:53:48 -0500
Subject: [PATCH 115/369] Minor optimization

---
 core/src/mindustry/entities/comp/UnitComp.java | 1 -
 core/src/mindustry/type/UnitType.java          | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index 828c9880d7..a09d5ecdfe 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -110,7 +110,6 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         return !type.flying && world.tiles.in(tileX, tileY) && type.pathCost.getCost(team.id, pathfinder.get(tileX, tileY)) == -1;
     }
 
-
     /** @return approx. square size of the physical hitbox for physics */
     public float physicSize(){
         return hitSize * 0.7f;
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 8c29a2e50d..b12e272c48 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -1344,16 +1344,17 @@ public class UnitType extends UnlockableContent implements Senseable{
 
         //draw back items
         if(unit.item() != null && unit.itemTime > 0.01f){
-            float size = (itemSize + Mathf.absin(Time.time, 5f, 1f)) * unit.itemTime;
+            float sin = Mathf.absin(Time.time, 5f, 1f);
+            float size = (itemSize + sin) * unit.itemTime;
 
-            Draw.mixcol(Pal.accent, Mathf.absin(Time.time, 5f, 0.1f));
+            Draw.mixcol(Pal.accent, sin * 0.1f);
             Draw.rect(unit.item().fullIcon,
             unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY),
             unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY),
             size, size, unit.rotation);
             Draw.mixcol();
 
-            size = ((3f + Mathf.absin(Time.time, 5f, 1f)) * unit.itemTime + 0.5f) * 2;
+            size = ((3f + sin) * unit.itemTime + 0.5f) * 2;
             Draw.color(Pal.accent);
             Draw.rect(itemCircleRegion,
             unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY),

From 981796a5b2e8830e2c3721990fac450b1bb009f3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 6 Jan 2024 12:55:59 -0500
Subject: [PATCH 116/369] Another minor optimization

---
 core/src/mindustry/core/Renderer.java                   | 7 ++++---
 core/src/mindustry/graphics/Drawf.java                  | 2 +-
 core/src/mindustry/graphics/Pixelator.java              | 2 +-
 core/src/mindustry/type/UnitType.java                   | 2 +-
 core/src/mindustry/world/Block.java                     | 2 +-
 core/src/mindustry/world/blocks/logic/MessageBlock.java | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index f78a9da907..7769d3be76 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -46,7 +46,7 @@ public class Renderer implements ApplicationListener{
     public @Nullable Bloom bloom;
     public @Nullable FrameBuffer backgroundBuffer;
     public FrameBuffer effectBuffer = new FrameBuffer();
-    public boolean animateShields, drawWeather = true, drawStatus, enableEffects, drawDisplays = true, drawLight = true;
+    public boolean animateShields, drawWeather = true, drawStatus, enableEffects, drawDisplays = true, drawLight = true, pixelate = false;
     public float weatherAlpha;
     /** minZoom = zooming out, maxZoom = zooming in */
     public float minZoom = 1.5f, maxZoom = 6f;
@@ -181,6 +181,7 @@ public class Renderer implements ApplicationListener{
         enableEffects = settings.getBool("effects");
         drawDisplays = !settings.getBool("hidedisplays");
         drawLight = settings.getBool("drawlight", true);
+        pixelate = Core.settings.getBool("pixelate");
 
         if(landTime > 0){
             if(!state.isPaused()){
@@ -227,7 +228,7 @@ public class Renderer implements ApplicationListener{
                 shakeIntensity = 0f;
             }
 
-            if(pixelator.enabled()){
+            if(renderer.pixelate){
                 pixelator.drawPixelate();
             }else{
                 draw();
@@ -318,7 +319,7 @@ public class Renderer implements ApplicationListener{
         Events.fire(Trigger.draw);
         MapPreviewLoader.checkPreviews();
 
-        if(pixelator.enabled()){
+        if(renderer.pixelate){
             pixelator.register();
         }
 
diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java
index 0dbf5a5b33..44cbc6b38e 100644
--- a/core/src/mindustry/graphics/Drawf.java
+++ b/core/src/mindustry/graphics/Drawf.java
@@ -223,7 +223,7 @@ public class Drawf{
     /** Sets Draw.z to the text layer, and returns the previous layer. */
     public static float text(){
         float z = Draw.z();
-        if(renderer.pixelator.enabled()){
+        if(renderer.pixelate){
             Draw.z(Layer.endPixeled);
         }
 
diff --git a/core/src/mindustry/graphics/Pixelator.java b/core/src/mindustry/graphics/Pixelator.java
index 12eed4e255..2c7141d0bf 100644
--- a/core/src/mindustry/graphics/Pixelator.java
+++ b/core/src/mindustry/graphics/Pixelator.java
@@ -58,7 +58,7 @@ public class Pixelator implements Disposable{
     }
 
     public boolean enabled(){
-        return Core.settings.getBool("pixelate");
+        return renderer.pixelate;
     }
 
     @Override
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index b12e272c48..d49e2e7a21 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -1361,7 +1361,7 @@ public class UnitType extends UnlockableContent implements Senseable{
             unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY),
             size, size);
 
-            if(unit.isLocal() && !renderer.pixelator.enabled()){
+            if(unit.isLocal() && !renderer.pixelate){
                 Fonts.outline.draw(unit.stack.amount + "",
                 unit.x + Angles.trnsx(unit.rotation + 180f, itemOffsetY),
                 unit.y + Angles.trnsy(unit.rotation + 180f, itemOffsetY) - 3,
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index f4f50c2fc1..60d6b63d19 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -440,7 +440,7 @@ public class Block extends UnlockableContent implements Senseable{
     }
 
     public float drawPlaceText(String text, int x, int y, boolean valid){
-        if(renderer.pixelator.enabled()) return 0;
+        if(renderer.pixelate) return 0;
 
         Color color = valid ? Pal.accent : Pal.remove;
         Font font = Fonts.outline;
diff --git a/core/src/mindustry/world/blocks/logic/MessageBlock.java b/core/src/mindustry/world/blocks/logic/MessageBlock.java
index ecf043b3dc..f81e7d4672 100644
--- a/core/src/mindustry/world/blocks/logic/MessageBlock.java
+++ b/core/src/mindustry/world/blocks/logic/MessageBlock.java
@@ -71,7 +71,7 @@ public class MessageBlock extends Block{
 
         @Override
         public void drawSelect(){
-            if(renderer.pixelator.enabled()) return;
+            if(renderer.pixelate) return;
 
             Font font = Fonts.outline;
             GlyphLayout l = Pools.obtain(GlyphLayout.class, GlyphLayout::new);

From 2191c89fe3fdc4f144b45b3fe33dc5662a6fadb8 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 7 Jan 2024 08:52:35 -0500
Subject: [PATCH 117/369] Fixed #9438

---
 core/assets/bundles/bundle.properties |   1 +
 core/assets/maps/onset.msav           | Bin 45490 -> 45623 bytes
 2 files changed, 1 insertion(+)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index cf79d16140..6c6947b0d6 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1926,6 +1926,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium[] as ammo, using ducts.
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uF6EE [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uF725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/maps/onset.msav b/core/assets/maps/onset.msav
index c48193b98ee4a9a0c151dd20d17662aa432ddf62..62d034084222df47d93ff6def6ef6874569865a9 100644
GIT binary patch
literal 45623
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%0A6OyL%eUf$hP
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
D4tEbX

literal 45490
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


From 5a30696e79f4b4b981354096f7d542ee0715c7cc Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az1272-858.grsihaubamwerhiryzjrxtypna.phxx.internal.cloudapp.net>
Date: Sun, 7 Jan 2024 13:53:23 +0000
Subject: [PATCH 118/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 1 +
 core/assets/bundles/bundle_bg.properties    | 1 +
 core/assets/bundles/bundle_ca.properties    | 1 +
 core/assets/bundles/bundle_cs.properties    | 1 +
 core/assets/bundles/bundle_da.properties    | 1 +
 core/assets/bundles/bundle_de.properties    | 1 +
 core/assets/bundles/bundle_es.properties    | 1 +
 core/assets/bundles/bundle_et.properties    | 1 +
 core/assets/bundles/bundle_eu.properties    | 1 +
 core/assets/bundles/bundle_fi.properties    | 1 +
 core/assets/bundles/bundle_fil.properties   | 1 +
 core/assets/bundles/bundle_fr.properties    | 1 +
 core/assets/bundles/bundle_hu.properties    | 1 +
 core/assets/bundles/bundle_id_ID.properties | 1 +
 core/assets/bundles/bundle_it.properties    | 1 +
 core/assets/bundles/bundle_ja.properties    | 1 +
 core/assets/bundles/bundle_ko.properties    | 1 +
 core/assets/bundles/bundle_lt.properties    | 1 +
 core/assets/bundles/bundle_nl.properties    | 1 +
 core/assets/bundles/bundle_nl_BE.properties | 1 +
 core/assets/bundles/bundle_pl.properties    | 1 +
 core/assets/bundles/bundle_pt_BR.properties | 1 +
 core/assets/bundles/bundle_pt_PT.properties | 1 +
 core/assets/bundles/bundle_ro.properties    | 1 +
 core/assets/bundles/bundle_ru.properties    | 1 +
 core/assets/bundles/bundle_sr.properties    | 1 +
 core/assets/bundles/bundle_sv.properties    | 1 +
 core/assets/bundles/bundle_th.properties    | 1 +
 core/assets/bundles/bundle_tk.properties    | 1 +
 core/assets/bundles/bundle_tr.properties    | 1 +
 core/assets/bundles/bundle_uk_UA.properties | 1 +
 core/assets/bundles/bundle_vi.properties    | 1 +
 core/assets/bundles/bundle_zh_CN.properties | 1 +
 core/assets/bundles/bundle_zh_TW.properties | 1 +
 34 files changed, 34 insertions(+)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index b559a248b7..b640d5c957 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -1886,6 +1886,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index ff7771fc5f..7e287c4463 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -1899,6 +1899,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index 166189e37d..cc72d72090 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -1908,6 +1908,7 @@ onset.turrets = Les unitats són efectives, però les [accent]torretes[] proporc
 onset.turretammo = Subministreu [accent]munició de beril·li[] a la torreta.
 onset.walls = Els [accent]murs[] poden evitar que el dany arribi a les estructures importants.\nConstruïu alguns \uf6ee [accent]murs de beril·li[] al voltant de la torreta.
 onset.enemies = S’apropa un enemic. Prepareu la defensa.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = L’enemic és vulnerable. Contraataqueu.
 onset.cores = Els nuclis nous es poden construir en [accent]caselles de nucli[].\nEls nuclis nous funcionen com a bases i comparteixen un inventari de recursos amb altres nuclis.\nConstruïu un \uf725 nucli.
 onset.detect = L’enemic us detectarà d’aquí 2 minuts.\nEstabliu les defenses i les explotacions mineres i de producció.
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index d96220ed35..031ded45ef 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -1902,6 +1902,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index aea8011160..c7994a4626 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -1888,6 +1888,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index d148a01445..b273f5e222 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -1922,6 +1922,7 @@ onset.turrets = Einheiten sind effektiv, aber [accent]Geschütze[] sind beim Ver
 onset.turretammo = Versorge das Geschütz mit [accent]Berylliummunition[].
 onset.walls = [accent]Mauern[] können andere Blöcke vor Schaden schützen.\nBaue \uf6ee [accent]Berylliummauern[] um die Geschütze.
 onset.enemies = Feinde kommen bald, bereite dich vor.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = Der Feid ist verwundbar. Greife ihn an.
 onset.cores = Neue Kerne können auf [accent]Kernzonen[] platziert werden.\nNeue Kerne funktionieren als Außenposten und haben alle Zugriff auf dasselbe Kerninventar.\nBaue einen \uf725 Kern.
 onset.detect = Der Feind wird dich in zwei Minuten entdecken.\nStelle Verteidigung, Bergbau und Produktion auf.
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 41b25772f8..22c9668909 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -1915,6 +1915,7 @@ onset.turrets = Las unidades son efectivas, pero las [accent]torretas[] pueden o
 onset.turretammo = Suministra [accent]munición de berilio[] a la torreta.
 onset.walls = Los [accent]muros[] pueden evitar que las estructuras reciban daño.\nColoca unos \uf6ee [accent]muros de berilio[] alrededor de la torreta.
 onset.enemies = Se aproxima un enemigo, prepárate para defenderte.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = El enemigo es ahora vulnerable. Contraataca.
 onset.cores = Se pueden colocar nuevos núcleos sobre las [accent]zonas de núcleo[].\nLos núcleos adicionales funcionan como bases avanzadas y comparten el inventario de recursos con otros núcleos.\nColoca un \uf725 núcleo.
 onset.detect = El enemigo te detectará en 2 minutos.\nEstablece sistemas de defensa, minería, y producción.
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 0c088e1193..566d618295 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -1888,6 +1888,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 50325ca09e..f53df1eb0f 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -1890,6 +1890,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index e657836822..734cde678b 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -1890,6 +1890,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index bb9ea59e67..5f9a9fed8b 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -1887,6 +1887,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 5219de9fe4..c8c32b782f 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -1925,6 +1925,7 @@ onset.turrets = Les unités sont efficaces, mais les [accent]tourelles[] ont de
 onset.turretammo = Approvisionnez les tourelles avec du [accent]béryllium[].
 onset.walls = Les [accent]murs[] peuvent encaisser les dégâts des attaques ennemies avant qu'elles atteignent vos constructions.\nPlacez quelques \uf6ee [accent]murs de béryllium[] autour de la tourelle.
 onset.enemies = Ennemis en approche, préparez-vous à défendre.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = L'ennemi est vulnérable. Contre-attaquez !
 onset.cores = Les noyaux peuvent être placés sur des [accent]tuiles de noyau[].\nCes nouveaux noyaux servent à faire avancer votre base et partager vos ressources avec d'autres noyaux.\nPlacez un noyau \uf725.
 onset.detect = L'ennemi sera capable de vous détecter dans 2 minutes.\nAméliorez vos défenses, vos exploitations minières ainsi que votre production.
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 1f125341c4..7cbe7378b3 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1926,6 +1926,7 @@ onset.turrets = Az egységek hatékonyak, de a [accent]lövegtornyok[] jobb véd
 onset.turretammo = Lásd el a lövegtornyokat [accent]Berillium[] lőszerrel.
 onset.walls = A [accent]Falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts \uf6ee [accent]Berillium Fal[]akat a lövegtornyok körül.
 onset.enemies = Az ellenség közeledik, készülj fel a védekezésre.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = Az ellenség most sebezhető. Ellentámadásra fel.
 onset.cores = Új Mag csak a [accent]Mag Csempé[]re építhető.\nAz új Magok előretolt bázisként működnek, és megosztják a nyersanyagkészletüket más Magokkal.\nÉpíts egy új \uf725 Magot.
 onset.detect = Az ellenség 2 percen belül észrevesz téged.\nÁllíts fel védelmet, bányássz és termelj.
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index 37ac2fac03..f2f82e0061 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -1914,6 +1914,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 962f742aa3..09643a8557 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -1900,6 +1900,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 83af7e6755..3381c785c3 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -1903,6 +1903,7 @@ onset.turrets = ユニットは効果的ですが、[accent]タレット[] は
 onset.turretammo = タレットに[accent]ベリリウム弾[]を供給してください。
 onset.walls = [accent]壁[]は建物に対するダメージを防ぐことができます。\n砲台の周囲に \uf6ee [accent]ベリリウムの壁[] をいくつか配置しましょう。
 onset.enemies = 敵が迫ってきました、防御する準備をしてください。
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = 敵は脆弱です。反撃しましょう！
 onset.cores = 新しいコアは [accent]コアタイル[] に配置できます。\n新しいコアは前線基地として機能し、リソースインベントリを他のコアと共有します。\n\uf725 コアを配置しましょう。
 onset.detect = 敵は 2 分以内にあなたを見つけます。\n防御、採掘、生産を用意しましょう。
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index fafa137270..9b304fe9c8 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -1901,6 +1901,7 @@ onset.turrets = 기체는 유용하지만, [accent]포탑[]은 사용하기에 
 onset.turretammo = 포탑에 [accent]베릴륨 탄약[]을 공급하세요.
 onset.walls = [accent]벽[]은 건물로 날아오는 공격을 막을 수 있습니다. \n포탑 주변에 \uf6ee [accent]베릴륨 벽[]을 배치하세요.
 onset.enemies = 적이 다가옵니다, 방어 태세를 갖추세요.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = 적은 취약한 상태입니다. 반격하세요.
 onset.cores = 새로운 코어는 [accent]코어 타일[]위에 배치할 수 있습니다.\n새로운 코어는 전진기지 역할을 하며 다른 코어와 저장된 자원을 공유합니다.\n \uf725 코어를 배치하세요.
 onset.detect = 적은 2분 이내에 당신을 탐지할 것입니다.\n생산, 채굴, 방어시설을 구성하세요.
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index bc785a4c78..2ff4e70fda 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -1888,6 +1888,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 6e747d38bf..d0aa7e286e 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -1901,6 +1901,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index ea3d7db054..921b927630 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -1888,6 +1888,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index 2c7d6c9586..d2edf5e359 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -1909,6 +1909,7 @@ onset.turrets = Jednostki są efektywne, ale [accent]działka[] zapewniają leps
 onset.turretammo = Dostarcz [accent]beryl[] do działka.
 onset.walls = [accent]Mury[] chronią budynki przed obrażeniami.\nPostaw parę \uf6ee [accent]berylowych murów[] naokoło działka.
 onset.enemies = Nadchodzi wróg, przygotuj obronę.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = Wróg jest wrażliwy na atak. Przeprowadź kontratak.
 onset.cores = Nowe rdzenie mogą być postawione tylko w [accent]strefach rdzenia[].\nNowy rdzeń działa tak samo jak każdy poprzedni. Rdzenie współdzielą surowce.\nPostaw nowy \uf725 rdzeń.
 onset.detect = Wróg wykryje cię za 2 minuty.\nPrzygotuj obronę, wydobywaj surowce i je produkuj.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 75e2a23295..6117d4e3be 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -1909,6 +1909,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 208e560ca3..a296ea5dc4 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -1888,6 +1888,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index 62a12c2af2..33ed099aa0 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -1903,6 +1903,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index ae5eadb2d5..3e35984df8 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -1904,6 +1904,7 @@ onset.turrets = Боевые единицы эффективны, но [accent]
 onset.turretammo = Снабдите турель [accent]бериллиевыми боеприпасами.[]
 onset.walls = [accent]Стены[] могут предотвратить повреждение близлежащих построек.\nПоставьте \uf6ee [accent]бериллиевые стены[] вокруг турели.
 onset.enemies = Враг на подходе, приготовьтесь защищаться.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = Враг уязвим. Начните контратаку.
 onset.cores = Новые ядра могут быть поставлены на [accent]зоны ядра[].\nНовые ядра функционируют как передовые базы и имеют общий инвентарь между другими ядрами.\nПоставьте \uf725 ядро.
 onset.detect = Враг обнаружит вас через 2 минуты.\nПриготовьте оборону, добычу и производство.
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 25a0778287..cca8cf3f33 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -1906,6 +1906,7 @@ onset.turrets = Jedinice su efikasne, ali [accent]platforme[] imaju veći odbram
 onset.turretammo = Snabdevajte platformu sa [accent]berilijumskom municijom.[]
 onset.walls = [accent]Zidovi[] mogu da spreče da se šteta nanese na građevine.\nPostavite nekoliko \uf6ee [accent]berilijumskih zidova[] oko platformi.
 onset.enemies = Neprijatelj dolazi, spremite se.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = Nova jezgra se mogu postaviti na [accent]poljima jezgra[].\nNova jezgra funkcionišu kao prednje baze i dele resursni invetar sa ostalim jezgrima.\nPostavi \uf725 jezgro.
 onset.detect = Neprijatelj će te primetiti za 2 minuta.\nPostavite odbranu, rudu i proizvodnju.
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index f5e12f5995..b5565cfac1 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -1888,6 +1888,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index b3702b3e69..4bf30afe08 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -1912,6 +1912,7 @@ onset.turrets = ยูนิตนั้นมีประสิทธิภา
 onset.turretammo = เติมกระสุนให้แก่ป้อมปืนด้วย[accent]กระสุนเบริลเลี่ยม[]
 onset.walls = [accent]กำแพง[]สามารถป้องกันความเสียหายที่จะมาถึงให้ไม่ไปโดนสิ่งก่อสร้างได้\nวางกำแพง \uf6ee [accent]กำแพงเบริลเลี่ยม[]รอบๆ ป้อมปืน
 onset.enemies = ศัตรูกำลังจะเข้ามา เตรียมตัวป้องกันให้ดี
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = ศัตรูอ่อนแอลงแล้ว ตอบโต้กลับ
 onset.cores = แกนกลางใหม่สามารถวางได้บน[accent]โซนแกนกลาง[]\nแกนกลางใหม่จะทำหน้าที่เป็นฐานทัพหน้าด่านและจะแบ่งปันทรัพยากรกับแกนกลางอื่นๆ\nวาง \uf725 แกนกลาง
 onset.detect = ศัตรูจะสามารถตรวจจับการมีอยู่ของคุณได้ในอีก 2 นาที\nจัดตั้งกองกำลังป้องกัน ปฏิบัติการขุด และการผลิต
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 32b50b9a54..dcfda82e40 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -1888,6 +1888,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index b26237acc4..b7b44fecb5 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -1903,6 +1903,7 @@ onset.turrets = Birimler etkili, ancak [accent]taretler[] daha iyi bir savunma s
 onset.turretammo = Tareti [accent]berilyum mermi[] ile besle.
 onset.walls = [accent]Duvarlar[] gelen hasarı engelleyebilir.\nSilahların etrafına, koruma amçlı\uf8ae [accent]Berilyum Duvar[] inşa et.
 onset.enemies = DÜŞMAN GELİYO!!! Hazırlan.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = Düşman zayıf! Hemen geri dal!
 onset.cores = [accent]Merkez Zemin[]lerinin üzerine yeni merkezler inşa edilebilir.\nTüm merkezler birbirleri ile malzemeleri paylaşır.\n\uf725 Bir merkez inşa et.
 onset.detect = Düşman seni 2 dakika içinde tespit edicek.\nSavunma, maden ve üretime başla.
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 88d02346da..ea1123f93b 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -1919,6 +1919,7 @@ onset.turrets = Одиниці ефективні, але [accent]башти[] 
 onset.turretammo = Забезпечте башту [accent]берилієвими боєприпасами[].
 onset.walls = [accent]Стіни[] cможе запобігти потраплянню зустрічної шкоди на будівлі.\nРозмістіть декілька \uf6ee [accent]берилієвих стін[] навколо башти.
 onset.enemies = Ворог наступає, готуйтеся до оборони.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = Ворог беззахисний. Контратакуйте.
 onset.cores = Нові ядра можуть бути розміщені на плитках [accent]зони ядра[].\nНові ядра функціонують як передові бази й мають спільний інвентар ресурсів з іншими ядрами.\nРозмістіть \uf725 ядро.
 onset.detect = Ворог зможе виявити вас за 2 хвилини.\nОрганізуйте оборону, видобуток корисних копалин та виробництво.
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index a7fa4af8c4..b8196e4826 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -1904,6 +1904,7 @@ onset.turrets = Các đơn vị rất tốt, nhưng [accent]súng[] cung cấp k
 onset.turretammo = Tiếp đạn cho súng bằng [accent]beryllium[].
 onset.walls = [accent]Tường[] có thể ngăn chặn sát thương đến các công trình.\nĐặt một số \uf6ee [accent]tường beryllium[] xung quanh súng.
 onset.enemies = Quân địch đang đến, hãy chuẩn bị phòng thủ.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = Quân địch đã suy yếu.\nHãy phản công.
 onset.cores = Các căn cứ có thể được đặt trên [accent]ô căn cứ[].\nCác căn cứ mới có thể được đặt ở bất kỳ đâu trên bản đồ.\nĐặt một \uf725 căn cứ.
 onset.detect = Quân địch sẽ phát hiện bạn trong vòng 2 phút.\nHãy chuẩn bị phòng thủ, khai thác và sản xuất.
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 46dabee5b7..ba530fd635 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -1920,6 +1920,7 @@ onset.turrets = 使用单位防御很有效，但合理使用[accent]炮塔[]可
 onset.turretammo = 给炮塔供给[accent]铍[]。
 onset.walls = [accent]墙[]可以防止建筑受到伤害。\n在炮塔周围放置一些\uf6ee[accent]铍墙[]。
 onset.enemies = 敌人来袭，准备防御。
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = 敌军基地十分脆弱。 发动反攻。
 onset.cores = 你可以在[accent]核心地块[]上建造新的核心。\n新核心的功能类似于前沿基地，且与其他核心共享资源仓库。\n放置一个\uf725核心。
 onset.detect = 敌军将在2分钟内发现你。\n设立防御，挖掘矿物，并建造生产设施。
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index deb30b3855..a4d0aca9c9 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -1913,6 +1913,7 @@ onset.turrets = Units are effective, but [accent]turrets[] provide better defens
 onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
 onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
 onset.enemies = Enemy incoming, prepare to defend.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = The enemy is vulnerable. Counter-attack.
 onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
 onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.

From 836e0a6f663b8b38e5fe8865b1333d4ba7f40b80 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 7 Jan 2024 10:35:31 -0500
Subject: [PATCH 119/369] Fixed speed multiplier not affecting omni rotation
 speed

---
 core/src/mindustry/entities/comp/UnitComp.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index a09d5ecdfe..061d323858 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -92,7 +92,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         moveAt(Tmp.v2.trns(rotation, vec.len()));
 
         if(!vec.isZero()){
-            rotation = Angles.moveToward(rotation, vec.angle(), type.rotateSpeed * Time.delta);
+            rotation = Angles.moveToward(rotation, vec.angle(), type.rotateSpeed * Time.delta * speedMultiplier);
         }
     }
 

From 0145a1599e48230845f714df3808d2be123fa08e Mon Sep 17 00:00:00 2001
From: summoner001 <summoner001@users.noreply.github.com>
Date: Sun, 7 Jan 2024 16:39:58 +0100
Subject: [PATCH 120/369] Update bundle_hu.properties (ready to merge) (#9436)

* Update bundle_hu.properties

Updates

* Update bundle_hu.properties

fixing typos

* Update bundle_hu.properties

fix

* Update bundle_hu.properties

Update
---
 core/assets/bundles/bundle_hu.properties | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 7cbe7378b3..d0fda05641 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -774,7 +774,7 @@ sector.missingresources = [scarlet]Nincs elég nyersanyag
 sector.attacked = A(z) [accent]{0}[white] szektor támadás alatt áll!
 sector.lost = A(z) [accent]{0}[white] szektor elveszett!
 #note: the missing space in the line below is intentional
-sector.captured = A(z) [accent]{0}[white]szektor megvédve!
+sector.captured = A(z) [accent]{0}[white]Szektor Elfoglalva!
 sector.changeicon = Ikon Módosítása
 sector.noswitch.title = A szektorváltás Nem Lehetséges
 sector.noswitch = Nem válthatsz szektort, amíg egy meglévő szektor támadás alatt áll.\n\nSzektor: [accent]{0}[] a(z) [accent]{1}[]-n
@@ -1865,8 +1865,8 @@ hint.unitControl = Nyomd le a [accent][[Bal-CTRL][] gombot és kattints [accent]
 hint.unitControl.mobile = [accent][[Dupla koppintás][]sal átveheted az irányítást szövetséges egységek, vagy -lövegtornyok felett.
 hint.unitSelectControl = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd hosszan a [accent]Bal-SHIFT[] gombot.\nParancs Módban az egységek kijelöléséhez kattints és húzd az egeret. [accent]Jobb-Egérgomb[]-al kattints az egységek mozgatásához egy helyszínre, vagy az ellenséges célpontra.
 hint.unitSelectControl.mobile = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd meg a [accent]Parancs Mód[] gombot a bal alsó sarokban.\nParancs módban az egységek kiválasztásához érintsd meg a kijelzőt és húzással jelöld ki az egységeket. Koppints az egységek mozgatásához egy helyszínre, vagy ellenséges az célpontra.
-hint.launch = Ha elegendő nyersanyagot gyűjtöttél, [accent]Kilőhetsz[] egy közeli szektorba. Ezt lent a jobb oldalon látható \ue827 [accent]Térkép[]en teheted meg.
-hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél, [accent]Kilőhetsz[] egy közeli szektorba. Ezt a \ue88c [accent]Menü[]ből elérhető \ue827 [accent]Térkép[]en teheted meg.
+hint.launch = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Magot a következő szektorba, úgy, hogy megnyitod a \uE827 [accent]Térkép[]et a jobb alsó sarokban, és átpásztázol az új helyszínre.
+hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Magot egy közeli szektorba, úgy, hogy kiválasztasz egy szektort a \uE88C [accent]Menü[]ben a \uE827 [accent]Térkép[]ről.
 hint.schematicSelect = Az [accent][[F][] nyomva tartásával kijelölhetsz és másolhatsz épületeket.\n\nKattints a [accent][[görgővel][], hogy egy épületet lemásolj.
 hint.rebuildSelect = Tartsd nyomva a [accent][[B][] és húzással jelöld ki a megsemmisített blokkterveket.\nEz automatikusan újraépíti őket.
 hint.rebuildSelect.mobile = Válaszd a \ue874 másolás gombot, majd koppints \ue80f újjáépítés gombra, és húzd a megsemmisült blokktervek kijelöléséhez.\nEz automatikusan újraépíti őket.
@@ -1926,7 +1926,7 @@ onset.turrets = Az egységek hatékonyak, de a [accent]lövegtornyok[] jobb véd
 onset.turretammo = Lásd el a lövegtornyokat [accent]Berillium[] lőszerrel.
 onset.walls = A [accent]Falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts \uf6ee [accent]Berillium Fal[]akat a lövegtornyok körül.
 onset.enemies = Az ellenség közeledik, készülj fel a védekezésre.
-onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.defenses = [accent]Állíts fel védelmet:[lightgray] {0}
 onset.attack = Az ellenség most sebezhető. Ellentámadásra fel.
 onset.cores = Új Mag csak a [accent]Mag Csempé[]re építhető.\nAz új Magok előretolt bázisként működnek, és megosztják a nyersanyagkészletüket más Magokkal.\nÉpíts egy új \uf725 Magot.
 onset.detect = Az ellenség 2 percen belül észrevesz téged.\nÁllíts fel védelmet, bányássz és termelj.
@@ -2479,4 +2479,4 @@ lenum.mine = Bánya egy helyen.
 lenum.build = Építs egy szerkezetet.
 lenum.getblock = Egy épület és a koordinátái típusának lekérdezése. \nAz egységnek a pozíciótartományon belül kell lennie.\nA nem szilárd épületek [accent]@solid[] típusúak lesznek.
 lenum.within = Ellenőrizze, hogy az egység egy pozíció közelében van-e.
-lenum.boost = Erősítés indítás/leállítás.
+lenum.boost = Erősítés indítás/leállítás.
\ No newline at end of file

From 5eab64ee5026da4b088f5224c1510ad490f60d9b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 8 Jan 2024 08:09:39 -0500
Subject: [PATCH 121/369] Updated mod tests with new URL

---
 tests/src/test/java/ModTestAllure.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/src/test/java/ModTestAllure.java b/tests/src/test/java/ModTestAllure.java
index 56dad03283..c19b8da472 100644
--- a/tests/src/test/java/ModTestAllure.java
+++ b/tests/src/test/java/ModTestAllure.java
@@ -17,7 +17,7 @@ public class ModTestAllure extends GenericModTest{
 
     @Test
     public void begin(){
-        grabMod("https://github.com/BlueWolf3682/Allure/archive/4150f74db1ea6058dc090959cf0fe5dc9d239e37.zip");
+        grabMod("https://github.com/Allure/Allure/archive/4150f74db1ea6058dc090959cf0fe5dc9d239e37.zip");
         checkExistence("allure");
 
         UnitType type = Vars.content.unit("allure-0b11-exodus");

From f5b9fc21d08aef84b2ce965c02d47c10c6e12128 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 8 Jan 2024 08:12:26 -0500
Subject: [PATCH 122/369] .

---
 tests/src/test/java/ModTestAllure.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/src/test/java/ModTestAllure.java b/tests/src/test/java/ModTestAllure.java
index c19b8da472..9d1db792dc 100644
--- a/tests/src/test/java/ModTestAllure.java
+++ b/tests/src/test/java/ModTestAllure.java
@@ -17,7 +17,7 @@ public class ModTestAllure extends GenericModTest{
 
     @Test
     public void begin(){
-        grabMod("https://github.com/Allure/Allure/archive/4150f74db1ea6058dc090959cf0fe5dc9d239e37.zip");
+        grabMod("https://github.com/LixieWulf/Allure/archive/4150f74db1ea6058dc090959cf0fe5dc9d239e37.zip");
         checkExistence("allure");
 
         UnitType type = Vars.content.unit("allure-0b11-exodus");

From 6e163591d920ba215a4c316d1a8987e0e04992ce Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az887-13.elnf45sohryeljqptybdtvknwa.bx.internal.cloudapp.net>
Date: Mon, 8 Jan 2024 13:13:13 +0000
Subject: [PATCH 123/369] Automatic bundle update

---
 core/assets/bundles/bundle_hu.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index d0fda05641..067a15a744 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1865,8 +1865,8 @@ hint.unitControl = Nyomd le a [accent][[Bal-CTRL][] gombot és kattints [accent]
 hint.unitControl.mobile = [accent][[Dupla koppintás][]sal átveheted az irányítást szövetséges egységek, vagy -lövegtornyok felett.
 hint.unitSelectControl = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd hosszan a [accent]Bal-SHIFT[] gombot.\nParancs Módban az egységek kijelöléséhez kattints és húzd az egeret. [accent]Jobb-Egérgomb[]-al kattints az egységek mozgatásához egy helyszínre, vagy az ellenséges célpontra.
 hint.unitSelectControl.mobile = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd meg a [accent]Parancs Mód[] gombot a bal alsó sarokban.\nParancs módban az egységek kiválasztásához érintsd meg a kijelzőt és húzással jelöld ki az egységeket. Koppints az egységek mozgatásához egy helyszínre, vagy ellenséges az célpontra.
-hint.launch = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Magot a következő szektorba, úgy, hogy megnyitod a \uE827 [accent]Térkép[]et a jobb alsó sarokban, és átpásztázol az új helyszínre.
-hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Magot egy közeli szektorba, úgy, hogy kiválasztasz egy szektort a \uE88C [accent]Menü[]ben a \uE827 [accent]Térkép[]ről.
+hint.launch = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Magot a következő szektorba, úgy, hogy megnyitod a \ue827 [accent]Térkép[]et a jobb alsó sarokban, és átpásztázol az új helyszínre.
+hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Magot egy közeli szektorba, úgy, hogy kiválasztasz egy szektort a \ue88c [accent]Menü[]ben a \ue827 [accent]Térkép[]ről.
 hint.schematicSelect = Az [accent][[F][] nyomva tartásával kijelölhetsz és másolhatsz épületeket.\n\nKattints a [accent][[görgővel][], hogy egy épületet lemásolj.
 hint.rebuildSelect = Tartsd nyomva a [accent][[B][] és húzással jelöld ki a megsemmisített blokkterveket.\nEz automatikusan újraépíti őket.
 hint.rebuildSelect.mobile = Válaszd a \ue874 másolás gombot, majd koppints \ue80f újjáépítés gombra, és húzd a megsemmisült blokktervek kijelöléséhez.\nEz automatikusan újraépíti őket.
@@ -2479,4 +2479,4 @@ lenum.mine = Bánya egy helyen.
 lenum.build = Építs egy szerkezetet.
 lenum.getblock = Egy épület és a koordinátái típusának lekérdezése. \nAz egységnek a pozíciótartományon belül kell lennie.\nA nem szilárd épületek [accent]@solid[] típusúak lesznek.
 lenum.within = Ellenőrizze, hogy az egység egy pozíció közelében van-e.
-lenum.boost = Erősítés indítás/leállítás.
\ No newline at end of file
+lenum.boost = Erősítés indítás/leállítás.

From 4aaf3b228786b99838e228ffe50dd9cab3c225b9 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 9 Jan 2024 12:17:11 -0500
Subject: [PATCH 124/369] Use movePref for circling

---
 core/src/mindustry/entities/units/AIController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/entities/units/AIController.java b/core/src/mindustry/entities/units/AIController.java
index 963fb67933..2c638bec76 100644
--- a/core/src/mindustry/entities/units/AIController.java
+++ b/core/src/mindustry/entities/units/AIController.java
@@ -277,7 +277,7 @@ public class AIController implements UnitController{
 
         vec.setLength(prefSpeed());
 
-        unit.moveAt(vec);
+        unit.movePref(vec);
     }
 
     public void circle(Position target, float circleLength){
@@ -295,7 +295,7 @@ public class AIController implements UnitController{
 
         vec.setLength(speed);
 
-        unit.moveAt(vec);
+        unit.movePref(vec);
     }
 
     public void moveTo(Position target, float circleLength){

From 07fb3e04ff864379d7c6a22c127da676f4f4fd7a Mon Sep 17 00:00:00 2001
From: thedimas <51395517+thedimas3007@users.noreply.github.com>
Date: Wed, 10 Jan 2024 00:13:37 +0100
Subject: [PATCH 125/369] Update thedimas IP (#9441)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 2cf3ac0b29..534874d778 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -65,7 +65,7 @@
   },
   {
     "name": "thedimas",
-    "address": ["167.86.69.235", "167.86.69.235:6503","167.86.69.235:6505", "167.86.69.235:6506", "167.86.69.235:6507", "167.86.69.235:6508", "167.86.69.235:6509", "167.86.69.235:6510", "167.86.69.235:6511", "167.86.69.235:6512", "167.86.69.235:6513"]
+    "address": ["130.162.212.232", "130.162.212.232:6503","130.162.212.232:6505", "130.162.212.232:6506", "130.162.212.232:6507", "130.162.212.232:6508", "130.162.212.232:6509", "130.162.212.232:6510", "130.162.212.232:6511", "130.162.212.232:6512", "130.162.212.232:6513"]
   },
   {
     "name": "HexPvP Network",

From 92b2fc077254dfc3dc649a3b742013e5e2e4391b Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Wed, 10 Jan 2024 08:35:41 +0700
Subject: [PATCH 126/369] Update servers_v7.json (#9442)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

💀
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 534874d778..bbc45c52ba 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -230,7 +230,7 @@
   },
   {
     "name": "ABCXYZ Community",
-    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "140.238.246.78:7000"]
+    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "140.238.246.78:7000", "5.9.8.124:28848"]
   },
   {
     "name": "CroCraft Network",

From b94de4e9b9b8976a6e9491ce46ac636e16288e86 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 10 Jan 2024 23:39:09 -0500
Subject: [PATCH 127/369] Removed unused keepOutlines value in ModMeta

---
 core/src/mindustry/mod/Mods.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
index e4f3692282..1eed765d19 100644
--- a/core/src/mindustry/mod/Mods.java
+++ b/core/src/mindustry/mod/Mods.java
@@ -1180,8 +1180,6 @@ public class Mods implements Loadable{
         public boolean hidden;
         /** If true, this mod should be loaded as a Java class mod. This is technically optional, but highly recommended. */
         public boolean java;
-        /** If true, -outline regions for units are kept when packing. Only use if you know exactly what you are doing. */
-        public boolean keepOutlines;
         /** To rescale textures with a different size. Represents the size in pixels of the sprite of a 1x1 block. */
         public float texturescale = 1.0f;
         /** If true, bleeding is skipped and no content icons are generated. */
@@ -1229,7 +1227,6 @@ public class Mods implements Loadable{
             ", softDependencies=" + softDependencies +
             ", hidden=" + hidden +
             ", java=" + java +
-            ", keepOutlines=" + keepOutlines +
             ", texturescale=" + texturescale +
             ", pregenerated=" + pregenerated +
             '}';

From 1d3736cf8281859d8168c342d81aa2d7c918b360 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 12 Jan 2024 14:20:28 -0500
Subject: [PATCH 128/369] Fixed #9449

---
 .../src/mindustry/world/blocks/distribution/StackRouter.java | 5 +++++
 gradle.properties                                            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/blocks/distribution/StackRouter.java b/core/src/mindustry/world/blocks/distribution/StackRouter.java
index e763b2ece1..1186401c9c 100644
--- a/core/src/mindustry/world/blocks/distribution/StackRouter.java
+++ b/core/src/mindustry/world/blocks/distribution/StackRouter.java
@@ -61,6 +61,11 @@ public class StackRouter extends DuctRouter{
             if((current == null || items.get(current) == 0) && items.total() > 0){
                 current = items.first();
             }
+
+            if(items.empty()){
+                unloading = false;
+                current = null;
+            }
         }
 
         @Override
diff --git a/gradle.properties b/gradle.properties
index 5baefb5b6a..b18f49c047 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=e5a3dd82b8
+archash=8fdcdbfccc

From e8db6d4837983a7c6493cad5371015560f17f228 Mon Sep 17 00:00:00 2001
From: Tom <25043847+Douile@users.noreply.github.com>
Date: Fri, 12 Jan 2024 19:21:13 +0000
Subject: [PATCH 129/369] Truncate ping response packets (#9446)

Previously all ping response packets were 0-padded to 500 bytes. By
truncating we only send the bytes that are actually needed.
---
 core/src/mindustry/net/ArcNetProvider.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java
index 15028d37f9..e7a1a33dd6 100644
--- a/core/src/mindustry/net/ArcNetProvider.java
+++ b/core/src/mindustry/net/ArcNetProvider.java
@@ -94,7 +94,9 @@ public class ArcNetProvider implements NetProvider{
         server.setMulticast(multicastGroup, multicastPort);
         server.setDiscoveryHandler((address, handler) -> {
             ByteBuffer buffer = NetworkIO.writeServerData();
+            int length = buffer.position();
             buffer.position(0);
+            buffer.limit(length);
             handler.respond(buffer);
         });
 

From b0cc7d2e85b622cf277cf5997df2e88a3052abf5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 12 Jan 2024 15:13:11 -0500
Subject: [PATCH 130/369] Fixed #9445

---
 core/src/mindustry/entities/Fires.java   | 4 ++--
 core/src/mindustry/entities/Puddles.java | 2 +-
 core/src/mindustry/world/Tiles.java      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/entities/Fires.java b/core/src/mindustry/entities/Fires.java
index 0deafd3618..e3601e3e31 100644
--- a/core/src/mindustry/entities/Fires.java
+++ b/core/src/mindustry/entities/Fires.java
@@ -33,11 +33,11 @@ public class Fires{
     }
 
     public static @Nullable Fire get(Tile tile){
-        return world.tiles.getFire(tile.array());
+        return tile == null ? null : world.tiles.getFire(tile.array());
     }
 
     public static @Nullable Fire get(int x, int y){
-        return world.tiles.getFire(world.packArray(x, y));
+        return Structs.inBounds(x, y, world.width(), world.height()) ? world.tiles.getFire(world.packArray(x, y)) : null;
     }
 
     private static void set(Tile tile, Fire fire){
diff --git a/core/src/mindustry/entities/Puddles.java b/core/src/mindustry/entities/Puddles.java
index be7b1bba1b..ec546882b4 100644
--- a/core/src/mindustry/entities/Puddles.java
+++ b/core/src/mindustry/entities/Puddles.java
@@ -27,7 +27,7 @@ public class Puddles{
 
     /** Returns the Puddle on the specified tile. May return null. */
     public static @Nullable Puddle get(Tile tile){
-        return world.tiles.getPuddle(tile.array());
+        return tile == null ? null : world.tiles.getPuddle(tile.array());
     }
 
     public static void deposit(Tile tile, Tile source, Liquid liquid, float amount, boolean initial){
diff --git a/core/src/mindustry/world/Tiles.java b/core/src/mindustry/world/Tiles.java
index 85a2f54c4c..51bc22568b 100644
--- a/core/src/mindustry/world/Tiles.java
+++ b/core/src/mindustry/world/Tiles.java
@@ -32,7 +32,7 @@ public class Tiles implements Iterable<Tile>{
         puddles[pos] = p;
     }
 
-    public Fire getFire(int pos){
+    public @Nullable Fire getFire(int pos){
         return fires[pos];
     }
 

From cde4fa2c2961da594ca9cce3e036c427ac800648 Mon Sep 17 00:00:00 2001
From: Toma <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 12 Jan 2024 21:17:15 +0100
Subject: [PATCH 131/369] Make file name orders deterministic (#9443)

---
 build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1828919509..342a85c96c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -106,12 +106,12 @@ allprojects{
         generateLocales = {
             def output = 'en\n'
             def bundles = new File(project(':core').projectDir, 'assets/bundles/')
-            bundles.listFiles().each{ other ->
-                if(other.name == "bundle.properties") return
-                output += other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + "\n"
+            bundles.list().sort().each{ name ->
+                if(name == "bundle.properties") return
+                output += name.substring("bundle".length() + 1, name.lastIndexOf('.')) + "\n"
             }
             new File(project(':core').projectDir, 'assets/locales').text = output
-            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().join("\n")
+            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().sort().join("\n")
         }
 
         writeVersion = {

From ce1ac8e934270cbbdf74501c40d3aca2f864f1d1 Mon Sep 17 00:00:00 2001
From: HamzaGSopp <104453337+HamzaGSopp@users.noreply.github.com>
Date: Fri, 12 Jan 2024 21:17:35 +0100
Subject: [PATCH 132/369] Update servers_v7.json (#9447)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index bbc45c52ba..d6b3b00ba3 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -29,7 +29,7 @@
   },
   {
     "name": "Tamazia",
-    "address": ["5.250.178.221:6567","node1.adky.net:3215"]
+    "address": ["5.250.178.221:6567","5.250.178.221:6677"]
   },
   {
     "name": "Crux's Federation",

From 797ef6400cff94018305b2667d4de4f6cf0da99b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 12 Jan 2024 22:26:08 -0500
Subject: [PATCH 133/369] Removed redundant RailBulletType hitEffect call

---
 core/src/mindustry/entities/bullet/RailBulletType.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/mindustry/entities/bullet/RailBulletType.java b/core/src/mindustry/entities/bullet/RailBulletType.java
index 276a428e4e..dfa41520f4 100644
--- a/core/src/mindustry/entities/bullet/RailBulletType.java
+++ b/core/src/mindustry/entities/bullet/RailBulletType.java
@@ -43,8 +43,6 @@ public class RailBulletType extends BulletType{
 
         if(b.damage > 0){
             pierceEffect.at(x, y, b.rotation());
-
-            hitEffect.at(x, y);
         }
 
         //subtract health from each consecutive pierce

From a4c137b6b8cd3a98d73b1fa0e73fe566dbfa071c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 13 Jan 2024 12:20:14 -0500
Subject: [PATCH 134/369] Fixed #9452

---
 core/assets/bundles/bundle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 6c6947b0d6..c9f5ae6d06 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -774,7 +774,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 #note: the missing space in the line below is intentional
-sector.captured = Sector [accent]{0}[white]Captured!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]

From 30d2b443b1a7a2d703dcdda30a23cea9b77697f8 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az659-285.luykedtozraezimdvwvtsy4hga.cx.internal.cloudapp.net>
Date: Sat, 13 Jan 2024 17:21:00 +0000
Subject: [PATCH 135/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 2 +-
 core/assets/bundles/bundle_bg.properties    | 3 +--
 core/assets/bundles/bundle_ca.properties    | 3 +--
 core/assets/bundles/bundle_cs.properties    | 3 +--
 core/assets/bundles/bundle_da.properties    | 2 +-
 core/assets/bundles/bundle_de.properties    | 3 +--
 core/assets/bundles/bundle_es.properties    | 3 +--
 core/assets/bundles/bundle_et.properties    | 2 +-
 core/assets/bundles/bundle_eu.properties    | 2 +-
 core/assets/bundles/bundle_fi.properties    | 2 +-
 core/assets/bundles/bundle_fil.properties   | 2 +-
 core/assets/bundles/bundle_fr.properties    | 3 +--
 core/assets/bundles/bundle_hu.properties    | 3 +--
 core/assets/bundles/bundle_id_ID.properties | 3 +--
 core/assets/bundles/bundle_it.properties    | 3 +--
 core/assets/bundles/bundle_ja.properties    | 3 +--
 core/assets/bundles/bundle_ko.properties    | 3 +--
 core/assets/bundles/bundle_lt.properties    | 2 +-
 core/assets/bundles/bundle_nl.properties    | 2 +-
 core/assets/bundles/bundle_nl_BE.properties | 2 +-
 core/assets/bundles/bundle_pl.properties    | 3 +--
 core/assets/bundles/bundle_pt_BR.properties | 3 +--
 core/assets/bundles/bundle_pt_PT.properties | 2 +-
 core/assets/bundles/bundle_ro.properties    | 3 +--
 core/assets/bundles/bundle_ru.properties    | 3 +--
 core/assets/bundles/bundle_sr.properties    | 3 +--
 core/assets/bundles/bundle_sv.properties    | 2 +-
 core/assets/bundles/bundle_th.properties    | 3 +--
 core/assets/bundles/bundle_tk.properties    | 2 +-
 core/assets/bundles/bundle_tr.properties    | 3 +--
 core/assets/bundles/bundle_uk_UA.properties | 3 +--
 core/assets/bundles/bundle_vi.properties    | 3 +--
 core/assets/bundles/bundle_zh_CN.properties | 3 +--
 core/assets/bundles/bundle_zh_TW.properties | 3 +--
 34 files changed, 34 insertions(+), 56 deletions(-)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index b640d5c957..c8c570b812 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -750,7 +750,7 @@ sector.curlost = Сектар Згублены
 sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Сектар [accent]{0}[white] атакуецца!
 sector.lost = Сектар [accent]{0}[white] згублены!
-sector.captured = Сектар [accent]{0}[white]захоплены!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Змяніць Іконку
 sector.noswitch.title = Немагчыма Пераключыцца на Сектар
 sector.noswitch = Вы не можаце пераключацца на сектары калі гэты сектар атакуецца.\n\nСектар: [accent]{0}[] у [accent]{1}[]
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 7e287c4463..0c93161b86 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -757,8 +757,7 @@ sector.curlost = Зоната загубена
 sector.missingresources = [scarlet]Недостатъчни ресурси в ядрото
 sector.attacked = Зона [accent]{0}[white] е под атака!
 sector.lost = Зона [accent]{0}[white] беше загубена!
-#note: the missing space in the line below is intentional
-sector.captured = Зона [accent]{0}[white]беше превзета!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index cc72d72090..edde043645 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -761,8 +761,7 @@ sector.curlost = Sector perdut
 sector.missingresources = [scarlet]Recursos insuficients al nucli
 sector.attacked = Ataquen el sector [accent]{0}[white]!
 sector.lost = Heu perdut el sector [accent]{0}[white]!
-#note: the missing space in the line below is intentional
-sector.captured = S’ha capturat el sector [accent]{0}[white]!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Canvia la icona
 sector.noswitch.title = Els sectors no es poden canviar.
 sector.noswitch = Potser no podeu canviar de sector perquè n’ataquen un altre.\n\nSector: [accent]{0}[] de [accent]{1}[]
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 031ded45ef..e68c9cdbd5 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -758,8 +758,7 @@ sector.curlost = Sektor ztracen
 sector.missingresources = [scarlet]Nedostatečné zdroje v jádře
 sector.attacked = Sektor [accent]{0}[white] pod útokem!
 sector.lost = Sektor [accent]{0}[white] ztracen! :(
-#note: chybějící mezera v řádce níže je záměrná :)
-sector.captured = Sektor [accent]{0}[white]polapen! :)
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Změnit Ikonu
 sector.noswitch.title = Nelze Vyměnit Sektor
 sector.noswitch = Sektory nelze přepnut, pokud je stávající sektor pod útokem.\n\nSektor: [accent]{0}[] na [accent]{1}[]
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index c7994a4626..8d72d9336c 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -751,7 +751,7 @@ sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Ikke nok resurser i kernen.
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
-sector.captured = Sector [accent]{0}[white]captured!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index b273f5e222..5ecbe76ad2 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -769,8 +769,7 @@ sector.curlost = Sektor verloren
 sector.missingresources = [scarlet]Fehlende Kernressourcen
 sector.attacked = Sektor [accent]{0}[white] wird angegriffen!
 sector.lost = Sektor [accent]{0}[white] verloren!
-#note: the missing space in the line below is intentional
-sector.captured = Sektor [accent]{0}[white]erobert!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Bild ändern
 sector.noswitch.title = Kann Sektoren nicht wechseln
 sector.noswitch = Du kannst nicht zwischen Sektoren wechseln, wenn ein anderer angegriffen wird.\n\nSektor: [accent]{0}[] auf [accent]{1}[]
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 22c9668909..d14f568c2a 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -765,8 +765,7 @@ sector.curlost = Sector perdido
 sector.missingresources = [scarlet]Recursos insuficientes en el núcleo
 sector.attacked = ¡Sector [accent]{0}[white] bajo ataque!
 sector.lost = ¡Sector [accent]{0}[white] perdido!
-#nota: El espacio que falta en la línea inferior (antes de "capturado") es intencional:
-sector.captured = ¡Sector [accent]{0}[white]capturado!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Cambiar icono
 sector.noswitch.title = No se pueden cambiar los sectores
 sector.noswitch = Tal vez no puedas cambiar de sector mientras se encuentre bajo ataque.\n\nSector: [accent]{0}[] en [accent]{1}[]
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 566d618295..2245277ea0 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -751,7 +751,7 @@ sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
-sector.captured = Sector [accent]{0}[white]captured!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index f53df1eb0f..fb60b06579 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -753,7 +753,7 @@ sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
-sector.captured = Sector [accent]{0}[white]captured!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 734cde678b..06087c1f4b 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -751,7 +751,7 @@ sector.curlost = Sektori menetetty
 sector.missingresources = [scarlet]Sinulla ei ole tarpeeksi resursseja.
 sector.attacked = Sektori [accent]{0}[white] on hyökkäyksen kohteena!
 sector.lost = Sektori [accent]{0}[white] menetetty!
-sector.captured = Sektori [accent]{0}[white]vallattu!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Vaihda kuvaketta
 sector.noswitch.title = Sektoria ei voida vaihtaa
 sector.noswitch = Et voi vaihtaa sektoria, kun olemassaoleva sektori on hyökkäyksen kohteena.\n\nSektori: [accent]{0}[] planeetalla [accent]{1}[]
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 5f9a9fed8b..dc7b69e612 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -751,7 +751,7 @@ sector.curlost = Nawala ang sector
 sector.missingresources = [scarlet]Kulang ang mga Core Resources
 sector.attacked = Ang sector [accent]{0}[white] ay inaatake!
 sector.lost = Ang sector [accent]{0}[white] ay nawala!
-sector.captured = Ang sector [accent]{0}[white] ay na-capture na!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index c8c32b782f..43dfd83db6 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -772,8 +772,7 @@ sector.curlost = Secteur perdu
 sector.missingresources = [scarlet]Ressources du Noyau insuffisantes !
 sector.attacked = Secteur [accent]{0}[white] attaqué !
 sector.lost = Secteur [accent]{0}[white] perdu !
-#note: l'espace manquant dans la ligne ci-dessous est intentionnel
-sector.captured = Secteur [accent]{0}[white]capturé !
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Changer l'Icône
 sector.noswitch.title = Impossible de changer de Secteur
 sector.noswitch = Vous ne pouvez pas changer de secteur pendant qu’un autre est attaqué.\n\nSecteur: [accent]{0}[] sur [accent]{1}[]
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 067a15a744..ba0f82a5ef 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -773,8 +773,7 @@ sector.curlost = A szektor Elveszett
 sector.missingresources = [scarlet]Nincs elég nyersanyag
 sector.attacked = A(z) [accent]{0}[white] szektor támadás alatt áll!
 sector.lost = A(z) [accent]{0}[white] szektor elveszett!
-#note: the missing space in the line below is intentional
-sector.captured = A(z) [accent]{0}[white]Szektor Elfoglalva!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Ikon Módosítása
 sector.noswitch.title = A szektorváltás Nem Lehetséges
 sector.noswitch = Nem válthatsz szektort, amíg egy meglévő szektor támadás alatt áll.\n\nSzektor: [accent]{0}[] a(z) [accent]{1}[]-n
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index f2f82e0061..176bcdb5bc 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -765,8 +765,7 @@ sector.curlost = Sektor Gagal Bertahan
 sector.missingresources = [scarlet]Sumber Daya Inti Tidak Cukup
 sector.attacked = Sektor [accent]{0}[white] sedang diserang!
 sector.lost = Sektor [accent]{0}[white] telah dihancurkan!
-#note: the missing space in the line below is intentional
-sector.captured = Sektor [accent]{0}[white]ditaklukkan!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Ubah Ikon
 sector.noswitch.title = Tidak Dapat beralih Sektor
 sector.noswitch = Andak tidak boleh berpindah sektor jika salah satu sektor terkena serangan.\nSektor: [accent]{0}[] di [accent]{1}[]
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 09643a8557..8ecd1722ca 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -755,8 +755,7 @@ sector.curlost = Settore Perso
 sector.missingresources = [scarlet]Risorse del Nucleo Insufficienti
 sector.attacked = Settore [accent]{0}[white] sotto attacco!
 sector.lost = Settore [accent]{0}[white] perso!
-#nota: lo spazio mancante nella linea sotto è intenzionale
-sector.captured = Settore [accent]{0}[white]catturato!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Cambia icona
 sector.noswitch.title = Impossibile cambiare settore
 sector.noswitch = Non puoi cambiare settore mentre sei sotto attacco.\n\nSectore: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 3381c785c3..90c9d96eaf 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -759,8 +759,7 @@ sector.curlost = 失われたセクター
 sector.missingresources = [scarlet]資源が足りません
 sector.attacked = セクター [accent]{0}[white] が攻撃を受けています!
 sector.lost = セクター [accent]{0}[white] 喪失!
-#note: the missing space in the line below is intentional = #注: 以下の行の空白は意図的なものです
-sector.captured = セクター [accent]{0}[white]制圧!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = アイコンを変更
 sector.noswitch.title = セクターを切り替えることができません
 sector.noswitch = 既存のセクターが攻撃を受けている間は、セクターを切り替えることはできません。\n\nセクター: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 9b304fe9c8..43dc8bff2d 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -760,8 +760,7 @@ sector.curlost = 지역 잃음
 sector.missingresources = [scarlet]코어 자원 부족[]
 sector.attacked = [accent]{0}[white] 지역이 공격받고 있습니다![]
 sector.lost = [accent]{0}[white] 지역을 잃었습니다![]
-#note: the missing space in the line below is intentional
-sector.captured = [accent]{0}[white] 지역을 점령했습니다![]
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = 아이콘 바꾸기
 sector.noswitch.title = 지역 전환 불가능
 sector.noswitch = 기존 지역이 공격받는 동안은 지역을 전환할 수 없습니다.\n\n지역: [accent]{0}[] 중 [accent]{1}[]
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 2ff4e70fda..f1ad3a3144 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -751,7 +751,7 @@ sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
-sector.captured = Sector [accent]{0}[white]captured!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index d0aa7e286e..136515c639 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -762,7 +762,7 @@ sector.curlost = Sector Verloren
 sector.missingresources = [scarlet]Onvoeldoende Materialen in Core
 sector.attacked = Sector [accent]{0}[white] onder vuur!
 sector.lost = Sector [accent]{0}[white] verloren!
-sector.captured = Sector [accent]{0}[white]veroverd!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Verander icoon
 sector.noswitch.title = Kan niet van sector wisselen
 sector.noswitch = Je mag niet van sector wisselen terwijl een bestaande sector wordt aangevallen.\n\nSector: [accent]{0}[] op [accent]{1}[]
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 921b927630..418f25a36d 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -751,7 +751,7 @@ sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
-sector.captured = Sector [accent]{0}[white]captured!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index d2edf5e359..d58e29c710 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -757,8 +757,7 @@ sector.curlost = Sektor Stracony
 sector.missingresources = [scarlet]Niewystarczające Zasoby Rdzenia
 sector.attacked = Sektor [accent]{0}[white] jest atakowany!
 sector.lost = Sektor [accent]{0}[white] został stracony!
-#note: the missing space in the line below is intentional
-sector.captured = Sektor [accent]{0}[white]został podbity!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Zmień Ikonę
 sector.noswitch.title = Nie można zmienić sektorów
 sector.noswitch = Nie możesz zmieniać sektorów, gdy istniejący sektor jest atakowany.\n\nSektor: [accent]{0}[] na [accent]{1}[]
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 6117d4e3be..38079f57ae 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -765,8 +765,7 @@ sector.curlost = Setor Perdido
 sector.missingresources = [scarlet]Recursos Insuficientes no Núcleo
 sector.attacked = Setor [accent]{0}[white] sob ataque!
 sector.lost = Setor [accent]{0}[white] perdido!
-#note: the missing space in the line below is intentional
-sector.captured = Setor [accent]{0}[white]capturado!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Trocar Ícone
 sector.noswitch.title = Incapaz de Mudar de Setores
 sector.noswitch = Você não pode trocar de setor enquanto um setor existente estiver sob ataque.\n\nSetor: [accent]{0}[] em [accent]{1}[]
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index a296ea5dc4..cbc570d1e9 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -751,7 +751,7 @@ sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
-sector.captured = Sector [accent]{0}[white]captured!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index 33ed099aa0..e18ad5c34a 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -759,8 +759,7 @@ sector.curlost = Sector Pierdut
 sector.missingresources = [scarlet]Resurse din Nucleu Insuficiente
 sector.attacked = Sectorul [accent]{0}[white] este atacat!
 sector.lost = Ai pierdut sectorul [accent]{0}[white]!
-#spațiul lipsă de mai jos e intenționat
-sector.captured = Ai capturat sectorul [accent]{0}[white]!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Schimbă Iconița
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 3e35984df8..6bdbefebc5 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -760,8 +760,7 @@ sector.curlost = Сектор потерян
 sector.missingresources = [scarlet]Недостаточно ресурсов для высадки
 sector.attacked = Сектор [accent]{0}[white] атакован!
 sector.lost = Сектор [accent]{0}[white] потерян!
-#note: the missing space in the line below is intentional (недостающий пробел управляется кодом)
-sector.captured = Сектор [accent]{0}[white]захвачен!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Изменить иконку
 sector.noswitch.title = Перемещение между секторами
 sector.noswitch = Вы не можете переключаться между секторами, пока существующий сектор находится под атакой.\n\nСектор: [accent]{0}[] на [accent]{1}[]
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index cca8cf3f33..c13d1f953c 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -760,8 +760,7 @@ sector.curlost = Sektor Izgubljen
 sector.missingresources = [scarlet]Nedovoljnema Resursa u Jezgru
 sector.attacked = Sektor [accent]{0}[white] je napadnut!
 sector.lost = Sektor [accent]{0}[white] je izgubljen!
-#note: the missing space in the line below is intentional
-sector.captured = Sektor [accent]{0}[white]je zauzet!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Promeni Ikonicu
 sector.noswitch.title = Nije Moguće Promeniti Sektor
 sector.noswitch = Ne možete promeniti sektor dok je drugi napadnut.\n\nSektor: [accent]{0}[] na [accent]{1}[]
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index b5565cfac1..779b8ba071 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -751,7 +751,7 @@ sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
-sector.captured = Sector [accent]{0}[white]captured!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 4bf30afe08..7522f06626 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -760,8 +760,7 @@ sector.curlost = เราเสียเซ็กเตอร์!
 sector.missingresources = [scarlet]ขาดทรัพยากรในการลงจอด
 sector.attacked = เซ็กเตอร์ [accent]{0}[white] ถูกโจมตี!
 sector.lost = เราเสียเซ็กเตอร์ [accent]{0}[white]!
-#note: the missing space in the line below is intentional
-sector.captured = เรายึดครองเซ็กเตอร์'[accent]{0}[white]ได้แล้ว!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = เปลี่ยนไอคอน
 sector.noswitch.title = ไม่สามารถเปลี่ยนเซ็กเตอร์ได้
 sector.noswitch = คุณไม่สามารถเปลี่ยนเซ็กเตอร์ได้ระหว่างที่อีกเซ็กเตอร์กำลังถูกโจมตีอยู่\n\nเซ็กเตอร์: [accent]{0}[] บนดาว [accent]{1}[]
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index dcfda82e40..2e476ded50 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -751,7 +751,7 @@ sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
-sector.captured = Sector [accent]{0}[white]captured!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index b7b44fecb5..d45152c39b 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -759,8 +759,7 @@ sector.curlost = Sektör Kaybedildi
 sector.missingresources = [scarlet]Yetersiz Merkez Kaynakları
 sector.attacked = Sektör [accent]{0}[white] saldırı altında!
 sector.lost = Sektör [accent]{0}[white] kaybedildi!
-#Çekirdek -> Merkez -RTOmega
-sector.captured = Sektör [accent]{0}[white]elegeçirildi!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = İkon Değiştir
 sector.noswitch.title = Sektör Değiştirilemiyor
 sector.noswitch = Bir Sektör saldırı altındayken başka bir sektöre geçemezsin.\n\nSektör: [accent]{1}[] deki [accent]{0}[]
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index ea1123f93b..14ece0f626 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -768,8 +768,7 @@ sector.curlost = Сектор втрачено
 sector.missingresources = [scarlet]Недостатньо ресурсів у ядрі
 sector.attacked = Сектор [accent]{0}[white] під атакою!
 sector.lost = Сектор [accent]{0}[white] втрачено!
-#note: the missing space in the line below is intentional
-sector.captured = Сектор [accent]{0}[white]захоплено!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Змінити значок
 sector.noswitch.title = Неможливо переключити сектори
 sector.noswitch = Ви не можете змінювати сектори, поки поточний сектор піддається атаці.\n\nСектор: [accent]{0}[] на [accent]{1}[]
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index b8196e4826..94b65a1d21 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -760,8 +760,7 @@ sector.curlost = Khu vực đã mất
 sector.missingresources = [scarlet]Không đủ tài nguyên căn cứ
 sector.attacked = Khu vực [accent]{0}[white] đang bị tấn công!
 sector.lost = Khu vực [accent]{0}[white] đã mất!
-#note: the missing space in the line below is intentional
-sector.captured = Khu vực [accent]{0}[white]đã chiếm!
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = Thay đổi biểu tượng
 sector.noswitch.title = Không thể thay đổi sang khu vực khác
 sector.noswitch = Bạn không thể đổi sang khu vực khác khi một khu vực đang bị tấn công.\n\nKhu vực: [accent]{0}[] ở [accent]{1}[]
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index ba530fd635..33a30adbb0 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -769,8 +769,7 @@ sector.curlost = 区块已丢失
 sector.missingresources = [scarlet]建造核心所需资源不足
 sector.attacked = 区块[accent]{0}[white]受到攻击！
 sector.lost = 区块[accent]{0}[white]已丢失！
-#note: the missing space in the line below is intentional（中文无关）
-sector.captured = 区块[accent]{0}[white]已占领！
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = 更改图标
 sector.noswitch.title = 无法切换区块
 sector.noswitch = 你无法在当前区块遭受攻击时切换区块。\n\n区块：[accent]{0}[]位于[accent]{1}[]
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index a4d0aca9c9..6b212f8392 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -765,8 +765,7 @@ sector.curlost = 已失去該地區
 sector.missingresources = [scarlet]核心資源不足
 sector.attacked = 地區 [accent]{0}[white] 遭受攻擊！
 sector.lost = 地區 [accent]{0}[white] 戰敗！
-#note: the missing space in the line below is intentional
-sector.captured = 成功佔領地區[accent]{0}[white]！
+sector.capture = Sector [accent]{0}[white]Captured!
 sector.changeicon = 更改圖標
 sector.noswitch.title = 無法切換地區
 sector.noswitch = 當前地區遭受攻擊時，無法切換地區\n\n地區: [accent]{0}[] 於 [accent]{1}[]

From 1d894bdacd70c6fabe3789bc08193ed9aa0b94ce Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 14 Jan 2024 12:41:20 -0500
Subject: [PATCH 136/369] Objective marker cleanup & optimization

---
 core/assets/bundles/bundle.properties         |  2 +-
 core/src/mindustry/core/GameState.java        |  4 +-
 core/src/mindustry/core/Renderer.java         | 10 ++-
 core/src/mindustry/game/MapMarkers.java       | 72 ++++++++++++++++
 core/src/mindustry/game/MapObjectives.java    | 85 +++++++++++++------
 .../mindustry/graphics/MinimapRenderer.java   | 10 ++-
 core/src/mindustry/graphics/Shaders.java      | 13 ++-
 core/src/mindustry/io/SaveVersion.java        |  6 +-
 core/src/mindustry/logic/LExecutor.java       |  8 +-
 9 files changed, 161 insertions(+), 49 deletions(-)
 create mode 100644 core/src/mindustry/game/MapMarkers.java

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 279bbb7bbd..a0aea04348 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2326,7 +2326,7 @@ lst.setprop = Sets a property of a unit or building.
 lst.effect = Create a particle effect.
 lst.sync = Sync a variable across the network.\nLimited to 20 times a second per variable.
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
-lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.\n[accent]null []values are being ignored instead of converting to 0.
+lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.\n[accent]null []values are ignored.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
 logic.nounitbuild = [red]Unit building logic is not allowed here.
diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java
index 5d9ee3515e..7c89abe05d 100644
--- a/core/src/mindustry/core/GameState.java
+++ b/core/src/mindustry/core/GameState.java
@@ -1,11 +1,9 @@
 package mindustry.core;
 
 import arc.*;
-import arc.struct.*;
 import arc.util.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
-import mindustry.game.MapObjectives.*;
 import mindustry.gen.*;
 import mindustry.maps.*;
 import mindustry.type.*;
@@ -35,7 +33,7 @@ public class GameState{
     /** Statistics for this save/game. Displayed after game over. */
     public GameStats stats = new GameStats();
     /** Markers not linked to objectives. Controlled by world processors. */
-    public IntMap<ObjectiveMarker> markers = new IntMap<>();
+    public MapMarkers markers = new MapMarkers();
     /** Locale-specific string bundles of current map */
     public MapLocales mapLocales = new MapLocales();
     /** Global attributes of the environment, calculated by weather. */
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index a7fe83e6c2..13b1ead08f 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -375,13 +375,15 @@ public class Renderer implements ApplicationListener{
         //draw objective markers
         state.rules.objectives.eachRunning(obj -> {
             for(var marker : obj.markers){
-                if(!marker.minimap) marker.drawWorld();
+                if(!marker.minimap){
+                    marker.drawWorld();
+                }
             }
         });
 
-        for(var marker : state.markers.values()){
-            if(marker != null){
-                if(!marker.isHidden() && !marker.minimap) marker.drawWorld();
+        for(var marker : state.markers){
+            if(!marker.isHidden() && !marker.minimap){
+                marker.drawWorld();
             }
         }
 
diff --git a/core/src/mindustry/game/MapMarkers.java b/core/src/mindustry/game/MapMarkers.java
new file mode 100644
index 0000000000..3afb6895ee
--- /dev/null
+++ b/core/src/mindustry/game/MapMarkers.java
@@ -0,0 +1,72 @@
+package mindustry.game;
+
+import arc.struct.*;
+import arc.util.*;
+import mindustry.game.MapObjectives.*;
+import mindustry.io.*;
+
+import java.io.*;
+import java.util.*;
+
+public class MapMarkers implements Iterable<ObjectiveMarker>{
+    /** Maps marker unique ID to marker. */
+    private IntMap<ObjectiveMarker> map = new IntMap<>();
+    /** Sequential list of markers. This allows for faster iteration than a map. */
+    private Seq<ObjectiveMarker> all = new Seq<>(false);
+
+    public void add(int id, ObjectiveMarker marker){
+        if(marker == null) return;
+
+        var prev = map.put(id, marker);
+        if(prev != null){
+            all.set(prev.arrayIndex, marker);
+        }else{
+            all.add(marker);
+            marker.arrayIndex = all.size - 1;
+        }
+    }
+
+    public void remove(int id){
+        var prev = map.remove(id);
+        if(prev != null){
+            if(all.size > prev.arrayIndex + 1){ //there needs to be something above the index to replace it with
+                all.remove(prev.arrayIndex);
+                //update its index
+                all.get(prev.arrayIndex).arrayIndex = prev.arrayIndex;
+            }else{
+                //no sense updating the index of the replaced element when it was not replaced
+                all.remove(prev.arrayIndex);
+            }
+        }
+    }
+
+    public @Nullable ObjectiveMarker get(int id){
+        return map.get(id);
+    }
+
+    public boolean has(int id){
+        return get(id) != null;
+    }
+
+    public int size(){
+        return all.size;
+    }
+
+    public void write(DataOutput stream) throws IOException{
+        JsonIO.writeBytes(map, ObjectiveMarker.class, (DataOutputStream)stream);
+    }
+
+    public void read(DataInput stream) throws IOException{
+        all.clear();
+        map = JsonIO.readBytes(IntMap.class, ObjectiveMarker.class, (DataInputStream)stream);
+        for(var entry : map.entries()){
+            all.add(entry.value);
+            entry.value.arrayIndex = all.size - 1;
+        }
+    }
+
+    @Override
+    public Iterator<ObjectiveMarker> iterator(){
+        return all.iterator();
+    }
+}
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index ee617ac49e..879ba2ad94 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -627,10 +627,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
     /** Marker used for drawing various content to indicate something along with an objective. Mostly used as UI overlay.  */
     public static abstract class ObjectiveMarker{
-        /** Position of marker, in world coordinates */
-        public @TilePos Vec2 pos = new Vec2();
         /** Makes sure markers are only added once. */
         public transient boolean wasAdded;
+        /** Internal use only! Do not access. */
+        public transient int arrayIndex;
+
         /** Whether to display marker on minimap instead of world. {@link MinimapMarker} ignores this value. */
         public boolean minimap = false;
         /** Whether to scale marker corresponding to player's zoom level. {@link MinimapMarker} ignores this value. */
@@ -639,28 +640,31 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         protected boolean hidden = false;
         /** On which z-sorting layer is marker drawn. */
         protected float drawLayer = Layer.overlayUI;
+
         /** Draws the marker. Actual marker position and scale are calculated in {@link #drawWorld()} and {@link #drawMinimap(MinimapRenderer)}. */
         public void baseDraw(float x, float y, float scaleFactor){}
+
         /** Called in the main renderer. */
-        public void drawWorld(){
-            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
-        }
+        public void drawWorld(){}
+
         /** Called in the small and large map. */
-        public void drawMinimap(MinimapRenderer minimap){
-            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
-            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
-        }
+        public void drawMinimap(MinimapRenderer minimap){}
+
         /** Add any UI elements necessary. */
         public void added(){}
+
         /** Remove any UI elements, if necessary. */
         public void removed(){}
+
         /** Whether the marker is hidden */
         public boolean isHidden(){
             return hidden;
         }
+
         /** Control marker with world processor code. Ignores NaN (null) values. */
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(Double.isNaN(p1)) return;
+
             switch(type){
                 case visibility -> hidden = Mathf.equal((float)p1, 0f);
                 case drawLayer -> drawLayer = (float)p1;
@@ -668,6 +672,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 case autoscale -> autoscale = !Mathf.equal((float)p1, 0f);
             }
         }
+
         public void setText(String text, boolean fetch){}
 
         public void setTexture(String textureName){}
@@ -699,8 +704,46 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         }
     }
 
+    /** A marker that has a position in the world in world coordinates. */
+    public static abstract class PosMarker extends ObjectiveMarker{
+        /** Position of marker, in world coordinates */
+        public @TilePos Vec2 pos = new Vec2();
+
+        /** Called in the main renderer. */
+        @Override
+        public void drawWorld(){
+            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
+        }
+
+        /** Called in the small and large map. */
+        @Override
+        public void drawMinimap(MinimapRenderer minimap){
+            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
+            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
+        }
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            if(!Double.isNaN(p1)){
+                if(type == LMarkerControl.pos){
+                    pos.x = (float)p1 * tilesize;
+                }else{
+                    super.control(type, p1, p2, p3);
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                if(type == LMarkerControl.pos){
+                    pos.y = (float)p2 * tilesize;
+                }else{
+                    super.control(type, p1, p2, p3);
+                }
+            }
+        }
+    }
+
     /** Displays text above a shape. */
-    public static class ShapeTextMarker extends ObjectiveMarker{
+    public static class ShapeTextMarker extends PosMarker{
         public @Multiline String text = "frog";
         public float fontSize = 1f, textHeight = 7f;
         public @LabelFlag byte flags = WorldLabel.flagBackground | WorldLabel.flagOutline;
@@ -743,7 +786,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         @Override
         public void baseDraw(float x, float y, float scaleFactor){
             //in case some idiot decides to make 9999999 sides and freeze the game
-            int sides = Math.min(this.sides, 200);
+            int sides = Math.min(this.sides, 300);
 
             Draw.z(drawLayer);
             Lines.stroke(3f * scaleFactor, Pal.gray);
@@ -766,7 +809,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(!Double.isNaN(p1)){
                 switch(type){
-                    case pos -> pos.x = (float)p1 * tilesize;
                     case fontSize -> fontSize = (float)p1;
                     case textHeight -> textHeight = (float)p1;
                     case labelFlags -> {
@@ -786,7 +828,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             if(!Double.isNaN(p2)){
                 switch(type){
-                    case pos -> pos.y = (float)p2 * tilesize;
                     case labelFlags -> {
                         if(!Mathf.equal((float)p2, 0f)){
                             flags |= WorldLabel.flagOutline;
@@ -883,7 +924,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     }
 
     /** Displays a shape with an outline and color. */
-    public static class ShapeMarker extends ObjectiveMarker{
+    public static class ShapeMarker extends PosMarker{
         public float radius = 8f, rotation = 0f, stroke = 1f;
         public boolean fill = false, outline = true;
         public int sides = 4;
@@ -927,7 +968,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(!Double.isNaN(p1)){
                 switch(type){
-                    case pos -> pos.x = (float)p1 * tilesize;
                     case radius -> radius = (float)p1;
                     case stroke -> stroke = (float)p1;
                     case rotation -> rotation = (float)p1;
@@ -939,7 +979,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             if(!Double.isNaN(p2)){
                 switch(type){
-                    case pos -> pos.y = (float)p2 * tilesize;
                     case shape -> fill = !Mathf.equal((float)p2, 0f);
                     default -> super.control(type, p1, p2, p3);
                 }
@@ -956,7 +995,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     }
 
     /** Displays text at a location. */
-    public static class TextMarker extends ObjectiveMarker{
+    public static class TextMarker extends PosMarker{
         public @Multiline String text = "uwu";
         public float fontSize = 1f;
         public @LabelFlag byte flags = WorldLabel.flagBackground | WorldLabel.flagOutline;
@@ -993,7 +1032,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(!Double.isNaN(p1)){
                 switch(type){
-                    case pos -> pos.x = (float)p1 * tilesize;
                     case fontSize -> fontSize = (float)p1;
                     case labelFlags -> {
                         if(!Mathf.equal((float)p1, 0f)){
@@ -1008,7 +1046,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             if(!Double.isNaN(p2)){
                 switch(type){
-                    case pos -> pos.y = (float)p2 * tilesize;
                     case labelFlags -> {
                         if(!Mathf.equal((float)p2, 0f)){
                             flags |= WorldLabel.flagOutline;
@@ -1033,8 +1070,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     }
 
     /** Displays a line from pos1 to pos2. */
-    public static class LineMarker extends ObjectiveMarker{
-        public @TilePos Vec2 pos = new Vec2(), endPos = new Vec2();
+    public static class LineMarker extends PosMarker{
+        public @TilePos Vec2 endPos = new Vec2();
         public float stroke = 1f;
         public boolean outline = true;
         public Color color = Color.valueOf("ffd37f");
@@ -1079,7 +1116,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(!Double.isNaN(p1)){
                 switch(type){
-                    case pos -> pos.x = (float)p1 * tilesize;
                     case endPos -> endPos.x = (float)p1 * tilesize;
                     case stroke -> stroke = (float)p1;
                     case color -> color.set(Tmp.c1.fromDouble(p1));
@@ -1089,7 +1125,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             if(!Double.isNaN(p2)){
                 switch(type){
-                    case pos -> pos.y = (float)p2 * tilesize;
                     case endPos -> endPos.y = (float)p2 * tilesize;
                     default -> super.control(type, p1, p2, p3);
                 }
@@ -1098,7 +1133,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     }
 
     /** Displays a texture with specified name. */
-    public static class TextureMarker extends ObjectiveMarker{
+    public static class TextureMarker extends PosMarker{
         public float rotation = 0f, width = 0f, height = 0f; // Zero width/height scales marker to original texture's size
         public String textureName = "";
         public Color color = Color.white.cpy();
@@ -1123,7 +1158,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(!Double.isNaN(p1)){
                 switch(type){
-                    case pos -> pos.x = (float)p1 * tilesize;
                     case rotation -> rotation = (float)p1;
                     case textureSize -> width = (float)p1 * tilesize;
                     case color -> color.set(Tmp.c1.fromDouble(p1));
@@ -1133,7 +1167,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             if(!Double.isNaN(p2)){
                 switch(type){
-                    case pos -> pos.y = (float)p2 * tilesize;
                     case textureSize -> height = (float)p2 * tilesize;
                     default -> super.control(type, p1, p2, p3);
                 }
diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java
index 12694b2b8a..62df0d9c9c 100644
--- a/core/src/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/mindustry/graphics/MinimapRenderer.java
@@ -255,13 +255,15 @@ public class MinimapRenderer{
 
         state.rules.objectives.eachRunning(obj -> {
             for(var marker : obj.markers){
-                if(marker.minimap) marker.drawMinimap(this);
+                if(marker.minimap){
+                    marker.drawMinimap(this);
+                }
             }
         });
 
-        for(var marker : state.markers.values()){
-            if(marker != null){
-                if(!marker.isHidden() && marker.minimap) marker.drawMinimap(this);
+        for(var marker : state.markers){
+            if(!marker.isHidden() && marker.minimap){
+                marker.drawMinimap(this);
             }
         }
     }
diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java
index 263514a706..eb1aa22a4e 100644
--- a/core/src/mindustry/graphics/Shaders.java
+++ b/core/src/mindustry/graphics/Shaders.java
@@ -242,10 +242,17 @@ public class Shaders{
         @Override
         public void apply(){
             setUniformf("u_progress", progress);
-            setUniformf("u_uv", region.u, region.v);
-            setUniformf("u_uv2", region.u2, region.v2);
             setUniformf("u_time", time);
-            setUniformf("u_texsize", region.texture.width, region.texture.height);
+
+            if(region.texture == null){
+                setUniformf("u_uv", 0f, 0f);
+                setUniformf("u_uv2", 1f, 1f);
+                setUniformf("u_texsize", 1, 1);
+            }else{
+                setUniformf("u_uv", region.u, region.v);
+                setUniformf("u_uv2", region.u2, region.v2);
+                setUniformf("u_texsize", region.texture.width, region.texture.height);
+            }
         }
     }
 
diff --git a/core/src/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java
index e45d510893..ca7a5f4c9e 100644
--- a/core/src/mindustry/io/SaveVersion.java
+++ b/core/src/mindustry/io/SaveVersion.java
@@ -6,14 +6,12 @@ import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
-import mindustry.*;
 import mindustry.content.*;
 import mindustry.content.TechTree.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.game.*;
-import mindustry.game.MapObjectives.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
 import mindustry.maps.Map;
@@ -403,11 +401,11 @@ public abstract class SaveVersion extends SaveFileReader{
     }
 
     public void writeMarkers(DataOutput stream) throws IOException{
-        JsonIO.writeBytes(Vars.state.markers, ObjectiveMarker.class, (DataOutputStream)stream);
+        state.markers.write(stream);
     }
 
     public void readMarkers(DataInput stream) throws IOException{
-        Vars.state.markers = JsonIO.readBytes(IntMap.class, ObjectiveMarker.class, (DataInputStream)stream);
+        state.markers.read(stream);
     }
 
     public void readTeamBlocks(DataInput stream) throws IOException{
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index b32faa78aa..b152bd1e5d 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -2033,12 +2033,12 @@ public class LExecutor{
         public void run(LExecutor exec){
             var cons = MapObjectives.markerNameToType.get(type);
 
-            if(cons != null && state.markers.size < maxMarkers){
+            if(cons != null && state.markers.size() < maxMarkers){
                 int mid = exec.numi(id);
-                if(exec.bool(replace) || !state.markers.containsKey(mid)){
+                if(exec.bool(replace) || !state.markers.has(mid)){
                     var marker = cons.get();
                     marker.control(LMarkerControl.pos, exec.num(x), exec.num(y), 0);
-                    state.markers.put(mid, marker);
+                    state.markers.add(mid, marker);
                 }
             }
         }
@@ -2046,7 +2046,7 @@ public class LExecutor{
 
     @Remote(called = Loc.server, variants = Variant.both, unreliable = true)
     public static void createMarker(int id, ObjectiveMarker marker){
-        state.markers.put(id, marker);
+        state.markers.add(id, marker);
     }
 
     @Remote(called = Loc.server, variants = Variant.both, unreliable = true)

From 14854ae0a2b1d79ccbc4e66f7fd0e60e0e841aad Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 14 Jan 2024 12:47:56 -0500
Subject: [PATCH 137/369] Removed unused methods

---
 core/src/mindustry/core/NetClient.java     | 10 ----------
 core/src/mindustry/game/MapObjectives.java | 21 ---------------------
 2 files changed, 31 deletions(-)

diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index 9f6a8bf922..914e8eb003 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -342,16 +342,6 @@ public class NetClient implements ApplicationListener{
 
     @Remote(variants = Variant.both)
     public static void setObjectives(MapObjectives executor){
-        //clear old markers
-        for(var objective : state.rules.objectives){
-            for(var marker : objective.markers){
-                if(marker.wasAdded){
-                    marker.removed();
-                    marker.wasAdded = false;
-                }
-            }
-        }
-
         state.rules.objectives = executor;
     }
 
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index 879ba2ad94..f6a474399b 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -112,23 +112,10 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     /** Updates all objectives this executor contains. */
     public void update(){
         eachRunning(obj -> {
-            for(var marker : obj.markers){
-                if(!marker.wasAdded){
-                    marker.wasAdded = true;
-                    marker.added();
-                }
-            }
-
             //objectives cannot get completed on the client, but they do try to update for timers and such
             if(obj.update() && !net.client()){
                 obj.completed = true;
                 obj.done();
-                for(var marker : obj.markers){
-                    if(marker.wasAdded){
-                        marker.removed();
-                        marker.wasAdded = false;
-                    }
-                }
             }
 
             changed |= obj.changed;
@@ -627,8 +614,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
     /** Marker used for drawing various content to indicate something along with an objective. Mostly used as UI overlay.  */
     public static abstract class ObjectiveMarker{
-        /** Makes sure markers are only added once. */
-        public transient boolean wasAdded;
         /** Internal use only! Do not access. */
         public transient int arrayIndex;
 
@@ -650,12 +635,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         /** Called in the small and large map. */
         public void drawMinimap(MinimapRenderer minimap){}
 
-        /** Add any UI elements necessary. */
-        public void added(){}
-
-        /** Remove any UI elements, if necessary. */
-        public void removed(){}
-
         /** Whether the marker is hidden */
         public boolean isHidden(){
             return hidden;

From 8a5ccb3acf639b7071fcfb65c102427b263b09dc Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 14 Jan 2024 12:52:45 -0500
Subject: [PATCH 138/369] why does this suddenly not work

---
 .github/workflows/push.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 38660e3f77..de6607533e 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -33,6 +33,8 @@ jobs:
         ./gradlew updateBundles
 
         if [ -n "$(git status --porcelain)" ]; then
+          git config --global user.name "Github Actions"
+          git config --global user.email "cli@github.com"
           git add core/assets/bundles/*
           git commit -m "Automatic bundle update"
           git push

From 2f4d5fc1b24b020eab4f6304c381601152b62c66 Mon Sep 17 00:00:00 2001
From: Github Actions <cli@github.com>
Date: Sun, 14 Jan 2024 17:53:32 +0000
Subject: [PATCH 139/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 4 ++++
 core/assets/bundles/bundle_bg.properties    | 4 ++++
 core/assets/bundles/bundle_ca.properties    | 4 ++++
 core/assets/bundles/bundle_cs.properties    | 4 ++++
 core/assets/bundles/bundle_da.properties    | 4 ++++
 core/assets/bundles/bundle_de.properties    | 4 ++++
 core/assets/bundles/bundle_es.properties    | 4 ++++
 core/assets/bundles/bundle_et.properties    | 4 ++++
 core/assets/bundles/bundle_eu.properties    | 4 ++++
 core/assets/bundles/bundle_fi.properties    | 4 ++++
 core/assets/bundles/bundle_fil.properties   | 4 ++++
 core/assets/bundles/bundle_fr.properties    | 4 ++++
 core/assets/bundles/bundle_hu.properties    | 4 ++++
 core/assets/bundles/bundle_id_ID.properties | 4 ++++
 core/assets/bundles/bundle_it.properties    | 4 ++++
 core/assets/bundles/bundle_ja.properties    | 4 ++++
 core/assets/bundles/bundle_ko.properties    | 4 ++++
 core/assets/bundles/bundle_lt.properties    | 4 ++++
 core/assets/bundles/bundle_nl.properties    | 4 ++++
 core/assets/bundles/bundle_nl_BE.properties | 4 ++++
 core/assets/bundles/bundle_pl.properties    | 4 ++++
 core/assets/bundles/bundle_pt_BR.properties | 4 ++++
 core/assets/bundles/bundle_pt_PT.properties | 4 ++++
 core/assets/bundles/bundle_ro.properties    | 4 ++++
 core/assets/bundles/bundle_ru.properties    | 4 ++++
 core/assets/bundles/bundle_sr.properties    | 4 ++++
 core/assets/bundles/bundle_sv.properties    | 4 ++++
 core/assets/bundles/bundle_th.properties    | 4 ++++
 core/assets/bundles/bundle_tk.properties    | 4 ++++
 core/assets/bundles/bundle_tr.properties    | 4 ++++
 core/assets/bundles/bundle_uk_UA.properties | 4 ++++
 core/assets/bundles/bundle_vi.properties    | 4 ++++
 core/assets/bundles/bundle_zh_CN.properties | 4 ++++
 core/assets/bundles/bundle_zh_TW.properties | 4 ++++
 34 files changed, 136 insertions(+)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index c8c570b812..bb9555598d 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -2408,3 +2408,7 @@ lenum.build = Пабудаваць структуру.
 lenum.getblock = Атрымаць будынак і яго тып у каардынатах.\nАдзінка павінна быць у дыяпазоне ад каардынат.\nЦвердыя не будынкі павінны мець тып [accent]@solid[].
 lenum.within = Правярае калі адзінка знаходзіцца каля каардынат.
 lenum.boost = Пачаць/перастаць узлятаць.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 0c93161b86..e8074f5dfa 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -2438,3 +2438,7 @@ lenum.build = Построй структура.
 lenum.getblock = Преверете типът на постройката на дадени координати.\nПозицията трябва да е в обхвата на единицата.\nСолидни не-сгради ще имат типа [accent]@solid[].
 lenum.within = Проверете дали дадена позиция е в обхват на единицата.
 lenum.boost = Започни/Спри ускорението.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index edde043645..0d9c491f6a 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -2451,3 +2451,7 @@ lenum.build = Construeix una estructura.
 lenum.getblock = Obté un bloc i el seu tipus a les coordenades indicades.\nLa posició escollida ha d’estar a l’abast de la unitat.\nEls blocs que no són construccions tindran el tipus [accent]@solid[].
 lenum.within = Comprova si la unitat està a prop d’una posició.
 lenum.boost = Inicia/Detén el vol.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index e68c9cdbd5..9533193eac 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -2445,3 +2445,7 @@ lenum.build = Postavit strukturu.
 lenum.getblock = Získat budovu a typ na dané pozici.\nJednotka musí být v dosahu dané pozice.\nSolidní non-budovy budou mít typ [accent]@solid[].
 lenum.within = Zkontrolovat, jestli jednotka je blízko dané pozice.
 lenum.boost = Začít/Přestat posilovat.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 8d72d9336c..c9325e6d8b 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -2408,3 +2408,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 5ecbe76ad2..0d4fa1a90f 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -2477,3 +2477,7 @@ lenum.build = Einen Block bauen.
 lenum.getblock = Gibt den Boden- und Blocktyp an den Koordinaten zurück.\nEinheiten müssen nah genug dran sein.\nFeste nicht-Blöcke sind [accent]@solid[].
 lenum.within = Prüft, ob eine Einheit in einem Radius um einen Punkt ist.
 lenum.boost = Aktiviert / deaktiviert den Boost.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index d14f568c2a..ef7991befe 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -2470,3 +2470,7 @@ lenum.build = Construye una estructura.
 lenum.getblock = Obtiene la estructura y su categoría en unas coordenadas específicas.\nLa unidad debe estar en el rango de su posición.\nLos bloques no-construcciones tendrán el tipo [accent]@solid[].
 lenum.within = Comprueba si una unidad se encuentra cerca de una posición.
 lenum.boost = Iniciar/Detener vuelo.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 2245277ea0..b01a6100c8 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -2410,3 +2410,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index fb60b06579..ab6f4b5be3 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -2412,3 +2412,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 06087c1f4b..4222b46766 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -2413,3 +2413,7 @@ lenum.build = Rakenna tietty rakennus.
 lenum.getblock = Selvitä rakennus ja sen tyyppi tietyissä koordinaateissa.\nSijainnin täytyy olla yksikön kantamalla.\nKiinteillä ei-rakennuksilla on tyyppi [accent]@solid[].
 lenum.within = Tarkista, onko joukko tietyn sijainnin lähellä.
 lenum.boost = Aloita tai lopeta tehostus.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index dc7b69e612..9cd3a3daf6 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -2409,3 +2409,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 43dfd83db6..0e1b3031d2 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -2478,3 +2478,7 @@ lenum.build = Construit une structure.
 lenum.getblock = Récupère des données sur un bâtiment et son type aux coordonnées données.\nL'unité doit se trouver dans la portée de la position.\nLes blocs solides qui ne sont pas des bâtiments auront le type [accent]@solid[].
 lenum.within = Vérifie si l'unité est près de la position.
 lenum.boost = Active/Désactive le boost.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index ba0f82a5ef..dee0135499 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -2479,3 +2479,7 @@ lenum.build = Építs egy szerkezetet.
 lenum.getblock = Egy épület és a koordinátái típusának lekérdezése. \nAz egységnek a pozíciótartományon belül kell lennie.\nA nem szilárd épületek [accent]@solid[] típusúak lesznek.
 lenum.within = Ellenőrizze, hogy az egység egy pozíció közelében van-e.
 lenum.boost = Erősítés indítás/leállítás.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index 176bcdb5bc..fe30b45aa2 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -2468,3 +2468,7 @@ lenum.build = Membangun sebuah sttruktur.
 lenum.getblock = Mengambil bangunan dan tipenya pada koordinat tertentu.\nUnit harus ada dalam jangkauan tersebut.\nBentuk padat yang bukan merupakan bangunan akan memiliki tipe [accent]@solid[].
 lenum.within = Memeriksa apakah unit di dekat suatu posisi.
 lenum.boost = Mulai/berhenti mempercepat.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 8ecd1722ca..8f8c8e96c0 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -2422,3 +2422,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 90c9d96eaf..0d45273c1b 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -2426,3 +2426,7 @@ lenum.build = 建築をします。
 lenum.getblock = 座標から建物とタイプを取得します。\nユニットは範囲内でなければなりません。\n建物以外の物の型は [accent]@solid[] になります。
 lenum.within = ユニットが座標の近くにあるかどうかを確認します。
 lenum.boost = ブーストの開始、停止をします。
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 43dc8bff2d..f7b3cee4a3 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -2444,3 +2444,7 @@ lenum.build = 구조물 건설
 lenum.getblock = 특정 좌표의 빌딩과 블록을 반환합니다.\n위치는 기체의 인지 범위 내여야 합니다.\n자연 지형은 [accent]@solid[]의 유형을 가집니다.
 lenum.within = 좌표 주변 기체 발견 여부
 lenum.boost = 이륙 시작/중단
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index f1ad3a3144..82769f2694 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -2410,3 +2410,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 136515c639..d9e16b469d 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -2423,3 +2423,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 418f25a36d..8f0a0b9053 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -2410,3 +2410,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index d58e29c710..d39fc6514c 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -2463,3 +2463,7 @@ lenum.build = Buduj strukturę.
 lenum.getblock = Pobierz budynek i typ ze współrzędnych.\nJednostka musi być w zasięgu pozycji.\nSolidne niebudynki będą miały typ [accent]@solid[].
 lenum.within = Sprawdź czy jednostka jest w pobliżu pozycji.
 lenum.boost = Zacznij/zakończ przyspieszać.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 38079f57ae..6b22c3cea5 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -2461,3 +2461,7 @@ lenum.build = Construa uma estrutura.
 lenum.getblock = Busque uma construção e digite nas coordenadas.\nA unidade deve estar no intervalo de posição.\nConstruções sólidas não construídas terão o tipo [accent]@solid[].
 lenum.within = Verifique se a unidade está perto de uma posição.
 lenum.boost = Iniciar/parar o reforço.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index cbc570d1e9..cc0c4e3b8d 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -2410,3 +2410,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index e18ad5c34a..19320f252b 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -2446,3 +2446,7 @@ lenum.build = Construiește o structură.
 lenum.getblock = Obține clădirea și tipul clădirii aflate la coordonatele specificate.\nUnitatea trebuie să se afle în raza poziției.\nBlocurile solide care nu sunt clădiri vor avea tipul [accent]@solid[].
 lenum.within = Verifică dacă unitatea se află în apropierea poziției.
 lenum.boost = Pornește/oprește propulsorul.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 6bdbefebc5..66997bb4b8 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -2448,3 +2448,7 @@ lenum.build = Строительство блоков.
 lenum.getblock = Распознавание блока и его типа на координатах.\nЕдиница должна находиться в пределах досягаемости.\nТвёрдые не-постройки будут иметь тип [accent]@solid[].
 lenum.within = Проверка на нахождение единицы рядом с позицией.
 lenum.boost = Включение/выключение полёта.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index c13d1f953c..c4d45ca70b 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -2449,3 +2449,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 779b8ba071..8f9514f85a 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -2410,3 +2410,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 7522f06626..74fc4d3819 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -2467,3 +2467,7 @@ lenum.build = สร้างสิ่งก่อสร้าง
 lenum.getblock = ดึงข้อมูลสิ่งก่อสร้างและประเภทของสิ่งก่อสร้างที่ตำแหน่งเป้าหมาย\nยูนิตต้องอยู่ในระยะของตำแหน่ง\nบล็อกตันที่ไม่ใช่สิ่งก่อสร้างจะมีชนิดเป็น [accent]@solid[]
 lenum.within = ตรวจสอบว่ายูนิตนั้นอยู่ในระยะหรือไม่
 lenum.boost = เริ่ม/หยุดการบูสต์
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 2e476ded50..c7dd2ddbfc 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -2410,3 +2410,7 @@ lenum.build = Build a structure.
 lenum.getblock = Fetch a building and type at coordinates.\nUnit must be in range of position.\nSolid non-buildings will have the type [accent]@solid[].
 lenum.within = Check if unit is near a position.
 lenum.boost = Start/stop boosting.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index d45152c39b..079f563982 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -2446,3 +2446,7 @@ lenum.build = Bina inşa et.
 lenum.getblock = Bir bloğun verilerini al.
 lenum.within = Bir birim menzil alanında mı?
 lenum.boost = Boostlamaya başla/dur
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 14ece0f626..635b46d128 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -2474,3 +2474,7 @@ lenum.build = Побудувати будівлю.
 lenum.getblock = Розпізнавання блока та його типа за координатами.\nОдиниця повинна знаходитися в межах досяжності.\nСуцільні не-будівлі матимуть тип [accent]@solid[].
 lenum.within = Чи знаходиться одиниця біля позиції.
 lenum.boost = Почати чи зупинити політ.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 94b65a1d21..e3c46ee395 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -2447,3 +2447,7 @@ lenum.build = Xây công trình.
 lenum.getblock = Lấy một cấu trúc và kiểu tại một tọa độ.\nĐơn vị phải nằm trong tầm của vị trí.\nKhối rắn không phải công trình có kiểu [accent]@solid[].
 lenum.within = Kiểm tra xem đơn vị có gần vị trí không.
 lenum.boost = Bắt đầu/Dừng tăng tốc.
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 33a30adbb0..b6c286b73c 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -2473,3 +2473,7 @@ lenum.build = 建造建筑
 lenum.getblock = 获取某个坐标处的建筑及其类型\n坐标需要在单位的感知范围内\n无建筑的地面返回[accent]@air[]，墙壁返回[accent]@solid[]
 lenum.within = 检查单位是否接近了某个位置
 lenum.boost = 开始/停止助推
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 6b212f8392..bf1d9c843e 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -2459,3 +2459,7 @@ lenum.build = 建造一個建築
 lenum.getblock = 獲取指定位置的建築種類和該建築\n必須在單位的範圍內\n實體障礙物，如高山會回傳[accent]@solid[]
 lenum.within = 單位是否在指定範圍內
 lenum.boost = 使用推進器
+lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
+lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
+lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
+lenum.autoscale = Whether to scale marker corresponding to player's zoom level.

From 292c08fe63681ada2ece6785d0f505ed79128f5f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 14 Jan 2024 12:54:06 -0500
Subject: [PATCH 140/369] ?

---
 .github/workflows/push.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index de6607533e..d1194129d5 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -34,7 +34,6 @@ jobs:
 
         if [ -n "$(git status --porcelain)" ]; then
           git config --global user.name "Github Actions"
-          git config --global user.email "cli@github.com"
           git add core/assets/bundles/*
           git commit -m "Automatic bundle update"
           git push

From 7440f195ba862a1fdc0996cd3688fc9f109ddf0f Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <29004178+Redstonneur1256@users.noreply.github.com>
Date: Mon, 15 Jan 2024 03:55:37 +0100
Subject: [PATCH 141/369] Allow markers to use any texture (#9455)

---
 core/assets/contributors                   |  1 +
 core/src/mindustry/game/MapObjectives.java | 26 ++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/core/assets/contributors b/core/assets/contributors
index f3c6f10bfc..b16023715e 100644
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -163,3 +163,4 @@ Yoru Kitsune
 summoner
 OpalSoPL
 BalaM314
+Redstonneur1256
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index f6a474399b..dd64aa9106 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -1156,27 +1156,35 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public void baseDraw(float x, float y, float scaleFactor){
             if(textureName.isEmpty()) return;
 
-            if(fetchedRegion == null) fetchedRegion = Core.atlas.find(textureName);
+            if(fetchedRegion == null) setTexture(textureName);
 
             // Zero width/height scales marker to original texture's size
             if(Mathf.equal(width, 0f)) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
             if(Mathf.equal(height, 0f)) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
 
             Draw.z(drawLayer);
-            if(fetchedRegion.found()){
-                Draw.color(color);
-                Draw.rect(fetchedRegion, x, y, width * scaleFactor, height * scaleFactor, rotation);
-            }else{
-                Draw.color(Color.white);
-                Draw.rect("error", x, y, width * scaleFactor, height * scaleFactor, rotation);
-            }
+            Draw.color(color);
+            Draw.rect(fetchedRegion, x, y, width * scaleFactor, height * scaleFactor, rotation);
         }
 
         @Override
         public void setTexture(String textureName){
             this.textureName = textureName;
-            fetchedRegion = Core.atlas.find(textureName);
+
+            if(fetchedRegion == null) fetchedRegion = new TextureRegion();
+
+            TextureRegion region = Core.atlas.find(textureName);
+            if(region.found()){
+               fetchedRegion.set(region);
+            }else{
+                if(Core.assets.isLoaded(textureName, Texture.class)){
+                    fetchedRegion.set(Core.assets.get(textureName, Texture.class));
+                }else{
+                    fetchedRegion.set(Core.atlas.find("error"));
+                }
+            }
         }
+
     }
 
     /** For arrays or {@link Seq}s; does not create element rearrangement buttons. */

From 931c03945d3bf82206f2cceac06fb071390ed52c Mon Sep 17 00:00:00 2001
From: BlackDeluxeCat <65377021+BlackDeluxeCat@users.noreply.github.com>
Date: Tue, 16 Jan 2024 01:58:36 +0800
Subject: [PATCH 142/369] Further Fixed #7310 (#9456)

---
 core/src/mindustry/logic/LExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index b152bd1e5d..10cbdf07b3 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -62,7 +62,7 @@ public class LExecutor{
     public boolean privileged = false;
 
     //yes, this is a minor memory leak, but it's probably not significant enough to matter
-    protected IntFloatMap unitTimeouts = new IntFloatMap();
+    protected static IntFloatMap unitTimeouts = new IntFloatMap();
 
     boolean timeoutDone(Unit unit, float delay){
         return Time.time >= unitTimeouts.get(unit.id) + delay;

From 944797f8e1aa8c768e7022478e9fe4a71d0cbde8 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 15 Jan 2024 12:59:21 -0500
Subject: [PATCH 143/369] Cleared unit timeouts on reset

---
 core/src/mindustry/logic/LExecutor.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 10cbdf07b3..b7f5163e60 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -14,6 +14,7 @@ import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.game.*;
+import mindustry.game.EventType.*;
 import mindustry.game.MapObjectives.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
@@ -64,6 +65,10 @@ public class LExecutor{
     //yes, this is a minor memory leak, but it's probably not significant enough to matter
     protected static IntFloatMap unitTimeouts = new IntFloatMap();
 
+    static{
+        Events.on(ResetEvent.class, e -> unitTimeouts.clear());
+    }
+
     boolean timeoutDone(Unit unit, float delay){
         return Time.time >= unitTimeouts.get(unit.id) + delay;
     }

From 22b1639b6f9809bad740de026c6c05759dab623e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 17 Jan 2024 08:51:18 -0500
Subject: [PATCH 144/369] Fixed #9463

---
 core/src/mindustry/audio/SoundControl.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/audio/SoundControl.java b/core/src/mindustry/audio/SoundControl.java
index f035306b2c..980166227a 100644
--- a/core/src/mindustry/audio/SoundControl.java
+++ b/core/src/mindustry/audio/SoundControl.java
@@ -17,7 +17,7 @@ import static mindustry.Vars.*;
 
 /** Controls playback of multiple audio tracks.*/
 public class SoundControl{
-    public float finTime = 120f, foutTime = 120f, musicInterval = 3f * Time.toMinutes, musicChance = 0.6f, musicWaveChance = 0.46f;
+    public float finTime = 120f, foutTime = 120f, musicInterval = 3f * Time.toMinutes, musicChance = 0.8f, musicWaveChance = 0.46f;
 
     /** normal, ambient music, plays at any time */
     public Seq<Music> ambientMusic = Seq.with();
@@ -28,6 +28,7 @@ public class SoundControl{
 
     protected Music lastRandomPlayed;
     protected Interval timer = new Interval(4);
+    protected long lastPlayed;
     protected @Nullable Music current;
     protected float fade;
     protected boolean silenced;
@@ -55,6 +56,10 @@ public class SoundControl{
         }));
 
         setupFilters();
+
+        Events.on(ResetEvent.class, e -> {
+            lastPlayed = Time.millis();
+        });
     }
 
     protected void setupFilters(){
@@ -160,9 +165,10 @@ public class SoundControl{
             silence();
 
             //play music at intervals
-            if(timer.get(musicInterval)){
+            if(Time.timeSinceMillis(lastPlayed) > 1000 * musicInterval / 60f){
                 //chance to play it per interval
                 if(Mathf.chance(musicChance)){
+                    lastPlayed = Time.millis();
                     playRandom();
                 }
             }

From 0c233319d9f073ed97f14dce53d1fd3102448832 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 17 Jan 2024 12:47:19 -0500
Subject: [PATCH 145/369] Fixed recoil for continuous weapons with offset

---
 core/src/mindustry/type/Weapon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index 0864d670eb..0dc9843208 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -366,7 +366,7 @@ public class Weapon implements Cloneable{
                 mount.bullet.set(bulletX, bulletY);
                 mount.reload = reload;
                 mount.recoil = 1f;
-                unit.vel.add(Tmp.v1.trns(unit.rotation + 180f, mount.bullet.type.recoil * Time.delta));
+                unit.vel.add(Tmp.v1.trns(mount.bullet.rotation() + 180f, mount.bullet.type.recoil * Time.delta));
                 if(shootSound != Sounds.none && !headless){
                     if(mount.sound == null) mount.sound = new SoundLoop(shootSound, 1f);
                     mount.sound.update(bulletX, bulletY, true);

From 367a20c8911161ac46490276dc57b38b7715b299 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 19 Jan 2024 19:57:15 -0500
Subject: [PATCH 146/369] Disallow diagonal placement for bridges

---
 .../src/mindustry/world/blocks/distribution/DirectionBridge.java | 1 +
 core/src/mindustry/world/blocks/distribution/ItemBridge.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/src/mindustry/world/blocks/distribution/DirectionBridge.java b/core/src/mindustry/world/blocks/distribution/DirectionBridge.java
index 97e38584f7..2c0077cc99 100644
--- a/core/src/mindustry/world/blocks/distribution/DirectionBridge.java
+++ b/core/src/mindustry/world/blocks/distribution/DirectionBridge.java
@@ -40,6 +40,7 @@ public class DirectionBridge extends Block{
         priority = TargetPriority.transport;
         envEnabled = Env.space | Env.terrestrial | Env.underwater;
         drawArrow = false;
+        allowDiagonal = false;
         regionRotated1 = 1;
     }
 
diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
index 8688ae7889..2663365fc2 100644
--- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java
+++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
@@ -53,6 +53,7 @@ public class ItemBridge extends Block{
         unloadable = false;
         group = BlockGroup.transportation;
         noUpdateDisabled = true;
+        allowDiagonal = false;
         copyConfig = false;
         //disabled as to not be annoying
         allowConfigInventory = false;

From 2366041cfb694505b23e0ea09b633e30a3f7e6a2 Mon Sep 17 00:00:00 2001
From: PolarStar <107398572+PoIarStar@users.noreply.github.com>
Date: Sat, 20 Jan 2024 03:57:40 +0300
Subject: [PATCH 147/369] Update servers_v7.json (#9474)

The address of the attack server has been updated
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index d6b3b00ba3..a40d869a53 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -17,7 +17,7 @@
   },
   {
     "name": "CMS Empire",
-    "address": ["195.2.84.144","178.20.45.250"]
+    "address": ["195.2.84.144","95.84.198.97"]
   },
   {
     "name": "ShardDustry Eventos",

From 05fcc603b477c4541973982a05003191b9ad278f Mon Sep 17 00:00:00 2001
From: Gadgetroch <46190566+Gadgetroch@users.noreply.github.com>
Date: Sat, 20 Jan 2024 01:57:51 +0100
Subject: [PATCH 148/369] Update servers_v7.json (#9470)

add erekir server
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index a40d869a53..e83eecbb22 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -266,7 +266,7 @@
   },
   {
     "name": "Gadgetroch's Server",
-    "address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568"]
+    "address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568", "mindustry.gadgetroch.com:6569"]
   },
   {
     "name": "Duel.Server",

From ef4a07a94f4af27260996d814839f81b81392b4e Mon Sep 17 00:00:00 2001
From: alex <67626131+alexpvpmindustry@users.noreply.github.com>
Date: Sat, 20 Jan 2024 08:58:11 +0800
Subject: [PATCH 149/369] Update servers_v7.json (#9475)

add france servers
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index e83eecbb22..862a1ddbb8 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -242,7 +242,7 @@
   },
   {
     "name": "Alex Multiverse",
-    "address": ["alexmindustryv7.servegame.com:25588", "172.234.80.96:6768", "139.162.41.78:6767", "172.245.187.143:6868", "172.245.187.143:6869" ]
+    "address": ["alexmindustryv7.servegame.com:25588", "172.234.80.96:6768", "139.162.41.78:6767", "172.245.187.143:6868", "172.245.187.143:6869", "92.119.127.171:6888" ]
   },
   {
     "name": "Open PVP",

From 68f82e7b44ea7df4697a1f01b08cc3503fdbbd4e Mon Sep 17 00:00:00 2001
From: GeoNew2011 <152255543+GeoNew2011@users.noreply.github.com>
Date: Sat, 20 Jan 2024 03:58:38 +0300
Subject: [PATCH 150/369] Update servers_v7.json (#9473)

added erepulo
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index 862a1ddbb8..ec929c5e7c 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -276,4 +276,8 @@
     "name": "AZDustry",
     "address": ["118.127.8.162:25628"]
   }
+  {
+    "name": "Erepulo",
+    "address": ["95.84.198.97:5401", "95.84.198.97:5402", "95.84.198.97:5403"]
+  }
 ]

From 2297aed1c92fdb67ac54720c94a7ea9d2c285b90 Mon Sep 17 00:00:00 2001
From: nega0311 <139965763+totto0311@users.noreply.github.com>
Date: Sat, 20 Jan 2024 09:58:57 +0900
Subject: [PATCH 151/369] Add new pvp servers to Duel.server. (#9471)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index ec929c5e7c..86d6cba0bd 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -270,7 +270,7 @@
   },
   {
     "name": "Duel.Server",
-    "address":["160.251.41.148:6568","160.251.41.148:6569"]
+    "address":["160.251.41.148:6567","160.251.41.148:6568","160.251.41.148:6569","160.251.41.148:6570"]
   },
   {
     "name": "AZDustry",

From 778e61e8d5422741c9474c409ebc2c348d6ee55d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 20 Jan 2024 08:10:24 -0500
Subject: [PATCH 152/369] Update servers_v7.json

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 86d6cba0bd..d9687a6c19 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -275,7 +275,7 @@
   {
     "name": "AZDustry",
     "address": ["118.127.8.162:25628"]
-  }
+  },
   {
     "name": "Erepulo",
     "address": ["95.84.198.97:5401", "95.84.198.97:5402", "95.84.198.97:5403"]

From 9d4f5ff87ccf977d181e2db9e9023d00e6ed2290 Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <29004178+Redstonneur1256@users.noreply.github.com>
Date: Sat, 20 Jan 2024 15:37:18 +0100
Subject: [PATCH 153/369] Fix wait instruction inconsistency (#9479)

---
 core/src/mindustry/logic/LExecutor.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index b7f5163e60..44e03ef12c 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1230,7 +1230,6 @@ public class LExecutor{
         public int value;
 
         public float curTime;
-        public long frameId;
 
         public WaitI(int value){
             this.value = value;
@@ -1247,11 +1246,7 @@ public class LExecutor{
                 //skip back to self.
                 exec.var(varCounter).numval --;
                 exec.yield = true;
-            }
-
-            if(state.updateId != frameId){
                 curTime += Time.delta / 60f;
-                frameId = state.updateId;
             }
         }
     }

From b8ab3fcc90324fb0770cf5db1c00b6fe71d67c27 Mon Sep 17 00:00:00 2001
From: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com>
Date: Sun, 21 Jan 2024 00:13:41 +0700
Subject: [PATCH 154/369] Indonesian localization for Steam game page (#9461)

* Indonesian localization for Steam

* id_ID Steam description fix

left untouched as is from the main repo
---
 .../steam/indonesian/achievements.vdf         | 183 ++++++++++++++++++
 .../metadata/steam/indonesian/description.txt |  62 ++++++
 .../steam/indonesian/short-description.txt    |   1 +
 3 files changed, 246 insertions(+)
 create mode 100644 fastlane/metadata/steam/indonesian/achievements.vdf
 create mode 100644 fastlane/metadata/steam/indonesian/description.txt
 create mode 100644 fastlane/metadata/steam/indonesian/short-description.txt

diff --git a/fastlane/metadata/steam/indonesian/achievements.vdf b/fastlane/metadata/steam/indonesian/achievements.vdf
new file mode 100644
index 0000000000..417527f198
--- /dev/null
+++ b/fastlane/metadata/steam/indonesian/achievements.vdf
@@ -0,0 +1,183 @@
+"lang"
+{
+	"Language"	"indonesian"
+	"Tokens"
+	{
+		"NEW_ACHIEVEMENT_20_1_NAME"	"Scrapper"
+		"NEW_ACHIEVEMENT_20_1_DESC"	"Hancurkan 1000 unit musuh."
+		"NEW_ACHIEVEMENT_20_2_NAME"	"Purge"
+		"NEW_ACHIEVEMENT_20_2_DESC"	"Hancurkan 100.000 unit musuh."
+		"NEW_ACHIEVEMENT_20_5_NAME"	"Endless Shipments"
+		"NEW_ACHIEVEMENT_20_5_DESC"	"Luncurkan 100.000 item secara keseluruhan."
+		"NEW_ACHIEVEMENT_20_6_NAME"	"Penakluk"
+		"NEW_ACHIEVEMENT_20_6_DESC"	"Menangkan 10 pertandingan dalam mode penyerangan."
+		"NEW_ACHIEVEMENT_20_7_NAME"	"Jawara"
+		"NEW_ACHIEVEMENT_20_7_DESC"	"Menangkan 10 pertandingan PvP multipemain."
+		"NEW_ACHIEVEMENT_20_8_NAME"	"Secepat Kilat"
+		"NEW_ACHIEVEMENT_20_8_DESC"	"Hancurkan inti musuh pada zona penyerangan dalam 5 gelombang atau kurang."
+		"NEW_ACHIEVEMENT_20_9_NAME"	"Hujan Inti"
+		"NEW_ACHIEVEMENT_20_9_DESC"	"Luncurkan inti sebanyak 30 kali."
+		"NEW_ACHIEVEMENT_20_10_NAME"	"Kegigihan"
+		"NEW_ACHIEVEMENT_20_10_DESC"	"Bertahan hingga 100 gelombang."
+		"NEW_ACHIEVEMENT_20_12_NAME"	"Periset"
+		"NEW_ACHIEVEMENT_20_12_DESC"	"Buka semua riset yang ada."
+		"NEW_ACHIEVEMENT_20_14_NAME"	"Overload"
+		"NEW_ACHIEVEMENT_20_14_DESC"	"Tembak musuh yang basah dengan listrik."
+		"NEW_ACHIEVEMENT_20_15_NAME"	"Deflection"
+		"NEW_ACHIEVEMENT_20_15_DESC"	"Hancurkan unit dengan tembakan pantulannya sendiri."
+		"NEW_ACHIEVEMENT_20_17_NAME"	"Kesalahan Besar"
+		"NEW_ACHIEVEMENT_20_17_DESC"	"Buka riset Pengarah."
+		"NEW_ACHIEVEMENT_20_18_NAME"	"Pencipta"
+		"NEW_ACHIEVEMENT_20_18_DESC"	"Letakkan 10,000 blok."
+		"NEW_ACHIEVEMENT_20_19_NAME"	"Raze"
+		"NEW_ACHIEVEMENT_20_19_DESC"	"Hancurkan 1,000 blok musuh."
+		"NEW_ACHIEVEMENT_20_20_NAME"	"A Spectacular Disaster"
+		"NEW_ACHIEVEMENT_20_20_DESC"	"Biarkan Reaktor Thorium memanas lalu meledak."
+		"NEW_ACHIEVEMENT_20_21_NAME"	"Mapper"
+		"NEW_ACHIEVEMENT_20_21_DESC"	"Buat peta baru sebanyak 10 kali."
+		"NEW_ACHIEVEMENT_20_22_NAME"	"Peramban"
+		"NEW_ACHIEVEMENT_20_22_DESC"	"Unduh peta dari Workshop."
+		"NEW_ACHIEVEMENT_20_23_NAME"	"Kreator"
+		"NEW_ACHIEVEMENT_20_23_DESC"	"Publikasikan peta ke Workshop."
+		"NEW_ACHIEVEMENT_20_24_NAME"	"Slayer"
+		"NEW_ACHIEVEMENT_20_24_DESC"	"Kalahkan boss."
+		"NEW_ACHIEVEMENT_20_29_NAME"	"Material II"
+		"NEW_ACHIEVEMENT_20_29_DESC"	"Temukan Thorium."
+		"NEW_ACHIEVEMENT_20_31_NAME"	"Material I"
+		"NEW_ACHIEVEMENT_20_31_DESC"	"Temukan Titanium."
+		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
+		"NEW_ACHIEVEMENT_21_0_DESC"	"Isi penuh unit biasa dengan bahan yang mudah meledak lalu hancurkan unitnya."
+		"NEW_ACHIEVEMENT_21_1_NAME"	"Sudah Waktunya"
+		"NEW_ACHIEVEMENT_21_1_DESC"	"Bangun pabrik unit darat."
+		"NEW_ACHIEVEMENT_21_2_NAME"	"Serangan Langsung"
+		"NEW_ACHIEVEMENT_21_2_DESC"	"Issue the Attack command using the Command Center."
+		"NEW_ACHIEVEMENT_21_3_NAME"	"Swarm"
+		"NEW_ACHIEVEMENT_21_3_DESC"	"Miliki 100 unit aktif secara bersamaan."
+		"NEW_ACHIEVEMENT_21_4_NAME"	"Flock"
+		"NEW_ACHIEVEMENT_21_4_DESC"	"Miliki 10 Poly aktif secara bersamaan."
+		"NEW_ACHIEVEMENT_21_5_NAME"	"Roboticist"
+		"NEW_ACHIEVEMENT_21_5_DESC"	"Buat setiap tipe unit."
+		"NEW_ACHIEVEMENT_21_6_NAME"	"Legions"
+		"NEW_ACHIEVEMENT_21_6_DESC"	"Buat 1000 unit."
+		"NEW_ACHIEVEMENT_21_9_NAME"	"Dengarkan Nasihat Dulu"
+		"NEW_ACHIEVEMENT_21_9_DESC"	"Hancur di dalam zona pendaratan musuh."
+		"NEW_ACHIEVEMENT_21_10_NAME"	"Percuma Ada Unit Laut Kalau Begitu"
+		"NEW_ACHIEVEMENT_21_10_DESC"	"Tenggelam."
+		"NEW_ACHIEVEMENT_21_11_NAME"	"Kolektor"
+		"NEW_ACHIEVEMENT_21_11_DESC"	"Isi inti hingga kapasitas penuh dengan semua jenis material."
+		"NEW_ACHIEVEMENT_21_12_NAME"	"Crowd"
+		"NEW_ACHIEVEMENT_21_12_DESC"	"Host server dengan 10 pemain bergabung."
+		"NEW_ACHIEVEMENT_21_13_NAME"	"Invulnerable"
+		"NEW_ACHIEVEMENT_21_13_DESC"	"Bangun menara Meltdown, Spectre dan Foreshadow."
+		"NEW_ACHIEVEMENT_21_14_NAME"	"Lepas Landas"
+		"NEW_ACHIEVEMENT_21_14_DESC"	"Gunakan Launch Pad."
+		"NEW_ACHIEVEMENT_21_16_NAME"	"Heresy"
+		"NEW_ACHIEVEMENT_21_16_DESC"	"Bangun dua pengarah berdekatan satu sama lain."
+		"NEW_ACHIEVEMENT_21_17_NAME"	"Lone Guardian"
+		"NEW_ACHIEVEMENT_21_17_DESC"	"Bertahan sebanyak 10 gelombang pada zona apapun tanpa menaruh blok apapun."
+		"NEW_ACHIEVEMENT_21_18_NAME"	"Incinerate"
+		"NEW_ACHIEVEMENT_21_18_DESC"	"Gunakan Pyratit dalam menara apapun."
+		"NEW_ACHIEVEMENT_21_19_NAME"	"Efisien"
+		"NEW_ACHIEVEMENT_21_19_DESC"	"Dinginkan menara dengan air atau cairan dingin."
+		"NEW_ACHIEVEMENT_21_20_NAME"	"Mode Klasik"
+		"NEW_ACHIEVEMENT_21_20_DESC"	"Hidupkan pikselasi."
+		"NEW_ACHIEVEMENT_21_21_NAME"	"Scholar"
+		"NEW_ACHIEVEMENT_21_21_DESC"	"Buka Wiki dari dalam game."
+		"NEW_ACHIEVEMENT_21_22_NAME"	"Head Start"
+		"NEW_ACHIEVEMENT_21_22_DESC"	"Meluncur ke zona dengan membawa 10.000 atau lebih item."
+		"NEW_ACHIEVEMENT_21_23_NAME"	"Penyalaan"
+		"NEW_ACHIEVEMENT_21_23_DESC"	"Nyalakan sebuah Reaktor Benturan."
+		"NEW_ACHIEVEMENT_21_25_NAME"	"The Spiral"
+		"NEW_ACHIEVEMENT_21_25_DESC"	"Aku pusing tujuh keliling..."
+		"NEW_ACHIEVEMENT_21_26_NAME"	"Escalation"
+		"NEW_ACHIEVEMENT_21_26_DESC"	"Buat unit Tingkat 5."
+		"NEW_ACHIEVEMENT_21_27_NAME"	"Arsitek"
+		"NEW_ACHIEVEMENT_21_27_DESC"	"Buat 20 skematik."
+		"NEW_ACHIEVEMENT_21_28_NAME"	"Dominasi Dunia"
+		"NEW_ACHIEVEMENT_21_28_DESC"	"Taklukkan semua sektor di Serpulo."
+		"NEW_ACHIEVEMENT_21_29_NAME"	"Lepas Landas"
+		"NEW_ACHIEVEMENT_21_29_DESC"	"Angkut sebuah unit T5 dengan unit Oct."
+		"NEW_ACHIEVEMENT_21_30_NAME"	"Wujud Tertinggi"
+		"NEW_ACHIEVEMENT_21_30_DESC"	"Bergabunglah."
+		"NEW_ACHIEVEMENT_21_31_NAME"	"Produksi I"
+		"NEW_ACHIEVEMENT_21_31_DESC"	"Raih total produksi 5,000 item/menit dalam kampanye."
+		"NEW_ACHIEVEMENT_26_0_NAME"	"Produksi II"
+		"NEW_ACHIEVEMENT_26_0_DESC"	"Raih total produksi 50,000 item/menit dalam kampanye."
+		"NEW_ACHIEVEMENT_26_1_NAME"	"Kemenangan Mutlak"
+		"NEW_ACHIEVEMENT_26_1_DESC"	"Taklukkan suatu sektor saat bermain di sektor yang berbeda."
+		"NEW_ACHIEVEMENT_26_2_NAME"	"Kerajaan Kecil"
+		"NEW_ACHIEVEMENT_26_2_DESC"	"Kendalikan 10 sektor secara bersamaan."
+		"NEW_ACHIEVEMENT_26_3_NAME"	"Desainer"
+		"NEW_ACHIEVEMENT_26_3_DESC"	"Buat 500 skematik."
+		"NEW_ACHIEVEMENT_26_4_NAME"	"Master of Distribution"
+		"NEW_ACHIEVEMENT_26_4_DESC"	"Gunakan semua blok transportasi (dari satu planet) dalam peta yang sama."
+		"NEW_ACHIEVEMENT_26_5_NAME"	"Percepatan"
+		"NEW_ACHIEVEMENT_26_5_DESC"	"Bangun sebuah Proyektor Pemercepat."
+		"NEW_ACHIEVEMENT_26_6_NAME"	"Penyembuhan"
+		"NEW_ACHIEVEMENT_26_6_DESC"	"Bangun sebuah Proyektor Penyembuh."
+		"NEW_ACHIEVEMENT_26_7_NAME"	"Tidak Efisien"
+		"NEW_ACHIEVEMENT_26_7_DESC"	"Bangun sebuah Pengekstrak Air di air, yang seharusnya menggunakan pompa."
+		"NEW_ACHIEVEMENT_26_8_NAME"	"Stockpile"
+		"NEW_ACHIEVEMENT_26_8_DESC"	"Kumpulkan 10 juta item dalam kampanye."
+		"NEW_ACHIEVEMENT_26_9_NAME"	"Against All Odds"
+		"NEW_ACHIEVEMENT_26_9_DESC"	"Hancurkan unit Eclipse yang diakhiri tembakan oleh menara Duo."
+		"NEW_ACHIEVEMENT_26_10_NAME"	"Erekir Completion"
+		"NEW_ACHIEVEMENT_26_10_DESC"	"Taklukkan sektor terakhir di Erekir."
+		"NEW_ACHIEVEMENT_26_11_NAME"	"Serpulo Completion"
+		"NEW_ACHIEVEMENT_26_11_DESC"	"Taklukkan sektor terakhir di Serpulo."
+		"NEW_ACHIEVEMENT_26_12_NAME"	"Loadout"
+		"NEW_ACHIEVEMENT_26_12_DESC"	"Luncurkan dengan skema inti kustom di planet Serpulo."
+		"NEW_ACHIEVEMENT_26_13_NAME"	"Overprepared"
+		"NEW_ACHIEVEMENT_26_13_DESC"	"Tingkatkan inti pada Ground Zero menjadi Nukleus."
+		"NEW_ACHIEVEMENT_26_14_NAME"	"Outbreak"
+		"NEW_ACHIEVEMENT_26_14_DESC"	"Biarkan neoplasma menyebar ke blok yang mengisi cairan."
+		"NEW_ACHIEVEMENT_26_15_NAME"	"Brittle"
+		"NEW_ACHIEVEMENT_26_15_DESC"	"Berikan kerusakan ledakan tambahan pada unit yang terkena status efek Membeku."
+		"NEW_ACHIEVEMENT_26_16_NAME"	"Serpulo Structure Mastery"
+		"NEW_ACHIEVEMENT_26_16_DESC"	"Bangun semua blok yang tersedia di Serpulo."
+		"NEW_ACHIEVEMENT_26_17_NAME"	"Erekir Structure Mastery"
+		"NEW_ACHIEVEMENT_26_17_DESC"	"Bangun semua blok yang tersedia di Erekir."
+		"NEW_ACHIEVEMENT_26_18_NAME"	"Shields Down"
+		"NEW_ACHIEVEMENT_26_18_DESC"	"Hancurkan an enemy Force Projector's shield."
+		"NEW_ACHIEVEMENT_26_19_NAME"	"Di Mana Buku Petunjuknya?"
+		"NEW_ACHIEVEMENT_26_19_DESC"	"Buka riset mikro-prosesor."
+		"NEW_ACHIEVEMENT_26_20_NAME"	"Pemadaman"
+		"NEW_ACHIEVEMENT_26_20_DESC"	"Capai -10rb/dtk pasokan tenaga dalam jaringan."
+		"NEW_ACHIEVEMENT_26_21_NAME"	"Power Surge"
+		"NEW_ACHIEVEMENT_26_21_DESC"	"Capai hingga 100rb/dtk tenaga."
+		"NEW_ACHIEVEMENT_26_22_NAME"	"Tegangan Tinggi"
+		"NEW_ACHIEVEMENT_26_22_DESC"	"Miliki 1 juta tenaga stored in batteries in a network."
+		"NEW_ACHIEVEMENT_26_23_NAME"	"Ide Buruk"
+		"NEW_ACHIEVEMENT_26_23_DESC"	"Masukan senyawa peledak dalam generator pembakar."
+		"NEW_ACHIEVEMENT_26_24_NAME"	"Kontaminasi"
+		"NEW_ACHIEVEMENT_26_24_DESC"	"Jadilah saksi meledaknya Reaktor Neoplasia yang disebabkan oleh penumpukan neoplasma."
+		"NEW_ACHIEVEMENT_26_25_NAME"	"Termodifikasi"
+		"NEW_ACHIEVEMENT_26_25_DESC"	"Pasang sebuah mod."
+		"NEW_ACHIEVEMENT_26_26_NAME"	"pengarah"
+		"NEW_ACHIEVEMENT_26_26_DESC"	"pengarah"
+		"NEW_ACHIEVEMENT_26_27_NAME"	"Pengalaman Penuh"
+		"NEW_ACHIEVEMENT_26_27_DESC"	"Masuk dalam peladen komunitas."
+		"NEW_ACHIEVEMENT_26_28_NAME"	"Peretas"
+		"NEW_ACHIEVEMENT_26_28_DESC"	"Buka terminal untuk skripting."
+		"NEW_ACHIEVEMENT_26_29_NAME"	"Kendali Langsung"
+		"NEW_ACHIEVEMENT_26_29_DESC"	"Perintahkan menara secara manual."
+		"NEW_ACHIEVEMENT_26_30_NAME"	"Behind Enemy Lines"
+		"NEW_ACHIEVEMENT_26_30_DESC"	"Jatuhkan unit dalam zona inti anti-membangun musuh."
+		"NEW_ACHIEVEMENT_26_31_NAME"	"Vengeance"
+		"NEW_ACHIEVEMENT_26_31_DESC"	"Hancurkan menara scatter dengan unit flare."
+		"NEW_ACHIEVEMENT_29_0_NAME"	"Mengudara"
+		"NEW_ACHIEVEMENT_29_0_DESC"	"Gunakan fungsi boost pada unit darat."
+		"NEW_ACHIEVEMENT_29_1_NAME"	"Amphibi"
+		"NEW_ACHIEVEMENT_29_1_DESC"	"Gunakan unit Elude untuk menyebrangi cairan."
+		"NEW_ACHIEVEMENT_29_2_NAME"	"Ubin Pemercepat"
+		"NEW_ACHIEVEMENT_29_2_DESC"	"Naikkan efisiensi bangunan dengan menempatkannya di ubin tertentu."
+		"NEW_ACHIEVEMENT_29_3_NAME"	"Bersih-bersih"
+		"NEW_ACHIEVEMENT_29_3_DESC"	"Hancurkan 100 bebatuan kecil."
+		"NEW_ACHIEVEMENT_29_4_NAME"	"The Global Sweep"
+		"NEW_ACHIEVEMENT_29_4_DESC"	"Hancurkan 10,000 bebatuan kecil."
+		"NEW_ACHIEVEMENT_29_5_NAME"	"Ternetralisasi"
+		"NEW_ACHIEVEMENT_29_5_DESC"	"Gunakan menara Shockwave Tower to absorb incoming bullets."
+		"NEW_ACHIEVEMENT_29_6_NAME"	"Sayangnya,"
+		"NEW_ACHIEVEMENT_29_6_DESC"	"Gunakan emoji :alphachan: dalam obrolan multipemain. Mau apa nggak, terserahlah."
+	}
+}
\ No newline at end of file
diff --git a/fastlane/metadata/steam/indonesian/description.txt b/fastlane/metadata/steam/indonesian/description.txt
new file mode 100644
index 0000000000..c0e9b8c134
--- /dev/null
+++ b/fastlane/metadata/steam/indonesian/description.txt
@@ -0,0 +1,62 @@
+Mindustry is a factory-building game with tower defense and RTS elements. Create elaborate supply chains to feed ammo into your turrets, produce materials to use for building, and construct units. Command units to capture enemy bases, and expand your production. Defend your core from waves of enemies.
+
+Play through the campaign alone or with with your friends in cross-platform multiplayer co-op and challenge them in team-based PvP matches.
+
+[img]{STEAM_APP_IMAGE}/extras/factory.gif[/img]
+
+[h2]Factory Building[/h2]
+
+[list]
+[*] Create elaborate supply chains of conveyor belts to feed ammo into your turrets and produce materials to use for building
+[*] Use production blocks to create a wide variety of advanced materials
+[*] Distribute liquids and fight constant challenges, like outbreaks of fire or enemy flier raids
+[*] Get the most out of your production by supplying optional coolant and lubricant
+[*] Produce a wide variety of units for automatic management of your base or assault on enemy bases
+[/list]
+
+[h2]Tower Defense[/h2]
+
+[list]
+[*] Defend your structures from waves of enemies
+[*] Strategically place your turrets to destroy them before they reach your core
+[*] Supply your turrets with ammo, coolant, and power
+[*] Bolster your defenses with powered shields, regeneration projectors and other support buildings
+[/list]
+
+[img]{STEAM_APP_IMAGE}/extras/rts3.png[/img]
+
+[h2]Real Time Strategy[/h2]
+
+[list]
+[*] Set up assembly lines to construct armies of mechanized units
+[*] Use your units to square up against fully functional enemy bases
+[*] Capture more territory to place down more cores and get access to additional resources for expansion
+[/list]
+
+[h2]Campaign[/h2]
+
+[list]
+[*] Play through two separate planetary campaigns
+[*] Conquer the planet Serpulo and Erekir as you advance through 35 hand-made maps and 250+ procedurally generated sectors
+[*] Capture territory and set up factories to produce resources while you play other sectors
+[*] Defend your sectors from periodic invasions
+[*] Coordinate resource distribution between sectors via launch pads
+[*] Research new blocks to fuel progress
+[*] Invite your friends to complete missions together
+[*] 250+ technology blocks to master
+[*] 50+ different types of drones, mechs and ships
+[*] 80+ achievements to complete
+[/list]
+
+[h2]Community and Modding[/h2]
+
+[list]
+[*] Use the steam workshop to browse community-made maps and schematics
+[*] Join public community servers to play with others across platforms
+[*] Play co-op, PvP or sandbox
+[*] Community servers support plugins for custom maps and gamemodes
+[*] Create your public dedicated server, or invite friends to your own private session
+[*] Customizable game rules: Change block costs, enemy stats, starting items, wave timing and more
+[*] Built-in map editor lets you make your own maps to play and share with the community
+[*] Browse community-made mods to add or remix even more content
+[/list]
diff --git a/fastlane/metadata/steam/indonesian/short-description.txt b/fastlane/metadata/steam/indonesian/short-description.txt
new file mode 100644
index 0000000000..85f1f7ca20
--- /dev/null
+++ b/fastlane/metadata/steam/indonesian/short-description.txt
@@ -0,0 +1 @@
+Sebuah game manajemen industri terbuka dengan elemen RTS dan pertahanan menara.
\ No newline at end of file

From 7d8aea77d83a6463bb750962471983a1996e8ff7 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 20 Jan 2024 20:45:15 -0500
Subject: [PATCH 155/369] Added hidden rule for environment deconstruction /
 Increased impact reactor liquid capacity

---
 core/src/mindustry/content/Blocks.java | 1 +
 core/src/mindustry/game/Rules.java     | 2 ++
 core/src/mindustry/world/Build.java    | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 1275b3b169..c86f3ffe56 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2433,6 +2433,7 @@ public class Blocks{
             itemDuration = 140f;
             ambientSound = Sounds.pulse;
             ambientSoundVolume = 0.07f;
+            liquidCapacity = 60f;
 
             consumePower(25f);
             consumeItem(Items.blastCompound);
diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index aea4dde5c5..16a09e8990 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -105,6 +105,8 @@ public class Rules{
     public boolean coreDestroyClear = false;
     /** If true, banned blocks are hidden from the build menu. */
     public boolean hideBannedBlocks = false;
+    /** If true, most blocks (including environmental walls) can be deconstructed. This is only meant to be used internally in sandbox/test maps. */
+    public boolean allowEnvironmentDeconstruct = false;
     /** If true, bannedBlocks becomes a whitelist. */
     public boolean blockWhitelist = false;
     /** If true, bannedUnits becomes a whitelist. */
diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java
index 4377eb521a..42c37c3bcf 100644
--- a/core/src/mindustry/world/Build.java
+++ b/core/src/mindustry/world/Build.java
@@ -281,9 +281,9 @@ public class Build{
         return false;
     }
 
-    /** Returns whether the tile at this position is breakable by this team */
+    /** @return whether the tile at this position is breakable by this team */
     public static boolean validBreak(Team team, int x, int y){
         Tile tile = world.tile(x, y);
-        return tile != null && tile.block().canBreak(tile) && tile.breakable() && tile.interactable(team);
+        return tile != null && tile.block() != Blocks.air && (tile.block().canBreak(tile) && (tile.breakable() || state.rules.allowEnvironmentDeconstruct)) && tile.interactable(team);
     }
 }

From 75a06eaea133ec56767f1fc68fd7b36846d9d79a Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Sun, 21 Jan 2024 22:35:14 +0700
Subject: [PATCH 156/369] Update servers_v7.json (#9481)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index d9687a6c19..d695b1aae7 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -230,7 +230,7 @@
   },
   {
     "name": "ABCXYZ Community",
-    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "140.238.246.78:7000", "5.9.8.124:28848"]
+    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "140.238.246.78:7000", "5.9.8.124:28848", "free2.titaniumhost.tech:25669"]
   },
   {
     "name": "CroCraft Network",

From 282946c5d83bfc56bba4eafde4fe353a22718b55 Mon Sep 17 00:00:00 2001
From: meiqiu <119494143+MEIQIUawa@users.noreply.github.com>
Date: Sun, 21 Jan 2024 23:35:25 +0800
Subject: [PATCH 157/369] Update servers_v7.json (#9480)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index d695b1aae7..e15ddcd420 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -9,7 +9,7 @@
   },
   {
     "name": "meiqiuMDT",
-    "address": ["cn1.meiqiumdy.top:7000","cn1.meiqiumdt.top:7002","cn1.meiqiumdt.top:7006","bj-1.lcf.icu:10240"]
+    "address": ["cn1.meiqiumdy.top:7000","cn1.meiqiumdt.top:7002","cn1.meiqiumdt.top:7006","cn1.meiqiumdt.top:7013"]
   },
   {
     "name": "Crux's Revelations",

From 4bf140c5166b76f91252f53d6903ff4a6a6ace11 Mon Sep 17 00:00:00 2001
From: Poli23 <126602903+Poli23@users.noreply.github.com>
Date: Sun, 21 Jan 2024 20:20:14 +0200
Subject: [PATCH 158/369] Update servers_v7.json (#9482)

I am the owner of the MineCore server, I ask you to update the list of servers and add new MineCore servers.
---
 servers_v7.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index e15ddcd420..9700334f24 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -252,10 +252,6 @@
     "name": "XuwenHost",
     "address": ["mdt.xuwenblock.cn:6568","mdt.xuwenblock.cn:6567","106.14.14.210"]
   },
-  {
-    "name": "MineCore",
-    "address": ["194.247.42.11:27792"]
-  },
   {
     "name": "Atomic",
     "address": ["atomic-de.ddns.net:35199", "atomic-de.ddns.net:35176", "atomic-de.ddns.net:35845", "atomic-de.ddns.net:35313"]
@@ -279,5 +275,9 @@
   {
     "name": "Erepulo",
     "address": ["95.84.198.97:5401", "95.84.198.97:5402", "95.84.198.97:5403"]
+  },
+  {
+    "name": "MineCore",
+    "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"]
   }
 ]

From 41f448af2cacc00697cb4fae4a14c2855dbce79a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 21 Jan 2024 19:12:39 -0500
Subject: [PATCH 159/369] Don't create outlines in units if they already exist

---
 core/src/mindustry/type/UnitType.java | 2 +-
 gradle.properties                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index d49e2e7a21..b5855f69b5 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -960,7 +960,7 @@ public class UnitType extends UnlockableContent implements Senseable{
         getRegionsToOutline(toOutline);
 
         for(var region : toOutline){
-            if(region instanceof AtlasRegion atlas){
+            if(region instanceof AtlasRegion atlas && !Core.atlas.has(atlas.name + "-outline")){
                 String regionName = atlas.name;
                 Pixmap outlined = Pixmaps.outline(Core.atlas.getPixmap(region), outlineColor, outlineRadius);
 
diff --git a/gradle.properties b/gradle.properties
index b18f49c047..e69588eb44 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=8fdcdbfccc
+archash=137d14855f

From e9d95c2c2e55d239aeae6722d0b5c55c92bca058 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 21 Jan 2024 19:18:41 -0500
Subject: [PATCH 160/369] Switched sourceCompatibility to Java 17

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 342a85c96c..d051101a24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -185,7 +185,7 @@ allprojects{
 
     tasks.withType(JavaCompile){
         targetCompatibility = 8
-        sourceCompatibility = JavaVersion.VERSION_16
+        sourceCompatibility = JavaVersion.VERSION_17
         options.encoding = "UTF-8"
         options.compilerArgs += ["-Xlint:deprecation"]
         dependsOn clearCache

From 477645a211d6d1a9b47f5f20813139562cfd590d Mon Sep 17 00:00:00 2001
From: CommandLine <71168720+Def-Try@users.noreply.github.com>
Date: Mon, 22 Jan 2024 20:38:33 +0700
Subject: [PATCH 161/369] Mindurka IP change (#9483)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 9700334f24..54ce1c7466 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -85,7 +85,7 @@
   },
   {
     "name": "MinDurka",
-    "address": ["95.181.151.210", "95.181.151.210:3001", "95.181.151.210:3002", "95.181.151.210:3003", "95.181.151.210:3004", "95.181.151.210:3005", "95.181.151.210:3006", "95.181.151.210:3007", "95.181.151.210:3008", "95.181.151.210:3009", "95.181.151.210:3010"]
+    "address": ["45.87.104.124", "45.87.104.124:3001", "45.87.104.124:3002", "45.87.104.124:3003", "45.87.104.124:3004", "45.87.104.124:3005", "45.87.104.124:3006", "45.87.104.124:3007", "45.87.104.124:3008", "45.87.104.124:3009", "45.87.104.124:3010"]
   },
   {
     "name": "Chaotic Neutral",

From 59ea35c44314952b57c89fe1db6a76325ad0f26c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 22 Jan 2024 16:14:14 -0500
Subject: [PATCH 162/369] Allow all floors to replace each other

---
 core/src/mindustry/world/Build.java                    | 4 ++--
 core/src/mindustry/world/blocks/environment/Floor.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java
index 42c37c3bcf..5ae2afb151 100644
--- a/core/src/mindustry/world/Build.java
+++ b/core/src/mindustry/world/Build.java
@@ -195,7 +195,7 @@ public class Build{
             return false;
         }
 
-        if(!type.requiresWater && !contactsShallows(tile.x, tile.y, type) && !type.placeableLiquid){
+        if(!type.requiresWater && !type.isFloor() && !contactsShallows(tile.x, tile.y, type) && !type.placeableLiquid){
             return false;
         }
 
@@ -223,7 +223,7 @@ public class Build{
                 (check.floor().isDeep() && !type.floating && !type.requiresWater && !type.placeableLiquid) || //deep water
                 (type == check.block() && check.build != null && rotation == check.build.rotation && type.rotate && !((type == check.block && check.team() == Team.derelict))) || //same block, same rotation
                 !check.interactable(team) || //cannot interact
-                !check.floor().placeableOn || //solid wall
+                (!check.floor().placeableOn && !type.isFloor()) || //solid floor
                 (!checkVisible && !check.block().alwaysReplace) || //replacing a block that should be replaced (e.g. payload placement)
                     !(((type.canReplace(check.block()) || (type == check.block && state.rules.derelictRepair && check.team() == Team.derelict)) || //can replace type OR can replace derelict block of same type
                         (check.build instanceof ConstructBuild build && build.current == type && check.centerX() == tile.x && check.centerY() == tile.y)) && //same type in construction
diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java
index dc056da237..26631119e8 100644
--- a/core/src/mindustry/world/blocks/environment/Floor.java
+++ b/core/src/mindustry/world/blocks/environment/Floor.java
@@ -83,13 +83,13 @@ public class Floor extends Block{
     protected TextureRegion edgeRegion;
 
     public Floor(String name){
-        super(name);
-        variants = 3;
+        this(name, 3);
     }
 
     public Floor(String name, int variants){
         super(name);
         this.variants = variants;
+        placeableLiquid = true;
     }
 
     @Override

From bd4ae0639d7d28ffea3dec3824494b7d9f841a56 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 22 Jan 2024 16:41:43 -0500
Subject: [PATCH 163/369] Added allowRectanglePlacement for 1x1 blocks

---
 core/src/mindustry/input/InputHandler.java       |  4 +++-
 core/src/mindustry/input/Placement.java          | 16 ++++++++++++++++
 core/src/mindustry/world/Block.java              |  4 ++++
 core/src/mindustry/world/Build.java              |  8 ++++++++
 .../mindustry/world/blocks/ConstructBlock.java   | 10 +++++-----
 .../world/blocks/environment/Floor.java          |  2 ++
 .../world/blocks/environment/StaticWall.java     |  2 ++
 7 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 9472028766..3e17870597 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -1973,11 +1973,13 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         var end = world.build(endX, endY);
         if(diagonal && (block == null || block.allowDiagonal)){
             if(block != null && start instanceof ChainedBuilding && end instanceof ChainedBuilding
-                    && block.canReplace(end.block) && block.canReplace(start.block)){
+            && block.canReplace(end.block) && block.canReplace(start.block)){
                 points = Placement.upgradeLine(startX, startY, endX, endY);
             }else{
                 points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY);
             }
+        }else if(block != null && block.size == 1 && block.allowRectanglePlacement){
+            points = Placement.normalizeRectangle(startX, startY, endX, endY, block.size);
         }else{
             points = Placement.normalizeLine(startX, startY, endX, endY);
         }
diff --git a/core/src/mindustry/input/Placement.java b/core/src/mindustry/input/Placement.java
index 09935e4e5c..d6c8b4a7c4 100644
--- a/core/src/mindustry/input/Placement.java
+++ b/core/src/mindustry/input/Placement.java
@@ -58,6 +58,22 @@ public class Placement{
         return points;
     }
 
+    /** Normalize two points into a rectangle. */
+    public static Seq<Point2> normalizeRectangle(int startX, int startY, int endX, int endY, int blockSize){
+        Pools.freeAll(points);
+        points.clear();
+
+        int minX = Math.min(startX, endX), minY = Math.min(startY, endY), maxX = Math.max(startX, endX), maxY = Math.max(startY, endY);
+
+        for(int y = minY; y <= maxY; y += blockSize){
+            for(int x = minX; x <= maxX; x += blockSize){
+                points.add(Pools.obtain(Point2.class, Point2::new).set(x, y));
+            }
+        }
+
+        return points;
+    }
+
     public static Seq<Point2> upgradeLine(int startX, int startY, int endX, int endY){
         closed.clear();
         Pools.freeAll(points);
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 60d6b63d19..cbbf969d1c 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -245,6 +245,8 @@ public class Block extends UnlockableContent implements Senseable{
     public boolean allowDiagonal = true;
     /** Whether to swap the diagonal placement modes. */
     public boolean swapDiagonalPlacement;
+    /** Whether to allow rectangular placement, as opposed to a line. Only supported for 1x1 blocks currently! */
+    public boolean allowRectanglePlacement = false;
     /** Build queue priority in schematics. */
     public int schematicPriority = 0;
     /**
@@ -322,6 +324,8 @@ public class Block extends UnlockableContent implements Senseable{
     public float deconstructThreshold = 0f;
     /** If true, this block deconstructs immediately. Instant deconstruction implies no resource refund. */
     public boolean instantDeconstruct = false;
+    /** If true, this block constructs immediately. This implies no resource requirement, and ignores configs - do not use, this is for performance only! */
+    public boolean instantBuild = false;
     /** Effect for placing the block. Passes size as rotation. */
     public Effect placeEffect = Fx.placeBlock;
     /** Effect for breaking the block. Passes size as rotation. */
diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java
index 5ae2afb151..03a3db970b 100644
--- a/core/src/mindustry/world/Build.java
+++ b/core/src/mindustry/world/Build.java
@@ -122,6 +122,14 @@ public class Build{
             }
         });
 
+        //complete it immediately
+        if(result.instantBuild){
+            Events.fire(new BlockBuildBeginEvent(tile, team, unit, false));
+            result.placeBegan(tile, tile.block, unit);
+            ConstructBlock.constructFinish(tile, result, unit, (byte)rotation, team, null);
+            return;
+        }
+
         Block previous = tile.block();
         Block sub = ConstructBlock.get(result.size);
         var prevBuild = new Seq<Building>(9);
diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java
index df459ae6d8..9e4ac3e719 100644
--- a/core/src/mindustry/world/blocks/ConstructBlock.java
+++ b/core/src/mindustry/world/blocks/ConstructBlock.java
@@ -83,7 +83,7 @@ public class ConstructBlock extends Block{
             tile.setBlock(block, team, rotation);
         }
 
-        if(tile.build != null){
+        if(tile.build != null && tile.build.block == block){
             tile.build.health = block.health * healthf;
 
             if(config != null){
@@ -100,11 +100,11 @@ public class ConstructBlock extends Block{
 
             //make sure block indexer knows it's damaged
             indexer.notifyHealthChanged(tile.build);
-        }
 
-        //last builder was this local client player, call placed()
-        if(tile.build != null && !headless && builder == player.unit()){
-            tile.build.playerPlaced(config);
+            //last builder was this local client player, call placed()
+            if(!headless && builder == player.unit()){
+                tile.build.playerPlaced(config);
+            }
         }
 
         if(fogControl.isVisibleTile(team, tile.x, tile.y)){
diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java
index 26631119e8..c1c839887b 100644
--- a/core/src/mindustry/world/blocks/environment/Floor.java
+++ b/core/src/mindustry/world/blocks/environment/Floor.java
@@ -90,6 +90,8 @@ public class Floor extends Block{
         super(name);
         this.variants = variants;
         placeableLiquid = true;
+        allowRectanglePlacement = true;
+        instantBuild = true;
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/environment/StaticWall.java b/core/src/mindustry/world/blocks/environment/StaticWall.java
index 464df26ec6..56fc569b24 100644
--- a/core/src/mindustry/world/blocks/environment/StaticWall.java
+++ b/core/src/mindustry/world/blocks/environment/StaticWall.java
@@ -20,6 +20,8 @@ public class StaticWall extends Prop{
         solid = true;
         variants = 2;
         cacheLayer = CacheLayer.walls;
+        allowRectanglePlacement = true;
+        instantBuild = true;
     }
 
     @Override

From 76e83c151690961109d36e401d813a635d505886 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 22 Jan 2024 22:12:24 -0500
Subject: [PATCH 164/369] Better allowRectanglePlacement

---
 core/src/mindustry/input/InputHandler.java | 2 +-
 core/src/mindustry/input/Placement.java    | 6 +++---
 core/src/mindustry/world/Block.java        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 3e17870597..c43c8e8fed 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -1978,7 +1978,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             }else{
                 points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY);
             }
-        }else if(block != null && block.size == 1 && block.allowRectanglePlacement){
+        }else if(block != null && block.allowRectanglePlacement){
             points = Placement.normalizeRectangle(startX, startY, endX, endY, block.size);
         }else{
             points = Placement.normalizeLine(startX, startY, endX, endY);
diff --git a/core/src/mindustry/input/Placement.java b/core/src/mindustry/input/Placement.java
index d6c8b4a7c4..abec7d9f65 100644
--- a/core/src/mindustry/input/Placement.java
+++ b/core/src/mindustry/input/Placement.java
@@ -65,9 +65,9 @@ public class Placement{
 
         int minX = Math.min(startX, endX), minY = Math.min(startY, endY), maxX = Math.max(startX, endX), maxY = Math.max(startY, endY);
 
-        for(int y = minY; y <= maxY; y += blockSize){
-            for(int x = minX; x <= maxX; x += blockSize){
-                points.add(Pools.obtain(Point2.class, Point2::new).set(x, y));
+        for(int y = 0; y <= maxY - minY; y += blockSize){
+            for(int x = 0; x <= maxX - minX; x += blockSize){
+                points.add(Pools.obtain(Point2.class, Point2::new).set(startX + x * Mathf.sign(endX - startX), startY + y * Mathf.sign(endY - startY)));
             }
         }
 
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index cbbf969d1c..31d98e1efc 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -245,7 +245,7 @@ public class Block extends UnlockableContent implements Senseable{
     public boolean allowDiagonal = true;
     /** Whether to swap the diagonal placement modes. */
     public boolean swapDiagonalPlacement;
-    /** Whether to allow rectangular placement, as opposed to a line. Only supported for 1x1 blocks currently! */
+    /** Whether to allow rectangular placement, as opposed to a line. */
     public boolean allowRectanglePlacement = false;
     /** Build queue priority in schematics. */
     public int schematicPriority = 0;

From 6f3e75569ca6c80568b079a2fa1e966c7944c291 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 23 Jan 2024 21:22:02 -0500
Subject: [PATCH 165/369] Added instantBuild rule for editor

---
 core/src/mindustry/entities/comp/BuilderComp.java      | 4 ++--
 core/src/mindustry/game/Gamemode.java                  | 1 +
 core/src/mindustry/game/Rules.java                     | 2 ++
 core/src/mindustry/world/blocks/environment/Floor.java | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java
index 64a575bb16..332c7de701 100644
--- a/core/src/mindustry/entities/comp/BuilderComp.java
+++ b/core/src/mindustry/entities/comp/BuilderComp.java
@@ -100,9 +100,9 @@ abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{
         buildCounter = Math.min(buildCounter, 10f);
 
         //random attempt to fix a freeze that only occurs on Android
-        int maxPerFrame = 10, count = 0;
+        int maxPerFrame = state.rules.instantBuild ? plans.size : 10, count = 0;
 
-        while(buildCounter >= 1 && count++ < maxPerFrame){
+        while((buildCounter >= 1 || state.rules.instantBuild) && count++ < maxPerFrame){
             buildCounter -= 1f;
 
             validatePlans();
diff --git a/core/src/mindustry/game/Gamemode.java b/core/src/mindustry/game/Gamemode.java
index d48bc956fd..86e94966fa 100644
--- a/core/src/mindustry/game/Gamemode.java
+++ b/core/src/mindustry/game/Gamemode.java
@@ -35,6 +35,7 @@ public enum Gamemode{
     }, map -> map.teams.size > 1),
     editor(true, rules -> {
         rules.infiniteResources = true;
+        rules.instantBuild = true;
         rules.editor = true;
         rules.waves = false;
         rules.waveTimer = false;
diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index 16a09e8990..951426907d 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -107,6 +107,8 @@ public class Rules{
     public boolean hideBannedBlocks = false;
     /** If true, most blocks (including environmental walls) can be deconstructed. This is only meant to be used internally in sandbox/test maps. */
     public boolean allowEnvironmentDeconstruct = false;
+    /** If true, buildings will be constructed instantly, with no limit on blocks placed per second. This is highly experimental and may cause lag! */
+    public boolean instantBuild = false;
     /** If true, bannedBlocks becomes a whitelist. */
     public boolean blockWhitelist = false;
     /** If true, bannedUnits becomes a whitelist. */
diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java
index c1c839887b..db9ae24a3f 100644
--- a/core/src/mindustry/world/blocks/environment/Floor.java
+++ b/core/src/mindustry/world/blocks/environment/Floor.java
@@ -92,6 +92,7 @@ public class Floor extends Block{
         placeableLiquid = true;
         allowRectanglePlacement = true;
         instantBuild = true;
+        placeEffect = Fx.rotateBlock;
     }
 
     @Override

From b9bf4ee79405363cfee650b154889ace5bee0b5a Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <29004178+Redstonneur1256@users.noreply.github.com>
Date: Wed, 24 Jan 2024 04:05:14 +0100
Subject: [PATCH 166/369] Allow markers to be deleted (#9485)

---
 core/src/mindustry/logic/LExecutor.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 44e03ef12c..3b67f5a958 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -2049,6 +2049,11 @@ public class LExecutor{
         state.markers.add(id, marker);
     }
 
+    @Remote(called = Loc.server, variants = Variant.both, unreliable = true)
+    public static void removeMarker(int id){
+        state.markers.remove(id);
+    }
+
     @Remote(called = Loc.server, variants = Variant.both, unreliable = true)
     public static void updateMarker(int id, LMarkerControl control, double p1, double p2, double p3){
         var marker = state.markers.get(id);

From 35a833eb67c4cce3051d5f36aab26f19d2eed5f5 Mon Sep 17 00:00:00 2001
From: HubsvVN <157294903+HubsvVN@users.noreply.github.com>
Date: Thu, 25 Jan 2024 10:43:40 +0700
Subject: [PATCH 167/369] Update servers_v7.json (#9484)

* Update servers_v7.json

* Update servers_v7.json
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index 54ce1c7466..75b0446fdf 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -279,5 +279,9 @@
   {
     "name": "MineCore",
     "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"]
+  },
+  { 
+    "name": "hubVn"
+    "address": ["de-free-01.hosts.optikservers.com:32362"]
   }
 ]

From 083168f7e03d6422f8efc0014c0ed84f171b31e2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 26 Jan 2024 19:04:43 -0500
Subject: [PATCH 168/369] Update servers_v7.json

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 75b0446fdf..fd09b2b6db 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -281,7 +281,7 @@
     "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"]
   },
   { 
-    "name": "hubVn"
+    "name": "hubVn",
     "address": ["de-free-01.hosts.optikservers.com:32362"]
   }
 ]

From 1c40e3bbf2be042102a6d962a491aa5610132512 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 26 Jan 2024 19:07:32 -0500
Subject: [PATCH 169/369] Update pr.yml

---
 .github/workflows/pr.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 4cc2f6d88f..5bb8637f56 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -17,8 +17,10 @@ jobs:
         java-version: 17
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
+    - name: Run unit tests
+      run: ./gradlew clean cleanTest test --stacktrace
     - name: Run unit tests and build JAR
-      run: ./gradlew test desktop:dist
+      run: ./gradlew desktop:dist
     - name: Upload desktop JAR for testing
       uses: actions/upload-artifact@v2
       with:

From 440643129149392a589c09fd0e70a9f1e6a17955 Mon Sep 17 00:00:00 2001
From: Elixias <61173114+LixieWulf@users.noreply.github.com>
Date: Fri, 26 Jan 2024 17:08:15 -0700
Subject: [PATCH 170/369] Better Malis palette (#9491)

---
 core/src/mindustry/game/Team.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java
index afd32eb95e..affcbe525c 100644
--- a/core/src/mindustry/game/Team.java
+++ b/core/src/mindustry/game/Team.java
@@ -31,7 +31,7 @@ public class Team implements Comparable<Team>{
         derelict = new Team(0, "derelict", Color.valueOf("4d4e58")),
         sharded = new Team(1, "sharded", Pal.accent.cpy(), Color.valueOf("ffd37f"), Color.valueOf("eab678"), Color.valueOf("d4816b")),
         crux = new Team(2, "crux", Color.valueOf("f25555"), Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")),
-        malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("c195fb"), Color.valueOf("665c9f"), Color.valueOf("484988")),
+        malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("c7a4f5"), Color.valueOf("896fd6"), Color.valueOf("504cba")),
 
         //TODO temporarily no palettes for these teams.
         green = new Team(4, "green", Color.valueOf("54d67d")),//Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")),

From d4d85ec8731a75022b4e2e097e86064f6ad49b7f Mon Sep 17 00:00:00 2001
From: StalkerBaran <120944331+StalkerBaran@users.noreply.github.com>
Date: Sat, 27 Jan 2024 21:22:12 +0700
Subject: [PATCH 171/369] Update servers_v7.json (#9494)

New server (MeowIsland)
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index fd09b2b6db..509fee6b66 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -222,7 +222,7 @@
   },
   {
     "name": "MeowIsland",
-    "address": ["nexus.minecraft.rent:25598", "nexus.minecraft.rent:25596", "jupiter.minecraft.rent:25651"]
+    "address": ["nexus.minecraft.rent:25598", "nexus.minecraft.rent:25596", "jupiter.minecraft.rent:25651", "orion.minecraft.rent:25573"]
   },
   {
     "name": "3MIDustry",

From 342ec4adcebedc1e43ce6aa2d51a1f66e2f6a653 Mon Sep 17 00:00:00 2001
From: Elixias <61173114+LixieWulf@users.noreply.github.com>
Date: Sat, 27 Jan 2024 07:22:28 -0700
Subject: [PATCH 172/369] Unprotect dumpTime (#9493)

---
 core/src/mindustry/world/Block.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 31d98e1efc..05f064cbaf 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -382,7 +382,7 @@ public class Block extends UnlockableContent implements Senseable{
     /** Dump timer ID.*/
     protected final int timerDump = timers++;
     /** How often to try dumping items in ticks, e.g. 5 = 12 times/sec*/
-    protected final int dumpTime = 5;
+    public int dumpTime = 5;
 
     public Block(String name){
         super(name);

From 8d89fac0af651b8a0ffa5e4eed2ca97200dbb7c5 Mon Sep 17 00:00:00 2001
From: ulwepo <85295540+ulwepo@users.noreply.github.com>
Date: Sun, 28 Jan 2024 00:05:03 +0900
Subject: [PATCH 173/369] Update servers_v7.json (#9496)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 509fee6b66..4e5c27d47b 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -157,7 +157,7 @@
   },
   {
     "name": "Sakura", 
-    "address": ["160.16.207.141:20527", "160.16.207.141:21527", "160.16.207.141:22527", "160.16.207.141:23527", "160.16.207.141:24527", "160.16.207.141:25527", "160.16.207.141:26527", "160.16.207.141:27527", "160.16.207.141:28527", "160.16.207.141:29527"]
+    "address": ["160.16.207.141:20527", "160.16.207.141:21527", "160.16.207.141:22527", "160.16.207.141:23527", "160.16.207.141:24527", "160.16.207.141:25527", "160.16.207.141:26527", "160.16.207.141:27527", "160.16.207.141:28527", "160.16.207.141:29527", "162.43.36.78:20527", "162.43.36.78:21527", "162.43.36.78:22527", "162.43.36.78:23527", "162.43.36.78:24527", "162.43.36.78:25527", "162.43.36.78:26527", "162.43.36.78:27527", "162.43.36.78:28527", "162.43.36.78:29527", "sakura-mindustry.jp:20527"]
   },
   {
     "name": "|RussianServers|[]",

From 021e766214068cf10a5251a21a2cb5049b3d7ca6 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 27 Jan 2024 10:07:59 -0500
Subject: [PATCH 174/369] Cleanup

---
 core/src/mindustry/world/Build.java                 | 13 +++++++------
 core/src/mindustry/world/blocks/ConstructBlock.java |  2 --
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java
index 03a3db970b..bbc38dbdd4 100644
--- a/core/src/mindustry/world/Build.java
+++ b/core/src/mindustry/world/Build.java
@@ -198,16 +198,17 @@ public class Build{
 
         if(tile == null) return false;
 
+        //floors have different checks
+        if(type.isFloor()){
+            return type.isOverlay() ? tile.overlay() != type : tile.floor() != type;
+        }
+
         //campaign darkness check
         if(world.getDarkness(x, y) >= 3){
             return false;
         }
 
-        if(!type.requiresWater && !type.isFloor() && !contactsShallows(tile.x, tile.y, type) && !type.placeableLiquid){
-            return false;
-        }
-
-        if((type.isFloor() && tile.floor() == type) || (type.isOverlay() && tile.overlay() == type)){
+        if(!type.requiresWater && !contactsShallows(tile.x, tile.y, type) && !type.placeableLiquid){
             return false;
         }
 
@@ -231,7 +232,7 @@ public class Build{
                 (check.floor().isDeep() && !type.floating && !type.requiresWater && !type.placeableLiquid) || //deep water
                 (type == check.block() && check.build != null && rotation == check.build.rotation && type.rotate && !((type == check.block && check.team() == Team.derelict))) || //same block, same rotation
                 !check.interactable(team) || //cannot interact
-                (!check.floor().placeableOn && !type.isFloor()) || //solid floor
+                !check.floor().placeableOn  || //solid floor
                 (!checkVisible && !check.block().alwaysReplace) || //replacing a block that should be replaced (e.g. payload placement)
                     !(((type.canReplace(check.block()) || (type == check.block && state.rules.derelictRepair && check.team() == Team.derelict)) || //can replace type OR can replace derelict block of same type
                         (check.build instanceof ConstructBuild build && build.current == type && check.centerX() == tile.x && check.centerY() == tile.y)) && //same type in construction
diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java
index 9e4ac3e719..df7434a222 100644
--- a/core/src/mindustry/world/blocks/ConstructBlock.java
+++ b/core/src/mindustry/world/blocks/ConstructBlock.java
@@ -75,10 +75,8 @@ public class ConstructBlock extends Block{
 
         if(block instanceof OverlayFloor overlay){
             tile.setOverlay(overlay);
-            tile.setBlock(Blocks.air);
         }else if(block instanceof Floor floor){
             tile.setFloorUnder(floor);
-            tile.setBlock(Blocks.air);
         }else{
             tile.setBlock(block, team, rotation);
         }

From 1b14a09f1c9c3d39a22f87dd153d9df5b6598eb0 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sat, 27 Jan 2024 18:24:48 -0800
Subject: [PATCH 175/369] Shield health should also be factored in pierce
 factor when maxDamageFraction is 0 (#9486)

---
 core/src/mindustry/entities/bullet/BulletType.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index 4ab4c929a4..2870715f06 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -387,14 +387,14 @@ public class BulletType extends Content implements Cloneable{
 
         if(entity instanceof Healthc h){
             float damage = b.damage;
+            float shield = entity instanceof Shieldc s ? Math.max(s.shield(), 0f) : 0f;
             if(maxDamageFraction > 0){
-                float cap = h.maxHealth() * maxDamageFraction;
-                if(entity instanceof Shieldc s){
-                    cap += Math.max(s.shield(), 0f);
-                }
+                float cap = h.maxHealth() * maxDamageFraction + shield;
                 damage = Math.min(damage, cap);
                 //cap health to effective health for handlePierce to handle it properly
                 health = Math.min(health, cap);
+            }else{
+                health += shield;
             }
             if(pierceArmor){
                 h.damagePierce(damage);

From 6db4ef7f1c428021c1df8f5efffb0796add7589f Mon Sep 17 00:00:00 2001
From: Sh1p*nfire <73347888+Sh1penfire@users.noreply.github.com>
Date: Mon, 29 Jan 2024 05:04:21 +1100
Subject: [PATCH 176/369] PartProgress.time & PartProgress.mod added (#9499)

* PartProgress.time & PartProgress.mod added

* Add loop() to combine mul and mod
---
 core/src/mindustry/entities/part/DrawPart.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/entities/part/DrawPart.java b/core/src/mindustry/entities/part/DrawPart.java
index f3ebfc6ceb..a8642fe6d4 100644
--- a/core/src/mindustry/entities/part/DrawPart.java
+++ b/core/src/mindustry/entities/part/DrawPart.java
@@ -85,8 +85,10 @@ public abstract class DrawPart{
         /** Weapon heat, 1 when just fired, 0, when it has cooled down (duration depends on weapon) */
         heat = p -> p.heat,
         /** Lifetime fraction, 0 to 1. Only for missiles. */
-        life = p -> p.life;
-
+        life = p -> p.life,
+        /** Current unscaled value of Time.time. */
+        time = p -> Time.time;
+        
         float get(PartParams p);
 
         static PartProgress constant(float value){
@@ -167,6 +169,14 @@ public abstract class DrawPart{
         default PartProgress absin(float scl, float mag){
             return p -> get(p) + Mathf.absin(scl, mag);
         }
+        
+        default PartProgress mod(float amount){
+            return p -> Mathf.mod(get(p), amount);
+        }
+        
+        default PartProgress loop(float time){
+            return p -> Mathf.mod(get(p)/time, 1);
+        }
 
         default PartProgress apply(PartProgress other, PartFunc func){
             return p -> func.get(get(p), other.get(p));

From eddcd8fc6d09fdb9bf850cd9e14591a98139771e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 28 Jan 2024 15:50:05 -0500
Subject: [PATCH 177/369] Minor building optimization

---
 .../mindustry/entities/comp/BuilderComp.java  | 21 +++++++++----------
 gradle.properties                             |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java
index 332c7de701..0c5070febb 100644
--- a/core/src/mindustry/entities/comp/BuilderComp.java
+++ b/core/src/mindustry/entities/comp/BuilderComp.java
@@ -86,9 +86,9 @@ abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{
             buildAlpha = Mathf.lerpDelta(buildAlpha, activelyBuilding() ? 1f : 0f, 0.15f);
         }
 
-        //validate regardless of whether building is enabled.
+        validatePlans();
+
         if(!updateBuilding || !canBuild()){
-            validatePlans();
             return;
         }
 
@@ -99,19 +99,18 @@ abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{
         if(Float.isNaN(buildCounter) || Float.isInfinite(buildCounter)) buildCounter = 0f;
         buildCounter = Math.min(buildCounter, 10f);
 
+        boolean instant = state.rules.instantBuild && state.rules.infiniteResources;
+
         //random attempt to fix a freeze that only occurs on Android
-        int maxPerFrame = state.rules.instantBuild ? plans.size : 10, count = 0;
+        int maxPerFrame = instant ? plans.size : 10, count = 0;
 
-        while((buildCounter >= 1 || state.rules.instantBuild) && count++ < maxPerFrame){
+        var core = core();
+
+        if((core == null && !infinite)) return;
+
+        while((buildCounter >= 1 || instant) && count++ < maxPerFrame && plans.size > 0){
             buildCounter -= 1f;
 
-            validatePlans();
-
-            var core = core();
-
-            //nothing to build, or core doesn't exist
-            if(buildPlan() == null || (core == null && !infinite)) return;
-
             //find the next build plan
             if(plans.size > 1){
                 int total = 0;
diff --git a/gradle.properties b/gradle.properties
index e69588eb44..3d72e86dff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=137d14855f
+archash=008e73aa33

From a6f2aa6c4325931395f255c4813f3d1acbeaf740 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 29 Jan 2024 15:17:49 -0500
Subject: [PATCH 178/369] Marker control cleanup

---
 core/src/mindustry/game/MapObjectives.java | 33 +++++++++-------------
 gradle.properties                          |  2 +-
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index dd64aa9106..f88607419a 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -703,19 +703,17 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
             if(!Double.isNaN(p1)){
                 if(type == LMarkerControl.pos){
                     pos.x = (float)p1 * tilesize;
-                }else{
-                    super.control(type, p1, p2, p3);
                 }
             }
 
             if(!Double.isNaN(p2)){
                 if(type == LMarkerControl.pos){
                     pos.y = (float)p2 * tilesize;
-                }else{
-                    super.control(type, p1, p2, p3);
                 }
             }
         }
@@ -786,6 +784,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
             if(!Double.isNaN(p1)){
                 switch(type){
                     case fontSize -> fontSize = (float)p1;
@@ -801,7 +801,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                     case rotation -> rotation = (float)p1;
                     case color -> color.set(Tmp.c1.fromDouble(p1));
                     case shape -> sides = (int)p1;
-                    default -> super.control(type, p1, p2, p3);
                 }
             }
 
@@ -814,7 +813,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                             flags &= ~WorldLabel.flagOutline;
                         }
                     }
-                    default -> super.control(type, p1, p2, p3);
                 }
             }
         }
@@ -881,6 +879,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
             if(!Double.isNaN(p1)){
                 switch(type){
                     case pos -> pos.x = (int)p1;
@@ -888,15 +888,12 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                     case stroke -> stroke = (float)p1;
                     case color -> color.set(Tmp.c1.fromDouble(p1));
                     case minimap -> minimap = true;
-                    default -> super.control(type, p1, p2, p3);
                 }
             }
 
             if(!Double.isNaN(p2)){
                 if(type == LMarkerControl.pos){
                     pos.y = (int)p2;
-                }else{
-                    super.control(type, p1, p2, p3);
                 }
             }
         }
@@ -945,6 +942,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
             if(!Double.isNaN(p1)){
                 switch(type){
                     case radius -> radius = (float)p1;
@@ -952,22 +951,18 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                     case rotation -> rotation = (float)p1;
                     case color -> color.set(Tmp.c1.fromDouble(p1));
                     case shape -> sides = (int)p1;
-                    default -> super.control(type, p1, p2, p3);
                 }
             }
 
             if(!Double.isNaN(p2)){
                 switch(type){
                     case shape -> fill = !Mathf.equal((float)p2, 0f);
-                    default -> super.control(type, p1, p2, p3);
                 }
             }
 
             if(!Double.isNaN(p3)){
                 if(type == LMarkerControl.shape){
                     outline = !Mathf.equal((float)p3, 0f);
-                }else{
-                    super.control(type, p1, p2, p3);
                 }
             }
         }
@@ -1009,6 +1004,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
             if(!Double.isNaN(p1)){
                 switch(type){
                     case fontSize -> fontSize = (float)p1;
@@ -1019,7 +1016,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                             flags &= ~WorldLabel.flagBackground;
                         }
                     }
-                    default -> super.control(type, p1, p2, p3);
                 }
             }
 
@@ -1032,7 +1028,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                             flags &= ~WorldLabel.flagOutline;
                         }
                     }
-                    default -> super.control(type, p1, p2, p3);
                 }
             }
         }
@@ -1093,19 +1088,19 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
             if(!Double.isNaN(p1)){
                 switch(type){
                     case endPos -> endPos.x = (float)p1 * tilesize;
                     case stroke -> stroke = (float)p1;
                     case color -> color.set(Tmp.c1.fromDouble(p1));
-                    default -> super.control(type, p1, p2, p3);
                 }
             }
 
             if(!Double.isNaN(p2)){
                 switch(type){
                     case endPos -> endPos.y = (float)p2 * tilesize;
-                    default -> super.control(type, p1, p2, p3);
                 }
             }
         }
@@ -1135,19 +1130,19 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
             if(!Double.isNaN(p1)){
                 switch(type){
                     case rotation -> rotation = (float)p1;
                     case textureSize -> width = (float)p1 * tilesize;
                     case color -> color.set(Tmp.c1.fromDouble(p1));
-                    default -> super.control(type, p1, p2, p3);
                 }
             }
 
             if(!Double.isNaN(p2)){
                 switch(type){
                     case textureSize -> height = (float)p2 * tilesize;
-                    default -> super.control(type, p1, p2, p3);
                 }
             }
         }
diff --git a/gradle.properties b/gradle.properties
index 3d72e86dff..00ed2b3ae2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=008e73aa33
+archash=7a2f8eada1

From b7485b5bc4e444438001b17f658a7ba8b698bb76 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 29 Jan 2024 22:45:22 -0500
Subject: [PATCH 179/369] Join dialog performance improvement

---
 core/src/mindustry/ui/dialogs/JoinDialog.java | 11 +++++++++++
 gradle.properties                             |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index 3b826c3c79..115cdd32c8 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -1,6 +1,7 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
+import arc.freetype.FreeTypeFontGenerator.*;
 import arc.graphics.*;
 import arc.input.*;
 import arc.math.*;
@@ -35,6 +36,7 @@ public class JoinDialog extends BaseDialog{
     int refreshes;
     boolean showHidden;
     TextButtonStyle style;
+    Task fontIgnoreDirtyTask;
 
     String lastIp;
     int lastPort, lastColumns = -1;
@@ -413,6 +415,15 @@ public class JoinDialog extends BaseDialog{
                 net.pingHost(resaddress, resport, res -> {
                     if(refreshes != cur) return;
 
+                    //don't recache the texture for a while
+                    if(fontIgnoreDirtyTask == null){
+                        FreeTypeFontData.ignoreDirty = true;
+                        fontIgnoreDirtyTask = Time.runTask(60f, () -> {
+                            FreeTypeFontData.ignoreDirty = false;
+                            fontIgnoreDirtyTask = null;
+                        });
+                    }
+
                     if(!serverSearch.isEmpty() && !(group.name.toLowerCase().contains(serverSearch)
                         || res.name.toLowerCase().contains(serverSearch)
                         || res.description.toLowerCase().contains(serverSearch)
diff --git a/gradle.properties b/gradle.properties
index 00ed2b3ae2..bacb7e3213 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=7a2f8eada1
+archash=5bbfaf2ad9

From 4e35ae2dec4388183984e4e919e5592409d5cc57 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 29 Jan 2024 23:04:12 -0500
Subject: [PATCH 180/369] Minor font cache delay tweak

---
 core/src/mindustry/ui/dialogs/JoinDialog.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index 115cdd32c8..3c3fd58ba4 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -418,7 +418,7 @@ public class JoinDialog extends BaseDialog{
                     //don't recache the texture for a while
                     if(fontIgnoreDirtyTask == null){
                         FreeTypeFontData.ignoreDirty = true;
-                        fontIgnoreDirtyTask = Time.runTask(60f, () -> {
+                        fontIgnoreDirtyTask = Time.runTask(0.6f * 60f, () -> {
                             FreeTypeFontData.ignoreDirty = false;
                             fontIgnoreDirtyTask = null;
                         });

From cc0ac1523beba2b525392aff64144c38d18b0fa1 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Tue, 30 Jan 2024 07:45:38 -0800
Subject: [PATCH 181/369] SoundEffect's sound should be delayed by its
 startDelay (#9502)

* SoundEffect's sound should be delayed by its startDelay

* h
---
 .../mindustry/entities/effect/SoundEffect.java   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/effect/SoundEffect.java b/core/src/mindustry/entities/effect/SoundEffect.java
index 8ed0f74a20..c3d320d527 100644
--- a/core/src/mindustry/entities/effect/SoundEffect.java
+++ b/core/src/mindustry/entities/effect/SoundEffect.java
@@ -21,18 +21,32 @@ public class SoundEffect extends Effect{
     public Effect effect;
 
     public SoundEffect(){
+        startDelay = -1;
     }
 
     public SoundEffect(Sound sound, Effect effect){
+        this();
         this.sound = sound;
         this.effect = effect;
     }
 
+    @Override
+    public void init(){
+        if(startDelay < 0){
+            startDelay = effect.startDelay;
+        }
+    }
+
     @Override
     public void create(float x, float y, float rotation, Color color, Object data){
         if(!shouldCreate()) return;
 
-        sound.at(x, y, Mathf.random(minPitch, maxPitch), Mathf.random(minVolume, maxVolume));
+        if(startDelay > 0){
+            Time.run(startDelay, () -> sound.at(x, y, Mathf.random(minPitch, maxPitch), Mathf.random(minVolume, maxVolume)));
+        }else{
+            sound.at(x, y, Mathf.random(minPitch, maxPitch), Mathf.random(minVolume, maxVolume));
+        }
+        
         effect.create(x, y, rotation, color, data);
     }
 }

From 994ed5a87200b663bf3f4dd6c0226eb1854abaae Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Wed, 31 Jan 2024 01:05:50 +0700
Subject: [PATCH 182/369] I want to delete some unused IPs and IPs that overlap
 with the eradication server (#9504)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 4e5c27d47b..f7da7e20f1 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -230,7 +230,7 @@
   },
   {
     "name": "ABCXYZ Community",
-    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "140.238.246.78:7000", "5.9.8.124:28848", "free2.titaniumhost.tech:25669"]
+    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "5.9.8.124:28848"]
   },
   {
     "name": "CroCraft Network",

From 6a429184aafa2097d8aaa8b5f2e777752f365acd Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <29004178+Redstonneur1256@users.noreply.github.com>
Date: Wed, 31 Jan 2024 01:35:39 +0100
Subject: [PATCH 183/369] update markers (#9506)

* update markers

* update markers & minimap rendering
---
 core/assets/bundles/bundle.properties         |   6 +-
 core/src/mindustry/core/Renderer.java         |  10 +-
 .../mindustry/editor/MapObjectivesDialog.java |  46 ++-
 core/src/mindustry/game/MapObjectives.java    | 290 +++++++++++-------
 .../mindustry/graphics/MinimapRenderer.java   |  92 +++---
 core/src/mindustry/logic/LMarkerControl.java  |   7 +-
 core/src/mindustry/logic/LStatements.java     |  19 +-
 7 files changed, 290 insertions(+), 180 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index a0aea04348..b8a1089fe3 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -682,10 +682,11 @@ objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 
 marker.background = Background
 marker.outline = Outline
@@ -2485,3 +2486,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index 13b1ead08f..7b7d1dc155 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -372,18 +372,20 @@ public class Renderer implements ApplicationListener{
             });
         }
 
+        float scaleFactor = 4f / renderer.getDisplayScale();
+
         //draw objective markers
         state.rules.objectives.eachRunning(obj -> {
             for(var marker : obj.markers){
-                if(!marker.minimap){
-                    marker.drawWorld();
+                if(marker.world){
+                    marker.draw(marker.autoscale ? scaleFactor : 1);
                 }
             }
         });
 
         for(var marker : state.markers){
-            if(!marker.isHidden() && !marker.minimap){
-                marker.drawWorld();
+            if(marker.world){
+                marker.draw(marker.autoscale ? scaleFactor : 1);
             }
         }
 
diff --git a/core/src/mindustry/editor/MapObjectivesDialog.java b/core/src/mindustry/editor/MapObjectivesDialog.java
index 5e354a84ae..ecdc53e01e 100644
--- a/core/src/mindustry/editor/MapObjectivesDialog.java
+++ b/core/src/mindustry/editor/MapObjectivesDialog.java
@@ -246,6 +246,38 @@ public class MapObjectivesDialog extends BaseDialog{
             show();
         }});
 
+        setInterpreter(Vertices.class, float[].class, (cont, name, type, field, remover, indexer, get, set) -> cont.table(main -> {
+            float[] data = get.get();
+
+            name(cont, name, remover, indexer);
+            cont.table(t -> {
+                t.left().defaults().left();
+
+                String[] names = {"x", "y", "color", "u", "v"};
+                int stride = 6;
+                int vertices = data.length / stride;
+
+                for(int i = 0; i < vertices; i++){
+                    int offset = i * stride;
+
+                    t.table(row -> {
+                        for(int j = 0; j < names.length; j++){
+                            int index = offset + j;
+
+                            if("color".equals(names[j])) {
+                                getInterpreter(Color.class).build(row, names[j], new TypeInfo(Color.class), null, null, null, () -> new Color().abgr8888(data[index]), value -> data[index] = value.toFloatBits());
+                            }else{
+                                float scale = j <= 1 ? tilesize : 1;
+                                getInterpreter(float.class).build(row, names[j], new TypeInfo(float.class), null, null, null, () -> data[index] / scale, value -> data[index] = value * scale);
+                            }
+
+                            row.add().pad(4);
+                        }
+                    }).row();
+                }
+            });
+        }));
+
         // Types that use the default interpreter. It would be nice if all types could use it, but I don't know how to reliably prevent classes like [? extends Content] from using it.
         for(var obj : MapObjectives.allObjectiveTypes) setInterpreter(obj.get().getClass(), defaultInterpreter());
         for(var mark : MapObjectives.allMarkerTypes) setInterpreter(mark.get().getClass(), defaultInterpreter());
@@ -290,10 +322,12 @@ public class MapObjectivesDialog extends BaseDialog{
                     t.button(Icon.downOpen, Styles.emptyi, () -> indexer.get(false)).fill().padRight(4f);
                 }
 
-                t.button(Icon.add, Styles.emptyi, () -> getProvider(type.element.raw).get(type.element, res -> {
-                    arr.add(res);
-                    rebuild[0].run();
-                })).fill();
+                if(!field.isAnnotationPresent(Immutable.class)) {
+                    t.button(Icon.add, Styles.emptyi, () -> getProvider(type.element.raw).get(type.element, res -> {
+                        arr.add(res);
+                        rebuild[0].run();
+                    })).fill();
+                }
             }).growX().height(46f).pad(0f, -10f, 0f, -10f).get();
 
             main.row().table(Tex.button, t -> rebuild[0] = () -> {
@@ -312,10 +346,10 @@ public class MapObjectivesDialog extends BaseDialog{
 
                     getInterpreter((Class<Object>)arr.get(index).getClass()).build(
                         t, "", new TypeInfo(arr.get(index).getClass()),
-                        field, () -> {
+                        field, field == null || !field.isAnnotationPresent(Immutable.class) ? () -> {
                             arr.remove(index);
                             rebuild[0].run();
-                        }, field == null || !field.isAnnotationPresent(Unordered.class) ? in -> {
+                        } : null, field == null || !field.isAnnotationPresent(Unordered.class) ? in -> {
                             if(in && index > 0){
                                 arr.swap(index, index - 1);
                                 rebuild[0].run();
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index f88607419a..466068c4eb 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -61,12 +61,15 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         registerMarker(
             ShapeTextMarker::new,
-            MinimapMarker::new,
+            PointMarker::new,
             ShapeMarker::new,
             TextMarker::new,
             LineMarker::new,
-            TextureMarker::new
+            TextureMarker::new,
+            QuadMarker::new
         );
+
+        registerLegacyMarker("Minimap", PointMarker::new);
     }
 
     @SafeVarargs
@@ -96,6 +99,15 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         }
     }
 
+    public static void registerLegacyMarker(String name, Prov<? extends ObjectiveMarker> prov) {
+        Class<?> type = prov.get().getClass();
+
+        markerNameToType.put(name, prov);
+        markerNameToType.put(Strings.camelize(name), prov);
+        JsonIO.classTag(Strings.camelize(name), type);
+        JsonIO.classTag(name, type);
+    }
+
     /** Adds all given objectives to the executor as root objectives. */
     public void add(MapObjective... objectives){
         for(var objective : objectives) flatten(objective);
@@ -617,38 +629,26 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         /** Internal use only! Do not access. */
         public transient int arrayIndex;
 
-        /** Whether to display marker on minimap instead of world. {@link MinimapMarker} ignores this value. */
+        /** Whether to display marker in the world. */
+        public boolean world = true;
+        /** Whether to display marker on minimap. */
         public boolean minimap = false;
-        /** Whether to scale marker corresponding to player's zoom level. {@link MinimapMarker} ignores this value. */
+        /** Whether to scale marker corresponding to player's zoom level. */
         public boolean autoscale = false;
-        /** Hides the marker, used by world processors. */
-        protected boolean hidden = false;
         /** On which z-sorting layer is marker drawn. */
         protected float drawLayer = Layer.overlayUI;
 
-        /** Draws the marker. Actual marker position and scale are calculated in {@link #drawWorld()} and {@link #drawMinimap(MinimapRenderer)}. */
-        public void baseDraw(float x, float y, float scaleFactor){}
-
-        /** Called in the main renderer. */
-        public void drawWorld(){}
-
-        /** Called in the small and large map. */
-        public void drawMinimap(MinimapRenderer minimap){}
-
-        /** Whether the marker is hidden */
-        public boolean isHidden(){
-            return hidden;
-        }
+        public void draw(float scaleFactor){}
 
         /** Control marker with world processor code. Ignores NaN (null) values. */
         public void control(LMarkerControl type, double p1, double p2, double p3){
             if(Double.isNaN(p1)) return;
 
             switch(type){
-                case visibility -> hidden = Mathf.equal((float)p1, 0f);
-                case drawLayer -> drawLayer = (float)p1;
+                case world -> world = !Mathf.equal((float)p1, 0f);
                 case minimap -> minimap = !Mathf.equal((float)p1, 0f);
                 case autoscale -> autoscale = !Mathf.equal((float)p1, 0f);
+                case drawLayer -> drawLayer = (float)p1;
             }
         }
 
@@ -688,19 +688,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         /** Position of marker, in world coordinates */
         public @TilePos Vec2 pos = new Vec2();
 
-        /** Called in the main renderer. */
-        @Override
-        public void drawWorld(){
-            baseDraw(pos.x, pos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
-        }
-
-        /** Called in the small and large map. */
-        @Override
-        public void drawMinimap(MinimapRenderer minimap){
-            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
-            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
-        }
-
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
             super.control(type, p1, p2, p3);
@@ -761,15 +748,15 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public ShapeTextMarker(){}
 
         @Override
-        public void baseDraw(float x, float y, float scaleFactor){
+        public void draw(float scaleFactor){
             //in case some idiot decides to make 9999999 sides and freeze the game
             int sides = Math.min(this.sides, 300);
 
             Draw.z(drawLayer);
             Lines.stroke(3f * scaleFactor, Pal.gray);
-            Lines.poly(x, y, sides, (radius + 1f) * scaleFactor, rotation);
+            Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation);
             Lines.stroke(scaleFactor, color);
-            Lines.poly(x, y, sides, (radius + 1f) * scaleFactor, rotation);
+            Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation);
             Draw.reset();
 
             if(fetchedText == null){
@@ -779,7 +766,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             // font size cannot be 0
             if(Mathf.equal(fontSize, 0f)) return;
 
-            WorldLabel.drawAt(fetchedText, x, y + radius * scaleFactor + textHeight * scaleFactor, drawLayer, flags, fontSize * scaleFactor);
+            WorldLabel.drawAt(fetchedText, pos.x, pos.y + radius * scaleFactor + textHeight * scaleFactor, drawLayer, flags, fontSize * scaleFactor);
         }
 
         @Override
@@ -799,7 +786,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                     }
                     case radius -> radius = (float)p1;
                     case rotation -> rotation = (float)p1;
-                    case color -> color.set(Tmp.c1.fromDouble(p1));
+                    case color -> color.fromDouble(p1);
                     case shape -> sides = (int)p1;
                 }
             }
@@ -828,72 +815,50 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         }
     }
 
-    /** Displays a circle on the minimap. */
-    public static class MinimapMarker extends ObjectiveMarker{
-        public Point2 pos = new Point2();
+    /** Displays a circle in the world. */
+    public static class PointMarker extends PosMarker{
         public float radius = 5f, stroke = 11f;
         public Color color = Color.valueOf("f25555");
 
-        public MinimapMarker(int x, int y){
+        public PointMarker(int x, int y){
             this.pos.set(x, y);
         }
 
-        public MinimapMarker(int x, int y, Color color){
+        public PointMarker(int x, int y, Color color){
             this.pos.set(x, y);
             this.color = color;
-            minimap = true;
         }
 
-        public MinimapMarker(int x, int y, float radius, float stroke, Color color){
+        public PointMarker(int x, int y, float radius, float stroke, Color color){
             this.pos.set(x, y);
             this.stroke = stroke;
             this.radius = radius;
             this.color = color;
-            minimap = true;
         }
 
-        public MinimapMarker(){}
+        public PointMarker(){}
 
         @Override
-        public void baseDraw(float x, float y, float scaleFactor){
+        public void draw(float scaleFactor){
             float rad = radius * tilesize * scaleFactor;
             float fin = Interp.pow2Out.apply((Time.globalTime / 100f) % 1f);
 
             Draw.z(drawLayer);
             Lines.stroke(Scl.scl((1f - fin) * stroke + 0.1f), color);
-            Lines.circle(x, y, rad * fin);
+            Lines.circle(pos.x, pos.y, rad * fin);
 
             Draw.reset();
         }
 
-        @Override
-        public void drawWorld(){
-            minimap = true;
-        }
-
-        @Override
-        public void drawMinimap(MinimapRenderer minimap){
-            minimap.transform(Tmp.v1.set(pos.x * tilesize, pos.y * tilesize));
-            baseDraw(Tmp.v1.x, Tmp.v1.y, minimap.getScaleFactor(autoscale));
-        }
-
         @Override
         public void control(LMarkerControl type, double p1, double p2, double p3){
             super.control(type, p1, p2, p3);
 
             if(!Double.isNaN(p1)){
                 switch(type){
-                    case pos -> pos.x = (int)p1;
                     case radius -> radius = (float)p1;
                     case stroke -> stroke = (float)p1;
-                    case color -> color.set(Tmp.c1.fromDouble(p1));
-                    case minimap -> minimap = true;
-                }
-            }
-
-            if(!Double.isNaN(p2)){
-                if(type == LMarkerControl.pos){
-                    pos.y = (int)p2;
+                    case color -> color.fromDouble(p1);
                 }
             }
         }
@@ -919,7 +884,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public ShapeMarker(){}
 
         @Override
-        public void baseDraw(float x, float y, float scaleFactor){
+        public void draw(float scaleFactor){
             //in case some idiot decides to make 9999999 sides and freeze the game
             int sides = Math.min(this.sides, 200);
 
@@ -927,14 +892,14 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             if(!fill){
                 if(outline){
                     Lines.stroke((stroke + 2f) * scaleFactor, Pal.gray);
-                    Lines.poly(x, y, sides, (radius + 1f) * scaleFactor, rotation);
+                    Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation);
                 }
 
                 Lines.stroke(stroke * scaleFactor, color);
-                Lines.poly(x, y, sides, (radius + 1f) * scaleFactor, rotation);
+                Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation);
             }else{
                 Draw.color(color);
-                Fill.poly(x, y, sides, radius * scaleFactor, rotation);
+                Fill.poly(pos.x, pos.y, sides, radius * scaleFactor, rotation);
             }
 
             Draw.reset();
@@ -949,7 +914,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                     case radius -> radius = (float)p1;
                     case stroke -> stroke = (float)p1;
                     case rotation -> rotation = (float)p1;
-                    case color -> color.set(Tmp.c1.fromDouble(p1));
+                    case color -> color.fromDouble(p1);
                     case shape -> sides = (int)p1;
                 }
             }
@@ -991,7 +956,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public TextMarker(){}
 
         @Override
-        public void baseDraw(float x, float y, float scaleFactor){
+        public void draw(float scaleFactor){
             // font size cannot be 0
             if(Mathf.equal(fontSize, 0f)) return;
 
@@ -999,7 +964,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 fetchedText = fetchText(text);
             }
 
-            WorldLabel.drawAt(fetchedText, x, y, drawLayer, flags, fontSize * scaleFactor);
+            WorldLabel.drawAt(fetchedText, pos.x, pos.y, drawLayer, flags, fontSize * scaleFactor);
         }
 
         @Override
@@ -1048,7 +1013,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public @TilePos Vec2 endPos = new Vec2();
         public float stroke = 1f;
         public boolean outline = true;
-        public Color color = Color.valueOf("ffd37f");
+        public Color color1 = Color.valueOf("ffd37f");
+        public Color color2 = Color.valueOf("ffd37f");
 
         public LineMarker(float x1, float y1, float x2, float y2, float stroke){
             this.stroke = stroke;
@@ -1063,27 +1029,16 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         public LineMarker(){}
 
-        public void baseLineDraw(float x1, float y1, float x2, float y2, float scaleFactor){
+        @Override
+        public void draw(float scaleFactor){
             Draw.z(drawLayer);
             if(outline){
                 Lines.stroke((stroke + 2f) * scaleFactor, Pal.gray);
-                Lines.line(x1, y1, x2, y2);
+                Lines.line(pos.x, pos.y, endPos.x, endPos.y);
             }
 
-            Lines.stroke(stroke * scaleFactor, color);
-            Lines.line(x1, y1, x2, y2);
-        }
-
-        @Override
-        public void drawWorld(){
-            baseLineDraw(pos.x, pos.y, endPos.x, endPos.y, autoscale ? 4f / renderer.getDisplayScale() : 1f);
-        }
-
-        @Override
-        public void drawMinimap(MinimapRenderer minimap){
-            minimap.transform(Tmp.v1.set(pos.x + 4f, pos.y + 4f));
-            minimap.transform(Tmp.v2.set(endPos.x + 4f, endPos.y + 4f));
-            baseLineDraw(Tmp.v1.x, Tmp.v1.y, Tmp.v2.x, Tmp.v2.y, minimap.getScaleFactor(autoscale));
+            Lines.stroke(stroke * scaleFactor, Color.white);
+            Lines.line(pos.x, pos.y, color1, endPos.x, endPos.y, color2);
         }
 
         @Override
@@ -1094,7 +1049,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 switch(type){
                     case endPos -> endPos.x = (float)p1 * tilesize;
                     case stroke -> stroke = (float)p1;
-                    case color -> color.set(Tmp.c1.fromDouble(p1));
+                    case color -> color1.set(color2.fromDouble(p1));
                 }
             }
 
@@ -1103,6 +1058,19 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                     case endPos -> endPos.y = (float)p2 * tilesize;
                 }
             }
+
+            if(!Double.isNaN(p1) && !Double.isNaN(p2)){
+                switch (type){
+                    case posi -> ((int)p1 == 0 ? pos : (int)p1 == 1 ? endPos : Tmp.v1).x = (float)p2 * tilesize;
+                    case colori -> ((int)p1 == 0 ? color1 : (int)p1 == 1 ? color2 : Tmp.c1).fromDouble(p2);
+                }
+            }
+
+            if(!Double.isNaN(p1) && !Double.isNaN(p3)){
+                switch(type){
+                    case posi -> ((int)p1 == 0 ? pos : (int)p1 == 1 ? endPos : Tmp.v1).y = (float)p3 * tilesize;
+                }
+            }
         }
     }
 
@@ -1136,7 +1104,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 switch(type){
                     case rotation -> rotation = (float)p1;
                     case textureSize -> width = (float)p1 * tilesize;
-                    case color -> color.set(Tmp.c1.fromDouble(p1));
+                    case color -> color.fromDouble(p1);
                 }
             }
 
@@ -1148,7 +1116,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         }
 
         @Override
-        public void baseDraw(float x, float y, float scaleFactor){
+        public void draw(float scaleFactor){
             if(textureName.isEmpty()) return;
 
             if(fetchedRegion == null) setTexture(textureName);
@@ -1159,7 +1127,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             Draw.z(drawLayer);
             Draw.color(color);
-            Draw.rect(fetchedRegion, x, y, width * scaleFactor, height * scaleFactor, rotation);
+            Draw.rect(fetchedRegion, pos.x, pos.y, width * scaleFactor, height * scaleFactor, rotation);
         }
 
         @Override
@@ -1167,19 +1135,119 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             this.textureName = textureName;
 
             if(fetchedRegion == null) fetchedRegion = new TextureRegion();
+            lookupRegion(textureName, fetchedRegion);
+        }
 
-            TextureRegion region = Core.atlas.find(textureName);
-            if(region.found()){
-               fetchedRegion.set(region);
-            }else{
-                if(Core.assets.isLoaded(textureName, Texture.class)){
-                    fetchedRegion.set(Core.assets.get(textureName, Texture.class));
-                }else{
-                    fetchedRegion.set(Core.atlas.find("error"));
+    }
+
+    public static class QuadMarker extends ObjectiveMarker{
+        public String textureName = "white";
+        public @Vertices float[] vertices = new float[24];
+
+        private transient TextureRegion fetchedRegion;
+
+        public QuadMarker() {
+            for(int i = 0; i < 4; i++){
+                vertices[i * 6 + 2] = Color.white.toFloatBits();
+                vertices[i * 6 + 5] = Color.clearFloatBits;
+            }
+        }
+
+        @Override
+        public void draw(float scaleFactor){
+            if(fetchedRegion == null) setTexture(textureName);
+
+            Draw.z(drawLayer);
+            Draw.vert(fetchedRegion.texture, vertices, 0, vertices.length);
+        }
+
+        @Override
+        public void control(LMarkerControl type, double p1, double p2, double p3){
+            super.control(type, p1, p2, p3);
+
+            if(!Double.isNaN(p1)){
+                switch(type){
+                    case color -> {
+                        float col = Tmp.c1.fromDouble(p1).toFloatBits();
+                        for(int i = 0; i < 4; i++) vertices[i * 6 + 2] = col;
+                    }
+                    case pos -> vertices[0] = (float)p1 * tilesize;
+                    case posi -> setPos((int)p1, p2, p3);
+                    case uvi -> setUv((int)p1, p2, p3);
+                }
+            }
+
+            if(!Double.isNaN(p2)){
+                switch(type){
+                    case pos -> vertices[1] = (float)p1 * tilesize;
+                }
+            }
+
+            if(!Double.isNaN(p1) && !Double.isNaN(p2)){
+                switch(type){
+                    case colori -> setColor((int)p1, p2);
                 }
             }
         }
 
+        @Override
+        public void setTexture(String textureName){
+            this.textureName = textureName;
+
+            boolean firstUpdate = fetchedRegion == null;
+
+            if(fetchedRegion == null) fetchedRegion = new TextureRegion();
+            Tmp.tr1.set(fetchedRegion);
+
+            lookupRegion(textureName, fetchedRegion);
+
+            if(firstUpdate) {
+                // possibly from the editor, we need to clamp the values
+                for(int i = 0; i < 4; i++){
+                    vertices[i * 6 + 3] = Mathf.map(Mathf.clamp(vertices[i * 6 + 3]), fetchedRegion.u, fetchedRegion.u2);
+                    vertices[i * 6 + 4] = Mathf.map(1 - Mathf.clamp(vertices[i * 6 + 4]), fetchedRegion.v, fetchedRegion.v2);
+                }
+            }else{
+                for(int i = 0; i < 4; i++){
+                    vertices[i * 6 + 3] = Mathf.map(vertices[i * 6 + 3], Tmp.tr1.u, Tmp.tr1.u2, fetchedRegion.u, fetchedRegion.u2);
+                    vertices[i * 6 + 4] = Mathf.map(vertices[i * 6 + 4], Tmp.tr1.v, Tmp.tr1.v2, fetchedRegion.v, fetchedRegion.v2);
+                }
+            }
+        }
+
+        private void setPos(int i, double x, double y){
+            if(i >= 0 && i < 4){
+                if(!Double.isNaN(x)) vertices[i * 6] = (float)x * tilesize;
+                if(!Double.isNaN(y)) vertices[i * 6 + 1] = (float)y * tilesize;
+            }
+        }
+
+        private void setColor(int i, double c){
+            if(i >= 0 && i < 4){
+                vertices[i * 6 + 2] = Tmp.c1.fromDouble(c).toFloatBits();
+            }
+        }
+
+        private void setUv(int i, double u, double v){
+            if(i >= 0 && i < 4){
+                if(!Double.isNaN(u)) vertices[i * 6 + 3] = Mathf.map(Mathf.clamp((float)u), fetchedRegion.u, fetchedRegion.u2);
+                if(!Double.isNaN(v)) vertices[i * 6 + 4] = Mathf.map(1 - Mathf.clamp((float)v), fetchedRegion.v, fetchedRegion.v2);
+            }
+        }
+
+    }
+
+    private static void lookupRegion(String name, TextureRegion out){
+        TextureRegion region = Core.atlas.find(name);
+        if(region.found()){
+            out.set(region);
+        }else{
+            if(Core.assets.isLoaded(name, Texture.class)){
+                out.set(Core.assets.get(name, Texture.class));
+            }else{
+                out.set(Core.atlas.find("error"));
+            }
+        }
     }
 
     /** For arrays or {@link Seq}s; does not create element rearrangement buttons. */
@@ -1187,6 +1255,16 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     @Retention(RUNTIME)
     public @interface Unordered{}
 
+    /** For arrays or {@link Seq}s; does not add the new and delete buttons */
+    @Target(FIELD)
+    @Retention(RUNTIME)
+    public @interface Immutable{}
+
+    /** For {@code float[]}; treats it as an array of vertices. */
+    @Target(FIELD)
+    @Retention(RUNTIME)
+    public @interface Vertices{}
+
     /** For {@code byte}; treats it as a world label flag. */
     @Target(FIELD)
     @Retention(RUNTIME)
diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java
index 62df0d9c9c..cd0362ff62 100644
--- a/core/src/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/mindustry/graphics/MinimapRenderer.java
@@ -146,16 +146,27 @@ public class MinimapRenderer{
 
         rect.set((dx - sz) * tilesize, (dy - sz) * tilesize, sz * 2 * tilesize, sz * 2 * tilesize);
 
+        Tmp.m2.set(Draw.trans());
+
+        var trans = Tmp.m1.idt();
+        trans.translate(lastX, lastY);
+        if(!worldSpace){
+            trans.scl(Tmp.v1.set(lastW / rect.width, lastH / rect.height));
+            trans.translate(-rect.x, -rect.y);
+        }else{
+            trans.scl(Tmp.v1.set(lastW / world.unitWidth(), lastH / world.unitHeight()));
+        }
+        trans.translate(tilesize / 2f, tilesize / 2f);
+        Draw.trans(trans);
+
         for(Unit unit : units){
             if(unit.inFogTo(player.team()) || !unit.type.drawMinimap) continue;
 
-            float rx = !fullView ? (unit.x - rect.x) / rect.width * w : unit.x / (world.width() * tilesize) * w;
-            float ry = !fullView ? (unit.y - rect.y) / rect.width * h : unit.y / (world.height() * tilesize) * h;
+            float scale = Scl.scl(1f) * tilesize * 3;
+            var region = unit.icon();
 
             Draw.mixcol(unit.team.color, 1f);
-            float scale = Scl.scl(1f) / 2f * scaling * 32f;
-            var region = unit.icon();
-            Draw.rect(region, x + rx, y + ry, scale, scale * (float)region.height / region.width, unit.rotation() - 90);
+            Draw.rect(region, unit.x, unit.y, scale, scale * (float)region.height / region.width, unit.rotation() - 90);
             Draw.reset();
         }
 
@@ -186,15 +197,14 @@ public class MinimapRenderer{
             //crisp pixels
             dynamicTex.setFilter(TextureFilter.nearest);
 
-            if(worldSpace){
-                region.set(0f, 0f, 1f, 1f);
-            }
-
             Tmp.tr1.set(dynamicTex);
-            Tmp.tr1.set(region.u, 1f - region.v, region.u2, 1f - region.v2);
+            Tmp.tr1.set(0f, 0f, 1f, 1f);
+
+            float wf = world.width() * tilesize;
+            float hf = world.height() * tilesize;
 
             Draw.color(state.rules.dynamicColor, 0.5f);
-            Draw.rect(Tmp.tr1, x + w/2f, y + h/2f, w, h);
+            Draw.rect(Tmp.tr1, wf / 2, hf / 2, wf, hf);
 
             if(state.rules.staticFog){
                 staticTex.setFilter(TextureFilter.nearest);
@@ -202,7 +212,7 @@ public class MinimapRenderer{
                 Tmp.tr1.texture = staticTex;
                 //must be black to fit with borders
                 Draw.color(0f, 0f, 0f, 1f);
-                Draw.rect(Tmp.tr1, x + w/2f, y + h/2f, w, h);
+                Draw.rect(Tmp.tr1, wf / 2, hf / 2, wf, hf);
             }
 
             Draw.color();
@@ -211,23 +221,21 @@ public class MinimapRenderer{
 
         //TODO might be useful in the standard minimap too
         if(fullView){
-            drawSpawns(x, y, w, h, scaling);
+            drawSpawns();
 
             if(!mobile){
                 //draw bounds for camera - not drawn on mobile because you can't shift it by tapping anyway
                 Rect r = Core.camera.bounds(Tmp.r1);
-                Vec2 bot = transform(Tmp.v1.set(r.x, r.y));
-                Vec2 top = transform(Tmp.v2.set(r.x + r.width, r.y + r.height));
                 Lines.stroke(Scl.scl(3f));
                 Draw.color(Pal.accent);
-                Lines.rect(bot.x,bot.y, top.x - bot.x, top.y - bot.y);
+                Lines.rect(r.x, r.y, r.width, r.height);
                 Draw.reset();
             }
         }
 
         LongSeq indicators = control.indicators.list();
         float fin = ((Time.globalTime / 30f) % 1f);
-        float rad = scale(fin * 5f + tilesize - 2f);
+        float rad = fin * 5f + tilesize - 2f;
         Lines.stroke(Scl.scl((1f - fin) * 4f + 0.5f));
 
         for(int i = 0; i < indicators.size; i++){
@@ -244,31 +252,32 @@ public class MinimapRenderer{
                 offset = build.block.offset / tilesize;
             }
 
-            Vec2 v = transform(Tmp.v1.set((ix + 0.5f + offset) * tilesize, (iy + 0.5f + offset) * tilesize));
-
             Draw.color(Color.orange, Color.scarlet, Mathf.clamp(time / 70f));
 
-            Lines.square(v.x, v.y, rad);
+            Lines.square((ix + 0.5f + offset) * tilesize, (iy + 0.5f + offset) * tilesize, rad);
         }
 
         Draw.reset();
 
+        //TODO autoscale markers
         state.rules.objectives.eachRunning(obj -> {
             for(var marker : obj.markers){
                 if(marker.minimap){
-                    marker.drawMinimap(this);
+                    marker.draw(1);
                 }
             }
         });
 
         for(var marker : state.markers){
-            if(!marker.isHidden() && marker.minimap){
-                marker.drawMinimap(this);
+            if(marker.minimap){
+                marker.draw(1);
             }
         }
+
+        Draw.trans(Tmp.m2);
     }
 
-    public void drawSpawns(float x, float y, float w, float h, float scaling){
+    public void drawSpawns(){
         if(!state.rules.showSpawns || !state.hasSpawns() || !state.rules.waves) return;
 
         TextureRegion icon = Icon.units.getRegion();
@@ -277,44 +286,21 @@ public class MinimapRenderer{
 
         Draw.color(state.rules.waveTeam.color, Tmp.c2.set(state.rules.waveTeam.color).value(1.2f), Mathf.absin(Time.time, 16f, 1f));
 
-        float rad = scale(state.rules.dropZoneRadius);
+        float rad = state.rules.dropZoneRadius;
         float curve = Mathf.curve(Time.time % 240f, 120f, 240f);
 
         for(Tile tile : spawner.getSpawns()){
-            float tx = ((tile.x + 0.5f) / world.width()) * w;
-            float ty = ((tile.y + 0.5f) / world.height()) * h;
+            float tx = tile.worldx();
+            float ty = tile.worldy();
 
-            Draw.rect(icon, x + tx, y + ty, icon.width, icon.height);
-            Lines.circle(x + tx, y + ty, rad);
-            if(curve > 0f) Lines.circle(x + tx, y + ty, rad * Interp.pow3Out.apply(curve));
+            Draw.rect(icon, tx, ty, icon.width, icon.height);
+            Lines.circle(tx, ty, rad);
+            if(curve > 0f) Lines.circle(tx, ty, rad * Interp.pow3Out.apply(curve));
         }
 
         Draw.reset();
     }
 
-    //TODO horrible code, everywhere.
-    public Vec2 transform(Vec2 position){
-        if(!worldSpace){
-            position.sub(rect.x, rect.y).scl(lastW / rect.width, lastH / rect.height);
-        }else{
-            position.scl(lastW / world.unitWidth(), lastH / world.unitHeight());
-        }
-
-        return position.add(lastX, lastY);
-    }
-
-    public float scale(float radius){
-        return worldSpace ? (radius / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width * radius;
-    }
-
-    public float getScaleFactor(boolean zoomAutoScale){
-        if(!zoomAutoScale){
-            return worldSpace ? (1 / (baseSize / 2f)) * 5f * lastScl : lastW / rect.width;
-        }else{
-            return worldSpace ? (1 / (baseSize / 2f)) * 5f : lastW / 256f;
-        }
-    }
-
     public @Nullable TextureRegion getRegion(){
         if(texture == null) return null;
 
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
index eb7cfcb196..16a9aaa9c6 100644
--- a/core/src/mindustry/logic/LMarkerControl.java
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -2,7 +2,7 @@ package mindustry.logic;
 
 public enum LMarkerControl{
     remove,
-    visibility("true/false"),
+    world("true/false"),
     minimap("true/false"),
     autoscale("true/false"),
     pos("x", "y"),
@@ -18,7 +18,10 @@ public enum LMarkerControl{
     textHeight("height"),
     labelFlags("background", "outline"),
     texture("printFlush", "name"),
-    textureSize("width", "height");
+    textureSize("width", "height"),
+    posi("index", "x", "y"),
+    uvi("index", "x", "y"),
+    colori("index", "color");
 
     public final String[] params;
 
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index b5aafdfcee..32b812ee2b 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -1999,11 +1999,14 @@ public class LStatements{
                 table.table(t -> {
                     t.setColor(table.color);
 
-                    fields(t, type.params[i], i == 0 ? p1 : i == 1 ? p2 : p3, i == 0 ? v -> p1 = v : i == 1 ? v -> p2 = v : v -> p3 = v).width(100f);
+                    String value = i == 0 ? p1 : i == 1 ? p2 : p3;
+                    Cons<String> setter = i == 0 ? v -> p1 = v : i == 1 ? v -> p2 = v : v -> p3 = v;
 
-                    if(type == LMarkerControl.color){
-                        col(t, p1, res -> {
-                            p1 = "%" + res.toString().substring(0, res.a >= 1f ? 6 : 8);
+                    fields(t, type.params[i], value, setter).width(100f);
+
+                    if(type == LMarkerControl.color || (type == LMarkerControl.colori && i == 1)){
+                        col(t, value, res -> {
+                            setter.get("%" + res.toString().substring(0, res.a >= 1f ? 6 : 8));
                             build(table);
                         });
                     }else if(type == LMarkerControl.drawLayer){
@@ -2013,10 +2016,10 @@ public class LStatements{
                                 o.row();
                                 o.table(s -> {
                                     s.left();
-                                    for(var layer : Layer.class.getFields()){
-                                        float value = Reflect.get(Layer.class, layer.getName());
-                                        s.button(layer.getName() + " = " + value, Styles.logicTogglet, () -> {
-                                            p1 = Float.toString(value);
+                                    for(var field : Layer.class.getFields()){
+                                        float layer = Reflect.get(field);
+                                        s.button(field.getName() + " = " + layer, Styles.logicTogglet, () -> {
+                                            p1 = Float.toString(layer);
                                             rebuild(table);
                                             hide.run();
                                         }).size(240f, 40f).row();

From 13b8d6ba2a735583e811e8d7e5da53b8e6065a34 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az841-912.g11ey1dcctbuhkhojwlj3kcpwe.dx.internal.cloudapp.net>
Date: Wed, 31 Jan 2024 00:36:30 +0000
Subject: [PATCH 184/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 6 +++++-
 core/assets/bundles/bundle_bg.properties    | 6 +++++-
 core/assets/bundles/bundle_ca.properties    | 6 +++++-
 core/assets/bundles/bundle_cs.properties    | 6 +++++-
 core/assets/bundles/bundle_da.properties    | 6 +++++-
 core/assets/bundles/bundle_de.properties    | 6 +++++-
 core/assets/bundles/bundle_es.properties    | 6 +++++-
 core/assets/bundles/bundle_et.properties    | 6 +++++-
 core/assets/bundles/bundle_eu.properties    | 6 +++++-
 core/assets/bundles/bundle_fi.properties    | 6 +++++-
 core/assets/bundles/bundle_fil.properties   | 6 +++++-
 core/assets/bundles/bundle_fr.properties    | 6 +++++-
 core/assets/bundles/bundle_hu.properties    | 6 +++++-
 core/assets/bundles/bundle_id_ID.properties | 6 +++++-
 core/assets/bundles/bundle_it.properties    | 6 +++++-
 core/assets/bundles/bundle_ja.properties    | 6 +++++-
 core/assets/bundles/bundle_ko.properties    | 6 +++++-
 core/assets/bundles/bundle_lt.properties    | 6 +++++-
 core/assets/bundles/bundle_nl.properties    | 6 +++++-
 core/assets/bundles/bundle_nl_BE.properties | 6 +++++-
 core/assets/bundles/bundle_pl.properties    | 6 +++++-
 core/assets/bundles/bundle_pt_BR.properties | 6 +++++-
 core/assets/bundles/bundle_pt_PT.properties | 6 +++++-
 core/assets/bundles/bundle_ro.properties    | 6 +++++-
 core/assets/bundles/bundle_ru.properties    | 6 +++++-
 core/assets/bundles/bundle_sr.properties    | 6 +++++-
 core/assets/bundles/bundle_sv.properties    | 6 +++++-
 core/assets/bundles/bundle_th.properties    | 6 +++++-
 core/assets/bundles/bundle_tk.properties    | 6 +++++-
 core/assets/bundles/bundle_tr.properties    | 6 +++++-
 core/assets/bundles/bundle_uk_UA.properties | 6 +++++-
 core/assets/bundles/bundle_vi.properties    | 6 +++++-
 core/assets/bundles/bundle_zh_CN.properties | 6 +++++-
 core/assets/bundles/bundle_zh_TW.properties | 6 +++++-
 34 files changed, 170 insertions(+), 34 deletions(-)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index bb9555598d..0f2bd5d579 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -664,10 +664,11 @@ objective.destroycore.name = Знішчыць Ядро
 objective.commandmode.name = Рэжым Загадаў
 objective.flag.name = Сцяг
 marker.shapetext.name = Форма Тэксту
-marker.minimap.name = Міні-Мапа
+marker.point.name = Point
 marker.shape.name = Форма
 marker.text.name = Тэкст
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Задні Фон
 marker.outline = Контур
 objective.research = [accent]Даследаваць:\n[]{0}[lightgray]{1}
@@ -2412,3 +2413,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index e8074f5dfa..4f4a1b6a85 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -670,10 +670,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2442,3 +2443,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index 0d9c491f6a..6da600fb24 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -673,10 +673,11 @@ objective.destroycore.name = Destrueix el nucli
 objective.commandmode.name = Mode de comandament
 objective.flag.name = Bandera
 marker.shapetext.name = Forma del text
-marker.minimap.name = Minimapa
+marker.point.name = Point
 marker.shape.name = Forma
 marker.text.name = Text
 marker.line.name = Línia
+marker.quad.name = Quad
 marker.background = Fons
 marker.outline = Contorn
 
@@ -2455,3 +2456,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 9533193eac..e112b8a7dd 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -671,10 +671,11 @@ objective.destroycore.name = Zničit Jádro
 objective.commandmode.name = Příkazovy Režim
 objective.flag.name = Vlajka
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimapa
+marker.point.name = Point
 marker.shape.name = Tvar
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Pozadí
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2449,3 +2450,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index c9325e6d8b..ea0486f57f 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -665,10 +665,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2412,3 +2413,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 0d4fa1a90f..2d9b01b830 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -678,10 +678,11 @@ objective.commandmode.name = Steuerungsmodus
 objective.flag.name = Flag
 
 marker.shapetext.name = Geformter Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Form
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 
 marker.background = Hintergrund
 marker.outline = Umriss
@@ -2481,3 +2482,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index ef7991befe..0d8a67acc1 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -675,10 +675,11 @@ objective.commandmode.name = Modo comando
 objective.flag.name = Bandera
 
 marker.shapetext.name = Forma del texto
-marker.minimap.name = Minimapa
+marker.point.name = Point
 marker.shape.name = Forma
 marker.text.name = Texto
 marker.line.name = Line
+marker.quad.name = Quad
 
 marker.background = Fondo
 marker.outline = Bordes
@@ -2474,3 +2475,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index b01a6100c8..3d275aaf31 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -665,10 +665,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2414,3 +2415,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index ab6f4b5be3..e140e0f2d2 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -667,10 +667,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2416,3 +2417,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 4222b46766..b6fccfbb25 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -665,10 +665,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Pikkukartta
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Teksti
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Tutki:\n[]{0}[lightgray]{1}
@@ -2417,3 +2418,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 9cd3a3daf6..fa419f2b4e 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -665,10 +665,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2413,3 +2414,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 0e1b3031d2..451b2fe7ad 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -681,10 +681,11 @@ objective.commandmode.name = Mode « Commande »
 objective.flag.name = Drapeau
 
 marker.shapetext.name = Forme de Texte
-marker.minimap.name = Minicarte
+marker.point.name = Point
 marker.shape.name = Forme
 marker.text.name = Texte
 marker.line.name = Ligne
+marker.quad.name = Quad
 
 marker.background = Fond
 marker.outline = Contour
@@ -2482,3 +2483,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index dee0135499..d8503ea990 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -682,10 +682,11 @@ objective.commandmode.name = Parancs Mód
 objective.flag.name = Jelölő
 
 marker.shapetext.name = Szövegforma
-marker.minimap.name = Minitérkép
+marker.point.name = Point
 marker.shape.name = Alakzat
 marker.text.name = Szöveg
 marker.line.name = Vonal
+marker.quad.name = Quad
 
 marker.background = Háttér
 marker.outline = Körvonal
@@ -2483,3 +2484,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index fe30b45aa2..e9c1a422ed 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -675,10 +675,11 @@ objective.commandmode.name = Mode Perintah
 objective.flag.name = Bendera
 
 marker.shapetext.name = Teks Berbentuk
-marker.minimap.name = Peta Kecil
+marker.point.name = Point
 marker.shape.name = Bentuk
 marker.text.name = Teks
 marker.line.name = Line
+marker.quad.name = Quad
 
 marker.background = Latar Belakang
 marker.outline = Garis Luar
@@ -2472,3 +2473,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 8f8c8e96c0..5573373c19 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -668,10 +668,11 @@ objective.destroycore.name = Distruggi nuclei
 objective.commandmode.name = Modalità comando
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimappa
+marker.point.name = Point
 marker.shape.name = Forma
 marker.text.name = Testo
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Sfondo
 marker.outline = Outline
 objective.research = [accent]Ricerca:\n[]{0}[lightgray]{1}
@@ -2426,3 +2427,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 0d45273c1b..5bc5164d62 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -672,10 +672,11 @@ objective.destroycore.name = コアを破壊する
 objective.commandmode.name = コマンドモード
 objective.flag.name = フラグ
 marker.shapetext.name = テキストの形
-marker.minimap.name = ミニマップ
+marker.point.name = Point
 marker.shape.name = 図形
 marker.text.name = 文章
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = 背景
 marker.outline = 輪郭
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2430,3 +2431,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index f7b3cee4a3..19d67abc19 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -672,10 +672,11 @@ objective.destroycore.name = 코어 파괴
 objective.commandmode.name = 명령 모드
 objective.flag.name = 플래그
 marker.shapetext.name = 도형과 문자
-marker.minimap.name = 미니맵
+marker.point.name = Point
 marker.shape.name = 도형
 marker.text.name = 문자
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = 배경
 marker.outline = 외곽선
 
@@ -2448,3 +2449,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 82769f2694..506091d3fd 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -665,10 +665,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2414,3 +2415,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index d9e16b469d..dd8a5fa776 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -676,10 +676,11 @@ objective.destroycore.name = Vernietig Core
 objective.commandmode.name = Commando Modus
 objective.flag.name = Vlag
 marker.shapetext.name = Vorm Tekst
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Vorm
 marker.text.name = Tekst
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Achtergrond
 marker.outline = Omtrek
 objective.research = [accent]Onderzoek:\n[]{0}[lightgray]{1}
@@ -2427,3 +2428,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 8f0a0b9053..3f254be6bf 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -665,10 +665,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2414,3 +2415,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index d39fc6514c..354218436d 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -670,10 +670,11 @@ objective.destroycore.name = Zniszcz Rdzeń
 objective.commandmode.name = Tryb Poleceń
 objective.flag.name = Oznaczenie
 marker.shapetext.name = Dostosuj Tekst
-marker.minimap.name = Minimapa
+marker.point.name = Point
 marker.shape.name = Figura
 marker.text.name = Tekst
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Tło
 marker.outline = Kontur
 objective.research = [accent]Zbadaj:\n[]{0}[lightgray]{1}
@@ -2467,3 +2468,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 6b22c3cea5..57d093b14c 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -675,10 +675,11 @@ objective.commandmode.name = Modo de Comando
 objective.flag.name = Flag
 
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimapa
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Texto
 marker.line.name = Line
+marker.quad.name = Quad
 
 marker.background = Fundo
 marker.outline = Contorno
@@ -2465,3 +2466,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index cc0c4e3b8d..2779c1247b 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -665,10 +665,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2414,3 +2415,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index 19320f252b..1d30c519ac 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -672,10 +672,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2450,3 +2451,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 66997bb4b8..219d23880d 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -672,10 +672,11 @@ objective.destroycore.name = Уничтожить ядро
 objective.commandmode.name = Командовать единицей
 objective.flag.name = Флаг
 marker.shapetext.name = Фигура с текстом
-marker.minimap.name = Миникарта
+marker.point.name = Point
 marker.shape.name = Фигура
 marker.text.name = Текст
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Фон
 marker.outline = Контур
 objective.research = [accent]Исследуйте:\n[]{0}[lightgray]{1}
@@ -2452,3 +2453,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index c4d45ca70b..c372cd5e61 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -672,10 +672,11 @@ objective.destroycore.name = Uništi Jezgro
 objective.commandmode.name = Upravljački Mod
 objective.flag.name = Zastava
 marker.shapetext.name = Tekst i Oblik
-marker.minimap.name = Minimapa
+marker.point.name = Point
 marker.shape.name = Oblik
 marker.text.name = Tekst
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Pozadina
 marker.outline = Outline
 objective.research = [accent]Izuči:\n[]{0}[lightgray]{1}
@@ -2453,3 +2454,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 8f9514f85a..e149794032 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -665,10 +665,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2414,3 +2415,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 74fc4d3819..fdfc3f6fef 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -672,10 +672,11 @@ objective.destroycore.name = ทำลายแกนกลาง
 objective.commandmode.name = โหมดสั่งการ
 objective.flag.name = ธง
 marker.shapetext.name = ข้อความในรูปทรง
-marker.minimap.name = มินิแมพ
+marker.point.name = Point
 marker.shape.name = รูปทรง
 marker.text.name = ข้อความ
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = พื้นหลัง
 marker.outline = โครงร่าง
 objective.research = [accent]วิจัย:\n[]{0}[lightgray]{1}
@@ -2471,3 +2472,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index c7dd2ddbfc..8d56df9627 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -665,10 +665,11 @@ objective.destroycore.name = Destroy Core
 objective.commandmode.name = Command Mode
 objective.flag.name = Flag
 marker.shapetext.name = Shape Text
-marker.minimap.name = Minimap
+marker.point.name = Point
 marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -2414,3 +2415,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 079f563982..cbaf31d335 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -672,10 +672,11 @@ objective.destroycore.name = Merkezi Yok Et
 objective.commandmode.name = Komuta Et
 objective.flag.name = Bayrak
 marker.shapetext.name = Şekilli Yazı
-marker.minimap.name = Harita
+marker.point.name = Point
 marker.shape.name = Şekil
 marker.text.name = Yazı
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Arkaplan
 marker.outline = Anahat
 objective.research = [accent]Araştır:\n[]{0}[lightgray]{1}
@@ -2450,3 +2451,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 635b46d128..8d82468aab 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -677,10 +677,11 @@ objective.commandmode.name = Режим командування
 objective.flag.name = Прапорець
 
 marker.shapetext.name = Форма тексту
-marker.minimap.name = Мінімапа
+marker.point.name = Point
 marker.shape.name = Форма
 marker.text.name = Текст
 marker.line.name = Line
+marker.quad.name = Quad
 
 marker.background = Фон
 marker.outline = Контур
@@ -2478,3 +2479,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index e3c46ee395..a2846e923e 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -673,10 +673,11 @@ objective.destroycore.name = Phá huỷ căn cứ
 objective.commandmode.name = Chế độ ra lệnh
 objective.flag.name = Cờ
 marker.shapetext.name = Hình dạng văn bản
-marker.minimap.name = Bản đồ nhỏ
+marker.point.name = Point
 marker.shape.name = Hình dạng
 marker.text.name = Văn bản
 marker.line.name = Line
+marker.quad.name = Quad
 marker.background = Nền
 marker.outline = Đường viền
 objective.research = [accent]Nghiên cứu:\n[]{0}[lightgray]{1}
@@ -2451,3 +2452,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index b6c286b73c..e66a00616d 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -678,10 +678,11 @@ objective.commandmode.name = 指挥模式
 objective.flag.name = 标签
 
 marker.shapetext.name = 带形状文本
-marker.minimap.name = 小地图
+marker.point.name = Point
 marker.shape.name = 形状
 marker.text.name = 文本
 marker.line.name = Line
+marker.quad.name = Quad
 
 marker.background = 背景
 marker.outline = 轮廓
@@ -2477,3 +2478,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index bf1d9c843e..065c3a8eec 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -675,10 +675,11 @@ objective.commandmode.name = 指揮模式
 objective.flag.name = 全局Flag
 
 marker.shapetext.name = 稜框+文字標示
-marker.minimap.name = 小地圖標示
+marker.point.name = Point
 marker.shape.name = 稜框標示
 marker.text.name = 文字標示
 marker.line.name = Line
+marker.quad.name = Quad
 
 marker.background = 反黑背景
 marker.outline = 描邊
@@ -2463,3 +2464,6 @@ lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fet
 lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
 lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
+lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
+lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
+lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.

From f0b98c7bc47bf3338dbe25caf401d47a5dab2da1 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 31 Jan 2024 10:59:50 -0500
Subject: [PATCH 185/369] Fixed #8821

---
 core/assets/maps/groundZero.msav | Bin 16801 -> 17028 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/core/assets/maps/groundZero.msav b/core/assets/maps/groundZero.msav
index 29af408f740f8a3ddd3ac05f1def6c4d31651aed..30b2454d377fa20b99f51622eeaf28b7ab41ecea 100644
GIT binary patch
literal 17028
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

literal 16801
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
L;vak7?AB)hrzS4p


From 2ebe8c9f94352293b8ca5834b45408212b7a9544 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 31 Jan 2024 11:19:21 -0500
Subject: [PATCH 186/369] Additional ground zero logic fix

---
 core/assets/maps/groundZero.msav | Bin 17028 -> 17072 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/core/assets/maps/groundZero.msav b/core/assets/maps/groundZero.msav
index 30b2454d377fa20b99f51622eeaf28b7ab41ecea..9ece04c2ba97647caca924d2ff98df45c3f242ac 100644
GIT binary patch
literal 17072
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

literal 17028
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


From cf2ba356ae1832d1a04cbc79faea02f7b6d06ce1 Mon Sep 17 00:00:00 2001
From: TheRadioactiveBanana
 <89061718+TheRadioactiveBanana@users.noreply.github.com>
Date: Thu, 1 Feb 2024 00:03:44 +0530
Subject: [PATCH 187/369] Moving server on to an edge node, deleting unused ips
 (#9505)

Moving rapid on edge node for stability, deleting some ips that were mindlessly added and I dont plan on ever using
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index f7da7e20f1..b5b263f7a3 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -133,7 +133,7 @@
   },
   {
     "name": "Eradication Mindustry",
-    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "140.238.246.78:7005", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "130.61.22.183:7005", "77.99.254.211:7000", "77.99.254.211:7001", "77.99.254.211:7002", "141.148.196.135:7000"]
+    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "77.99.254.211:7000", "77.99.254.211:7001", "77.99.254.211:7002", "141.148.196.135:7000", "130.61.220.99:7000", "130.61.220.99:7001"]
   },
   {
     "name": "Conservatory",

From 999a63c5f42c7acf4c8871749d1295ebcb21ed56 Mon Sep 17 00:00:00 2001
From: ApsZoldat <128713348+ApsZoldat@users.noreply.github.com>
Date: Thu, 1 Feb 2024 00:12:49 +0300
Subject: [PATCH 188/369] Minor fixes (#9467)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Minor fixes

* Change javadoc for statusSpeed()

* 🧠🔨
---
 core/assets/bundles/bundle.properties         |  2 +-
 core/assets/bundles/bundle_ru.properties      |  4 ++--
 core/assets/contributors                      |  1 +
 .../mindustry/editor/MapLocalesDialog.java    | 24 ++++++++++++-------
 .../mindustry/entities/comp/StatusComp.java   |  4 ++--
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index b8a1089fe3..82ad500884 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -613,7 +613,7 @@ filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
 
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 219d23880d..21cdbc14c2 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -1904,13 +1904,13 @@ onset.turrets = Боевые единицы эффективны, но [accent]
 onset.turretammo = Снабдите турель [accent]бериллиевыми боеприпасами.[]
 onset.walls = [accent]Стены[] могут предотвратить повреждение близлежащих построек.\nПоставьте \uf6ee [accent]бериллиевые стены[] вокруг турели.
 onset.enemies = Враг на подходе, приготовьтесь защищаться.
-onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.defenses = [accent]Приготовьте оборону:[lightgray] {0}
 onset.attack = Враг уязвим. Начните контратаку.
 onset.cores = Новые ядра могут быть поставлены на [accent]зоны ядра[].\nНовые ядра функционируют как передовые базы и имеют общий инвентарь между другими ядрами.\nПоставьте \uf725 ядро.
 onset.detect = Враг обнаружит вас через 2 минуты.\nПриготовьте оборону, добычу и производство.
 onset.commandmode = Удерживайте [accent]shift[], чтобы войти в [accent]режим командования[].\n[accent]Щелкните левой кнопкой мыши и выделите область[] для выбора боевых единиц.\n[accent]Щелкните правой кнопкой мыши[], чтобы приказать выбранным единицам двигаться или атаковать.
 onset.commandmode.mobile = Нажмите [accent]Командовать[], чтобы войти в [accent]режим командования[].\nЗажмите палец, затем [accent]выделите область[] для выбора боевых единиц.\n[accent]Нажмите[], чтобы приказать выбранным единицам двигаться или атаковать.
-aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+aegis.tungsten = Вольфрам может быть добыт [accent]ударной дрелью[].\nЭта постройка требует [accent]воду[] и [accent]энергию[].
 
 split.pickup = Некоторые блоки можно подобрать боевой единицей ядра.\nВозьмите этот [accent]контейнер[] и поставьте его на [accent]грузовой загрузчик[].\n(Клавиши по умолчанию - [ и ] для поднятия и разгрузки)
 split.pickup.mobile = Некоторые блоки можно подобрать боевой единицей ядра.\nВозьмите этот [accent]контейнер[] и поставьте его на [accent]грузовой загрузчик[].\n(Чтобы поднять или разгрузить что-либо, удерживайте палец.)
diff --git a/core/assets/contributors b/core/assets/contributors
index b16023715e..3b3153b7ee 100644
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -164,3 +164,4 @@ summoner
 OpalSoPL
 BalaM314
 Redstonneur1256
+ApsZoldat
diff --git a/core/src/mindustry/editor/MapLocalesDialog.java b/core/src/mindustry/editor/MapLocalesDialog.java
index 0ac5a53d6d..17cc9f2764 100644
--- a/core/src/mindustry/editor/MapLocalesDialog.java
+++ b/core/src/mindustry/editor/MapLocalesDialog.java
@@ -91,6 +91,8 @@ public class MapLocalesDialog extends BaseDialog{
             t.button("@edit", Icon.edit, this::editDialog).size(210f, 64f);
         }).growX();
 
+        resized(this::buildMain);
+
         buttons.button("?", () -> ui.showInfo("@locales.info")).size(60f, 64f).uniform();
 
         shown(this::setup);
@@ -158,7 +160,7 @@ public class MapLocalesDialog extends BaseDialog{
 
                 saved = false;
                 buildMain();
-            }).padTop(10f).size(400f, 50f).fillX().row();
+            }).padTop(10f).size(cardWidth, 50f).fillX().row();
         }).right();
     }
 
@@ -184,7 +186,7 @@ public class MapLocalesDialog extends BaseDialog{
 
                         selectedLocale = name;
                         buildTables();
-                    }).update(b -> b.setChecked(selectedLocale.equals(name))).size(300f, 50f);
+                    }).update(b -> b.setChecked(selectedLocale.equals(name))).width(200f).minHeight(50f);
                     p.button(Icon.edit, Styles.flati, () -> localeEditDialog(name)).size(50f);
                     p.button(Icon.trash, Styles.flati, () -> ui.showConfirm("@confirm", "@locales.deletelocale", () -> {
                         locales.remove(name);
@@ -196,7 +198,7 @@ public class MapLocalesDialog extends BaseDialog{
                 }
             }
         }).row();
-        langs.button("@add", Icon.add, this::addLocaleDialog).padTop(10f).width(400f);
+        langs.button("@add", Icon.add, this::addLocaleDialog).padTop(10f).width(250f);
     }
 
     private void buildMain(){
@@ -206,7 +208,7 @@ public class MapLocalesDialog extends BaseDialog{
 
         main.image().color(Pal.gray).height(3f).growX().expandY().top().row();
         main.pane(p -> {
-            int cols = Math.max(1, (Core.graphics.getWidth() - 630) / ((int)cardWidth + 10));
+            int cols = Math.max(1, (int)((Core.graphics.getWidth() / Scl.scl() - 410f) / cardWidth) - 1);
             if(props.size == 0){
                 main.add("@empty").center().row();
                 return;
@@ -512,7 +514,7 @@ public class MapLocalesDialog extends BaseDialog{
 
         propView.image().color(Pal.gray).height(3f).fillX().top().row();
         propView.pane(p -> {
-            int cols = (Core.graphics.getWidth() - 100) / ((int)cardWidth + 10);
+            int cols = Math.max(1, (int)((Core.graphics.getWidth() / Scl.scl() - 100f) / cardWidth));
             if(cols == 0){
                 propView.add("@empty").center().row();
                 return;
@@ -720,7 +722,9 @@ public class MapLocalesDialog extends BaseDialog{
         if(!locales.containsKey(key)) return "";
 
         for(var prop : locales.get(key).entries()){
-            data.append(prop.key).append(" = ").append(prop.value).append("\n");
+            // Convert \n in plain text to \\n, then convert newlines to \n
+            data.append(prop.key).append(" = ").append(prop.value
+            .replace("\\n", "\\\\n").replace("\n", "\\n")).append("\n");
         }
 
         return data.toString();
@@ -738,7 +742,9 @@ public class MapLocalesDialog extends BaseDialog{
             }else{
                 int sepIndex = line.indexOf(" = ");
                 if(sepIndex != -1 && !currentLocale.isEmpty()){
-                    bundles.get(currentLocale).put(line.substring(0, sepIndex), line.substring(sepIndex + 3));
+                    // Convert \n in file to newlines in text, then revert newlines with escape characters
+                    bundles.get(currentLocale).put(line.substring(0, sepIndex), line.substring(sepIndex + 3)
+                    .replace("\\n", "\n").replace("\\\n", "\\n"));
                 }
             }
         }
@@ -752,7 +758,9 @@ public class MapLocalesDialog extends BaseDialog{
         for(var line : data.split("\\r?\\n|\\r")){
             int sepIndex = line.indexOf(" = ");
             if(sepIndex != -1){
-                map.put(line.substring(0, sepIndex), line.substring(sepIndex + 3));
+                // Convert \n in file to newlines in text, then revert newlines with escape characters
+                map.put(line.substring(0, sepIndex), line.substring(sepIndex + 3)
+                .replace("\\n", "\n").replace("\\\n", "\\n"));
             }
         }
 
diff --git a/core/src/mindustry/entities/comp/StatusComp.java b/core/src/mindustry/entities/comp/StatusComp.java
index 2df716253a..56b7559455 100644
--- a/core/src/mindustry/entities/comp/StatusComp.java
+++ b/core/src/mindustry/entities/comp/StatusComp.java
@@ -127,10 +127,10 @@ abstract class StatusComp implements Posc, Flyingc{
         return entry;
     }
 
-    /** Uses a dynamic status effect to override speed. */
+    /** Uses a dynamic status effect to override speed (in tiles/second). */
     public void statusSpeed(float speed){
         //type.speed should never be 0
-        applyDynamicStatus().speedMultiplier = speed / type.speed;
+        applyDynamicStatus().speedMultiplier = speed / (type.speed * 60f / tilesize);
     }
 
     /** Uses a dynamic status effect to change damage. */

From 01d875da0472e9f6b7f8aaccef05129ab492c795 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 1 Feb 2024 15:59:29 -0500
Subject: [PATCH 189/369] Added system for removing consumers in JSON

---
 core/src/mindustry/mod/ContentParser.java | 11 +++++++++++
 core/src/mindustry/world/Block.java       |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 0cf60c79e6..58c0c65089 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -445,6 +445,17 @@ public class ContentParser{
                 if(value.has("consumes") && value.get("consumes").isObject()){
                     for(JsonValue child : value.get("consumes")){
                         switch(child.name){
+                            case "remove" -> {
+                                String[] values = child.isString() ? new String[]{child.asString()} : child.asStringArray();
+                                for(String type : values){
+                                    Class<?> consumeType = resolve("Consume" + Strings.capitalize(type), Consume.class);
+                                    if(consumeType != Consume.class){
+                                        block.removeConsumers(b -> consumeType.isAssignableFrom(b.getClass()));
+                                    }else{
+                                        Log.warn("Unknown consumer type '@' in consume: remove.", type);
+                                    }
+                                }
+                            }
                             case "item" -> block.consumeItem(find(ContentType.item, child.asString()));
                             case "itemCharged" -> block.consume((Consume)parser.readValue(ConsumeItemCharged.class, child));
                             case "itemFlammable" -> block.consume((Consume)parser.readValue(ConsumeItemFlammable.class, child));
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 05f064cbaf..3f8a1fdc22 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -956,6 +956,14 @@ public class Block extends UnlockableContent implements Senseable{
         consumeBuilder.remove(cons);
     }
 
+    public void removeConsumers(Boolf<Consume> b){
+        consumeBuilder.removeAll(b);
+        //the power was removed, unassign it
+        if(!consumeBuilder.contains(c -> c instanceof ConsumePower)){
+            consPower = null;
+        }
+    }
+
     public ConsumeLiquid consumeLiquid(Liquid liquid, float amount){
         return consume(new ConsumeLiquid(liquid, amount));
     }

From e1a5484074be243bb4418f7f010b791c22678a98 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Thu, 1 Feb 2024 16:04:51 -0800
Subject: [PATCH 190/369] Allow mods to add to logic effect map (#9507)

* Allow mods to add to logic effect map

* Switch to being only a single add.
---
 core/src/mindustry/logic/LogicFx.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/src/mindustry/logic/LogicFx.java b/core/src/mindustry/logic/LogicFx.java
index b26b54f6a2..6080c7fd12 100644
--- a/core/src/mindustry/logic/LogicFx.java
+++ b/core/src/mindustry/logic/LogicFx.java
@@ -57,6 +57,12 @@ public class LogicFx{
         return map.get(name);
     }
 
+    /** Adds an effect entry to the map. */
+    public static void add(String name, EffectEntry entry){
+        entry.name = name;
+        map.put(name, entry);
+    }
+
     public static String[] all(){
         return map.orderedKeys().toArray(String.class);
     }

From 0867e251190298fc81b304b59a758971dd62efcd Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 1 Feb 2024 19:05:35 -0500
Subject: [PATCH 191/369] More detailed warning message

---
 core/src/mindustry/mod/ContentParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 58c0c65089..269cc56ce5 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -452,7 +452,7 @@ public class ContentParser{
                                     if(consumeType != Consume.class){
                                         block.removeConsumers(b -> consumeType.isAssignableFrom(b.getClass()));
                                     }else{
-                                        Log.warn("Unknown consumer type '@' in consume: remove.", type);
+                                        Log.warn("Unknown consumer type '@' (Class: @) in consume: remove.", type, "Consume" + Strings.capitalize(type));
                                     }
                                 }
                             }

From dc4f3ba972947ca29ab08285d101c183f399c237 Mon Sep 17 00:00:00 2001
From: BalaM314 <71201189+BalaM314@users.noreply.github.com>
Date: Fri, 2 Feb 2024 21:22:28 +0530
Subject: [PATCH 192/369] Add `bool Config::isDefault()` (#9510)

* Add `bool Config::isDefault()`

* use Structs.eq instead of ==
---
 core/src/mindustry/net/Administration.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java
index d544531fac..da453afaa5 100644
--- a/core/src/mindustry/net/Administration.java
+++ b/core/src/mindustry/net/Administration.java
@@ -577,6 +577,10 @@ public class Administration{
             changed.run();
         }
 
+        public boolean isDefault(){
+            return Structs.eq(get(), defaultValue);
+        }
+
         private static boolean debug(){
             return Config.debug.bool();
         }

From 75ae76135fed38a8455ce1c386d6795806681dd2 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sat, 3 Feb 2024 09:17:07 -0800
Subject: [PATCH 193/369] targetUnderBlocks for units (#8160)

* targetUnderBlocks for units

You know, why don't units use the same targeting code as turrets?

* prioritize non-under blocks
---
 core/src/mindustry/content/Blocks.java             |  1 +
 core/src/mindustry/entities/Units.java             | 14 ++++++++++++--
 .../src/mindustry/entities/units/AIController.java |  2 +-
 core/src/mindustry/type/UnitType.java              |  2 ++
 core/src/mindustry/type/Weapon.java                |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index c86f3ffe56..62af440a16 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -4567,6 +4567,7 @@ public class Blocks{
                     loopSoundVolume = 0.6f;
                     deathSound = Sounds.largeExplosion;
                     targetAir = false;
+                    targetUnderBlocks = false;
 
                     fogRadius = 6f;
 
diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java
index a641bac7a8..659112d57a 100644
--- a/core/src/mindustry/entities/Units.java
+++ b/core/src/mindustry/entities/Units.java
@@ -192,8 +192,18 @@ public class Units{
 
     /** Returns the nearest enemy tile in a range. */
     public static Building findEnemyTile(Team team, float x, float y, float range, Boolf<Building> pred){
+        return findEnemyTile(team, x, y, range, false, pred);
+    }
+
+    /** Returns the nearest enemy tile in a range. */
+    public static Building findEnemyTile(Team team, float x, float y, float range, boolean checkUnder, Boolf<Building> pred){
         if(team == Team.derelict) return null;
 
+        if(checkUnder){
+            Building target = indexer.findEnemyTile(team, x, y, range, build -> !build.block.underBullets && pred.get(build));
+            if(target != null) return target;
+        }
+
         return indexer.findEnemyTile(team, x, y, range, pred);
     }
 
@@ -243,7 +253,7 @@ public class Units{
         if(unit != null){
             return unit;
         }else{
-            return findEnemyTile(team, x, y, range, tilePred);
+            return findEnemyTile(team, x, y, range, true, tilePred);
         }
     }
 
@@ -255,7 +265,7 @@ public class Units{
         if(unit != null){
             return unit;
         }else{
-            return findEnemyTile(team, x, y, range, tilePred);
+            return findEnemyTile(team, x, y, range, true, tilePred);
         }
     }
 
diff --git a/core/src/mindustry/entities/units/AIController.java b/core/src/mindustry/entities/units/AIController.java
index 2c638bec76..009e56d6ad 100644
--- a/core/src/mindustry/entities/units/AIController.java
+++ b/core/src/mindustry/entities/units/AIController.java
@@ -227,7 +227,7 @@ public class AIController implements UnitController{
     }
 
     public Teamc target(float x, float y, float range, boolean air, boolean ground){
-        return Units.closestTarget(unit.team, x, y, range, u -> u.checkTarget(air, ground), t -> ground);
+        return Units.closestTarget(unit.team, x, y, range, u -> u.checkTarget(air, ground), t -> ground && (unit.type.targetUnderBlocks || !t.block.underBullets));
     }
 
     public boolean retarget(){
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index b5855f69b5..09dacda4db 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -215,6 +215,8 @@ public class UnitType extends UnlockableContent implements Senseable{
     naval = false,
     /** if false, RTS AI controlled units do not automatically attack things while moving. This is automatically assigned. */
     autoFindTarget = true,
+    /** If false, 'under' blocks like conveyors are not targeted. */
+    targetUnderBlocks = true,
     /** if true, this unit will always shoot while moving regardless of slowdown */
     alwaysShootWhenMoving = false,
 
diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index 0dc9843208..1e4378ebe5 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -430,7 +430,7 @@ public class Weapon implements Cloneable{
     }
 
     protected Teamc findTarget(Unit unit, float x, float y, float range, boolean air, boolean ground){
-        return Units.closestTarget(unit.team, x, y, range + Math.abs(shootY), u -> u.checkTarget(air, ground), t -> ground);
+        return Units.closestTarget(unit.team, x, y, range + Math.abs(shootY), u -> u.checkTarget(air, ground), t -> ground && (unit.type.targetUnderBlocks || !t.block.underBullets));
     }
 
     protected boolean checkTarget(Unit unit, Teamc target, float x, float y, float range){

From f0d37281d489cf018432c5ea414834b61640dd7d Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <29004178+Redstonneur1256@users.noreply.github.com>
Date: Sat, 3 Feb 2024 18:17:17 +0100
Subject: [PATCH 194/369] Marker fixes (#9514)

---
 core/src/mindustry/game/MapObjectives.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index 466068c4eb..94b57d4d59 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -1143,6 +1143,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     public static class QuadMarker extends ObjectiveMarker{
         public String textureName = "white";
         public @Vertices float[] vertices = new float[24];
+        private boolean mapRegion = true;
 
         private transient TextureRegion fetchedRegion;
 
@@ -1201,11 +1202,15 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             lookupRegion(textureName, fetchedRegion);
 
-            if(firstUpdate) {
-                // possibly from the editor, we need to clamp the values
-                for(int i = 0; i < 4; i++){
-                    vertices[i * 6 + 3] = Mathf.map(Mathf.clamp(vertices[i * 6 + 3]), fetchedRegion.u, fetchedRegion.u2);
-                    vertices[i * 6 + 4] = Mathf.map(1 - Mathf.clamp(vertices[i * 6 + 4]), fetchedRegion.v, fetchedRegion.v2);
+            if(firstUpdate){
+                if(mapRegion){
+                    mapRegion = false;
+
+                    // possibly from the editor, we need to clamp the values
+                    for(int i = 0; i < 4; i++){
+                        vertices[i * 6 + 3] = Mathf.map(Mathf.clamp(vertices[i * 6 + 3]), fetchedRegion.u, fetchedRegion.u2);
+                        vertices[i * 6 + 4] = Mathf.map(1 - Mathf.clamp(vertices[i * 6 + 4]), fetchedRegion.v, fetchedRegion.v2);
+                    }
                 }
             }else{
                 for(int i = 0; i < 4; i++){
@@ -1230,6 +1235,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         private void setUv(int i, double u, double v){
             if(i >= 0 && i < 4){
+                if(fetchedRegion == null) setTexture(textureName);
+
                 if(!Double.isNaN(u)) vertices[i * 6 + 3] = Mathf.map(Mathf.clamp((float)u), fetchedRegion.u, fetchedRegion.u2);
                 if(!Double.isNaN(v)) vertices[i * 6 + 4] = Mathf.map(1 - Mathf.clamp((float)v), fetchedRegion.v, fetchedRegion.v2);
             }

From e521cc52371eb9c9c2dbb2633f624c4935790549 Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <29004178+Redstonneur1256@users.noreply.github.com>
Date: Sun, 4 Feb 2024 07:08:38 +0100
Subject: [PATCH 195/369] yeet (#9515)

---
 servers_v7.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index b5b263f7a3..d44b00bf48 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -256,10 +256,6 @@
     "name": "Atomic",
     "address": ["atomic-de.ddns.net:35199", "atomic-de.ddns.net:35176", "atomic-de.ddns.net:35845", "atomic-de.ddns.net:35313"]
   },
-  {
-    "name": "SkyPlex",
-    "address": ["mc-skyplex.net"]
-  },
   {
     "name": "Gadgetroch's Server",
     "address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568", "mindustry.gadgetroch.com:6569"]

From 9093c92b075c8b5de1bcc6835acab9926dec39d1 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sun, 4 Feb 2024 15:58:40 -0800
Subject: [PATCH 196/369] Add RandomSound support to ContentParser (#9518)

---
 core/src/mindustry/mod/ContentParser.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 269cc56ce5..093f9fd98f 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -271,8 +271,9 @@ public class ContentParser{
             return new Vec3(data.getFloat("x", 0f), data.getFloat("y", 0f), data.getFloat("z", 0f));
         });
         put(Sound.class, (type, data) -> {
-            var field = fieldOpt(Sounds.class, data);
+            if(data.isArray()) return new RandomSound(parser.readValue(Sound[].class, data));
 
+            var field = fieldOpt(Sounds.class, data);
             return field != null ? field : Vars.tree.loadSound(data.asString());
         });
         put(Music.class, (type, data) -> {

From 602bb93f1ea36332d826370d03111e10474fa465 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 4 Feb 2024 19:09:36 -0500
Subject: [PATCH 197/369] Fixed #9512

---
 core/src/mindustry/ai/types/MissileAI.java | 7 +++++++
 gradle.properties                          | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/ai/types/MissileAI.java b/core/src/mindustry/ai/types/MissileAI.java
index dc941df8a7..4dafbd6156 100644
--- a/core/src/mindustry/ai/types/MissileAI.java
+++ b/core/src/mindustry/ai/types/MissileAI.java
@@ -2,6 +2,8 @@ package mindustry.ai.types;
 
 import arc.math.*;
 import arc.util.*;
+import mindustry.*;
+import mindustry.entities.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 
@@ -29,6 +31,11 @@ public class MissileAI extends AIController{
         }
     }
 
+    @Override
+    public Teamc target(float x, float y, float range, boolean air, boolean ground){
+        return Units.closestTarget(unit.team, x, y, range, u -> u.checkTarget(air, ground), t -> ground && (!t.block.underBullets || (shooter != null && t == Vars.world.buildWorld(shooter.aimX, shooter.aimY))));
+    }
+
     @Override
     public boolean retarget(){
         //more frequent retarget due to high speed. TODO won't this lag?
diff --git a/gradle.properties b/gradle.properties
index bacb7e3213..ef07990ffb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=5bbfaf2ad9
+archash=f3b941e548

From 7efc5fd99a4f46781b372621845b6eb8c1b64b41 Mon Sep 17 00:00:00 2001
From: summoner001 <summoner001@users.noreply.github.com>
Date: Mon, 5 Feb 2024 20:28:23 +0100
Subject: [PATCH 198/369] Update bundle_hu.properties (ready to merge ...
 again) (#9457)

* Update bundle_hu.properties

*Fixing a bunch of typos (sorry)
*Fine-tuning of the translation
*Translation for the last changes

* Adding hungarian translation for steam

* Update description.txt

minor fixes

* Hungarian translation for google play

* Update full_description.txt

fixing typos

* Update bundle_hu.properties

follow bundle.properties changes

* Update bundle_hu.properties

fixes
---
 core/assets/bundles/bundle_hu.properties      | 130 +++++++------
 .../android/hu-HU/full_description.txt        |  34 ++++
 .../android/hu-HU/short_description.txt       |   1 +
 fastlane/metadata/android/hu-HU/summary.txt   |   1 +
 fastlane/metadata/android/hu-HU/title.txt     |   1 +
 .../metadata/steam/hungarian/achievements.vdf | 183 ++++++++++++++++++
 .../metadata/steam/hungarian/description.txt  |  62 ++++++
 .../steam/hungarian/short-description.txt     |   1 +
 8 files changed, 349 insertions(+), 64 deletions(-)
 create mode 100644 fastlane/metadata/android/hu-HU/full_description.txt
 create mode 100644 fastlane/metadata/android/hu-HU/short_description.txt
 create mode 100644 fastlane/metadata/android/hu-HU/summary.txt
 create mode 100644 fastlane/metadata/android/hu-HU/title.txt
 create mode 100644 fastlane/metadata/steam/hungarian/achievements.vdf
 create mode 100644 fastlane/metadata/steam/hungarian/description.txt
 create mode 100644 fastlane/metadata/steam/hungarian/short-description.txt

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index d8503ea990..e665fd5494 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -103,7 +103,7 @@ database = Mag Adatbázis
 database.button = Adatbázis
 savegame = Játék Mentése
 loadgame = Játék Betöltése
-joingame = Csatlakozás Játékhoz
+joingame = Csatlakozás Egy Játékhoz
 customgame = Egyedi Játék
 newgame = Új Játék
 none = <semmi>
@@ -155,7 +155,7 @@ mod.erroredcontent = [red]Hibás Tartalom
 mod.circulardependencies = [red]Körkörös Függőségek
 mod.incompletedependencies = [red]Hiányos Függőségek
 
-mod.requiresversion.details = Szükséges játékverzió: [accent]{0}[]\nA játék ezen verzója elavult! Ez a Mod egy újabb verziót kíván (valószínűleg egy Béta, vagy egy Alfa kiadást) a működéshez.
+mod.requiresversion.details = Szükséges játékverzió: [accent]{0}[]\nA játék ezen verziója elavult! Ez a Mod egy újabb verziót kíván (valószínűleg egy Béta, vagy egy Alfa kiadást) a működéshez.
 mod.outdatedv7.details = Ez a Mod nem kompatibilis a játék legújabb verziójával! A Mod készítőjének frissítenie kell azt és hozzá kell adnia a [accent]minGameVersion: 136[]-t a [accent]mod.json[] fájlhoz.
 mod.blacklisted.details = Ez a Mod manuálisan a feketelistára került, mert a játék összeomlott tőle, vagy más probléma miatt. Ne használd!
 mod.missingdependencies.details = Ez a Mod függőségeket hiányol: {0}
@@ -163,7 +163,7 @@ mod.erroredcontent.details = Ez a Mod hibákat okozott a betöltésnél. Kérd m
 mod.circulardependencies.details = Ennek a Modnak egymástól függő függőségei vannak.
 mod.incompletedependencies.details = Ez a Mod nem tudott betölteni a hiányzó, vagy a rossz függőségek miatt: {0}.
 
-mod.requiresversion = Szükséges játékverzó: [red]{0}[]
+mod.requiresversion = Szükséges játékverzió: [red]{0}[]
 
 mod.errors = Hiba történt a tartalom betöltése közben.
 mod.noerrorplay = [red]Vannak hibás Modok.[] Kapcsold ki, vagy javítsd ki őket a játék előtt.
@@ -226,7 +226,7 @@ server.kicked.recentKick = Nemrég lettél kirúgva.\nVárj egy kicsit az újbó
 server.kicked.nameInUse = Már van egy ilyen nevű játékos\nezen a szerveren.
 server.kicked.nameEmpty = A kiválasztott név érvénytelen.
 server.kicked.idInUse = Már csatlakozva vagy ehhez a szerverhez! Nem lehet egyszerre két fiókot használni.
-server.kicked.customClient = Ez a szerver nem támogatja a saját készítésű játék-összzeállításokat. Használj egy hivatalos változatot.
+server.kicked.customClient = Ez a szerver nem támogatja a saját készítésű játék-összeállításokat. Használj egy hivatalos változatot.
 server.kicked.gameover = Vége a játéknak!
 server.kicked.serverRestarting = Ez a szerver újraindul.
 server.versions = A te játékverziód:[accent] {0}[]\nA szerver verziója:[accent] {1}[]
@@ -376,7 +376,7 @@ data.export = Adat Exportálása
 data.import = Adat Importálása
 data.openfolder = Adat Mappa Megnyitása
 data.exported = Adat exportálva.
-data.invalid = Ez nem érvényes játékadat.
+data.invalid = Ez nem egy érvényes játékadat.
 data.import.confirm = Külső adat importálása felülírja[scarlet] minden[] jelenlegi játékadatodat.\n[accent]Nem vonható vissza![]\n\nAmint kész az importálás, a játék azonnal kilép.
 quit.confirm = Biztosan kilépsz?
 loading = [accent]Betöltés...
@@ -613,7 +613,7 @@ filter.option.threshold2 = Másodlagos Küszöbérték
 filter.option.radius = Sugár
 filter.option.percentile = Arány
 
-locales.info = Itt adhatsz hozzá különböző Helyi Csomagokat a térképedhez. A Helyi Csomagok minden tulajdonságának van egy neve és egy értéke. Ezeket a tulajdonságokat a Világ Processzorok és a Célkitűzések azok neveivel használhatják. Támogatják a szövegformázást (a helyőrzőket az aktuális értékükkel helyettesítik).\n\n[cyan]Példa tulajdonság:\n[]name: [accent]időzítő[]\nvalue: [accent]Példa időzítő, hátralévő idő: @[]\n\n[cyan]Használat:\n[]Beállítás Célkitűzés szövegeként: [accent]@időzítő\n\n[]Írja be egy Világ Processzorba:\n[accent]localeprint "időzítő"\nformat time\n[gray](ahol az idő egy külön kiszámított változó)
+locales.info = Itt adhatsz hozzá különböző Helyi Csomagokat a térképedhez. A Helyi Csomagok minden tulajdonságának van egy neve és egy értéke. Ezeket a tulajdonságokat a Világ Processzorok és a Célkitűzések azok neveivel használhatják. Támogatják a szövegformázást (a helyőrzőket az aktuális értékükkel helyettesítik).\n\n[cyan]Példa tulajdonság:\n[]name: [accent]időzítő[]\nvalue: [accent]Példa időzítő, hátralévő idő: {0}[]\n\n[cyan]Használat:\n[]Beállítás Célkitűzés szövegeként: [accent]@időzítő\n\n[]Írja be egy Világ Processzorba:\n[accent]localeprint "időzítő"\nformat time\n[gray](ahol az idő egy külön kiszámított változó)
 locales.deletelocale = Biztos, hogy törölni akarod ezt a Helyi Csomagot?
 locales.applytoall = Változások alkalmazása az összes Helyi Csomagra
 locales.addtoother = Hozzáadás más Helyi Csomaghoz
@@ -682,29 +682,29 @@ objective.commandmode.name = Parancs Mód
 objective.flag.name = Jelölő
 
 marker.shapetext.name = Szövegforma
-marker.point.name = Point
+marker.point.name = Pont
 marker.shape.name = Alakzat
 marker.text.name = Szöveg
 marker.line.name = Vonal
-marker.quad.name = Quad
+marker.quad.name = Négyzet
 
 marker.background = Háttér
 marker.outline = Körvonal
 
-objective.research = [accent]Fejlesztés:\n[]{0}[lightgray]{1}
-objective.produce = [accent]Megszerzés:\n[]{0}[lightgray]{1}
-objective.destroyblock = [accent]Megsemmisítés:\n[]{0}[lightgray]{1}
-objective.destroyblocks = [accent]Megsemmisítés: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
-objective.item = [accent]Megszerzés: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
-objective.coreitem = [accent]Szállítás a Magba:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
-objective.build = [accent]Építés: [][lightgray]{0}[]x\n{1}[lightgray]{2}
-objective.buildunit = [accent]Egység Építés: [][lightgray]{0}[]x\n{1}[lightgray]{2}
-objective.destroyunits = [accent]Megsemmisítés: [][lightgray]{0}[]x Units
+objective.research = [accent]Fejleszd ki:\n[]{0}[lightgray]{1}
+objective.produce = [accent]Termelj:\n[]{0}[lightgray]{1}
+objective.destroyblock = [accent]Semmisítsd Meg:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Semmisítsd Meg: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.item = [accent]Termelj: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Szállítás A Magba:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Építs: [][lightgray]{0}[]db\n{1}[lightgray]{2}
+objective.buildunit = [accent]Gyárts Egységeket: [][lightgray]{0}[]db\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Semmisíts Meg: [][lightgray]{0}[]db Egységet
 objective.enemiesapproaching = [accent]Ellenség érkezik: [lightgray]{0}[] múlva
-objective.enemyescelating = [accent]Az ellenséges termelés fokozódik: [lightgray]{0}[] múlva
-objective.enemyairunits = [accent]Az ellenséges légi egységek termelése elkezdődik: [lightgray]{0}[] múlva
-objective.destroycore = [accent]Ellenséges Mag Megsemmisítése
-objective.command = [accent]Egységek Irányítása
+objective.enemyescelating = [accent]Az ellenséges gyártás fokozódik: [lightgray]{0}[] múlva
+objective.enemyairunits = [accent]Az ellenséges légi egységek gyártása elkezdődik: [lightgray]{0}[] múlva
+objective.destroycore = [accent]Semmisítsd Meg Az Ellenséges Magot
+objective.command = [accent]Irányítsd Az Egységeket
 objective.nuclearlaunch = [accent]⚠ Nukleáris kilövés észlelve: [lightgray]{0}
 
 announce.nuclearstrike = [red]⚠ BEÉRKEZŐ NUKLEÁRIS CSAPÁS ⚠\n[lightgray]Azonnal építs tartalék Magokat!
@@ -729,7 +729,7 @@ connectfail = [scarlet]Csatlakozási hiba:\n\n[accent]{0}
 error.unreachable = A szervert nem lehet elérni.\nBiztosan jól írtad be a címet?
 error.invalidaddress = Érvénytelen cím.
 error.timedout = Időtúllépés!\nGyőződj meg róla, hogy a "port forwarding" be van kapcsolva a hoszt gépen és a cím helyes!
-error.mismatch = Csomaghiba:\nLehetséges kliens/szerver verzió eltérés.\nGyőződj meg róla, hogy te és a host is a Mindustry legfrissebb verzióját használjátok!
+error.mismatch = Csomaghiba:\nLehetséges kliens/szerver verzió eltérés.\nGyőződj meg róla, hogy te és a hoszt is a Mindustry legfrissebb verzióját használjátok!
 error.alreadyconnected = Már csatlakozva vagy.
 error.mapnotfound = A pálya fájl nem található!
 error.io = Internet I/O hiba.
@@ -769,12 +769,13 @@ sectors.survives = [accent]Túlél {0} hullámot
 sectors.go = Utazás
 sector.abandon = Elhagy
 sector.abandon.confirm = Ennek a szektornak a Magja(i) önmegsemmisítésre kerülnek.\nFolytatod?
-sector.curcapture = A Szektor Meghódítva
+sector.curcapture = A Szektor Elfoglalva
 sector.curlost = A szektor Elveszett
 sector.missingresources = [scarlet]Nincs elég nyersanyag
 sector.attacked = A(z) [accent]{0}[white] szektor támadás alatt áll!
 sector.lost = A(z) [accent]{0}[white] szektor elveszett!
-sector.capture = Sector [accent]{0}[white]Captured!
+#note: the missing space in the line below is intentional
+sector.capture = A(z) [accent]{0}[white]Szektor Elfoglalva!
 sector.changeicon = Ikon Módosítása
 sector.noswitch.title = A szektorváltás Nem Lehetséges
 sector.noswitch = Nem válthatsz szektort, amíg egy meglévő szektor támadás alatt áll.\n\nSzektor: [accent]{0}[] a(z) [accent]{1}[]-n
@@ -821,7 +822,7 @@ sector.overgrowth.description = Ez a terület közelebb esik a spórák forrás
 sector.tarFields.description = Egy Olajtermelő övezet peremvidéke a hegyek és a sivatag között. Egy azon kevés szektorok közül, ahol még hasznosítható kátránykészletek találhatóak.\nBár a terület elhagyatott, veszélyes ellenséges erők fészkelnek a közelben. Ne becsüld alá őket!\n\n[lightgray]Fedezd fel az Olajfeldolgozási lehetőségeket, ha tudod!
 sector.desolateRift.description = Egy extrém veszélyes zóna. Nyersanyagokban gazdag, de szűkös a hely. Magas kockázat. Hagyd el, amint lehet! Ne tévesszen meg a hosszú szünet az ellenség támadásai között!
 sector.nuclearComplex.description = Egy néhai létesítmény a Tórium kitermelésére és feldolgozására, romokban.\n[lightgray]Fedezd fel a Tóriumot és sokrétű felhasználását!\n\nAz ellenség nagy létszámban van jelen, és folyamatosan megfigyelés alatt tartják a környéket.
-sector.fungalPass.description = Átmenet a magas hegyek és a mélyebben fekvő, spórák uralta lapály között. Egy kisebb ellenséges megfigyelő állomás található itt.\nSemmisítsd meg!.\nHasználj Dagger és Crawler egységeket! Pusztítsd el a két Magot!
+sector.fungalPass.description = Átmenet a magas hegyek és a mélyebben fekvő, spórák uralta lapály között. Egy kisebb ellenséges megfigyelő állomás található itt.\nSemmisítsd meg!\nHasználj Dagger és Crawler egységeket! Pusztítsd el a két Magot!
 sector.biomassFacility.description = A Spórák származási helye. Ebben a létesítményben fejlesztették ki őket és eredetileg itt került sor a gyártásukra.\nFejlszd ki az itt található technológiákat! Használd a Spórákat üzemanyag és Műanyagok gyártására!\n\n[lightgray]A létesítmény pusztulása nyomán a spórák elszabadultak. A helyi ökoszisztémában semmi sem tudta felvenni a versenyt egy ennyire invazív életformával.
 sector.windsweptIslands.description = Távolabb a partvonalon túl fekszik ez az elszigetelt szigetcsoport. Feljegyzések szerint egykor [accent]Műanyag[] gyártása zajlott itt.\n\nVerd vissza az ellenség vízi egységeit! Állíts fel egy bázist a szigeteken! Fejleszd ki az itt talált gyárakat!
 sector.extractionOutpost.description = Egy távoli ellenséges támaszpont, amelyet az ellenség azért épített, hogy nyersanyagokat juttasson el más szektorokba.\n\nA szektorok közötti szállítási technológia elengedhetetlen a további hódításhoz. Pusztítsd el a bázist. Fedezd fel a Kilövő Állást.
@@ -857,7 +858,7 @@ sector.split.description = A minimális ellenséges jelenlét miatt ez a szektor
 sector.basin.description = Jelentős ellenséges jelenlét lett érzékelve ebben a szektorban.\nÉpíts gyorsan egységeket, és foglalj el ellenséges Magokat, hogy megvethesd a lábad.
 sector.marsh.description = Ebben a szektorban rengeteg Arkycit található, de kevés a Víznyelő.\nÉpíts [accent]Kémiai Égető Kamra[]t az áramfejlesztéshez.
 sector.peaks.description = A hegyvidéki terep ebben a szektorban a legtöbb egységet használhatatlanná teszi. Repülő egységekre lesz szükség.\nVigyázz az ellenséges légvédelmi létesítményekkel. Lehetséges, hogy az ilyen létesítményeket hatástalanítani lehet a támogató épületeik célba vételével.
-sector.ravine.description = A szektorban nincs észlelve ellenséges Mag, bár ez egy fontos szállítási útvonal az ellenség számára. Várhatóan változatos ellenséges erőkkel kell számolni.Gyárts [accent]Elektrometál[]t. Építs [accent]Afflict[] lövegtornyokat.
+sector.ravine.description = A szektorban nincs észlelve ellenséges Mag, bár ez egy fontos szállítási útvonal az ellenség számára. Várhatóan változatos ellenséges erőkkel kell számolni. Gyárts [accent]Elektrometál[]t. Építs [accent]Afflict[] lövegtornyokat.
 sector.caldera-erekir.description = Ebben a szektorban a feltárható nyersanyagok több szigeten szétszóródva találhatóak.\nFedezd fel és helyezd üzembe a drónalapú szállítmányozást.
 sector.stronghold.description = A nagy ellenséges tábor ebben a szektorban jelentős [accent]Tórium[] készleteket őriz.\nHasználd magasabb szintű egységek és lövegtornyok fejlesztésére.
 sector.crevice.description = Az ellenség kegyetlen támadóerőket fog küldeni, hogy kiiktassa a bázisodat ebben a szektorban.\nGyűjts [accent]Karbid[]ot, majd fedezd fel és építs [accent]Pirolízis Erőmű[]vet, mert lehet, hogy nélkülözhetetlenek a túléléshez.
@@ -1080,7 +1081,7 @@ unit.percent = %
 unit.shieldhealth = pajzs állapot
 unit.items = nyersanyag
 unit.thousands = k
-unit.millions = mil
+unit.millions = Mil
 unit.billions = Mrd
 unit.pershot = /lövés
 category.purpose = Cél
@@ -1314,8 +1315,8 @@ rules.unitcapvariable = A Magok Befolyásolják A Legyártható Egységek Darabs
 rules.unitcap = Alap Egység-Darabszám
 rules.limitarea = Játékterület Korlátozása A Pályán
 rules.enemycorebuildradius = Ellenséges Mag Körüli Tiltott Zóna Sugara:[lightgray] (mező)
-rules.wavespacing = Hullámok Közötti Szünet Időzítés:[lightgray] (sec)
-rules.initialwavespacing = Az Első Hullám Előtti Szünet Időrtama:[lightgray] (sec)
+rules.wavespacing = Hullámok Közötti Szünet Időzítés:[lightgray] (mp)
+rules.initialwavespacing = Az Első Hullám Előtti Szünet Időrtama:[lightgray] (mp)
 rules.buildcostmultiplier = Építési Költség Szorzó
 rules.buildspeedmultiplier = Építési Sebesség Szorzó
 rules.deconstructrefundmultiplier = Bontási Visszatérítés Szorzó
@@ -1488,7 +1489,7 @@ block.spawn.name = Ellenséges Kezdőpont
 block.core-shard.name = Szilánk
 block.core-foundation.name = Alapítvány
 block.core-nucleus.name = Magnum
-block.deep-water.name = Mélyvíz
+block.deep-water.name = Mély Víz
 block.shallow-water.name = Víz
 block.tainted-water.name = Szennyezett Víz
 block.deep-tainted-water.name = Mély Szennyezett Víz
@@ -1565,7 +1566,7 @@ block.message.name = Üzenet
 block.reinforced-message.name = Megerősített Üzenet
 block.world-message.name = Világ Üzenet
 block.illuminator.name = Világítótest
-block.overflow-gate.name = Alulfolyó Kapu
+block.overflow-gate.name = Alul-folyó Kapu
 block.underflow-gate.name = Túlfolyó Kapu
 block.silicon-smelter.name = Szilícium Kohó
 block.phase-weaver.name = Tóritkvarcképző
@@ -1769,7 +1770,7 @@ block.shield-projector.name = Pajzs Generátor
 block.large-shield-projector.name = Nagy Pajzs Generátor
 block.armored-duct.name = Páncélozott Szállítószalag
 block.overflow-duct.name = Túlfolyó Szállítószalag
-block.underflow-duct.name = Alulfolyó Szállítószalag
+block.underflow-duct.name = Alul-folyó Szállítószalag
 block.duct-unloader.name = Kirakodó Szállítószalag
 block.surge-conveyor.name = Elektrometál Szállítószalag
 block.surge-router.name = Elektrometál Elosztó
@@ -1931,11 +1932,11 @@ onset.attack = Az ellenség most sebezhető. Ellentámadásra fel.
 onset.cores = Új Mag csak a [accent]Mag Csempé[]re építhető.\nAz új Magok előretolt bázisként működnek, és megosztják a nyersanyagkészletüket más Magokkal.\nÉpíts egy új \uf725 Magot.
 onset.detect = Az ellenség 2 percen belül észrevesz téged.\nÁllíts fel védelmet, bányássz és termelj.
 onset.commandmode = Tartsd nyomva a [accent]shift[] gombot, hogy belépj a [accent]Parancs Mód[]ba.\n[accent]Bal egérgomb lenyomásával és húzással[] tudod kijelölni az egységeket.\nKattints [accent]Jobb egérgomb[]al egy pontra, vagy ellenségre, hogy a kiválasztott egységeket mozgásra, vagy támadásra utasítsd.
-onset.commandmode.mobile = Nyomd meg a [accent]Parancs[] gombot, hogy belépj a [accent]Parancs Mód[]ba.\nTartsd a kijelzőn az újjad, majd [accent]húzd[] azt az egységek kiválasztásához.\n[accent]Koppints[] egy pontra, vagy ellenségre, hogy a kiválasztott egységeket mozgásra, vagy támadásra utasítsd.
+onset.commandmode.mobile = Nyomd meg a [accent]Parancs[] gombot, hogy belépj a [accent]Parancs Mód[]ba.\nTartsd a kijelzőn az ujjad, majd [accent]húzd[] azt az egységek kiválasztásához.\n[accent]Koppints[] egy pontra, vagy ellenségre, hogy a kiválasztott egységeket mozgásra, vagy támadásra utasítsd.
 aegis.tungsten = Volfrámot [accent]Ütve Fúró[]val tudsz bányászni.\nEnnek az épületnek szüksége van [accent]Víz[]re és [accent]Áram[]ra.
 
 split.pickup = Egyes blokkok a Mag Drónjával felvehetőek.\nVegyél fel egy [accent]Konténer[]t és helyezd bele egy [accent]Rakomány Csomagoló[]ba.\n(Az alapértelmezett gombok [ és ] a felvételhez és a lerakáshoz.)
-split.pickup.mobile = Egyes blokkok a Mag Drónjával felvehetőek.\nVegyél fel egy [accent]Konténer[]t és helyezd bele egy [accent]Rakomány Csomagoló[]ba.\nAhhoz felfegyél, vagy lerakj valamit koppints rá hosszan)
+split.pickup.mobile = Egyes blokkok a Mag Drónjával felvehetőek.\nVegyél fel egy [accent]Konténer[]t és helyezd bele egy [accent]Rakomány Csomagoló[]ba.\nAhhoz felvegyél, vagy lerakj valamit koppints rá hosszan)
 split.acquire = Az egységek építéséhez Volfrámot kell szerezned.
 split.build = Az egységeket a fal másik oldalára kell eljuttatni.\nÉpíts 2 [accent]Rakomány Tömegmozgató[]t egyet-egyet a fal mindkét oldalán\nÁllítsd be a szállítási kapcsolatukat úgy, hogy kiválasztod az egyiket, majd kiválasztod a másikat.
 split.container = Hasonlít a Konténerre, csak egységek szállítására is alkalmas a [accent]Rakomány Tömegmozgató[]val.\nÉpíts egy egységgyárat egy tömegmozgató mellé, hogy feltöltsd őket, majd küldd át őket a falon, hogy megtámadják az ellenséges bázist.
@@ -2042,8 +2043,8 @@ block.inverted-sorter.description = A kiválasztott nyersanyagot oldalra adja ki
 block.router.description = Háromfelé osztja szét a beérkező nyersanyagokat.
 block.router.details = Pokoli masina. Ne tedd közvetlenül gyárak mellé, mert az épületek nyersanyagai eltömítik.
 block.distributor.description = Hétfelé osztja szét a beérkező nyersanyagokat.
-block.overflow-gate.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud. Nem használható közvetlenül Túlfolyó Kapu, vagy Alulfolyó Kapu mellett.
-block.underflow-gate.description = Csak akkor enged tovább nyersanyagokat előre, ha oldalra már nem tudja kiadni őket. Nem használható közvetlenül Túlfolyó Kapu, vagy Alulfolyó Kapu mellett.
+block.overflow-gate.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud. Nem használható közvetlenül Túlfolyó Kapu, vagy Alul-folyó Kapu mellett.
+block.underflow-gate.description = Csak akkor enged tovább nyersanyagokat előre, ha oldalra már nem tudja kiadni őket. Nem használható közvetlenül Túlfolyó Kapu, vagy Alul-folyó Kapu mellett.
 block.mass-driver.description = Nagy hatótávolságú nyersanyagszállító eszköz. Rakományokban lő át nyersanyagokat egy másik, hozzákapcsolt Tömegmozgatónak.
 block.mechanical-pump.description = Folyadékot szivattyúz. Nem igényel Áramot.
 block.rotary-pump.description = Folyadékot szivattyúz. Árammal működik.
@@ -2056,7 +2057,7 @@ block.liquid-container.description = Jelentős mennyiségű folyadékot tárol.
 block.liquid-tank.description = Nagy mennyiségű folyadékot tárol és minden oldalán képes azt kijuttatni.
 block.liquid-junction.description = Hídként működik két egymást keresztező csővezeték között.
 block.bridge-conduit.description = Folyadékot szállít épületek és terepakadályok fölött.
-block.phase-conduit.description = Folyadékot szállít épületek és terepakadályok fölött. Nagyobb távolságr ér, mint a sima Csővezeték Híd, de Áramot használ.
+block.phase-conduit.description = Folyadékot szállít épületek és terepakadályok fölött. Nagyobb távolságra ér, mint a sima Csővezeték Híd, de Áramot használ.
 block.power-node.description = Áramot vezet az összekapcsolt épületekhez. Az érintkező épületekkel automatikusan kapcsolatban van.
 block.power-node-large.description = Nagyobb Villanyoszlop nagyobb hatótávolsággal.
 block.surge-tower.description = Hosszútávú Villanyoszlop, csak kevés kapcsolatra képes.
@@ -2066,7 +2067,7 @@ block.battery-large.description = Áramot raktároz el, ha túltermelés van. Le
 block.combustion-generator.description = Áramot termel éghető anyagok elégetésével.
 block.thermal-generator.description = Forró környezetben Áramot termel.
 block.steam-generator.description = Áramot termel éghető anyagok elégetésével és Víz gőzzé alakításával.
-block.differential-generator.description = Egy lórúgásnyi Áramot termel. Hasznosítja a Hűtőfolyadék és az égő Piratit hőmérsékletkülönbségét.
+block.differential-generator.description = Egy lórúgásnyi Áramot termel. Hasznosítja a Hűtőfolyadék és az égő Piratit hőmérséklet különbségét.
 block.rtg-generator.description = A radioaktív bomlás energiáját hasznosítja, hogy lassan de biztosan Áramot termeljen.
 block.solar-panel.description = Napfényből állít elő kevés Áramot.
 block.solar-panel-large.description = Napfényből állít elő kevés Áramot. Hatékonyabb a sima Napelemnél.
@@ -2076,7 +2077,7 @@ block.mechanical-drill.description = Ércre helyezve kis tempóban termeli ki az
 block.pneumatic-drill.description = Egy fejlettebb fúró, képes Titán kitermelésére. Gyorsabban dolgozik a Mechanikus Fúrónál.
 block.laser-drill.description = Lézerek használatával még gyorsabban tud dolgozni, de Áramot használ. Képes Tóriumot kitermelni.
 block.blast-drill.description = A technológia csúcsa. Rengeteg Áramot használ.
-block.water-extractor.description = Képes a talajvíz kiszívattyúzására. Akkor használd, ha nincs elérhető Víz a felszínen.
+block.water-extractor.description = Képes a talajvíz kiszivattyúzására. Akkor használd, ha nincs elérhető Víz a felszínen.
 block.cultivator.description = A légkörben szálló spórákat kapszulákba sűríti.
 block.cultivator.details = Visszaszerzett technológia. Hatalmas tömegű biomassza gyártására alkalmas a lehető leghatékonyabban. Valószínűleg a Serpulot ma borító spórák kezdeti inkubátora.
 block.oil-extractor.description = Nagy mennyiségben használ Vizet, Homokot és Áramot, hogy Olajat nyerjen ki a földből.
@@ -2146,7 +2147,7 @@ block.disperse.description = Égő repeszlövedékeket lő ki légi célpontokra
 block.lustre.description = Lassan mozgó, egyszerre egy célpontra ható lézert lő ki az ellenséges célpontokra.
 block.scathe.description = Nagy erejű rakétát indít jelentős távolságokra lévő földi célpontok ellen.
 block.smite.description = Átütő erejű, villámló lövedékeket lő ki.
-block.malign.description = Lézer töltetekből álló célzott sortüzet zúdít az ellenséges célpontokra. Nagymennyiségű Hőt igényel.
+block.malign.description = Lézer töltetekből álló célzott sortüzet zúdít az ellenséges célpontokra. Nagy mennyiségű Hőt igényel.
 block.silicon-arc-furnace.description = Szilíciumot finomít Homokból és Grafitból.
 block.oxidation-chamber.description = A Berilliumot és az Ózont Oxiddá alakítja. Melléktermékként Hőt bocsát ki.
 block.electric-heater.description = Fűti a vele szemben álló blokkokat. Nagy mennyiségű Áramot igényel.
@@ -2186,10 +2187,10 @@ block.blast-door.description = Egy fal, amely kinyílik, ha a szövetséges föl
 block.duct.description = Előre mozgatja a nyersanyagokat. Csak egyetlen nyersanyag tárolására alkalmas.
 block.armored-duct.description = Előre mozgatja a nyersanyagokat. Nem fogad el nem-szállító szalagos bemeneteket oldalról.
 block.duct-router.description = A nyersanyagokat egyenlően osztja el három irányba. Csak a hátsó oldalról fogadja be a tárgyakat. Nyersanyag Válogatóként is konfigurálható.
-block.overflow-duct.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud. Nem használható közvetlenül Túlfolyó Kapu, vagy Alulfolyó Kapu mellett.
+block.overflow-duct.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud. Nem használható közvetlenül Túlfolyó Kapu, vagy Alul-folyó Kapu mellett.
 block.duct-bridge.description = Nyersanyagok szállítására alkalmas épületek és terepakadályok fölött.
 block.duct-unloader.description = A kiválasztott nyersanyagokat kirakodja a mögötte lévő blokkból. Magokból nem lehet kirakodni.
-block.underflow-duct.description = Csak akkor enged tovább nyersanyagokat előre, ha oldalra már nem tudja kiadni őket. Nem használható közvetlenül Túlfolyó Kapu, vagy Alulfolyó Kapu mellett.
+block.underflow-duct.description = Csak akkor enged tovább nyersanyagokat előre, ha oldalra már nem tudja kiadni őket. Nem használható közvetlenül Túlfolyó Kapu, vagy Alul-folyó Kapu mellett.
 block.reinforced-liquid-junction.description = Két egymást keresztező csővezeték közötti csomópontként működik.
 block.surge-conveyor.description = A nyersanyagokat rakományokban mozgatja. Árammal felgyorsítható. Vezeti az Áramot.
 block.surge-router.description = Egyenletesen osztja el a nyersanyagokat három irányba a Szállítószalagról. Árammal felgyorsítható. Vezeti az Áramot.
@@ -2204,18 +2205,18 @@ block.flux-reactor.description = Nagy mennyiségű Áramot termel Hő hatására
 block.neoplasia-reactor.description = Arkycit, Víz és Tóritkvarc felhasználásával nagy mennyiségű Áramot termel. Melléktermékként Hőt és veszélyes Neoplazmát termel.\nHevesen robban, ha a Neoplazmát nem távolítják el a reaktorból a csővezetékeken keresztül.
 block.build-tower.description = Automatikusan újjáépíti a hatósugarában lévő építményeket, és segíti a többi egységet az építkezésben.
 block.regen-projector.description = Lassan javítja a szövetséges építményeket egy négyzet alakú kerületben. Hidrogént igényel.
-block.reinforced-container.description = Kis mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítsével nyerhető ki. Nem növeli a Mag tárolókapacitását.
-block.reinforced-vault.description = Nagy mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítsével nyerhető ki. Nem növeli a Mag tárolókapacitását.
+block.reinforced-container.description = Kis mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a Mag tárolókapacitását.
+block.reinforced-vault.description = Nagy mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a Mag tárolókapacitását.
 block.tank-fabricator.description = Stell egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Tank Újratervezőbe fejlesztésre.
 block.ship-fabricator.description = Elude egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Repülőgép Újratervezőbe fejlesztésre.
 block.mech-fabricator.description = Merui egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Mech Újratervezőbe fejlesztésre.
 block.tank-assembler.description = Nagy méretű tankokat állít össze a beadott blokkokból és egységekből. A kimeneti szint Összeszerelő Modulok hozzáadásával növelhető.
 block.ship-assembler.description = Nagy méretű hajókat állít össze a beadott blokkokból és egységekből. A kimeneti szint Összeszerelő Modulok hozzáadásával növelhető.
 block.mech-assembler.description = Nagy méretű Mech-eket állít össze a beadott blokkokból és egységekből. A kimeneti szint Összeszerelő Modulok hozzáadásával növelhető.
-block.tank-refabricator.description = Felfejleszti a bejuttatott tank tipusú egységeket a második szintre.
-block.ship-refabricator.description = Felfejleszti a bejuttatott repülőgép tipusú egységeket a második szintre.
-block.mech-refabricator.description = Felfejleszti a bejuttatott mech tipusú egységeket a második szintre.
-block.prime-refabricator.description = A bejuttatott tank-/repülőgép-/mech tipusú egységeket a harmadik szintre fejleszti.
+block.tank-refabricator.description = Felfejleszti a bejuttatott tank típusú egységeket a második szintre.
+block.ship-refabricator.description = Felfejleszti a bejuttatott repülőgép típusú egységeket a második szintre.
+block.mech-refabricator.description = Felfejleszti a bejuttatott mech típusú egységeket a második szintre.
+block.prime-refabricator.description = A bejuttatott tank-/repülőgép-/mech típusú egységeket a harmadik szintre fejleszti.
 block.basic-assembler-module.description = Növeli a Tank-/Repülgép-/Mech Összeszerelő szintjét, ha annak az építési határvonala mellé helyezik. Áramot igényel. Használható nyersanyag-rakomány bemenetként.
 block.small-deconstructor.description = Lebontja a bevitt építményeket és egységeket. Visszaadja az építési költség 100%-át.
 block.reinforced-payload-conveyor.description = Előre mozgatja a rakományokat.
@@ -2224,7 +2225,7 @@ block.payload-mass-driver.description = Nagy hatótávolságú nyersanyagszáll
 block.large-payload-mass-driver.description = Nagy hatótávolságú rakományszállító szerkezet. A fogadott rakományokat a hozzákapcsolt másik Tömegmozgatóra lövi.
 block.unit-repair-tower.description = Javítja a közelében lévő összes egységet. Ózont igényel.
 block.radar.description = Fokozatosan feltárja a terepet és az ellenséges egységeket egy nagy sugarú körben. Áramot igényel.
-block.shockwave-tower.description = Sérülést okoz és megsemmisíti az ellenséges lövedékeket egy egységsugárú körön belül. Cianogént igényel.
+block.shockwave-tower.description = Sérülést okoz és megsemmisíti az ellenséges lövedékeket egy egységsugarú körön belül. Cianogént igényel.
 block.canvas.description = Egy egyszerű képet jelenít meg egy előre meghatározott palettával. Szerkeszthető.
 
 unit.dagger.description = Egyszerű töltényeket lő közeli ellenségekre
@@ -2298,7 +2299,7 @@ lst.control = Épület irányítása.
 lst.radar = Beméri az egységeket az épület körül egy bizonyos hatótávolságban.
 lst.sensor = Adatok lekérése egy épületről vagy egységről.
 lst.set = Egy változó beállítása.
-lst.operation = Végezzen ely egy műveletet 1-2 változóval.
+lst.operation = Végezzen el egy műveletet 1-2 változóval.
 lst.end = Ugrás az utasítási verem tetejére.
 lst.wait = Várjon bizonyos számú másodpercet.
 lst.stop = A processzor program futtatásának leállítása.
@@ -2326,20 +2327,20 @@ lst.setprop = Egy egység vagy épület tulajdonságát állítja be.
 lst.effect = Létrehoz egy részecske-effektet.
 lst.sync = Egy változó szinkronizálása a hálózaton keresztül.\nMásodpercenként legfeljebb 10 alkalommal hívható meg.
 lst.makemarker = Új logikai jelölő létrehozása a világban.\nEgy azonosítót kell megadni a jelölő azonosításához.\nA jelölők száma jelenleg világonként 20 000-re van korlátozva.
-lst.setmarker = Egy jelölő tulajdonságának beállítása.\nA használt azonosítónak meg kell egyeznie a Jelölő Készítő utasításban megadottal.
-lst.localeprint = Hozzáadja a pálya Helyi Csomagjainak tulajdonság értékét a szövegpufferhez.\nA pálya Helyi Csomagjainak beállításait a térképszerkesztőben ellenőrízheted [accent]Pálya Infó > Helyi Csomagok[].\nHa a kliens egy mobileszköz, akkor először próbáld kiíratni a ".mobile" végződésű tulajdonságot.
+lst.setmarker = Egy jelölő tulajdonságának beállítása.\nA használt azonosítónak meg kell egyeznie a Make Marker utasításban megadottal.\n[accent]null []értékek figyelmen kívül lesznek hagyva.
+
+lst.localeprint = Hozzáadja a pálya Helyi Csomagjainak tulajdonság értékét a szövegpufferhez.\nA pálya Helyi Csomagjainak beállításait a térképszerkesztőben ellenőrizheted [accent]Pálya Infó > Helyi Csomagok[].\nHa a kliens egy mobileszköz, akkor először próbáld kiíratni a ".mobile" végződésű tulajdonságot.
 
 logic.nounitbuild = [red]Az egységépítési logika itt nem megengedett.
-
 lenum.type = Az épület/egység típusa.\nPéldául bármilyen elosztó esetében ez a [accent]@router[] értéket adja vissza.\nNem karakterlánc.
 lenum.shoot = Lőj egy pontra.
 lenum.shootp = Lőj egy egységre/épületre sebesség előrejelzéssel.
 lenum.config = Épületkonfiguráció, például nyersanyag Válogató.
-lenum.enabled = Attól, hogy a blokk engedélyezve van-e.
+lenum.enabled = Attól függ, hogy a blokk engedélyezve van-e.
 
 laccess.color = Megvilágítás színe.
 laccess.controller = Egységvezérlő. Ha a processzor vezérli, akkor a processzort adja vissza.\nHa formációban van, akkor a vezérlőjét adja vissza.\nMáskülönben magát az egységet adja vissza.
-laccess.dead = Attól, hogy egy egység/épület halott-e, vagy már nem érvényes.
+laccess.dead = Attól függ, hogy egy egység/épület halott-e, vagy már nem érvényes.
 laccess.controlled = Visszatér:\n[accent]@ctrlProcessor[]l, ha az egységvezérlő egy processzor\n[accent]@ctrlPlayer[]l, ha az egység/épület vezérlője a játékos\n[accent]@ctrlFormation[]l, ha az egység formációban van\nMáskülönben 0.
 laccess.progress = Akció előrehaladása, 0 és 1. között.\nVisszatér a termeléssel, a lövegtorony újratöltésével, vagy az építés előrehaladásával.
 laccess.speed = Az egység legnagyobb sebessége, csempe/mp-ben.
@@ -2375,7 +2376,7 @@ graphicstype.print = Szöveget rajzol a kiírási pufferből.\nTörli a kiírás
 
 lenum.always = Mindig igaz.
 lenum.idiv = Egész számok osztása.
-lenum.div = Osztás.\nVisszatér [accent]null[]val a nullával való osztásnál.
+lenum.div = Osztás.\nVisszatér [accent]null[]-al/-el a nullával való osztásnál.
 lenum.mod = Moduló.
 lenum.equal = Egyenlő. Kényszeríti a típusokat.\nA nem nulla értékű objektumok értéke 1 lesz, egyébként 0.
 lenum.notequal = Nem egyenlő. Kényszeríti a típusokat.
@@ -2430,7 +2431,7 @@ lenum.generator = Energiát termelő épületek.
 lenum.factory = Nyersanyagokat feldolgozó épületek.
 lenum.repair = Javítási pontok.
 lenum.battery = Bármilyen akkumulátor.
-lenum.resupply = Utánpótlási pontok.\nCsak akkor releváns, ha az [accent]"Egység Lőszer"[] engedélyezve van.
+lenum.resupply = Utánpótlási pontok.\nCsak akkor van jelentősége, ha az [accent]"Egység Lőszer"[] engedélyezve van.
 lenum.reactor = Ütközéses/Tórium Erőmű.
 lenum.turret = Bármilyen lövegtorony.
 
@@ -2480,10 +2481,11 @@ lenum.build = Építs egy szerkezetet.
 lenum.getblock = Egy épület és a koordinátái típusának lekérdezése. \nAz egységnek a pozíciótartományon belül kell lennie.\nA nem szilárd épületek [accent]@solid[] típusúak lesznek.
 lenum.within = Ellenőrizze, hogy az egység egy pozíció közelében van-e.
 lenum.boost = Erősítés indítás/leállítás.
-lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
-lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
-lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
-lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
-lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
-lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
-lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+
+lenum.flushtext = A nyomtatási puffer tartalmának ürítése a jelölőre, ha alkalmazható.\nHa a fetch értéke igaz, megpróbálja lehívni a tulajdonságokat a pálya Helyi Csomagjából, vagy a játék csomagjából.
+lenum.texture = A textúra neve közvetlenül a játék textúra-atlaszából (kebab-case elnevezési stílus használatával).\nHa a printFlush értéke igaz, akkor a szöveges puffer tartalmát használja szöveges argumentumként.
+lenum.texturesize = A textúra mérete csempékben. A nulla érték a jelölő szélességét az eredeti textúra méretére skálázza.
+lenum.autoscale = A jelölő skálázása a játékos nagyítási szintjének megfelelően.
+lenum.posi = Indexelt pozíció, vonal- és négyszögjelzőkhöz használatos, ahol a nulla index az első pozíció.
+lenum.uvi = A textúra pozíciója nullától egyig, négyzet jelölőkhöz használatos.
+lenum.colori = Indexelt pozíció, vonal- és négyzet jelölőkhöz használatos, ahol a nulla index az első szín.
diff --git a/fastlane/metadata/android/hu-HU/full_description.txt b/fastlane/metadata/android/hu-HU/full_description.txt
new file mode 100644
index 0000000000..41cbf4324b
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/full_description.txt
@@ -0,0 +1,34 @@
+A Mindustry egy gyárépítő játék Toronyvédő és RTS elemekkel. Készíts bonyolult ellátási láncokat, hogy lőszert juttass a lövegtornyokba, termelj az építkezéshez használható nyersanyagokat, és állíts elő egységeket. Irányítsd az egységeket, hogy elfoglald az ellenséges bázisokat, és bővítsd a termelésedet. Védd meg a magodat a hullámokban támadó ellenségtől.
+
+<h2>A Játékmenet Szolgáltatásai</h2>
+ 
+- Használd a gyártó-blokkokat a legkülönfélébb fejlett nyersanyagok létrehozásához
+- Védd meg építményeidet a hullámokban támadó ellenségektől
+- Játssz vállvetve a barátaiddal a platformokon átívelő többjátékos módban, vagy hívd ki őket csapat alapú PvP meccsekre
+- Oszd szét a folyadékokat, és küzdj meg az állandó kihívásokkal, mint például a tűzkitörések, vagy az ellenséges repülőgépek rajtaütéseivel
+- Hozd ki a legtöbbet a termelésből az opcionális hűtő- és kenőanyag-ellátással
+- Egységek széles skáláját állíthatod elő a bázisod automatikus irányításához és az ellenséges bázisok megtámadásához
+- Állíts fel összeszerelősorokat a gépesített egységek hadainak előállításához
+- Használd az egységeidet a hatékonyan felszerelt ellenséges bázisok ellen
+
+
+<h2>Kampány</h2>
+
+- Hódítsd meg a Serpulo és az Erekir bolygót, miközben 35 kézzel készített pályán és 250+ procedurálisan generált szektoron keresztül haladsz
+- Foglalj el területeket és építs gyárakat, hogy nyersanyagokat termelhess, miközben más szektorokban játszol
+- Védd meg a szektorokat az időszakos invázióktól
+- Koordináld az erőforrások elosztását a szektorok között az indítóállások felhasználásával
+- Fedezz fel új blokkokat a fejlődés elősegítése érdekében
+- Hívd meg barátaidat, hogy együtt teljesítsék a küldetéseket
+- 250+ technológiai blokk használatának elsajátítása
+- 50+ különböző típusú drón, mech és hajó
+
+
+<h2>Egyéni és Platformokon Átívelő Többjátékos Módok</h2>
+
+- 16+ beépített pálya az egyéni játékokhoz a két teljes kampány mellett
+- Játssz kooperatív, PvP vagy homokozóban
+- Hozz létre nyilvános dedikált szervert, vagy hívd meg a barátaidat a saját privát munkamenetedre
+- Testre szabható játékszabályok: Változtasd meg a blokk költségeket, az ellenséges statisztikákat, a kezdő elemeket, a hullámok időzítését és így tovább
+- Teljes funkcionalitású térképszerkesztő szkript támogatással
+- Beépített mod böngésző és mod támogatás
diff --git a/fastlane/metadata/android/hu-HU/short_description.txt b/fastlane/metadata/android/hu-HU/short_description.txt
new file mode 100644
index 0000000000..d0788ec62e
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/short_description.txt
@@ -0,0 +1 @@
+Egy nyílt végű gyártás-menedzselős játék Toronyvédő és RTS elemekkel.
diff --git a/fastlane/metadata/android/hu-HU/summary.txt b/fastlane/metadata/android/hu-HU/summary.txt
new file mode 100644
index 0000000000..d0788ec62e
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/summary.txt
@@ -0,0 +1 @@
+Egy nyílt végű gyártás-menedzselős játék Toronyvédő és RTS elemekkel.
diff --git a/fastlane/metadata/android/hu-HU/title.txt b/fastlane/metadata/android/hu-HU/title.txt
new file mode 100644
index 0000000000..e2842b447a
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/title.txt
@@ -0,0 +1 @@
+Mindustry
diff --git a/fastlane/metadata/steam/hungarian/achievements.vdf b/fastlane/metadata/steam/hungarian/achievements.vdf
new file mode 100644
index 0000000000..afdc6b8013
--- /dev/null
+++ b/fastlane/metadata/steam/hungarian/achievements.vdf
@@ -0,0 +1,183 @@
+"lang"
+{
+	"Language"	"hungarian"
+	"Tokens"
+	{
+		"NEW_ACHIEVEMENT_20_1_NAME"	"Selejtező"
+		"NEW_ACHIEVEMENT_20_1_DESC"	"Pusztíts el 1,000 ellenséges egységet."
+		"NEW_ACHIEVEMENT_20_2_NAME"	"Megtisztulás"
+		"NEW_ACHIEVEMENT_20_2_DESC"	"Pusztíts el 100,000 ellenséges egységet."
+		"NEW_ACHIEVEMENT_20_5_NAME"	"Végtelen Szállítmányok"
+		"NEW_ACHIEVEMENT_20_5_DESC"	"Összesen 100,000 tétel elindítása a szektorok között."
+		"NEW_ACHIEVEMENT_20_6_NAME"	"Hódító"
+		"NEW_ACHIEVEMENT_20_6_DESC"	"Nyerj meg 10 támadó módú mérkőzést."
+		"NEW_ACHIEVEMENT_20_7_NAME"	"Bajnok"
+		"NEW_ACHIEVEMENT_20_7_DESC"	"Nyerj meg 10 többjátékos PvP mérkőzést."
+		"NEW_ACHIEVEMENT_20_8_NAME"	"Villám"
+		"NEW_ACHIEVEMENT_20_8_DESC"	"Semmisítsd meg az ellenséges magot egy támadási zónában 5, vagy annál kevesebb hullámban."
+		"NEW_ACHIEVEMENT_20_9_NAME"	"Mag Eső"
+		"NEW_ACHIEVEMENT_20_9_DESC"	"Indítsd el a magot 30-szor."
+		"NEW_ACHIEVEMENT_20_10_NAME"	"Kitartó"
+		"NEW_ACHIEVEMENT_20_10_DESC"	"Élj túl 100 hullámot."
+		"NEW_ACHIEVEMENT_20_12_NAME"	"Kutató"
+		"NEW_ACHIEVEMENT_20_12_DESC"	"Kutass fel mindent."
+		"NEW_ACHIEVEMENT_20_14_NAME"	"Túlterhelés"
+		"NEW_ACHIEVEMENT_20_14_DESC"	"Üss meg egy vízzel borított ellenséget árammal."
+		"NEW_ACHIEVEMENT_20_15_NAME"	"Eltérítés"
+		"NEW_ACHIEVEMENT_20_15_DESC"	"Pusztíts el egy egységet a saját visszavert lövedékével."
+		"NEW_ACHIEVEMENT_20_17_NAME"	"Egy Végzetes Hiba"
+		"NEW_ACHIEVEMENT_20_17_DESC"	"Az elosztó kifejlesztése."
+		"NEW_ACHIEVEMENT_20_18_NAME"	"Készítő"
+		"NEW_ACHIEVEMENT_20_18_DESC"	"Helyezz el 10,000 blokkot."
+		"NEW_ACHIEVEMENT_20_19_NAME"	"Zúzás"
+		"NEW_ACHIEVEMENT_20_19_DESC"	"Pusztíts el 1,000 ellenséges blokkot."
+		"NEW_ACHIEVEMENT_20_20_NAME"	"Egy Látványos Katasztrófa"
+		"NEW_ACHIEVEMENT_20_20_DESC"	"Egy tóriumreaktor túlmelegedése és felrobbanása."
+		"NEW_ACHIEVEMENT_20_21_NAME"	"Térképész"
+		"NEW_ACHIEVEMENT_20_21_DESC"	"Készíts 10 új pályát."
+		"NEW_ACHIEVEMENT_20_22_NAME"	"Böngésző"
+		"NEW_ACHIEVEMENT_20_22_DESC"	"Töltse le egy pályát a Workshop-ból."
+		"NEW_ACHIEVEMENT_20_23_NAME"	"Alkotó"
+		"NEW_ACHIEVEMENT_20_23_DESC"	"Tegyél közzé egy pályát a Workshop-ban."
+		"NEW_ACHIEVEMENT_20_24_NAME"	"Gyilkoló"
+		"NEW_ACHIEVEMENT_20_24_DESC"	"Győzz le egy Őrzőt."
+		"NEW_ACHIEVEMENT_20_29_NAME"	"Anyag II"
+		"NEW_ACHIEVEMENT_20_29_DESC"	"Oldd fel a Tóriumot."
+		"NEW_ACHIEVEMENT_20_31_NAME"	"Anyag I"
+		"NEW_ACHIEVEMENT_20_31_DESC"	"Oldd fel a Titániumot."
+		"NEW_ACHIEVEMENT_21_0_NAME"	"Kamikaze"
+		"NEW_ACHIEVEMENT_21_0_DESC"	"Töltsd fel bármely nem-mag egységet robbanóanyaggal és halj meg."
+		"NEW_ACHIEVEMENT_21_1_NAME"	"Ez Kezdődik"
+		"NEW_ACHIEVEMENT_21_1_DESC"	"Építs egy földi-egység gyárat."
+		"NEW_ACHIEVEMENT_21_2_NAME"	"Közvetlen támadás"
+		"NEW_ACHIEVEMENT_21_2_DESC"	"Parancsold meg bármelyik egységnek, hogy támadjon meg egy célpontot."
+		"NEW_ACHIEVEMENT_21_3_NAME"	"Raj"
+		"NEW_ACHIEVEMENT_21_3_DESC"	"Legyen egyszerre 100 aktív egységed."
+		"NEW_ACHIEVEMENT_21_4_NAME"	"Nyáj"
+		"NEW_ACHIEVEMENT_21_4_DESC"	"Legyen egyszerre 10 aktív Poly drón egységed."
+		"NEW_ACHIEVEMENT_21_5_NAME"	"Robottechnikus"
+		"NEW_ACHIEVEMENT_21_5_DESC"	"Állítsd elő az egységek minden típusát."
+		"NEW_ACHIEVEMENT_21_6_NAME"	"Légiók"
+		"NEW_ACHIEVEMENT_21_6_DESC"	"Állíts elő 1,000 egységet."
+		"NEW_ACHIEVEMENT_21_9_NAME"	"Figyelned Kellett Volna"
+		"NEW_ACHIEVEMENT_21_9_DESC"	"Halj meg a ledobási pont kizárási zónájában."
+		"NEW_ACHIEVEMENT_21_10_NAME"	"Ezért Vannak a Haditengerészeti Egységek"
+		"NEW_ACHIEVEMENT_21_10_DESC"	"Megfulladt."
+		"NEW_ACHIEVEMENT_21_11_NAME"	"Gyűjtő"
+		"NEW_ACHIEVEMENT_21_11_DESC"	"Töltsd meg a magot a maximális kapacitásig mindenféle nyersanyaggal."
+		"NEW_ACHIEVEMENT_21_12_NAME"	"Tömeg"
+		"NEW_ACHIEVEMENT_21_12_DESC"	"Hosztolj egy szervert 10 játékossal."
+		"NEW_ACHIEVEMENT_21_13_NAME"	"Sebezhetetlen"
+		"NEW_ACHIEVEMENT_21_13_DESC"	"Építs Meltdown, Spectre és Foreshadow lövegtornyokat."
+		"NEW_ACHIEVEMENT_21_14_NAME"	"Felszállás"
+		"NEW_ACHIEVEMENT_21_14_DESC"	"Használd a Kilövő Állást."
+		"NEW_ACHIEVEMENT_21_16_NAME"	"Eretnekség"
+		"NEW_ACHIEVEMENT_21_16_DESC"	"Építs két Elosztót egymás mellé."
+		"NEW_ACHIEVEMENT_21_17_NAME"	"Magányos Védelmező"
+		"NEW_ACHIEVEMENT_21_17_DESC"	"Élj túl 10 hullámot bármelyik zónában blokkok elhelyezése nélkül."
+		"NEW_ACHIEVEMENT_21_18_NAME"	"Hamvasztás"
+		"NEW_ACHIEVEMENT_21_18_DESC"	"Használd a Piratitot bármelyik lövegtoronyban."
+		"NEW_ACHIEVEMENT_21_19_NAME"	"Hatásfok"
+		"NEW_ACHIEVEMENT_21_19_DESC"	"Hűts le egy lövegtornyot vízzel, vagy hűtőfolyadékkal."
+		"NEW_ACHIEVEMENT_21_20_NAME"	"Klasszikus Mód"
+		"NEW_ACHIEVEMENT_21_20_DESC"	"Kapcsold be a pixeles módot."
+		"NEW_ACHIEVEMENT_21_21_NAME"	"Tudós"
+		"NEW_ACHIEVEMENT_21_21_DESC"	"Nyisd meg a Wiki-t a játékból."
+		"NEW_ACHIEVEMENT_21_22_NAME"	"Erős Kezdés"
+		"NEW_ACHIEVEMENT_21_22_DESC"	"Indítsd el a magot bármely zónába 10,000, vagy több nyersanyaggal konfigurálva."
+		"NEW_ACHIEVEMENT_21_23_NAME"	"Begyújtás"
+		"NEW_ACHIEVEMENT_21_23_DESC"	"Indíts be egy Ütközéses Reaktort."
+		"NEW_ACHIEVEMENT_21_25_NAME"	"A spirál"
+		"NEW_ACHIEVEMENT_21_25_DESC"	"Járkálj körbe-körbe..."
+		"NEW_ACHIEVEMENT_21_26_NAME"	"Fokozás"
+		"NEW_ACHIEVEMENT_21_26_DESC"	"Építs egy 5-ös szintű egységet."
+		"NEW_ACHIEVEMENT_21_27_NAME"	"Építész"
+		"NEW_ACHIEVEMENT_21_27_DESC"	"Készíts 20 vázlatot."
+		"NEW_ACHIEVEMENT_21_28_NAME"	"Globális Dominancia"
+		"NEW_ACHIEVEMENT_21_28_DESC"	"Foglald el a Serpulo minden szektorát."
+		"NEW_ACHIEVEMENT_21_29_NAME"	"Légiszállítás"
+		"NEW_ACHIEVEMENT_21_29_DESC"	"Vegyél fel egy 5-ös szintű egységet egy Oct egységszállítóba."
+		"NEW_ACHIEVEMENT_21_30_NAME"	"A Tökéletes Forma"
+		"NEW_ACHIEVEMENT_21_30_DESC"	"Csatlakozz hozzájuk."
+		"NEW_ACHIEVEMENT_21_31_NAME"	"Termelés I"
+		"NEW_ACHIEVEMENT_21_31_DESC"	"Érj el 5,000 nyersanyag/perc össztermelést a kampányban."
+		"NEW_ACHIEVEMENT_26_0_NAME"	"Termelés II"
+		"NEW_ACHIEVEMENT_26_0_DESC"	"Érj el 50,000 nyersanyag/perc össztermelést a kampányban."
+		"NEW_ACHIEVEMENT_26_1_NAME"	"Biztos Győzelem"
+		"NEW_ACHIEVEMENT_26_1_DESC"	"Foglalj el egy szektort, miközben egy másik szektorban játszol."
+		"NEW_ACHIEVEMENT_26_2_NAME"	"Kis Birodalom"
+		"NEW_ACHIEVEMENT_26_2_DESC"	"Legyen az ellenőrzésed alatt egyszerre 10 szektor."
+		"NEW_ACHIEVEMENT_26_3_NAME"	"Tervező"
+		"NEW_ACHIEVEMENT_26_3_DESC"	"Készíts 500 vázlatot."
+		"NEW_ACHIEVEMENT_26_4_NAME"	"Mester a Terjesztésben"
+		"NEW_ACHIEVEMENT_26_4_DESC"	"Használj minden nyersanyagszállító blokkot (egy bolygón) egyetlen pályán."
+		"NEW_ACHIEVEMENT_26_5_NAME"	"Túlhajtás"
+		"NEW_ACHIEVEMENT_26_5_DESC"	"Építs egy Túlhajtó Projektort."
+		"NEW_ACHIEVEMENT_26_6_NAME"	"Foltozás"
+		"NEW_ACHIEVEMENT_26_6_DESC"	"Építs egy Foltozó Projektort."
+		"NEW_ACHIEVEMENT_26_7_NAME"	"Hatástalanság"
+		"NEW_ACHIEVEMENT_26_7_DESC"	"Építs Vízkiválasztót a vízre, ahelyett, hogy szivattyút használnál."
+		"NEW_ACHIEVEMENT_26_8_NAME"	"Raktárkészlet"
+		"NEW_ACHIEVEMENT_26_8_DESC"	"Gyűjts össze összesen 10 millió nyersanyagot a kampányban."
+		"NEW_ACHIEVEMENT_26_9_NAME"	"Minden Esély Ellenére"
+		"NEW_ACHIEVEMENT_26_9_DESC"	"Mérj gyilkos csapást egy Eclipse egységre egy Duo toronnyal."
+		"NEW_ACHIEVEMENT_26_10_NAME"	"Erekir Befejezése"
+		"NEW_ACHIEVEMENT_26_10_DESC"	"Foglald el az Erekir utolsó szektorát."
+		"NEW_ACHIEVEMENT_26_11_NAME"	"Serpulo Befejezése"
+		"NEW_ACHIEVEMENT_26_11_DESC"	"Foglald el a Serpulo utolsó szektorát."
+		"NEW_ACHIEVEMENT_26_12_NAME"	"Rakomány"
+		"NEW_ACHIEVEMENT_26_12_DESC"	"Indítsd el a magot a Serpulo egyik szektorába egy saját egyéni mag-vázlatot használva."
+		"NEW_ACHIEVEMENT_26_13_NAME"	"Túlságosan Felkészült"
+		"NEW_ACHIEVEMENT_26_13_DESC"	"Fejleszd a Becsapódási Pont szektorban lévő magot Magnum-ra."
+		"NEW_ACHIEVEMENT_26_14_NAME"	"Kitörés"
+		"NEW_ACHIEVEMENT_26_14_DESC"	"A Neoplazma terjedjen át bármely víztartalmú blokkra."
+		"NEW_ACHIEVEMENT_26_15_NAME"	"Törékeny"
+		"NEW_ACHIEVEMENT_26_15_DESC"	"Adj extra robbanás-sebzést a Fagyasztó állapothatással rendelkező egységnek."
+		"NEW_ACHIEVEMENT_26_16_NAME"	"Serpulo Struktúra Mester"
+		"NEW_ACHIEVEMENT_26_16_DESC"	"Építsd meg a Serpulo összes elérhető blokkját."
+		"NEW_ACHIEVEMENT_26_17_NAME"	"Erekir Struktúra Mester"
+		"NEW_ACHIEVEMENT_26_17_DESC"	"Építsd meg az Erekir összes elérhető blokkját."
+		"NEW_ACHIEVEMENT_26_18_NAME"	"Pajzsok Le"
+		"NEW_ACHIEVEMENT_26_18_DESC"	"Törd össze egy ellenséges Erő Projektor pajzsát."
+		"NEW_ACHIEVEMENT_26_19_NAME"	"Hol Van A Kézikönyv?"
+		"NEW_ACHIEVEMENT_26_19_DESC"	"Fejleszd ki a Mikroprocesszort."
+		"NEW_ACHIEVEMENT_26_20_NAME"	"Árnyékolás"
+		"NEW_ACHIEVEMENT_26_20_DESC"	"Negatív 10k/sec teljesítmény elérése egy hálózatban."
+		"NEW_ACHIEVEMENT_26_21_NAME"	"Teljesítmény Túltengés"
+		"NEW_ACHIEVEMENT_26_21_DESC"	"Pozitív 100k/sec teljesítmény elérése egy hálózatban."
+		"NEW_ACHIEVEMENT_26_22_NAME"	"Magas Kapacitás"
+		"NEW_ACHIEVEMENT_26_22_DESC"	"Legyen 1 millió tárolt energia az akkumulátorokban egy hálózatban."
+		"NEW_ACHIEVEMENT_26_23_NAME"	"Rossz Ötlet"
+		"NEW_ACHIEVEMENT_26_23_DESC"	"Helyezz robbanóanyagot egy Belső-égetésű Erőműbe."
+		"NEW_ACHIEVEMENT_26_24_NAME"	"Szennyezés"
+		"NEW_ACHIEVEMENT_26_24_DESC"	"Robbanjon fel egy Neoplázia Reaktor a Neoplazma felhalmozódása miatt."
+		"NEW_ACHIEVEMENT_26_25_NAME"	"Módosított"
+		"NEW_ACHIEVEMENT_26_25_DESC"	"Telepíts egy modot."
+		"NEW_ACHIEVEMENT_26_26_NAME"	"Elosztó"
+		"NEW_ACHIEVEMENT_26_26_DESC"	"Elosztó."
+		"NEW_ACHIEVEMENT_26_27_NAME"	"A Teljes Élmény"
+		"NEW_ACHIEVEMENT_26_27_DESC"	"Csatlakozz egy közösségi szerverhez."
+		"NEW_ACHIEVEMENT_26_28_NAME"	"Hackerman"
+		"NEW_ACHIEVEMENT_26_28_DESC"	"Nyisd meg a szkript-konzolt."
+		"NEW_ACHIEVEMENT_26_29_NAME"	"Közvetlen Irányítás"
+		"NEW_ACHIEVEMENT_26_29_DESC"	"Irányíts te magad kézzel egy lövegtornyot."
+		"NEW_ACHIEVEMENT_26_30_NAME"	"Ellenséges Vonalak Mögött"
+		"NEW_ACHIEVEMENT_26_30_DESC"	"Dobj le egységeket egy ellenséges mag építési tilalmi zónájába."
+		"NEW_ACHIEVEMENT_26_31_NAME"	"Bosszú"
+		"NEW_ACHIEVEMENT_26_31_DESC"	"Pusztíts el egy Scatter lövegtornyot egy Flare egységgel."
+		"NEW_ACHIEVEMENT_29_0_NAME"	"Légierő"
+		"NEW_ACHIEVEMENT_29_0_DESC"	"Használd egy földi egység erősítés funkcióját."
+		"NEW_ACHIEVEMENT_29_1_NAME"	"Légpárnás"
+		"NEW_ACHIEVEMENT_29_1_DESC"	"Használj egy Elude egységet a folyadékon való átkeléshez."
+		"NEW_ACHIEVEMENT_29_2_NAME"	"Terep Erősítés"
+		"NEW_ACHIEVEMENT_29_2_DESC"	"Növeld egy blokk hatékonyságát azáltal, hogy meghatározott terepre helyezed."
+		"NEW_ACHIEVEMENT_29_3_NAME"	"Takarítás"
+		"NEW_ACHIEVEMENT_29_3_DESC"	"Törj össze 100 sziklát."
+		"NEW_ACHIEVEMENT_29_4_NAME"	"Globális Takarítás"
+		"NEW_ACHIEVEMENT_29_4_DESC"	"Törj össze 10,000 sziklát."
+		"NEW_ACHIEVEMENT_29_5_NAME"	"Semlegesítve"
+		"NEW_ACHIEVEMENT_29_5_DESC"	"Használj egy Shockwave lövegtornyot, hogy semlegesítsd a beérkező lövedékeket."
+		"NEW_ACHIEVEMENT_29_6_NAME"	"Sajnos"
+		"NEW_ACHIEVEMENT_29_6_DESC"	"Használd az :alphachan: emojit a többjátékos csevegésben, vagy ne, te döntesz."
+	}
+}
diff --git a/fastlane/metadata/steam/hungarian/description.txt b/fastlane/metadata/steam/hungarian/description.txt
new file mode 100644
index 0000000000..97d526afda
--- /dev/null
+++ b/fastlane/metadata/steam/hungarian/description.txt
@@ -0,0 +1,62 @@
+A Mindustry egy gyárépítő játék Toronyvédő és RTS elemekkel. Készíts bonyolult ellátási láncokat, hogy lőszert juttass a lövegtornyokba, termelj az építkezéshez használható nyersanyagokat, és állíts elő egységeket. Irányítsd az egységeket, hogy elfoglald az ellenséges bázisokat, és bővítsd a termelésedet. Védd meg a magodat a hullámokban támadó ellenségtől.
+
+Játszd végig a kampányt egyedül, vagy vállvetve a barátaiddal a platformokon átívelő többjátékos módban, vagy hívd ki őket csapat alapú PvP meccsekre
+
+[img]{STEAM_APP_IMAGE}/extras/factory.gif[/img]
+
+[h2]Gyár Építés[/h2]
+
+[list]
+[*] Hozz létre bonyolult szállítószalagokból álló ellátási láncokat, hogy lőszert juttass a lövegtornyokba és termelj nyersanyagokat az építkezésekhez
+[*] Használd a gyártó-blokkokat a legkülönfélébb fejlett nyersanyagok létrehozásához
+[*] Oszd szét a folyadékokat, és küzdj meg az állandó kihívásokkal, mint például a tűzkitörések, vagy az ellenséges repülőgépek rajtaütéseivel
+[*] Hozd ki a legtöbbet a termelésből az opcionális hűtő- és kenőanyag-ellátással
+[*] Egységek széles skáláját állíthatod elő a bázisod automatikus irányításához és az ellenséges bázisok megtámadásához
+[/list]
+
+[h2]Toronyvédés[/h2]
+
+[list]
+[*] Védd meg építményeidet a hullámokban támadó ellenségektől
+[*] Stratégiailag helyezd el a tornyokat, hogy elpusztítsd a támadóidat, mielőtt elérnék a magodat
+[*] Lásd el a lövegtornyokat lőszerrel, hűtőfolyadékkal és energiával
+[*] Erősítsd meg a védelmed energiával működő pajzsokkal, regenerációs projektorokkal és egyéb támogató épületekkel
+[/list]
+
+[img]{STEAM_APP_IMAGE}/extras/rts3.png[/img]
+
+[h2]Valós Idejű Stratégia[/h2]
+
+[list]
+[*] Állíts fel összeszerelősorokat a gépesített egységek hadainak előállításához
+[*] Használd az egységeidet a hatékonyan felszerelt ellenséges bázisok ellen
+[*] Foglalj el minél több területet, hogy még több magot helyezhess el, és további erőforrásokhoz férhess hozzá a terjeszkedéshez
+[/list]
+
+[h2]Kampány[/h2]
+
+[list]
+[*] Játssz végig két különböző bolygókampányt
+[*] Hódítsd meg a Serpulo és az Erekir bolygót, miközben 35 kézzel készített pályán és 250+ procedurálisan generált szektoron keresztül haladsz
+[*] Foglalj el területeket és építs gyárakat, hogy nyersanyagokat termelhess, miközben más szektorokban játszol
+[*] Védd meg a szektorokat az időszakos invázióktól
+[*] Koordináld az erőforrások elosztását a szektorok között az indítóállások felhasználásával
+[*] Fedezz fel új blokkokat a fejlődés elősegítése érdekében
+[*] Hívd meg barátaidat, hogy együtt teljesítsék a küldetéseket
+[*] 250+ technológiai blokk használatának elsajátítása
+[*] 50+ különböző típusú drón, mech és hajó
+[*] 80+ teljesítendő feladat
+[/list]
+
+[h2]Közösség és Moddolás[/h2]
+
+[list]
+[*] Használd a steam workshop-ot a közösség által készített pályák és vázlatok böngészéséhez.
+[*] Csatlakozz nyilvános közösségi szerverekhez, hogy másokkal játszhass platformokon keresztül
+[*] Játssz kooperatív, PvP vagy homokozóban
+[*] A közösségi szerverek támogatják az egyéni pályák és játékmódok bővítményeit
+[*] Hozz létre nyilvános dedikált szervert, vagy hívd meg a barátaidat a saját privát munkamenetedre
+[*] Testre szabható játékszabályok: Változtasd meg a blokk költségeket, az ellenséges statisztikákat, a kezdő elemeket, a hullámok időzítését és így tovább
+[*] A beépített pályaszerkesztővel saját pályákat készíthetsz, hogy játszhass és megoszthasd a közösséggel
+[*] Böngéssz a közösség által készített modok között, hogy még több tartalmat adhass hozzá, vagy keverj belőlük egy újat
+[/list]
diff --git a/fastlane/metadata/steam/hungarian/short-description.txt b/fastlane/metadata/steam/hungarian/short-description.txt
new file mode 100644
index 0000000000..d0788ec62e
--- /dev/null
+++ b/fastlane/metadata/steam/hungarian/short-description.txt
@@ -0,0 +1 @@
+Egy nyílt végű gyártás-menedzselős játék Toronyvédő és RTS elemekkel.

From f2c267fd753e16f008e49e09f4f3c55c299d8a3d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 5 Feb 2024 21:19:16 -0500
Subject: [PATCH 199/369] Fixed #9520

---
 core/src/mindustry/content/UnitTypes.java | 6 ++++++
 core/src/mindustry/input/MobileInput.java | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 95f5ced15c..089f5d4e39 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -4063,6 +4063,8 @@ public class UnitTypes{
             isEnemy = false;
             envDisabled = 0;
 
+            range = 60f;
+            faceTarget = true;
             targetPriority = -2;
             lowAltitude = false;
             mineWalls = true;
@@ -4127,8 +4129,10 @@ public class UnitTypes{
             isEnemy = false;
             envDisabled = 0;
 
+            range = 60f;
             targetPriority = -2;
             lowAltitude = false;
+            faceTarget = true;
             mineWalls = true;
             mineFloor = false;
             mineHardnessScaling = false;
@@ -4204,6 +4208,8 @@ public class UnitTypes{
             isEnemy = false;
             envDisabled = 0;
 
+            range = 65f;
+            faceTarget = true;
             targetPriority = -2;
             lowAltitude = false;
             mineWalls = true;
diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java
index 5b410a11b7..54d2b3df2f 100644
--- a/core/src/mindustry/input/MobileInput.java
+++ b/core/src/mindustry/input/MobileInput.java
@@ -766,7 +766,7 @@ public class MobileInput extends InputHandler implements GestureListener{
             renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
         }
 
-        if(!Core.settings.getBool("keyboard") && !locked){
+        if(!Core.settings.getBool("keyboard") && !locked && !scene.hasKeyboard()){
             //move camera around
             float camSpeed = 6f;
             Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta * camSpeed));
@@ -967,7 +967,6 @@ public class MobileInput extends InputHandler implements GestureListener{
         boolean allowHealing = type.canHeal;
         boolean validHealTarget = allowHealing && target instanceof Building b && b.isValid() && target.team() == unit.team && b.damaged() && target.within(unit, type.range);
         boolean boosted = (unit instanceof Mechc && unit.isFlying());
-
         //reset target if:
         // - in the editor, or...
         // - it's both an invalid standard target and an invalid heal target

From d7fc3122a4e641ced72c6d786eda006e17ae9232 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 6 Feb 2024 09:35:03 -0500
Subject: [PATCH 200/369] Revert "yeet (#9515)" (#9523)

This reverts commit e521cc52371eb9c9c2dbb2633f624c4935790549.
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index d44b00bf48..b5b263f7a3 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -256,6 +256,10 @@
     "name": "Atomic",
     "address": ["atomic-de.ddns.net:35199", "atomic-de.ddns.net:35176", "atomic-de.ddns.net:35845", "atomic-de.ddns.net:35313"]
   },
+  {
+    "name": "SkyPlex",
+    "address": ["mc-skyplex.net"]
+  },
   {
     "name": "Gadgetroch's Server",
     "address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568", "mindustry.gadgetroch.com:6569"]

From 52b6d32f7376f58fd8d97e2feb9936249dddc38a Mon Sep 17 00:00:00 2001
From: a-big-fish-fish <111189982+a-big-fish-fish@users.noreply.github.com>
Date: Thu, 8 Feb 2024 23:09:42 +0800
Subject: [PATCH 201/369] Update servers_v7.json (#9527)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index b5b263f7a3..673fa228b7 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -238,7 +238,7 @@
   },
   {
     "name": "Extra Utilities",
-    "address": ["p1.i9mr.com:44922", "p1.i9mr.com:44834"]
+    "address": ["p1.i9mr.com:44922", "p1.i9mr.com:44834", "p1.i9mr.com:43189"]
   },
   {
     "name": "Alex Multiverse",

From 2fd92b8c80cd66f5c169293beae29ff1528de112 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 9 Feb 2024 18:09:41 -0500
Subject: [PATCH 202/369] Processor global variable dialog

---
 core/assets/bundles/bundle.properties         |  44 +++++++
 core/src/mindustry/logic/GlobalVars.java      | 114 ++++++++++++++----
 .../src/mindustry/logic/GlobalVarsDialog.java |  61 ++++++++++
 core/src/mindustry/logic/LogicDialog.java     |   7 +-
 .../world/blocks/logic/LogicBlock.java        |   2 -
 gradle.properties                             |   2 +-
 6 files changed, 201 insertions(+), 29 deletions(-)
 create mode 100644 core/src/mindustry/logic/GlobalVarsDialog.java

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 82ad500884..f9cbaa5622 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -501,6 +501,7 @@ editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Name:
 editor.spawn = Spawn Unit
 editor.removeunit = Remove Unit
@@ -2330,6 +2331,49 @@ lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.\n[accent]null []values are ignored.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
 
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
diff --git a/core/src/mindustry/logic/GlobalVars.java b/core/src/mindustry/logic/GlobalVars.java
index bd2a162e6d..fa07475c7f 100644
--- a/core/src/mindustry/logic/GlobalVars.java
+++ b/core/src/mindustry/logic/GlobalVars.java
@@ -27,45 +27,63 @@ public class GlobalVars{
     public static final Rand rand = new Rand();
 
     //non-constants that depend on state
-    private static int varTime, varTick, varSecond, varMinute, varWave, varWaveTime, varServer, varClient, varClientLocale, varClientUnit, varClientName, varClientTeam, varClientMobile;
+    private static int varTime, varTick, varSecond, varMinute, varWave, varWaveTime, varMapW, varMapH, varServer, varClient, varClientLocale, varClientUnit, varClientName, varClientTeam, varClientMobile;
 
     private ObjectIntMap<String> namesToIds = new ObjectIntMap<>();
     private Seq<Var> vars = new Seq<>(Var.class);
+    private Seq<VarEntry> varEntries = new Seq<>();
     private IntSet privilegedIds = new IntSet();
     private UnlockableContent[][] logicIdToContent;
     private int[][] contentIdToLogicId;
 
     public void init(){
-        put("the end", null);
+        putEntryOnly("sectionProcessor");
+
+        putEntryOnly("@this");
+        putEntryOnly("@thisx");
+        putEntryOnly("@thisy");
+        putEntryOnly("@links");
+        putEntryOnly("@ipt");
+
+        putEntryOnly("sectionGeneral");
+
+        put("the end", null, false, true);
         //add default constants
-        put("false", 0);
-        put("true", 1);
-        put("null", null);
+        putEntry("false", 0);
+        putEntry("true", 1);
+        put("null", null, false, true);
 
         //math
-        put("@pi", Mathf.PI);
-        put("π", Mathf.PI); //for the "cool" kids
-        put("@e", Mathf.E);
-        put("@degToRad", Mathf.degRad);
-        put("@radToDeg", Mathf.radDeg);
+        putEntry("@pi", Mathf.PI);
+        put("π", Mathf.PI, false, true); //for the "cool" kids
+        putEntry("@e", Mathf.E);
+        putEntry("@degToRad", Mathf.degRad);
+        putEntry("@radToDeg", Mathf.radDeg);
+
+        putEntryOnly("sectionMap");
 
         //time
-        varTime = put("@time", 0);
-        varTick = put("@tick", 0);
-        varSecond = put("@second", 0);
-        varMinute = put("@minute", 0);
-        varWave = put("@waveNumber", 0);
-        varWaveTime = put("@waveTime", 0);
+        varTime = putEntry("@time", 0);
+        varTick = putEntry("@tick", 0);
+        varSecond = putEntry("@second", 0);
+        varMinute = putEntry("@minute", 0);
+        varWave = putEntry("@waveNumber", 0);
+        varWaveTime = putEntry("@waveTime", 0);
 
-        varServer = put("@server", 0, true);
-        varClient = put("@client", 0, true);
+        varMapW = putEntry("@mapw", 0);
+        varMapH = putEntry("@maph", 0);
+
+        putEntryOnly("sectionNetwork");
+
+        varServer = putEntry("@server", 0, true);
+        varClient = putEntry("@client", 0, true);
 
         //privileged desynced client variables
-        varClientLocale = put("@clientLocale", null, true);
-        varClientUnit = put("@clientUnit", null, true);
-        varClientName = put("@clientName", null, true);
-        varClientTeam = put("@clientTeam", 0, true);
-        varClientMobile = put("@clientMobile", 0, true);
+        varClientLocale = putEntry("@clientLocale", null, true);
+        varClientUnit = putEntry("@clientUnit", null, true);
+        varClientName = putEntry("@clientName", null, true);
+        varClientTeam = putEntry("@clientTeam", 0, true);
+        varClientMobile = putEntry("@clientMobile", 0, true);
 
         //special enums
         put("@ctrlProcessor", ctrlProcessor);
@@ -115,6 +133,8 @@ public class GlobalVars{
         logicIdToContent = new UnlockableContent[ContentType.all.length][];
         contentIdToLogicId = new int[ContentType.all.length][];
 
+        putEntryOnly("sectionLookup");
+
         Fi ids = Core.files.internal("logicids.dat");
         if(ids.exists()){
             //read logic ID mapping data (generated in ImagePacker)
@@ -125,7 +145,7 @@ public class GlobalVars{
                     contentIdToLogicId[ctype.ordinal()] = new int[Vars.content.getBy(ctype).size];
 
                     //store count constants
-                    put("@" + ctype.name() + "Count", amount);
+                    putEntry("@" + ctype.name() + "Count", amount);
 
                     for(int i = 0; i < amount; i++){
                         String name = in.readUTF();
@@ -159,6 +179,9 @@ public class GlobalVars{
         vars.items[varWave].numval = state.wave;
         vars.items[varWaveTime].numval = state.wavetime / 60f;
 
+        vars.items[varMapW].numval = world.width();
+        vars.items[varMapH].numval = world.height();
+
         //network
         vars.items[varServer].numval = (net.server() || !net.active()) ? 1 : 0;
         vars.items[varClient].numval = net.client() ? 1 : 0;
@@ -173,6 +196,10 @@ public class GlobalVars{
         }
     }
 
+    public Seq<VarEntry> getEntries(){
+        return varEntries;
+    }
+
     /** @return a piece of content based on its logic ID. This is not equivalent to content ID. */
     public @Nullable Content lookupContent(ContentType type, int id){
         var arr = logicIdToContent[type.ordinal()];
@@ -209,6 +236,11 @@ public class GlobalVars{
 
     /** Adds a constant value by name. */
     public int put(String name, Object value, boolean privileged){
+        return put(name, value, privileged, true);
+    }
+
+    /** Adds a constant value by name. */
+    public int put(String name, Object value, boolean privileged, boolean hidden){
         int existingIdx = namesToIds.get(name, -1);
         if(existingIdx != -1){ //don't overwrite existing vars (see #6910)
             Log.debug("Failed to add global logic variable '@', as it already exists.", name);
@@ -228,10 +260,44 @@ public class GlobalVars{
         namesToIds.put(name, index);
         if(privileged) privilegedIds.add(index);
         vars.add(var);
+
+        if(!hidden){
+            varEntries.add(new VarEntry(index, name, "", "", privileged));
+        }
         return index;
     }
 
     public int put(String name, Object value){
         return put(name, value, false);
     }
+
+    public int putEntry(String name, Object value){
+        return put(name, value, false, false);
+    }
+
+    public int putEntry(String name, Object value, boolean privileged){
+        return put(name, value, privileged, false);
+    }
+
+    public void putEntryOnly(String name){
+        varEntries.add(new VarEntry(0, name, "", "", false));
+    }
+
+    /** An entry that describes a variable for documentation purposes. This is *only* used inside UI for global variables. */
+    public static class VarEntry{
+        public int id;
+        public String name, description, icon;
+        public boolean privileged;
+
+        public VarEntry(int id, String name, String description, String icon, boolean privileged){
+            this.id = id;
+            this.name = name;
+            this.description = description;
+            this.icon = icon;
+            this.privileged = privileged;
+        }
+
+        public VarEntry(){
+        }
+    }
 }
diff --git a/core/src/mindustry/logic/GlobalVarsDialog.java b/core/src/mindustry/logic/GlobalVarsDialog.java
new file mode 100644
index 0000000000..4d4e883f19
--- /dev/null
+++ b/core/src/mindustry/logic/GlobalVarsDialog.java
@@ -0,0 +1,61 @@
+package mindustry.logic;
+
+import arc.*;
+import arc.graphics.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import mindustry.*;
+import mindustry.gen.*;
+import mindustry.graphics.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+
+public class GlobalVarsDialog extends BaseDialog{
+
+    public GlobalVarsDialog(){
+        super("@logic.globals");
+
+        addCloseButton();
+        shown(this::setup);
+        onResize(this::setup);
+    }
+
+    void setup(){
+        float prefWidth = Math.min(Core.graphics.getWidth() * 0.9f / Scl.scl(1f) - 220f, 600f);
+        cont.clearChildren();
+
+        cont.pane(t -> {
+            t.margin(10f).marginRight(16f);
+            t.defaults().fillX().fillY();
+            for(var entry : Vars.logicVars.getEntries()){
+
+                if(entry.name.startsWith("section")){
+                    Color color = Pal.accent;
+                    t.add("@lglobal." + entry.name).fillX().center().labelAlign(Align.center).colspan(4).color(color).padTop(4f).padBottom(2f).row();
+                    t.image(Tex.whiteui).height(4f).color(color).colspan(4).padBottom(8f).row();
+                }else{
+                    Color varColor = Pal.gray;
+                    float stub = 8f, mul = 0.5f, pad = 4;
+
+                    String desc = entry.description;
+                    if(desc == null || desc.isEmpty()){
+                        desc = Core.bundle.get("lglobal." + entry.name, "");
+                    }
+
+                    String fdesc = desc;
+
+                    t.add(new Image(Tex.whiteui, varColor.cpy().mul(mul))).width(stub);
+                    t.stack(new Image(Tex.whiteui, varColor), new Label(" " + entry.name + " ", Styles.outlineLabel)).padRight(pad);
+
+                    t.add(new Image(Tex.whiteui, Pal.gray.cpy().mul(mul))).width(stub);
+                    t.table(Tex.pane, out -> out.add(fdesc).style(Styles.outlineLabel).width(prefWidth).padLeft(2).padRight(2).wrap()).padRight(pad);
+
+                    t.row();
+
+                    t.add().fillX().colspan(4).height(4).row();
+                }
+            }
+        }).grow();
+    }
+}
diff --git a/core/src/mindustry/logic/LogicDialog.java b/core/src/mindustry/logic/LogicDialog.java
index ac2fd249a8..e49928e572 100644
--- a/core/src/mindustry/logic/LogicDialog.java
+++ b/core/src/mindustry/logic/LogicDialog.java
@@ -26,6 +26,7 @@ public class LogicDialog extends BaseDialog{
     Cons<String> consumer = s -> {};
     boolean privileged;
     @Nullable LExecutor executor;
+    GlobalVarsDialog globalsDialog = new GlobalVarsDialog();
 
     public LogicDialog(){
         super("logic");
@@ -51,7 +52,7 @@ public class LogicDialog extends BaseDialog{
         add(buttons).growX().name("canvas");
     }
 
-    private Color typeColor(Var s, Color color){
+    public static Color typeColor(Var s, Color color){
         return color.set(
             !s.isobj ? Pal.place :
             s.objval == null ? Color.darkGray :
@@ -65,7 +66,7 @@ public class LogicDialog extends BaseDialog{
         );
     }
 
-    private String typeName(Var s){
+    public static String typeName(Var s){
         return
             !s.isobj ? "number" :
             s.objval == null ? "null" :
@@ -178,6 +179,8 @@ public class LogicDialog extends BaseDialog{
             });
 
             dialog.addCloseButton();
+            dialog.buttons.button("@logic.globals", Icon.list, () -> globalsDialog.show()).size(210f, 64f);
+
             dialog.show();
         }).name("variables").disabled(b -> executor == null || executor.vars.length == 0);
 
diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
index 18093949ab..765186cce1 100644
--- a/core/src/mindustry/world/blocks/logic/LogicBlock.java
+++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java
@@ -354,8 +354,6 @@ public class LogicBlock extends Block{
                         }
                     }
 
-                    asm.putConst("@mapw", world.width());
-                    asm.putConst("@maph", world.height());
                     asm.putConst("@links", executor.links.length);
                     asm.putConst("@ipt", instructionsPerTick);
 
diff --git a/gradle.properties b/gradle.properties
index ef07990ffb..1451cdd8a3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=f3b941e548
+archash=a2acd2ee5f

From fb3dd3d42204a614ec76440ccaf5765b01da021a Mon Sep 17 00:00:00 2001
From: summoner001 <summoner001@users.noreply.github.com>
Date: Sat, 10 Feb 2024 17:39:47 +0100
Subject: [PATCH 203/369] Update bundle_hu.properties (#9532)

Translate the new Processor global variable dialog
---
 core/assets/bundles/bundle_hu.properties | 46 +++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index e665fd5494..e6cd547ea2 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -501,6 +501,7 @@ editor.default = [lightgray]<Alapbeállítás>
 details = Részletek...
 edit = Szerkesztés...
 variables = Változók
+logic.globals = Beépített Változók
 editor.name = Név:
 editor.spawn = Egység Megidézése
 editor.removeunit = Egység Eltávolítása
@@ -2328,10 +2329,53 @@ lst.effect = Létrehoz egy részecske-effektet.
 lst.sync = Egy változó szinkronizálása a hálózaton keresztül.\nMásodpercenként legfeljebb 10 alkalommal hívható meg.
 lst.makemarker = Új logikai jelölő létrehozása a világban.\nEgy azonosítót kell megadni a jelölő azonosításához.\nA jelölők száma jelenleg világonként 20 000-re van korlátozva.
 lst.setmarker = Egy jelölő tulajdonságának beállítása.\nA használt azonosítónak meg kell egyeznie a Make Marker utasításban megadottal.\n[accent]null []értékek figyelmen kívül lesznek hagyva.
-
 lst.localeprint = Hozzáadja a pálya Helyi Csomagjainak tulajdonság értékét a szövegpufferhez.\nA pálya Helyi Csomagjainak beállításait a térképszerkesztőben ellenőrizheted [accent]Pálya Infó > Helyi Csomagok[].\nHa a kliens egy mobileszköz, akkor először próbáld kiíratni a ".mobile" végződésű tulajdonságot.
 
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = nulla
+lglobal.@pi = A pi matematikai állandó (3.141...)
+lglobal.@e = Az e matematikai állandó (2.718...)
+lglobal.@degToRad = Szorozza meg ezt a számot a fokok radiánra való konvertálásához
+lglobal.@radToDeg = Szorozza meg ezt a számot a radiánok fokokká konvertálásához
+
+lglobal.@time = Az aktuális mentés játék-ideje, milliszekundumban
+lglobal.@tick = Az aktuális mentés játék-ideje, tick-ben (1 másodperc = 60 tick)
+lglobal.@second = Az aktuális mentés játék-ideje, másodpercben
+lglobal.@minute = Az aktuális mentés játék-ideje, percben
+lglobal.@waveNumber = Az aktuális hullám száma, ha a hullámok engedélyezve vannak
+lglobal.@waveTime = Visszaszámláló a hullámokhoz, másodpercben
+lglobal.@mapw = A pálya szélessége csempékben
+lglobal.@maph = A pálya magassága csempékben
+
+lglobal.sectionMap = Pálya
+lglobal.sectionGeneral = Általános
+lglobal.sectionNetwork = Hálózati/kliensoldali [Csak Világprocesszor]
+lglobal.sectionProcessor = Processzor
+lglobal.sectionLookup = Keres
+
+lglobal.@this = A kódot végrehajtó logikai blokk
+lglobal.@thisx = A kódot végrehajtó blokk X koordinátája
+lglobal.@thisy = A kódot végrehajtó blokk Y koordinátája
+lglobal.@links = Az ehhez a processzorhoz kapcsolt blokkok összesített száma
+lglobal.@ipt = A processzor utasítás végrehajtási sebessége tick-ben (60 tick = 1 másodperc)
+
+lglobal.@unitCount = A játékban található egységek típusainak összesített száma; a Keres utasítással együtt használjuk
+lglobal.@blockCount = A játékban található blokkok típusainak összesített száma; a Keres utasítással együtt használjuk
+lglobal.@itemCount = A játékban található nyersanyagok típusainak összesített száma; a Keres utasítással együtt használjuk
+lglobal.@liquidCount = A játékban található folyadékok típusainak összesített száma; a Keres utasítással együtt használjuk
+
+lglobal.@server = Igaz, ha a kód szerveren, vagy egyjátékos módban fut, egyébként hamis
+lglobal.@client = Igaz, ha a kód egy szerverhez csatlakoztatott kliensen fut
+
+lglobal.@clientLocale = A kódot futtató kliens nyelvi beállítása. Például: hu_HU
+lglobal.@clientUnit = A kódot futtató kliens egysége
+lglobal.@clientName = A kódot futtató kliens játékos neve
+lglobal.@clientTeam = A kódot futtató kliens csapat azonosítója
+lglobal.@clientMobile = Igaz, ha a kódot futtató kliens egy mobil eszköz, egyébként hamis
+
 logic.nounitbuild = [red]Az egységépítési logika itt nem megengedett.
+
 lenum.type = Az épület/egység típusa.\nPéldául bármilyen elosztó esetében ez a [accent]@router[] értéket adja vissza.\nNem karakterlánc.
 lenum.shoot = Lőj egy pontra.
 lenum.shootp = Lőj egy egységre/épületre sebesség előrejelzéssel.

From c3ee92fba701f010b5033aa1d519b6b541d976c2 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az1040-859.0dilqmdz4mhurinb4xzj4l1lvc.bx.internal.cloudapp.net>
Date: Sat, 10 Feb 2024 16:40:37 +0000
Subject: [PATCH 204/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_bg.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_ca.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_cs.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_da.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_de.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_es.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_et.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_eu.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_fi.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_fil.properties   | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_fr.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_id_ID.properties | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_it.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_ja.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_ko.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_lt.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_nl.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_nl_BE.properties | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_pl.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_pt_BR.properties | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_pt_PT.properties | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_ro.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_ru.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_sr.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_sv.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_th.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_tk.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_tr.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_uk_UA.properties | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_vi.properties    | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_zh_CN.properties | 37 +++++++++++++++++++++
 core/assets/bundles/bundle_zh_TW.properties | 37 +++++++++++++++++++++
 33 files changed, 1221 insertions(+)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index 0f2bd5d579..a6c4c953a2 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -489,6 +489,7 @@ editor.default = [lightgray]<Па змаўчанні>
 details = Падрабязнасці...
 edit = Рэдагаваць...
 variables = Пераменныя
+logic.globals = Built-in Variables
 editor.name = Назва:
 editor.spawn = Стварыць баявую адзінку
 editor.removeunit = Выдаліць баявую адзінку
@@ -2277,6 +2278,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 4f4a1b6a85..2eefb3e206 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<Стандартно>
 details = Детайли...
 edit = Редактирай...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Име:
 editor.spawn = Създай Единица
 editor.removeunit = Премахни Единица
@@ -2291,6 +2292,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Действия за строене на единици не са позволени тук.
 
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index 6da600fb24..ec4c6affcc 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<Per defecte>
 details = Detalls
 edit = Edita
 variables = Variables
+logic.globals = Built-in Variables
 editor.name = Nom:
 editor.spawn = Genera una unitat
 editor.removeunit = Treu una unitat
@@ -2301,6 +2302,42 @@ lst.sync = Sincronitza una variable a través de la xarxa.\nS’invoca com a mol
 lst.makemarker = Crea una marca lògica al món.\nS’ha de donar un ID per a identificar-la.\nEs poden establir fins a 20.000 marcadors per món.
 lst.setmarker = Estableix una propietat per a la marca.\nL’ID que es faci servir ha de ser el mateix que el de la instrucció de crear la marca.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Aquí no es permet construir blocs de tipus lògic.
 
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index e112b8a7dd..c03d8d735c 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<Výchozí>[]
 details = Podrobnosti...
 edit = Upravit...
 variables = Hodnoty
+logic.globals = Built-in Variables
 editor.name = Jméno:
 editor.spawn = Zrodit jednotku
 editor.removeunit = Odstranit jednotku
@@ -2295,6 +2296,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Stavba budov pomoci jednotek kontrolované procesorem neni povolené.
 
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index ea0486f57f..db8c9259e5 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -490,6 +490,7 @@ editor.default = [lightgray]<standard>
 details = Detaljer...
 edit = Rediger...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Navn:
 editor.spawn = Påkald enhed
 editor.removeunit = Fjern enhed
@@ -2277,6 +2278,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 2d9b01b830..52f385530f 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -498,6 +498,7 @@ editor.default = [lightgray]<Standard>
 details = Details
 edit = Bearbeiten
 variables = Variablen
+logic.globals = Built-in Variables
 editor.name = Name:
 editor.spawn = Spawnbereich
 editor.removeunit = Bereich entfernen
@@ -2326,6 +2327,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Logik, die Blöcke baut, ist hier nicht erlaubt.
 
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 0d8a67acc1..1867c98505 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<Por defecto>
 details = Detalles...
 edit = Editar...
 variables = Variables
+logic.globals = Built-in Variables
 editor.name = Nombre:
 editor.spawn = Generar unidad
 editor.removeunit = Eliminar unidad
@@ -2319,6 +2320,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]No se permite construir bloques de categoría lógica.
 
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 3d275aaf31..0a715e1895 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -490,6 +490,7 @@ editor.default = [lightgray]<Vaikimisi>
 details = Üksikasjad...
 edit = Muuda...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Nimi:
 editor.spawn = Tekita väeüksus
 editor.removeunit = Eemalda väeüksus
@@ -2279,6 +2280,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index e140e0f2d2..0baea59b79 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -492,6 +492,7 @@ editor.default = [lightgray]<Lehenetsia>
 details = Xehetasunak...
 edit = Editatu...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Izena:
 editor.spawn = Sortu unitatea
 editor.removeunit = Kendu unitatea
@@ -2281,6 +2282,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index b6fccfbb25..55fbc04374 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -490,6 +490,7 @@ editor.default = [lightgray]<Oletus>
 details = Yksityiskohdat...
 edit = Muokkaa...
 variables = Muuttujat
+logic.globals = Built-in Variables
 editor.name = Nimi:
 editor.spawn = Luo yksikkö
 editor.removeunit = Poista yksikkö
@@ -2282,6 +2283,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Logiikan käyttö ei täällä ole sallittu yksikköjen tuottamisessa.
 lenum.type = Rakennuksen/Yksikön tyyppi.\nEsim. jokaisesta reitittimestä tämä palauttaa [accent]@router[].\nEi ole merkkijono.
 lenum.shoot = Ammu tiettyä sijaintia.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index fa419f2b4e..e66f954eb3 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -490,6 +490,7 @@ editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Name:
 editor.spawn = Spawn Unit
 editor.removeunit = Remove Unit
@@ -2278,6 +2279,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 451b2fe7ad..141ebaa102 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -501,6 +501,7 @@ editor.default = [lightgray]<par défaut>
 details = Détails...
 edit = Modifier...
 variables = Variables
+logic.globals = Built-in Variables
 editor.name = Nom :
 editor.spawn = Ajouter une unité
 editor.removeunit = Retirer l'unité
@@ -2327,6 +2328,42 @@ lst.sync = Synchronise une variable dans le réseau.\nLimité à 20 fois par sec
 lst.makemarker = Crée un marqueur dans le monde.\nUn ID pour identifier le marqueur doit être donné.\nLes marqueurs sont limités à 20,000 par monde.
 lst.setmarker = Change une propriété d'un marqueur.\nL'ID utilisé doit être le même que celui de l'instruction "Make Marker".
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Les unités contrôlées par des processeurs ne peuvent pas construire ici.
 
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index e9c1a422ed..7a7b796120 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<Standar>
 details = Detail...
 edit = Sunting...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Nama:
 editor.spawn = Munculkan Unit
 editor.removeunit = Hapus Unit
@@ -2317,6 +2318,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Logika unit membangun tidak diperbolehkan di sini.
 
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 5573373c19..0c23dce129 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -493,6 +493,7 @@ editor.default = [lightgray]<Predefinito>
 details = Dettagli...
 edit = Modifica...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Nome:
 editor.spawn = Piazza un'Unità
 editor.removeunit = Rimuovi un'Unità
@@ -2291,6 +2292,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 5bc5164d62..2eac0ca92f 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<デフォルト>
 details = 詳細...
 edit = 編集...
 variables = 変数
+logic.globals = Built-in Variables
 editor.name = 名前:
 editor.spawn = ユニットを出す
 editor.removeunit = ユニットを消す
@@ -2295,6 +2296,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]ここではユニット構築ロジックは使用できません。
 lenum.type = ユニットや建物の種類を取得します。\n例：任意のルーターに対して、 [accent]@router[] を返します。\n文字列ではありません。
 lenum.shoot = 指定した座標に向かって撃ちます。
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 19d67abc19..14fa6c5d0c 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -494,6 +494,7 @@ editor.default = [lightgray]<기본값>
 details = 설명...
 edit = 편집...
 variables = 변수
+logic.globals = Built-in Variables
 editor.name = 이름:
 editor.spawn = 기체 생성
 editor.removeunit = 기체 삭제
@@ -2294,6 +2295,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]기체의 건설 로직은 여기서 허용되지 않습니다.
 
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 506091d3fd..058578ed3c 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -490,6 +490,7 @@ editor.default = [lightgray]<Numatytasis>
 details = Detaliau...
 edit = Redaguoti...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Pavadinimas:
 editor.spawn = Atradinti vienetą
 editor.removeunit = Panaikinti vienetą
@@ -2279,6 +2280,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index dd8a5fa776..b0eff98f45 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -498,6 +498,7 @@ editor.default = [lightgray]<Standaard>
 details = Details...
 edit = Bewerk...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Naam:
 editor.spawn = Voeg Eenheid toe
 editor.removeunit = Verwijder Eenheid
@@ -2292,6 +2293,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 3f254be6bf..7ce6dfecd9 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -490,6 +490,7 @@ editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Name:
 editor.spawn = Spawn Unit
 editor.removeunit = Remove Unit
@@ -2279,6 +2280,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index 354218436d..58b1074efb 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<Domyślne>
 details = Detale...
 edit = Edytuj...
 variables = Zmienne
+logic.globals = Built-in Variables
 editor.name = Nazwa:
 editor.spawn = Stwórz Jednostkę
 editor.removeunit = Usuń Jednostkę
@@ -2313,6 +2314,42 @@ lst.sync = Synchronizuje zmienną poprzez sieć.\nWywoływane maksymalnie 10 raz
 lst.makemarker = Stwórz nowy marker logiki.\nMusisz podać ID, aby móc go później zidentyfikować.\nLimit markerów to 20,000.
 lst.setmarker = Ustaw właściwości markera.\nID markera musi być takie samo jak podczas jego tworzenia.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Logika budowania jednostek nie jest tu dozwolona.
 
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 57d093b14c..6d407f8b53 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<padrão>
 details = Detalhes...
 edit = Editar...
 variables = Variáveis
+logic.globals = Built-in Variables
 editor.name = Nome:
 editor.spawn = Spawnar unidade
 editor.removeunit = Remover unidade
@@ -2312,6 +2313,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Lógica de construção de unidades não é permitida aqui.
 
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 2779c1247b..655572aa1e 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -490,6 +490,7 @@ editor.default = [lightgray]<padrão>
 details = Detalhes...
 edit = Editar...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Nome:
 editor.spawn = Criar unidade
 editor.removeunit = Remover unidade
@@ -2279,6 +2280,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index 1d30c519ac..ebbc5c124e 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<Prestabilit>
 details = Detalii...
 edit = Editează...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Nume:
 editor.spawn = Adaugă Unitate
 editor.removeunit = Înlătură Unitate
@@ -2296,6 +2297,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Nu ai voie să construiești cu unitățile folosind procesoare.
 
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 21cdbc14c2..424a5a041b 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<По умолчанию>
 details = Подробности…
 edit = Редактировать…
 variables = Переменные
+logic.globals = Built-in Variables
 editor.name = Название:
 editor.spawn = Создать боевую единицу
 editor.removeunit = Удалить боевую единицу
@@ -2298,6 +2299,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Строительство с помощью процессоров здесь запрещено.
 
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index c372cd5e61..c2f7c81da6 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<Default>
 details = Detalji...
 edit = Izmeni...
 variables = Varijabla
+logic.globals = Built-in Variables
 editor.name = Ime:
 editor.spawn = Prizovi Jedinicu
 editor.removeunit = Ukloni Jedinicu
@@ -2299,6 +2300,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index e149794032..e8937b491c 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -490,6 +490,7 @@ editor.default = [lightgray]<Default>
 details = Details...
 edit = Redigera...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = Namn:
 editor.spawn = Spawn Unit
 editor.removeunit = Remove Unit
@@ -2279,6 +2280,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index fdfc3f6fef..d24aa629b5 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<ค่าเริ่มต้น>
 details = รายละเอียด...
 edit = แก้ไข...
 variables = ตัวแปร
+logic.globals = Built-in Variables
 editor.name = ชื่อ:
 editor.spawn = สร้างยูนิต
 editor.removeunit = ลบยูนิต
@@ -2316,6 +2317,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]ไม่อนุญาตให้ใช้ลอจิกควบคุมให้ยูนิตสร้างที่นี่
 
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 8d56df9627..c1dc4dbe72 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -490,6 +490,7 @@ editor.default = [lightgray]<Default>
 details = Details...
 edit = Edit...
 variables = Vars
+logic.globals = Built-in Variables
 editor.name = isim:
 editor.spawn = Spawn Unit
 editor.removeunit = Remove Unit
@@ -2279,6 +2280,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 lenum.type = Type of building/unit.\ne.g. for any router, this will return [accent]@router[].\nNot a string.
 lenum.shoot = Shoot at a position.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index cbaf31d335..172e78f31e 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]<Varsayılan>
 details = Detaylar...
 edit = Düzenle...
 variables = Değişkenler
+logic.globals = Built-in Variables
 editor.name = İsim:
 editor.spawn = Birim Oluştur
 editor.removeunit = Birim Kaldır
@@ -2296,6 +2297,42 @@ lst.sync = Ağ boyunca bir değişkeni senkronize et.\nSaniyede en fazla 10 kere
 lst.makemarker = Dünyada yeni bir İşlemci İşareti koy.\nBu İşarete bir Kimlik adamalısın.\nDünya başına 20.000 limit bulunmakta.
 lst.setmarker = Bir İşlemci İşareti için bir arazi seç.\nKimlik, İşaret Koyucudaki ile aynı olmalı.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Birim İnşası Yasak!
 
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 8d82468aab..0073cef162 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -497,6 +497,7 @@ editor.default = [lightgray]<За замовчуванням>
 details = Подробиці…
 edit = Змінити…
 variables = Змінні
+logic.globals = Built-in Variables
 editor.name = Ім’я:
 editor.spawn = Створити бойову одиницю
 editor.removeunit = Видалити бойову одиницю
@@ -2323,6 +2324,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Будування за допомогою процесорів заборено.
 
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index a2846e923e..35c9472d8e 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -496,6 +496,7 @@ editor.default = [lightgray]<Mặc định>
 details = Chi tiết...
 edit = Chỉnh sửa...
 variables = Thông số
+logic.globals = Built-in Variables
 editor.name = Tên:
 editor.spawn = Thêm kẻ địch
 editor.removeunit = Xóa kẻ địch
@@ -2297,6 +2298,42 @@ lst.sync = Đồng bộ giá trị biến qua mạng.\nChỉ gọi tối đa 10
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Lô-gíc xây dựng đơn vị không được phép ở đây.
 
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index e66a00616d..0761b47baf 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -498,6 +498,7 @@ editor.default = [lightgray]<默认>
 details = 详情…
 edit = 编辑…
 variables = 变量
+logic.globals = Built-in Variables
 editor.name = 名称：
 editor.spawn = 生成单位
 editor.removeunit = 移除单位
@@ -2322,6 +2323,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]此处不允许处理器操控单位去建设
 
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 065c3a8eec..3afb86a1f8 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -495,6 +495,7 @@ editor.default = [lightgray]（預設）
 details = 詳細資訊……
 edit = 編輯……
 variables = 變數
+logic.globals = Built-in Variables
 editor.name = 名稱：
 editor.spawn = 重生單位
 editor.removeunit = 移除單位
@@ -2308,6 +2309,42 @@ lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second a
 lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
 lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
 lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lglobal.false = 0
+lglobal.true = 1
+lglobal.null = null
+lglobal.@pi = The mathematical constant pi (3.141...)
+lglobal.@e = The mathematical constant e (2.718...)
+lglobal.@degToRad = Multiply by this number to convert degrees to radians
+lglobal.@radToDeg = Multiply by this number to convert radians to degrees
+lglobal.@time = Playtime of current save, in milliseconds
+lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
+lglobal.@second = Playtime of current save, in seconds
+lglobal.@minute = Playtime of current save, in minutes
+lglobal.@waveNumber = Current wave number, if waves are enabled
+lglobal.@waveTime = Countdown timer for waves, in seconds
+lglobal.@mapw = Map width in tiles
+lglobal.@maph = Map height in tiles
+lglobal.sectionMap = Map
+lglobal.sectionGeneral = General
+lglobal.sectionNetwork = Network/Clientside [World Processor Only]
+lglobal.sectionProcessor = Processor
+lglobal.sectionLookup = Lookup
+lglobal.@this = The logic block executing the code
+lglobal.@thisx = X coordinate of block executing the code
+lglobal.@thisy = Y coordinate of block executing the code
+lglobal.@links = Total number of blocks linked to this processors
+lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
+lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
+lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
+lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
+lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
+lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
+lglobal.@client = True if the code is running on a client connected to a server
+lglobal.@clientLocale = Locale of the client running the code. For example: en_US
+lglobal.@clientUnit = Unit of client running the code
+lglobal.@clientName = Player name of client running the code
+lglobal.@clientTeam = Team ID of client running the code
+lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]單位建造邏輯已被禁止。
 

From c9c0a6943654343cca01b5b58776346c247c6a0d Mon Sep 17 00:00:00 2001
From: NazrinNya <137837419+NazrinNya@users.noreply.github.com>
Date: Sat, 10 Feb 2024 21:07:04 +0300
Subject: [PATCH 205/369] Update servers_v7.json (#9533)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 673fa228b7..e305c8aba9 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -210,7 +210,7 @@
   },
   {
     "name": "Cyandustry",
-    "address": ["94.130.89.220:7000","94.130.89.220:7001", "94.130.89.220:7002", "94.130.89.220:7003", "94.130.89.220:7004", "94.130.89.220:7005", "94.130.89.220:7006", "94.130.89.220:7007", "94.130.89.220:7008"]
+    "address": ["45.88.109.9:7000","45.88.109.9:7001", "45.88.109.9:7002", "45.88.109.9:7003", "45.88.109.9:7004", "45.88.109.9:7005", "45.88.109.9:7006", "45.88.109.9:7007", "45.88.109.9:7008"]
   },
   {
     "name": "Four Family",

From 6f96cf1242cf7356e60c3d87dbb2b6e8c6449cdd Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 10 Feb 2024 13:41:39 -0500
Subject: [PATCH 206/369] Update SERVERLIST.md

---
 SERVERLIST.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/SERVERLIST.md b/SERVERLIST.md
index 2afe0b887e..f18655ff14 100644
--- a/SERVERLIST.md
+++ b/SERVERLIST.md
@@ -18,13 +18,16 @@ You'll need to either hire some moderators, or make use of (currently non-existe
 4. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option.
 5. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`).
 6. Finally, **submit a pull request** to add your server's IP to the list. 
-This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers_v7.json), then add a JSON object with a single key, indicating your server address.
-For example, if your server address is `example.com:6000`, you would add a comma after the last entry and insert:
+This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers_v7.json), then add a JSON object with the following format:
     ```json
       {
-        "address": "example.com:6000"
+        "name": "Your Server Group Name",
+        "address": ["your.server.address"]
       }
     ```
+
+    If your group has multiple servers, simply add extra addresses inside the square brackets, separated by commas. For example: `["address1", "address2"]`
+    
     > Note that Mindustry also support SRV records. This allows you to use a subdomain for your server address instead of specifying the port. For example, if you want to use `play.example.com` instead of `example.com:6000`, in the dns settings of your domain, add an SRV record with `_mindustry` as the service, `tcp` as the protocol, `play` as the target and `6000` as the port. You can also setup fallback servers by modifying the weight or priority of the record. Although SRV records are very convenient, keep in mind they are slower than regular addresses. Avoid using them in the server list, but rather as an easy way to share your server address.
 
     Then, press the *'submit pull request'* button and I'll take a look at your server. If I have any issues with it, I'll let you know in the PR comments.

From 1542f7c28e1174c5abd5009781ef22c26287fd98 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 10 Feb 2024 17:20:35 -0500
Subject: [PATCH 207/369] UI#loadColors moved earlier in init

---
 core/src/mindustry/ClientLauncher.java         | 1 +
 core/src/mindustry/core/UI.java                | 2 --
 core/src/mindustry/logic/GlobalVarsDialog.java | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java
index 7e07570470..ae8aae4ab3 100644
--- a/core/src/mindustry/ClientLauncher.java
+++ b/core/src/mindustry/ClientLauncher.java
@@ -69,6 +69,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
             return (Float.isNaN(result) || Float.isInfinite(result)) ? 1f : Mathf.clamp(result, 0.0001f, 60f / 10f);
         });
 
+        UI.loadColors();
         batch = new SortedSpriteBatch();
         assets = new AssetManager();
         assets.setLoader(Texture.class, "." + mapExtension, new MapPreviewLoader());
diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
index 1b6b550461..3deb6bd4d8 100644
--- a/core/src/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -101,8 +101,6 @@ public class UI implements ApplicationListener, Loadable{
 
     @Override
     public void loadSync(){
-        loadColors();
-
         Fonts.outline.getData().markupEnabled = true;
         Fonts.def.getData().markupEnabled = true;
         Fonts.def.setOwnsTexture(false);
diff --git a/core/src/mindustry/logic/GlobalVarsDialog.java b/core/src/mindustry/logic/GlobalVarsDialog.java
index 4d4e883f19..755c4a9886 100644
--- a/core/src/mindustry/logic/GlobalVarsDialog.java
+++ b/core/src/mindustry/logic/GlobalVarsDialog.java
@@ -22,7 +22,7 @@ public class GlobalVarsDialog extends BaseDialog{
     }
 
     void setup(){
-        float prefWidth = Math.min(Core.graphics.getWidth() * 0.9f / Scl.scl(1f) - 220f, 600f);
+        float prefWidth = Math.min(Core.graphics.getWidth() * 0.9f / Scl.scl(1f) - 240f, 600f);
         cont.clearChildren();
 
         cont.pane(t -> {

From a819b92e3d30a199d64d1449bc9b821d1ef0b107 Mon Sep 17 00:00:00 2001
From: 112Hack <144626073+112Hack@users.noreply.github.com>
Date: Sun, 11 Feb 2024 16:52:14 +0300
Subject: [PATCH 208/369] Update servers_v7.json (#9536)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index e305c8aba9..7d89a80c1d 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -17,7 +17,7 @@
   },
   {
     "name": "CMS Empire",
-    "address": ["195.2.84.144","95.84.198.97"]
+    "address": ["94.250.250.252","95.84.198.97"]
   },
   {
     "name": "ShardDustry Eventos",

From 0e3c4c097c9de2d69a2af0f5d273ce38bda998bb Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 11 Feb 2024 08:56:19 -0500
Subject: [PATCH 209/369] Fixed #9535

---
 core/src/mindustry/input/MobileInput.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java
index 54d2b3df2f..2d0fc1bec1 100644
--- a/core/src/mindustry/input/MobileInput.java
+++ b/core/src/mindustry/input/MobileInput.java
@@ -743,6 +743,11 @@ public class MobileInput extends InputHandler implements GestureListener{
             queueCommandMode = false;
         }
 
+        //cannot rebuild and place at the same time
+        if(block != null){
+            rebuildMode = false;
+        }
+
         if(player.dead()){
             mode = none;
             manualShooting = false;

From e99b9c2ad1eb0bd11054ebeee2b25d788f3cdb8a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 11 Feb 2024 09:00:51 -0500
Subject: [PATCH 210/369] Fixed #9537

---
 core/src/mindustry/game/Schematic.java                      | 2 +-
 core/src/mindustry/world/blocks/power/PowerGenerator.java   | 4 ++++
 core/src/mindustry/world/blocks/power/ThermalGenerator.java | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/game/Schematic.java b/core/src/mindustry/game/Schematic.java
index 75ac43ec66..dde5886f60 100644
--- a/core/src/mindustry/game/Schematic.java
+++ b/core/src/mindustry/game/Schematic.java
@@ -31,7 +31,7 @@ public class Schematic implements Publishable, Comparable<Schematic>{
     }
 
     public float powerProduction(){
-        return tiles.sumf(s -> s.block instanceof PowerGenerator p ? p.powerProduction : 0f);
+        return tiles.sumf(s -> s.block instanceof PowerGenerator p ? p.getDisplayedPowerProduction() : 0f);
     }
 
     public float powerConsumption(){
diff --git a/core/src/mindustry/world/blocks/power/PowerGenerator.java b/core/src/mindustry/world/blocks/power/PowerGenerator.java
index 966c2c48d0..fb77b987a1 100644
--- a/core/src/mindustry/world/blocks/power/PowerGenerator.java
+++ b/core/src/mindustry/world/blocks/power/PowerGenerator.java
@@ -46,6 +46,10 @@ public class PowerGenerator extends PowerDistributor{
         flags = EnumSet.of(BlockFlag.generator);
     }
 
+    public float getDisplayedPowerProduction(){
+        return powerProduction;
+    }
+
     @Override
     public TextureRegion[] icons(){
         return drawer.finalIcons(this);
diff --git a/core/src/mindustry/world/blocks/power/ThermalGenerator.java b/core/src/mindustry/world/blocks/power/ThermalGenerator.java
index eb2eff6cee..9195205a9f 100644
--- a/core/src/mindustry/world/blocks/power/ThermalGenerator.java
+++ b/core/src/mindustry/world/blocks/power/ThermalGenerator.java
@@ -26,6 +26,11 @@ public class ThermalGenerator extends PowerGenerator{
         noUpdateDisabled = true;
     }
 
+    @Override
+    public float getDisplayedPowerProduction(){
+        return powerProduction / displayEfficiencyScale;
+    }
+
     @Override
     public void init(){
         if(outputLiquid != null){

From da0bcdcca3be4c07b2713993c53d83f143557306 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 11 Feb 2024 09:06:28 -0500
Subject: [PATCH 211/369] Fixed #9538

---
 core/src/mindustry/ai/UnitGroup.java       | 22 +++++++++++++++++-----
 core/src/mindustry/ai/types/CommandAI.java |  4 ++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/ai/UnitGroup.java b/core/src/mindustry/ai/UnitGroup.java
index 7ccddcad50..dbb55312f3 100644
--- a/core/src/mindustry/ai/UnitGroup.java
+++ b/core/src/mindustry/ai/UnitGroup.java
@@ -19,7 +19,22 @@ public class UnitGroup{
     public int collisionLayer;
     public volatile float[] positions, originalPositions;
     public volatile boolean valid;
+    public long lastSpeedUpdate = -1;
     public float minSpeed = 999999f;
+
+    public void updateMinSpeed(){
+        if(lastSpeedUpdate == Vars.state.updateId) return;
+
+        lastSpeedUpdate = Vars.state.updateId;
+
+        for(Unit unit : units){
+            //don't factor in the floor speed multiplier
+            Floor on = unit.isFlying() ? Blocks.air.asFloor() : unit.floorOn();
+            minSpeed = Math.min(unit.speed() / on.speedMultiplier, minSpeed);
+        }
+
+        if(Float.isInfinite(minSpeed) || Float.isNaN(minSpeed)) minSpeed = 999999f;
+    }
     
     public void calculateFormation(Vec2 dest, int collisionLayer){
         this.collisionLayer = collisionLayer;
@@ -33,19 +48,16 @@ public class UnitGroup{
         cy /= units.size;
         positions = new float[units.size * 2];
 
+
         //all positions are relative to the center
         for(int i = 0; i < units.size; i ++){
             Unit unit = units.get(i);
             positions[i * 2] = unit.x - cx;
             positions[i * 2 + 1] = unit.y - cy;
             unit.command().groupIndex = i;
-
-            //don't factor in the floor speed multiplier
-            Floor on = unit.isFlying() ? Blocks.air.asFloor() : unit.floorOn();
-            minSpeed = Math.min(unit.speed() / on.speedMultiplier, minSpeed);
         }
 
-        if(Float.isInfinite(minSpeed) || Float.isNaN(minSpeed)) minSpeed = 999999f;
+        updateMinSpeed();
 
         //run on new thread to prevent stutter
         Vars.mainExecutor.submit(() -> {
diff --git a/core/src/mindustry/ai/types/CommandAI.java b/core/src/mindustry/ai/types/CommandAI.java
index bedc78fc14..692aff98c8 100644
--- a/core/src/mindustry/ai/types/CommandAI.java
+++ b/core/src/mindustry/ai/types/CommandAI.java
@@ -148,6 +148,10 @@ public class CommandAI extends AIController{
             }
         }
 
+        if(group != null){
+            group.updateMinSpeed();
+        }
+
         if(!net.client() && command == UnitCommand.enterPayloadCommand && unit.buildOn() != null && (targetPos == null || (world.buildWorld(targetPos.x, targetPos.y) != null && world.buildWorld(targetPos.x, targetPos.y) == unit.buildOn()))){
             var build = unit.buildOn();
             tmpPayload.unit = unit;

From 00ecf372762eaa10fbb76f51945c961da31c9be9 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 11 Feb 2024 20:14:48 -0500
Subject: [PATCH 212/369] Fixed #9539

---
 core/src/mindustry/service/Achievement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/service/Achievement.java b/core/src/mindustry/service/Achievement.java
index e433063fdc..cd62301fae 100644
--- a/core/src/mindustry/service/Achievement.java
+++ b/core/src/mindustry/service/Achievement.java
@@ -39,7 +39,7 @@ public enum Achievement{
     issueAttackCommand,
     active100Units(SStat.maxUnitActive, 100),
     build1000Units(SStat.unitsBuilt, 1000),
-    buildAllUnits(SStat.unitTypesBuilt, 30),
+    buildAllUnits(SStat.unitTypesBuilt, 50),
     buildT5,
     pickupT5,
     active10Polys,

From 8f231febb861bc7f1b14ae6ac75c92b2ef3d65cf Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Mon, 12 Feb 2024 20:32:30 -0800
Subject: [PATCH 213/369] Layer options in DrawTurret (#9541)

---
 core/src/mindustry/world/draw/DrawTurret.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/world/draw/DrawTurret.java b/core/src/mindustry/world/draw/DrawTurret.java
index a4377efc7a..d76708b9d6 100644
--- a/core/src/mindustry/world/draw/DrawTurret.java
+++ b/core/src/mindustry/world/draw/DrawTurret.java
@@ -22,6 +22,7 @@ public class DrawTurret extends DrawBlock{
     public String basePrefix = "";
     /** Overrides the liquid to draw in the liquid region. */
     public @Nullable Liquid liquidDraw;
+    public float turretLayer = Layer.turret, shadowLayer = Layer.turret - 0.5f, heatLayer = Layer.turretHeat;
     public TextureRegion base, liquid, top, heat, preview, outline;
 
     public DrawTurret(String basePrefix){
@@ -52,11 +53,11 @@ public class DrawTurret extends DrawBlock{
         Draw.rect(base, build.x, build.y);
         Draw.color();
 
-        Draw.z(Layer.turret - 0.5f);
+        Draw.z(shadowLayer);
 
         Drawf.shadow(preview, build.x + tb.recoilOffset.x - turret.elevation, build.y + tb.recoilOffset.y - turret.elevation, tb.drawrot());
 
-        Draw.z(Layer.turret);
+        Draw.z(turretLayer);
 
         drawTurret(turret, tb);
         drawHeat(turret, tb);
@@ -64,9 +65,9 @@ public class DrawTurret extends DrawBlock{
         if(parts.size > 0){
             if(outline.found()){
                 //draw outline under everything when parts are involved
-                Draw.z(Layer.turret - 0.01f);
+                Draw.z(turretLayer - 0.01f);
                 Draw.rect(outline, build.x + tb.recoilOffset.x, build.y + tb.recoilOffset.y, tb.drawrot());
-                Draw.z(Layer.turret);
+                Draw.z(turretLayer);
             }
 
             float progress = tb.progress();
@@ -99,7 +100,7 @@ public class DrawTurret extends DrawBlock{
     public void drawHeat(Turret block, TurretBuild build){
         if(build.heat <= 0.00001f || !heat.found()) return;
 
-        Drawf.additive(heat, block.heatColor.write(Tmp.c1).a(build.heat), build.x + build.recoilOffset.x, build.y + build.recoilOffset.y, build.drawrot(), Layer.turretHeat);
+        Drawf.additive(heat, block.heatColor.write(Tmp.c1).a(build.heat), build.x + build.recoilOffset.x, build.y + build.recoilOffset.y, build.drawrot(), heatLayer);
     }
 
     /** Load any relevant texture regions. */

From 15f98544270281a3764a63e590dc3545b089a683 Mon Sep 17 00:00:00 2001
From: Elixias <61173114+LixieWulf@users.noreply.github.com>
Date: Tue, 13 Feb 2024 06:24:47 -0700
Subject: [PATCH 214/369] Unhardcode frag offsets (#9543)

---
 core/src/mindustry/entities/bullet/BulletType.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index 2870715f06..64737495e7 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -174,6 +174,8 @@ public class BulletType extends Content implements Cloneable{
     public float fragVelocityMin = 0.2f, fragVelocityMax = 1f;
     /** Random range of frag lifetime as a multiplier. */
     public float fragLifeMin = 1f, fragLifeMax = 1f;
+    /** Random offset of frag bullets from the parent bullet. */
+    public float fragOffsetMin = 1f, fragOffsetMax = 7f;
 
     /** Bullet that is created at a fixed interval. */
     public @Nullable BulletType intervalBullet;
@@ -509,7 +511,7 @@ public class BulletType extends Content implements Cloneable{
     public void createFrags(Bullet b, float x, float y){
         if(fragBullet != null && (fragOnAbsorb || !b.absorbed)){
             for(int i = 0; i < fragBullets; i++){
-                float len = Mathf.random(1f, 7f);
+                float len = Mathf.random(fragOffsetMin, fragOffsetMax);
                 float a = b.rotation() + Mathf.range(fragRandomSpread / 2) + fragAngle + ((i - fragBullets/2) * fragSpread);
                 fragBullet.create(b, x + Angles.trnsx(a, len), y + Angles.trnsy(a, len), a, Mathf.random(fragVelocityMin, fragVelocityMax), Mathf.random(fragLifeMin, fragLifeMax));
             }

From 1ab8b509773ecc2cd75e8ab5db3d8fa107ab0700 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 13 Feb 2024 21:22:07 -0500
Subject: [PATCH 215/369] Fixed #9548

---
 core/src/mindustry/editor/MapEditor.java          | 15 +++++++++++++--
 core/src/mindustry/world/Block.java               |  2 ++
 .../mindustry/world/blocks/logic/LogicBlock.java  |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/editor/MapEditor.java b/core/src/mindustry/editor/MapEditor.java
index 96418def2f..37a10cca89 100644
--- a/core/src/mindustry/editor/MapEditor.java
+++ b/core/src/mindustry/editor/MapEditor.java
@@ -301,6 +301,14 @@ public class MapEditor{
                 if(previous.in(px, py)){
                     tiles.set(x, y, previous.getn(px, py));
                     Tile tile = tiles.getn(x, y);
+
+                    Object config = null;
+
+                    //fetch the old config first, configs can be relative to block position (tileX/tileY) before those are reassigned
+                    if(tile.build != null && tile.isCenter()){
+                        config = tile.build.config();
+                    }
+
                     tile.x = (short)x;
                     tile.y = (short)y;
 
@@ -309,9 +317,12 @@ public class MapEditor{
                         tile.build.y = y * tilesize + tile.block().offset;
 
                         //shift links to account for map resize
-                        Object config = tile.build.config();
                         if(config != null){
-                            Object out = BuildPlan.pointConfig(tile.block(), config, p -> p.sub(offsetX, offsetY));
+                            Object out = BuildPlan.pointConfig(tile.block(), config, p -> {
+                                if(!tile.build.block.ignoreResizeConfig){
+                                    p.sub(offsetX, offsetY);
+                                }
+                            });
                             if(out != config){
                                 tile.build.configureAny(out);
                             }
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 3f8a1fdc22..a401c896a7 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -219,6 +219,8 @@ public class Block extends UnlockableContent implements Senseable{
     public int unitCapModifier = 0;
     /** Whether the block can be tapped and selected to configure. */
     public boolean configurable;
+    /** If true, this block does not have pointConfig with a transform called on map resize. */
+    public boolean ignoreResizeConfig;
     /** If true, this building can be selected like a unit when commanding. */
     public boolean commandable;
     /** If true, the building inventory can be shown with the config. */
diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java
index 765186cce1..3b5abe456e 100644
--- a/core/src/mindustry/world/blocks/logic/LogicBlock.java
+++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java
@@ -45,6 +45,7 @@ public class LogicBlock extends Block{
         configurable = true;
         group = BlockGroup.logic;
         schematicPriority = 5;
+        ignoreResizeConfig = true;
 
         //universal, no real requirements
         envEnabled = Env.any;

From 73394436040a5a27cb12e1f889e5332e438708e3 Mon Sep 17 00:00:00 2001
From: SITUVNgcd <44901211+SITUVNgcd@users.noreply.github.com>
Date: Wed, 14 Feb 2024 11:17:41 +0700
Subject: [PATCH 216/369] Fix TextInput::message on mobile (#9549)

This issue from https://github.com/Anuken/Arc/commit/70f345cc75f541de8f592d3167245691cc9a765b
---
 core/src/mindustry/core/UI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
index 3deb6bd4d8..d634e122b5 100644
--- a/core/src/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -279,7 +279,7 @@ public class UI implements ApplicationListener, Loadable{
 
     public void showTextInput(String titleText, String text, int textLength, String def, boolean numbers, boolean allowEmpty, Cons<String> confirmed, Runnable closed){
         if(mobile){
-            var description = text;
+            var description = (text.startsWith("@") ? Core.bundle.get(text.substring(1)) : text);
             var empty = allowEmpty;
             Core.input.getTextInput(new TextInput(){{
                 this.title = (titleText.startsWith("@") ? Core.bundle.get(titleText.substring(1)) : titleText);

From d0845b481c9a34c4c3424e18b1adcea78fce86ef Mon Sep 17 00:00:00 2001
From: GlFolker <63218676+GlennFolker@users.noreply.github.com>
Date: Wed, 14 Feb 2024 22:04:55 +0700
Subject: [PATCH 217/369] Update Sector.java (#9553)

---
 core/src/mindustry/type/Sector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java
index 921802e389..304a73452a 100644
--- a/core/src/mindustry/type/Sector.java
+++ b/core/src/mindustry/type/Sector.java
@@ -236,7 +236,7 @@ public class Sector{
 
     /** Projects this sector onto a 4-corner square for use in map gen.
      * Allocates a new object. Do not call in the main loop. */
-    private SectorRect makeRect(){
+    protected SectorRect makeRect(){
         Vec3[] corners = new Vec3[tile.corners.length];
         for(int i = 0; i < corners.length; i++){
             corners[i] = tile.corners[i].v.cpy().setLength(planet.radius);

From c8d773382610a64187fb94cd55e2fc05b8ba6d8f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 14 Feb 2024 10:37:48 -0500
Subject: [PATCH 218/369] Fixed #9552

---
 core/src/mindustry/ui/dialogs/TraceDialog.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/mindustry/ui/dialogs/TraceDialog.java b/core/src/mindustry/ui/dialogs/TraceDialog.java
index a541f48027..a758e22fb3 100644
--- a/core/src/mindustry/ui/dialogs/TraceDialog.java
+++ b/core/src/mindustry/ui/dialogs/TraceDialog.java
@@ -36,8 +36,6 @@ public class TraceDialog extends BaseDialog{
             c.add(Core.bundle.format("trace.ip", info.ip)).row();
             c.button(Icon.copySmall, style, () -> copy(info.uuid)).size(s).padRight(4f);
             c.add(Core.bundle.format("trace.id", info.uuid)).row();
-            c.button(Icon.copySmall, style, () -> copy(player.locale)).size(s).padRight(4f);
-            c.add(Core.bundle.format("trace.language", player.locale)).row();
         }).row();
 
         table.add(Core.bundle.format("trace.modclient", info.modded)).row();

From 56d0b8744305a0717d0dfa883b39dee2a7586a1b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 16 Feb 2024 09:50:18 -0500
Subject: [PATCH 219/369] Fixed #9562

---
 core/src/mindustry/ai/UnitGroup.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/mindustry/ai/UnitGroup.java b/core/src/mindustry/ai/UnitGroup.java
index dbb55312f3..2721c07d55 100644
--- a/core/src/mindustry/ai/UnitGroup.java
+++ b/core/src/mindustry/ai/UnitGroup.java
@@ -26,6 +26,7 @@ public class UnitGroup{
         if(lastSpeedUpdate == Vars.state.updateId) return;
 
         lastSpeedUpdate = Vars.state.updateId;
+        minSpeed = 999999f;
 
         for(Unit unit : units){
             //don't factor in the floor speed multiplier

From b27ed03842f106b23fa59a0aa201489737ab9724 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 16 Feb 2024 09:52:14 -0500
Subject: [PATCH 220/369] Fixed #9561

---
 core/src/mindustry/world/Build.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java
index bbc38dbdd4..c1cfc9b5e7 100644
--- a/core/src/mindustry/world/Build.java
+++ b/core/src/mindustry/world/Build.java
@@ -50,6 +50,7 @@ public class Build{
         if(tile.build != null){
             prevBuild.add(tile.build);
             tile.build.onDeconstructed(unit);
+            tile.build.dead = true;
         }
 
         tile.setBlock(sub, team, rotation);

From e6dd6cb44d8db96b5d405b3ae367a6175f6cf08c Mon Sep 17 00:00:00 2001
From: SITUVNgcd <44901211+SITUVNgcd@users.noreply.github.com>
Date: Fri, 16 Feb 2024 21:52:31 +0700
Subject: [PATCH 221/369] Make privileged SwitchBlock(World Switch) can't
 pickup (#9557)

---
 core/src/mindustry/world/blocks/logic/SwitchBlock.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/mindustry/world/blocks/logic/SwitchBlock.java b/core/src/mindustry/world/blocks/logic/SwitchBlock.java
index c3e579e456..6c166fd331 100644
--- a/core/src/mindustry/world/blocks/logic/SwitchBlock.java
+++ b/core/src/mindustry/world/blocks/logic/SwitchBlock.java
@@ -42,6 +42,11 @@ public class SwitchBlock extends Block{
             if(privileged) return;
             super.damage(damage);
         }
+        
+        @Override
+        public boolean canPickup(){
+            return !privileged;
+        }
 
         @Override
         public boolean collide(Bullet other){

From d79a306970598ae8d7fa29102d1ce2aa0653e5ed Mon Sep 17 00:00:00 2001
From: SITUVNgcd <44901211+SITUVNgcd@users.noreply.github.com>
Date: Fri, 16 Feb 2024 21:52:41 +0700
Subject: [PATCH 222/369] Gammar & context fix (#9559)

- `lglobal.@clientMobile = True is ...` => `lglobal.@clientMobile = True if ...`
- `lenum.colori = Indexed position, ...` => `lenum.colori = Indexed color, ...`
---
 core/assets/bundles/bundle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index f9cbaa5622..09f8119504 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2372,7 +2372,7 @@ lglobal.@clientLocale = Locale of the client running the code. For example: en_U
 lglobal.@clientUnit = Unit of client running the code
 lglobal.@clientName = Player name of client running the code
 lglobal.@clientTeam = Team ID of client running the code
-lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+lglobal.@clientMobile = True if the client running the code is on mobile, false otherwise
 
 logic.nounitbuild = [red]Unit building logic is not allowed here.
 
@@ -2532,4 +2532,4 @@ lenum.texturesize = Size of texture in tiles. Zero value scales marker width to
 lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
 lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
 lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
-lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.colori = Indexed color, used for line and quad markers with index zero being the first color.

From 54967429fea12a4523fba1820a2d66f8abf51435 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 17 Feb 2024 09:03:09 -0500
Subject: [PATCH 223/369] Fixed #9566

---
 core/src/mindustry/logic/LExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 3b67f5a958..d991a727eb 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -706,7 +706,7 @@ public class LExecutor{
             int address = exec.numi(position);
             Building from = exec.building(target);
 
-            if(from instanceof MemoryBuild mem && (exec.privileged || from.team == exec.team) && address >= 0 && address < mem.memory.length){
+            if(from instanceof MemoryBuild mem && (exec.privileged || (from.team == exec.team && !mem.block.privileged)) && address >= 0 && address < mem.memory.length){
                 mem.memory[address] = exec.num(value);
             }
         }

From daf8398c5896bcabac23ffffbe26d1f3a5769a66 Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Sat, 17 Feb 2024 21:04:17 +0700
Subject: [PATCH 224/369] Update servers_v7.json (#9567)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 7d89a80c1d..559c1d9e60 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -230,7 +230,7 @@
   },
   {
     "name": "ABCXYZ Community",
-    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "5.9.8.124:28848"]
+    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "5.9.8.124:28848", "srv1.godlike.club:28466"]
   },
   {
     "name": "CroCraft Network",

From 4e24b31c0de9985cecc31a97709422a9756ca0fc Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sat, 17 Feb 2024 08:23:25 -0800
Subject: [PATCH 225/369] Allow gasses to be coolants (#9545)

---
 core/src/mindustry/type/Liquid.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java
index a524970fcd..9032b4bf9b 100644
--- a/core/src/mindustry/type/Liquid.java
+++ b/core/src/mindustry/type/Liquid.java
@@ -84,8 +84,6 @@ public class Liquid extends UnlockableContent implements Senseable{
         super.init();
 
         if(gas){
-            //gases can't be coolants
-            coolant = false;
             //always "boils", it's a gas
             boilPoint = -1;
             //ensure no accidental global mutation

From 2c3167e66848d25b14c5dd1d45047c2ebd741e79 Mon Sep 17 00:00:00 2001
From: GlFolker <63218676+GlennFolker@users.noreply.github.com>
Date: Sun, 18 Feb 2024 03:48:33 +0700
Subject: [PATCH 226/369] Delegate more methods into Planet (#9568)

---
 .../graphics/g3d/PlanetRenderer.java          | 12 +--------
 core/src/mindustry/type/Planet.java           | 22 ++++++++++++++++
 .../mindustry/ui/dialogs/PlanetDialog.java    | 26 +++++++++----------
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java
index 6b5c0b6676..3593f53957 100644
--- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java
+++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java
@@ -203,17 +203,7 @@ public class PlanetRenderer implements Disposable{
     }
 
     public void setPlane(Sector sector){
-        float rotation = -sector.planet.getRotation();
-        float length = 0.01f;
-
-        projector.setPlane(
-        //origin on sector position
-        Tmp.v33.set(sector.tile.v).setLength((outlineRad + length) * sector.planet.radius).rotate(Vec3.Y, rotation).add(sector.planet.position),
-        //face up
-        sector.plane.project(Tmp.v32.set(sector.tile.v).add(Vec3.Y)).sub(sector.tile.v, sector.planet.radius).rotate(Vec3.Y, rotation).nor(),
-        //right vector
-        Tmp.v31.set(Tmp.v32).rotate(Vec3.Y, -rotation).add(sector.tile.v).rotate(sector.tile.v, 90).sub(sector.tile.v).rotate(Vec3.Y, rotation).nor()
-        );
+        sector.planet.setPlane(sector, projector);
     }
 
     public void fill(Sector sector, Color color, float offset){
diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java
index 1aa63264e2..c25852881f 100644
--- a/core/src/mindustry/type/Planet.java
+++ b/core/src/mindustry/type/Planet.java
@@ -536,4 +536,26 @@ public class Planet extends UnlockableContent{
         }
         batch.flush(Gl.lineStrip);
     }
+
+    public Vec3 lookAt(Sector sector, Vec3 out){
+        return out.set(sector.tile.v).rotate(Vec3.Y, -getRotation());
+    }
+
+    public Vec3 project(Sector sector, Camera3D cam, Vec3 out){
+        return cam.project(out.set(sector.tile.v).setLength(outlineRad * radius).rotate(Vec3.Y, -getRotation()).add(position));
+    }
+
+    public void setPlane(Sector sector, PlaneBatch3D projector){
+        float rotation = -getRotation();
+        float length = 0.01f;
+
+        projector.setPlane(
+            //origin on sector position
+            Tmp.v33.set(sector.tile.v).setLength((outlineRad + length) * radius).rotate(Vec3.Y, rotation).add(position),
+            //face up
+            sector.plane.project(Tmp.v32.set(sector.tile.v).add(Vec3.Y)).sub(sector.tile.v, radius).rotate(Vec3.Y, rotation).nor(),
+            //right vector
+            Tmp.v31.set(Tmp.v32).rotate(Vec3.Y, -rotation).add(sector.tile.v).rotate(sector.tile.v, 90).sub(sector.tile.v).rotate(Vec3.Y, rotation).nor()
+        );
+    }
 }
diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index 16d5d9e304..9a230d0fc6 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -167,7 +167,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
 
         //show selection of Erekir/Serpulo campaign if the user has no bases, and hasn't selected yet (essentially a "have they played campaign before" check)
         shown(() -> {
-            if(!settings.getBool("campaignselect") && !content.planets().contains(p -> p.sectors.contains(s -> s.hasBase()))){
+            if(!settings.getBool("campaignselect") && !content.planets().contains(p -> p.sectors.contains(Sector::hasBase))){
                 var diag = new BaseDialog("@campaign.select");
 
                 Planet[] selected = {null};
@@ -214,7 +214,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         }
 
         //unlock defaults for older campaign saves (TODO move? where to?)
-        if(content.planets().contains(p -> p.sectors.contains(s -> s.hasBase())) || Blocks.scatter.unlocked() || Blocks.router.unlocked()){
+        if(content.planets().contains(p -> p.sectors.contains(Sector::hasBase)) || Blocks.scatter.unlocked() || Blocks.router.unlocked()){
             Seq.with(Blocks.junction, Blocks.mechanicalDrill, Blocks.conveyor, Blocks.duo, Items.copper, Items.lead).each(UnlockableContent::quietUnlock);
         }
     }
@@ -372,11 +372,17 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         super.show();
     }
 
-    void lookAt(Sector sector){
+    public void lookAt(Sector sector){
         if(sector.tile == Ptile.empty) return;
 
+        //TODO should this even set `state.planet`? the other lookAt() doesn't, so...
         state.planet = sector.planet;
-        state.camPos.set(Tmp.v33.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation()));
+        sector.planet.lookAt(sector, state.camPos);
+    }
+
+    public void lookAt(Sector sector, float alpha){
+        float len = state.camPos.len();
+        state.camPos.slerp(sector.planet.lookAt(sector, Tmp.v33).setLength(len), alpha);
     }
 
     boolean canSelect(Sector sector){
@@ -648,10 +654,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             }
         }).visible(() -> mode != select),
 
-        new Table(c -> {
-            expandTable = c;
-        })).grow();
-
+        new Table(c -> expandTable = c)).grow();
         rebuildExpand();
     }
 
@@ -770,11 +773,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         }
     }
 
-    public void lookAt(Sector sector, float alpha){
-        float len = state.camPos.len();
-        state.camPos.slerp(Tmp.v31.set(sector.tile.v).rotate(Vec3.Y, -sector.planet.getRotation()).setLength(len), alpha);
-    }
-
     @Override
     public void act(float delta){
         super.act(delta);
@@ -801,7 +799,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
             hoverLabel.touchable = Touchable.disabled;
             hoverLabel.color.a = state.uiAlpha;
 
-            Vec3 pos = planets.cam.project(Tmp.v31.set(hovered.tile.v).setLength(PlanetRenderer.outlineRad * state.planet.radius).rotate(Vec3.Y, -state.planet.getRotation()).add(state.planet.position));
+            Vec3 pos = hovered.planet.project(hovered, planets.cam, Tmp.v31);
             hoverLabel.setPosition(pos.x - Core.scene.marginLeft, pos.y - Core.scene.marginBottom, Align.center);
 
             hoverLabel.getText().setLength(0);

From ac4d57013df9651c53a6a038d66841482738cb46 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 19 Feb 2024 10:05:58 -0500
Subject: [PATCH 227/369] Fixed #9572

---
 core/src/mindustry/graphics/MinimapRenderer.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java
index cd0362ff62..78d57bebea 100644
--- a/core/src/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/mindustry/graphics/MinimapRenderer.java
@@ -148,17 +148,20 @@ public class MinimapRenderer{
 
         Tmp.m2.set(Draw.trans());
 
+        float scaleFactor;
         var trans = Tmp.m1.idt();
         trans.translate(lastX, lastY);
         if(!worldSpace){
-            trans.scl(Tmp.v1.set(lastW / rect.width, lastH / rect.height));
+            trans.scl(Tmp.v1.set(scaleFactor = lastW / rect.width, lastH / rect.height));
             trans.translate(-rect.x, -rect.y);
         }else{
-            trans.scl(Tmp.v1.set(lastW / world.unitWidth(), lastH / world.unitHeight()));
+            trans.scl(Tmp.v1.set(scaleFactor = lastW / world.unitWidth(), lastH / world.unitHeight()));
         }
         trans.translate(tilesize / 2f, tilesize / 2f);
         Draw.trans(trans);
 
+        scaleFactor = 1f / scaleFactor;
+
         for(Unit unit : units){
             if(unit.inFogTo(player.team()) || !unit.type.drawMinimap) continue;
 
@@ -198,7 +201,7 @@ public class MinimapRenderer{
             dynamicTex.setFilter(TextureFilter.nearest);
 
             Tmp.tr1.set(dynamicTex);
-            Tmp.tr1.set(0f, 0f, 1f, 1f);
+            Tmp.tr1.set(0f, 1f, 1f, 0f);
 
             float wf = world.width() * tilesize;
             float hf = world.height() * tilesize;
@@ -226,7 +229,7 @@ public class MinimapRenderer{
             if(!mobile){
                 //draw bounds for camera - not drawn on mobile because you can't shift it by tapping anyway
                 Rect r = Core.camera.bounds(Tmp.r1);
-                Lines.stroke(Scl.scl(3f));
+                Lines.stroke(Scl.scl(3f) * scaleFactor);
                 Draw.color(Pal.accent);
                 Lines.rect(r.x, r.y, r.width, r.height);
                 Draw.reset();

From eb42d91c5df720f6193a53bedee23948db9e7df7 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 19 Feb 2024 10:20:26 -0500
Subject: [PATCH 228/369] Fixed #9573

---
 .../stack-conveyors/surge-conveyor-edge-glow.png  | Bin 0 -> 510 bytes
 .../world/blocks/distribution/StackConveyor.java  |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge-glow.png

diff --git a/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge-glow.png b/core/assets-raw/sprites/blocks/distribution/stack-conveyors/surge-conveyor-edge-glow.png
new file mode 100644
index 0000000000000000000000000000000000000000..379eb103947dfe00331072c9cd219f014c5e8359
GIT binary patch
literal 510
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VBF#9
z;usRq`gYoDze5fJZs(cYSWPmR)Q<f4=byHy%|T#`Z{~6N-)m!6Z*llA>4v9T%iDA3
zUf$Vu!Atvp?45mVX<|7sDfvNjiofMDq+Mf7>SgR&aBk<L6%19c`7W^fEwTN}exi|g
zf@g7~iQ8g9g`zs9IZV$l8Lw4b&iO&hck4Bdi`h&abLKOOA5b-5YGZQZ3qQaV!E|0Q
zqRyb9=-$-D+z+H?FeE?VlIQ%8Z_EDc;!HM?w6s#wjiL*Leii?j?cWfcpw-d1ZGEHq
zsg9Pa8!iIz%NA*}8XoZQTYf;cAefQkqDP~6rjxVOD+VW)svm#&KPJkb{@Hu&z;pQ;
zEwKYWX11rw?piY?UTC?-Eo(4=Pq~4?@WQ;{n<YOjHrRPCXM5njM2{(P&$Ayk%YF!~
zU%EQuy;fBJa|gM(#R3kE>z}yzJ^PWx&nm8P?LhOqvs>q#*k&QZAelbp=+)&pTf^<P
zKipd<UN!G!&)Q9*2Q1Um#F%v!|6MsJg#DuMhZTF@Gn78wVa9ZB=b<x2mOPJ3o8Nzw
z{JPkJ_0zK1h0}K{xG>h}88f~qku;V4_kI0it`qNTCWI*T{qnr#rM-3!qshCI7SfUb
SgBchY7(8A5T-G@yGywpIVcY)z

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
index 264db024d8..e107b08a67 100644
--- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
@@ -29,6 +29,7 @@ public class StackConveyor extends Block implements Autotiler{
     public @Load("@-stack") TextureRegion stackRegion;
     /** requires power to work properly */
     public @Load(value = "@-glow") TextureRegion glowRegion;
+    public @Load(value = "@-edge-glow", fallback = "@-glow") TextureRegion edgeGlowRegion;
 
     public float glowAlpha = 1f;
     public Color glowColor = Pal.redLight;
@@ -154,7 +155,7 @@ public class StackConveyor extends Block implements Autotiler{
                 Draw.z(Layer.blockAdditive);
                 Draw.color(glowColor, glowAlpha * power.status);
                 Draw.blend(Blending.additive);
-                Draw.rect(glowRegion, x, y, rotation * 90);
+                Draw.rect(state == stateLoad ? edgeGlowRegion : glowRegion, x, y, rotation * 90);
                 Draw.blend();
                 Draw.color();
                 Draw.z(Layer.block - 0.1f);

From f50cfdf57b87a221e1c87806c6652c78de65265d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 20 Feb 2024 10:11:24 -0500
Subject: [PATCH 229/369] Use --rerun for tests

---
 .github/workflows/pr.yml                 | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 5bb8637f56..eb2dcff192 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
     - name: Run unit tests
-      run: ./gradlew clean cleanTest test --stacktrace
+      run: ./gradlew tests:test --stacktrace --rerun
     - name: Run unit tests and build JAR
       run: ./gradlew desktop:dist
     - name: Upload desktop JAR for testing
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661ee7..3994438e22 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 82222c87074ae8779aaa6f2605280f0aaaeec019 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 20 Feb 2024 10:11:55 -0500
Subject: [PATCH 230/369] Use --rerun for tests (for push too)

---
 .github/workflows/push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index d1194129d5..6d4dbbea84 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -57,4 +57,4 @@ jobs:
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
         cd ../Mindustry
     - name: Run unit tests
-      run: ./gradlew clean cleanTest test --stacktrace
+      run: ./gradlew tests:test --rerun --stacktrace

From 63b4d75c2662954cb1e03c2181fb27fbf78d2921 Mon Sep 17 00:00:00 2001
From: Gamer-art9044 <131509007+Gamer-art9044@users.noreply.github.com>
Date: Tue, 20 Feb 2024 23:59:08 +0400
Subject: [PATCH 231/369] Update servers_v7.json (#9576)

update. Adddin Crimson star
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index 559c1d9e60..50306e0c62 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -3,6 +3,10 @@
     "name": "STP",
     "address": ["23.88.73.88:25617"]
   },
+  {
+    "name": "Crimson Star",
+    "address": ["185.103.101.121:25528"]
+  },
   {
     "name" : "LesGarsCools",
     "address": ["est1.be"]

From 30c980bee118dfe88fe577876e3c6a1c9d4369dc Mon Sep 17 00:00:00 2001
From: HubsvVnMindus <160602714+HubsvVnMindus@users.noreply.github.com>
Date: Wed, 21 Feb 2024 22:07:47 +0700
Subject: [PATCH 232/369] Update servers_v7.json (#9579)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 50306e0c62..6052670dfc 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -286,6 +286,6 @@
   },
   { 
     "name": "hubVn",
-    "address": ["de-free-01.hosts.optikservers.com:32362"]
+    "address": ["srv24.godlike.club:26189"]
   }
 ]

From cb7f641ed60a9ef58b89d4c74da5efcb80d9b1f5 Mon Sep 17 00:00:00 2001
From: Hunggaming128 <160811008+Hunggaming128@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:23:41 +0700
Subject: [PATCH 233/369] Update servers_v7.json (#9582)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 6052670dfc..644e8944d9 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -285,7 +285,7 @@
     "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"]
   },
   { 
-    "name": "hubVn",
+    "name": "Sever.VN",
     "address": ["srv24.godlike.club:26189"]
   }
 ]

From e78237d291169cf05fa4898a382059d131864c5e Mon Sep 17 00:00:00 2001
From: TheRadioactiveBanana
 <89061718+TheRadioactiveBanana@users.noreply.github.com>
Date: Thu, 22 Feb 2024 23:23:31 +0530
Subject: [PATCH 234/369] Yay dynamic IP (#9584)

amazing
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 644e8944d9..cec99c16a7 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -137,7 +137,7 @@
   },
   {
     "name": "Eradication Mindustry",
-    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "77.99.254.211:7000", "77.99.254.211:7001", "77.99.254.211:7002", "141.148.196.135:7000", "130.61.220.99:7000", "130.61.220.99:7001"]
+    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "77.100.100.249:7000", "77.100.100.249:7001", "77.100.100.249:7002", "141.148.196.135:7000", "130.61.220.99:7000", "130.61.220.99:7001"]
   },
   {
     "name": "Conservatory",

From 52b5a950f9dc1deb3409867d7cd2038153108094 Mon Sep 17 00:00:00 2001
From: Gamer-art9044 <131509007+Gamer-art9044@users.noreply.github.com>
Date: Fri, 23 Feb 2024 18:45:32 +0400
Subject: [PATCH 235/369] Update servers_v7.json (#9585)

Server have a problems.
---
 servers_v7.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index cec99c16a7..b452715621 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -3,10 +3,6 @@
     "name": "STP",
     "address": ["23.88.73.88:25617"]
   },
-  {
-    "name": "Crimson Star",
-    "address": ["185.103.101.121:25528"]
-  },
   {
     "name" : "LesGarsCools",
     "address": ["est1.be"]

From 037f752b732de6a6badb89d453d762edf71fba30 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Fri, 23 Feb 2024 14:11:00 -0800
Subject: [PATCH 236/369] Improve ArmorPlateAbility draw (#9581)

* Improve ArmorPlateAbility draw

* Revert to tinting

Just make a white shine sprite. Or none-white if you want some interesting visuals with the colors.

* Fix not applying z when drawShine = false
---
 core/assets/shaders/unitarmor.frag            |  4 +-
 .../entities/abilities/ArmorPlateAbility.java | 53 ++++++++++++++-----
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/core/assets/shaders/unitarmor.frag b/core/assets/shaders/unitarmor.frag
index 10116ff3ac..1e475fda17 100644
--- a/core/assets/shaders/unitarmor.frag
+++ b/core/assets/shaders/unitarmor.frag
@@ -2,7 +2,6 @@ uniform sampler2D u_texture;
 
 uniform float u_time;
 uniform float u_progress;
-uniform vec4 u_color;
 uniform vec2 u_uv;
 uniform vec2 u_uv2;
 uniform vec2 u_texsize;
@@ -14,8 +13,7 @@ void main(){
     vec2 coords = (v_texCoords - u_uv) / (u_uv2 - u_uv);
     vec2 v = vec2(1.0/u_texsize.x, 1.0/u_texsize.y);
 
-	vec4 c = texture2D(u_texture, v_texCoords);
-
+    vec4 c = texture2D(u_texture, v_texCoords);
     c.a *= u_progress;
     c.a *= step(abs(sin(coords.y*3.0 + u_time)), 0.9);
 
diff --git a/core/src/mindustry/entities/abilities/ArmorPlateAbility.java b/core/src/mindustry/entities/abilities/ArmorPlateAbility.java
index bfe776d737..4c02028492 100644
--- a/core/src/mindustry/entities/abilities/ArmorPlateAbility.java
+++ b/core/src/mindustry/entities/abilities/ArmorPlateAbility.java
@@ -12,10 +12,20 @@ import mindustry.world.meta.*;
 
 public class ArmorPlateAbility extends Ability{
     public TextureRegion plateRegion;
-    public Color color = Color.valueOf("d1efff");
+    public TextureRegion shineRegion;
+    public String plateSuffix = "-armor";
+    public String shineSuffix = "-shine";
+    /** Color of the shine. If null, uses team color. */
+    public @Nullable Color color = null;
+    public float shineSpeed = 1f;
+    public float z = -1;
+
+    /** Whether to draw the plate region. */
+    public boolean drawPlate = true;
+    /** Whether to draw the shine over the plate region. */
+    public boolean drawShine = true;
 
     public float healthMultiplier = 0.2f;
-    public float z = Layer.effect;
 
     protected float warmup;
 
@@ -34,24 +44,39 @@ public class ArmorPlateAbility extends Ability{
 
     @Override
     public void draw(Unit unit){
+        if(!drawPlate && !drawShine) return;
+
         if(warmup > 0.001f){
             if(plateRegion == null){
-                plateRegion = Core.atlas.find(unit.type.name + "-armor", unit.type.region);
+                plateRegion = Core.atlas.find(unit.type.name + plateSuffix, unit.type.region);
+                shineRegion = Core.atlas.find(unit.type.name + shineSuffix, plateRegion);
             }
 
-            Draw.draw(z <= 0 ? Draw.z() : z, () -> {
-                Shaders.armor.region = plateRegion;
-                Shaders.armor.progress = warmup;
-                Shaders.armor.time = -Time.time / 20f;
+            float pz = Draw.z();
+            if(z > 0) Draw.z(z);
 
-                Draw.rect(Shaders.armor.region, unit.x, unit.y, unit.rotation - 90f);
-                Draw.color(color);
-                Draw.shader(Shaders.armor);
-                Draw.rect(Shaders.armor.region, unit.x, unit.y, unit.rotation - 90f);
-                Draw.shader();
+            if(drawPlate){
+                Draw.alpha(warmup);
+                Draw.rect(plateRegion, unit.x, unit.y, unit.rotation - 90f);
+                Draw.alpha(1f);
+            }
 
-                Draw.reset();
-            });
+            if(drawShine){
+                Draw.draw(Draw.z(), () -> {
+                    Shaders.armor.region = shineRegion;
+                    Shaders.armor.progress = warmup;
+                    Shaders.armor.time = -Time.time / 20f * shineSpeed;
+
+                    Draw.color(color == null ? unit.team.color : color);
+                    Draw.shader(Shaders.armor);
+                    Draw.rect(shineRegion, unit.x, unit.y, unit.rotation - 90f);
+                    Draw.shader();
+
+                    Draw.reset();
+                });
+            }
+
+            Draw.z(pz);
         }
     }
 }

From cf777c9c9a81d7ed24efe2810413b572e0d95938 Mon Sep 17 00:00:00 2001
From: BankaiDev <114865515+MarlokytKaneki@users.noreply.github.com>
Date: Sat, 24 Feb 2024 01:11:26 +0300
Subject: [PATCH 237/369] Update servers_v7.json (#9588)

Crimson star server
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index b452715621..42eff526d5 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -283,5 +283,9 @@
   { 
     "name": "Sever.VN",
     "address": ["srv24.godlike.club:26189"]
+  },
+  {
+    "name": "Crimson Star",
+    "address": ["185.103.101.121:25528"]
   }
 ]

From dadb3a2e484606c4a9b6e60beed6c23845336d80 Mon Sep 17 00:00:00 2001
From: Atomic-Laboratory <146392884+Atomic-Laboratory@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:50:55 -0500
Subject: [PATCH 238/369] Update servers_v7.json (#9589)

My VPS provider is weird... if the servers dont appear online give it a few hours for provider to deal with mess.
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 42eff526d5..07370224c2 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -254,7 +254,7 @@
   },
   {
     "name": "Atomic",
-    "address": ["atomic-de.ddns.net:35199", "atomic-de.ddns.net:35176", "atomic-de.ddns.net:35845", "atomic-de.ddns.net:35313"]
+    "address": ["atomic-uk.ddns.net:25595", "atomic-uk.ddns.net:25587", "atomic-uk.ddns.net:25584", "atomic-uk.ddns.net:25590"]
   },
   {
     "name": "SkyPlex",

From 8dcde40d8dab093c4a840f21ff22e645d23f500f Mon Sep 17 00:00:00 2001
From: BankaiDev <114865515+MarlokytKaneki@users.noreply.github.com>
Date: Sat, 24 Feb 2024 17:36:54 +0300
Subject: [PATCH 239/369] Update servers_v7.json (#9590)

Pls add new server
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 07370224c2..861b7a7f80 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -286,6 +286,6 @@
   },
   {
     "name": "Crimson Star",
-    "address": ["185.103.101.121:25528"]
+    "address": ["185.103.101.121:25528", "81.94.159.193"]
   }
 ]

From d8a66b7b2523b489b9c2fe606718ccc3502e4936 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 24 Feb 2024 12:31:06 -0500
Subject: [PATCH 240/369] Bundle change for #9591

---
 core/assets/bundles/bundle.properties            | 4 ++--
 core/src/mindustry/ui/fragments/HudFragment.java | 4 ++--
 gradle.properties                                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 09f8119504..427f9b00ef 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -775,8 +775,8 @@ sector.curlost = Sector Lost
 sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
-#note: the missing space in the line below is intentional
-sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture = Sector [accent]{0}[white] Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java
index e964aa5fdf..cb92cb77ad 100644
--- a/core/src/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/mindustry/ui/fragments/HudFragment.java
@@ -72,9 +72,9 @@ public class HudFragment{
 
         Events.on(SectorCaptureEvent.class, e -> {
             if(e.sector.isBeingPlayed()){
-                ui.announce(Core.bundle.format("sector.capture", ""), 5f);
+                ui.announce("@sector.capture.current", 5f);
             }else{
-                showToast(Core.bundle.format("sector.capture", e.sector.name() + " "));
+                showToast(Core.bundle.format("sector.capture", e.sector.name()));
             }
         });
 
diff --git a/gradle.properties b/gradle.properties
index 1451cdd8a3..73d2c94b6c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=a2acd2ee5f
+archash=580916ccfd

From 97010a5064178309b638e4a0adf72add4018bc0a Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az568-368.kq21xgauaq5efpa1vyplvqtvth.dx.internal.cloudapp.net>
Date: Sat, 24 Feb 2024 17:33:36 +0000
Subject: [PATCH 241/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 1 +
 core/assets/bundles/bundle_bg.properties    | 1 +
 core/assets/bundles/bundle_ca.properties    | 1 +
 core/assets/bundles/bundle_cs.properties    | 1 +
 core/assets/bundles/bundle_da.properties    | 1 +
 core/assets/bundles/bundle_de.properties    | 1 +
 core/assets/bundles/bundle_es.properties    | 1 +
 core/assets/bundles/bundle_et.properties    | 1 +
 core/assets/bundles/bundle_eu.properties    | 1 +
 core/assets/bundles/bundle_fi.properties    | 1 +
 core/assets/bundles/bundle_fil.properties   | 1 +
 core/assets/bundles/bundle_fr.properties    | 1 +
 core/assets/bundles/bundle_hu.properties    | 1 +
 core/assets/bundles/bundle_id_ID.properties | 1 +
 core/assets/bundles/bundle_it.properties    | 1 +
 core/assets/bundles/bundle_ja.properties    | 1 +
 core/assets/bundles/bundle_ko.properties    | 1 +
 core/assets/bundles/bundle_lt.properties    | 1 +
 core/assets/bundles/bundle_nl.properties    | 1 +
 core/assets/bundles/bundle_nl_BE.properties | 1 +
 core/assets/bundles/bundle_pl.properties    | 1 +
 core/assets/bundles/bundle_pt_BR.properties | 1 +
 core/assets/bundles/bundle_pt_PT.properties | 1 +
 core/assets/bundles/bundle_ro.properties    | 1 +
 core/assets/bundles/bundle_ru.properties    | 1 +
 core/assets/bundles/bundle_sr.properties    | 1 +
 core/assets/bundles/bundle_sv.properties    | 1 +
 core/assets/bundles/bundle_th.properties    | 1 +
 core/assets/bundles/bundle_tk.properties    | 1 +
 core/assets/bundles/bundle_tr.properties    | 1 +
 core/assets/bundles/bundle_uk_UA.properties | 1 +
 core/assets/bundles/bundle_vi.properties    | 1 +
 core/assets/bundles/bundle_zh_CN.properties | 1 +
 core/assets/bundles/bundle_zh_TW.properties | 1 +
 34 files changed, 34 insertions(+)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index a6c4c953a2..af909fceee 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -753,6 +753,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Сектар [accent]{0}[white] атакуецца!
 sector.lost = Сектар [accent]{0}[white] згублены!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Змяніць Іконку
 sector.noswitch.title = Немагчыма Пераключыцца на Сектар
 sector.noswitch = Вы не можаце пераключацца на сектары калі гэты сектар атакуецца.\n\nСектар: [accent]{0}[] у [accent]{1}[]
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 2eefb3e206..561b0879e1 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -760,6 +760,7 @@ sector.missingresources = [scarlet]Недостатъчни ресурси в я
 sector.attacked = Зона [accent]{0}[white] е под атака!
 sector.lost = Зона [accent]{0}[white] беше загубена!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index ec4c6affcc..cbbadfcbf9 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -764,6 +764,7 @@ sector.missingresources = [scarlet]Recursos insuficients al nucli
 sector.attacked = Ataquen el sector [accent]{0}[white]!
 sector.lost = Heu perdut el sector [accent]{0}[white]!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Canvia la icona
 sector.noswitch.title = Els sectors no es poden canviar.
 sector.noswitch = Potser no podeu canviar de sector perquè n’ataquen un altre.\n\nSector: [accent]{0}[] de [accent]{1}[]
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index c03d8d735c..2b0f9c4a5b 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -761,6 +761,7 @@ sector.missingresources = [scarlet]Nedostatečné zdroje v jádře
 sector.attacked = Sektor [accent]{0}[white] pod útokem!
 sector.lost = Sektor [accent]{0}[white] ztracen! :(
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Změnit Ikonu
 sector.noswitch.title = Nelze Vyměnit Sektor
 sector.noswitch = Sektory nelze přepnut, pokud je stávající sektor pod útokem.\n\nSektor: [accent]{0}[] na [accent]{1}[]
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index db8c9259e5..4c450e7b3d 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -754,6 +754,7 @@ sector.missingresources = [scarlet]Ikke nok resurser i kernen.
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 52f385530f..604dae62ab 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -772,6 +772,7 @@ sector.missingresources = [scarlet]Fehlende Kernressourcen
 sector.attacked = Sektor [accent]{0}[white] wird angegriffen!
 sector.lost = Sektor [accent]{0}[white] verloren!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Bild ändern
 sector.noswitch.title = Kann Sektoren nicht wechseln
 sector.noswitch = Du kannst nicht zwischen Sektoren wechseln, wenn ein anderer angegriffen wird.\n\nSektor: [accent]{0}[] auf [accent]{1}[]
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 1867c98505..02eb2c1cf7 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -768,6 +768,7 @@ sector.missingresources = [scarlet]Recursos insuficientes en el núcleo
 sector.attacked = ¡Sector [accent]{0}[white] bajo ataque!
 sector.lost = ¡Sector [accent]{0}[white] perdido!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Cambiar icono
 sector.noswitch.title = No se pueden cambiar los sectores
 sector.noswitch = Tal vez no puedas cambiar de sector mientras se encuentre bajo ataque.\n\nSector: [accent]{0}[] en [accent]{1}[]
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 0a715e1895..95eb26a4b3 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -754,6 +754,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 0baea59b79..9de7c79905 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -756,6 +756,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 55fbc04374..c72ec15423 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -754,6 +754,7 @@ sector.missingresources = [scarlet]Sinulla ei ole tarpeeksi resursseja.
 sector.attacked = Sektori [accent]{0}[white] on hyökkäyksen kohteena!
 sector.lost = Sektori [accent]{0}[white] menetetty!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Vaihda kuvaketta
 sector.noswitch.title = Sektoria ei voida vaihtaa
 sector.noswitch = Et voi vaihtaa sektoria, kun olemassaoleva sektori on hyökkäyksen kohteena.\n\nSektori: [accent]{0}[] planeetalla [accent]{1}[]
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index e66f954eb3..b807827ce0 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -754,6 +754,7 @@ sector.missingresources = [scarlet]Kulang ang mga Core Resources
 sector.attacked = Ang sector [accent]{0}[white] ay inaatake!
 sector.lost = Ang sector [accent]{0}[white] ay nawala!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 141ebaa102..c43c5cbe36 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -775,6 +775,7 @@ sector.missingresources = [scarlet]Ressources du Noyau insuffisantes !
 sector.attacked = Secteur [accent]{0}[white] attaqué !
 sector.lost = Secteur [accent]{0}[white] perdu !
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Changer l'Icône
 sector.noswitch.title = Impossible de changer de Secteur
 sector.noswitch = Vous ne pouvez pas changer de secteur pendant qu’un autre est attaqué.\n\nSecteur: [accent]{0}[] sur [accent]{1}[]
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index e6cd547ea2..2f5a474d32 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -777,6 +777,7 @@ sector.attacked = A(z) [accent]{0}[white] szektor támadás alatt áll!
 sector.lost = A(z) [accent]{0}[white] szektor elveszett!
 #note: the missing space in the line below is intentional
 sector.capture = A(z) [accent]{0}[white]Szektor Elfoglalva!
+sector.capture.current = Sector Captured!
 sector.changeicon = Ikon Módosítása
 sector.noswitch.title = A szektorváltás Nem Lehetséges
 sector.noswitch = Nem válthatsz szektort, amíg egy meglévő szektor támadás alatt áll.\n\nSzektor: [accent]{0}[] a(z) [accent]{1}[]-n
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index 7a7b796120..2d7df0159d 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -768,6 +768,7 @@ sector.missingresources = [scarlet]Sumber Daya Inti Tidak Cukup
 sector.attacked = Sektor [accent]{0}[white] sedang diserang!
 sector.lost = Sektor [accent]{0}[white] telah dihancurkan!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Ubah Ikon
 sector.noswitch.title = Tidak Dapat beralih Sektor
 sector.noswitch = Andak tidak boleh berpindah sektor jika salah satu sektor terkena serangan.\nSektor: [accent]{0}[] di [accent]{1}[]
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 0c23dce129..9e62453ad9 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -758,6 +758,7 @@ sector.missingresources = [scarlet]Risorse del Nucleo Insufficienti
 sector.attacked = Settore [accent]{0}[white] sotto attacco!
 sector.lost = Settore [accent]{0}[white] perso!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Cambia icona
 sector.noswitch.title = Impossibile cambiare settore
 sector.noswitch = Non puoi cambiare settore mentre sei sotto attacco.\n\nSectore: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 2eac0ca92f..cf0ddd9af3 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -762,6 +762,7 @@ sector.missingresources = [scarlet]資源が足りません
 sector.attacked = セクター [accent]{0}[white] が攻撃を受けています!
 sector.lost = セクター [accent]{0}[white] 喪失!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = アイコンを変更
 sector.noswitch.title = セクターを切り替えることができません
 sector.noswitch = 既存のセクターが攻撃を受けている間は、セクターを切り替えることはできません。\n\nセクター: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 14fa6c5d0c..e019bacac1 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -763,6 +763,7 @@ sector.missingresources = [scarlet]코어 자원 부족[]
 sector.attacked = [accent]{0}[white] 지역이 공격받고 있습니다![]
 sector.lost = [accent]{0}[white] 지역을 잃었습니다![]
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = 아이콘 바꾸기
 sector.noswitch.title = 지역 전환 불가능
 sector.noswitch = 기존 지역이 공격받는 동안은 지역을 전환할 수 없습니다.\n\n지역: [accent]{0}[] 중 [accent]{1}[]
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 058578ed3c..9b2748ec60 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -754,6 +754,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index b0eff98f45..40dc6f948e 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -765,6 +765,7 @@ sector.missingresources = [scarlet]Onvoeldoende Materialen in Core
 sector.attacked = Sector [accent]{0}[white] onder vuur!
 sector.lost = Sector [accent]{0}[white] verloren!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Verander icoon
 sector.noswitch.title = Kan niet van sector wisselen
 sector.noswitch = Je mag niet van sector wisselen terwijl een bestaande sector wordt aangevallen.\n\nSector: [accent]{0}[] op [accent]{1}[]
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 7ce6dfecd9..58fc14e283 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -754,6 +754,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index 58b1074efb..2acef9ccdc 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -760,6 +760,7 @@ sector.missingresources = [scarlet]Niewystarczające Zasoby Rdzenia
 sector.attacked = Sektor [accent]{0}[white] jest atakowany!
 sector.lost = Sektor [accent]{0}[white] został stracony!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Zmień Ikonę
 sector.noswitch.title = Nie można zmienić sektorów
 sector.noswitch = Nie możesz zmieniać sektorów, gdy istniejący sektor jest atakowany.\n\nSektor: [accent]{0}[] na [accent]{1}[]
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 6d407f8b53..783d4b55fd 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -768,6 +768,7 @@ sector.missingresources = [scarlet]Recursos Insuficientes no Núcleo
 sector.attacked = Setor [accent]{0}[white] sob ataque!
 sector.lost = Setor [accent]{0}[white] perdido!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Trocar Ícone
 sector.noswitch.title = Incapaz de Mudar de Setores
 sector.noswitch = Você não pode trocar de setor enquanto um setor existente estiver sob ataque.\n\nSetor: [accent]{0}[] em [accent]{1}[]
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 655572aa1e..089b9ab48f 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -754,6 +754,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index ebbc5c124e..8dfbe2f380 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -762,6 +762,7 @@ sector.missingresources = [scarlet]Resurse din Nucleu Insuficiente
 sector.attacked = Sectorul [accent]{0}[white] este atacat!
 sector.lost = Ai pierdut sectorul [accent]{0}[white]!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Schimbă Iconița
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 424a5a041b..51907dbd98 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -763,6 +763,7 @@ sector.missingresources = [scarlet]Недостаточно ресурсов д
 sector.attacked = Сектор [accent]{0}[white] атакован!
 sector.lost = Сектор [accent]{0}[white] потерян!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Изменить иконку
 sector.noswitch.title = Перемещение между секторами
 sector.noswitch = Вы не можете переключаться между секторами, пока существующий сектор находится под атакой.\n\nСектор: [accent]{0}[] на [accent]{1}[]
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index c2f7c81da6..3582786290 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -763,6 +763,7 @@ sector.missingresources = [scarlet]Nedovoljnema Resursa u Jezgru
 sector.attacked = Sektor [accent]{0}[white] je napadnut!
 sector.lost = Sektor [accent]{0}[white] je izgubljen!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Promeni Ikonicu
 sector.noswitch.title = Nije Moguće Promeniti Sektor
 sector.noswitch = Ne možete promeniti sektor dok je drugi napadnut.\n\nSektor: [accent]{0}[] na [accent]{1}[]
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index e8937b491c..9443d418b6 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -754,6 +754,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index d24aa629b5..6afd8357ec 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -763,6 +763,7 @@ sector.missingresources = [scarlet]ขาดทรัพยากรในกา
 sector.attacked = เซ็กเตอร์ [accent]{0}[white] ถูกโจมตี!
 sector.lost = เราเสียเซ็กเตอร์ [accent]{0}[white]!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = เปลี่ยนไอคอน
 sector.noswitch.title = ไม่สามารถเปลี่ยนเซ็กเตอร์ได้
 sector.noswitch = คุณไม่สามารถเปลี่ยนเซ็กเตอร์ได้ระหว่างที่อีกเซ็กเตอร์กำลังถูกโจมตีอยู่\n\nเซ็กเตอร์: [accent]{0}[] บนดาว [accent]{1}[]
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index c1dc4dbe72..f857cf8b78 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -754,6 +754,7 @@ sector.missingresources = [scarlet]Insufficient Core Resources
 sector.attacked = Sector [accent]{0}[white] under attack!
 sector.lost = Sector [accent]{0}[white] lost!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Change Icon
 sector.noswitch.title = Unable to Switch Sectors
 sector.noswitch = You may not switch sectors while an existing sector is under attack.\n\nSector: [accent]{0}[] on [accent]{1}[]
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 172e78f31e..57081daccb 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -762,6 +762,7 @@ sector.missingresources = [scarlet]Yetersiz Merkez Kaynakları
 sector.attacked = Sektör [accent]{0}[white] saldırı altında!
 sector.lost = Sektör [accent]{0}[white] kaybedildi!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = İkon Değiştir
 sector.noswitch.title = Sektör Değiştirilemiyor
 sector.noswitch = Bir Sektör saldırı altındayken başka bir sektöre geçemezsin.\n\nSektör: [accent]{1}[] deki [accent]{0}[]
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 0073cef162..03e23829c9 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -771,6 +771,7 @@ sector.missingresources = [scarlet]Недостатньо ресурсів у я
 sector.attacked = Сектор [accent]{0}[white] під атакою!
 sector.lost = Сектор [accent]{0}[white] втрачено!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Змінити значок
 sector.noswitch.title = Неможливо переключити сектори
 sector.noswitch = Ви не можете змінювати сектори, поки поточний сектор піддається атаці.\n\nСектор: [accent]{0}[] на [accent]{1}[]
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 35c9472d8e..74c756b956 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -763,6 +763,7 @@ sector.missingresources = [scarlet]Không đủ tài nguyên căn cứ
 sector.attacked = Khu vực [accent]{0}[white] đang bị tấn công!
 sector.lost = Khu vực [accent]{0}[white] đã mất!
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = Thay đổi biểu tượng
 sector.noswitch.title = Không thể thay đổi sang khu vực khác
 sector.noswitch = Bạn không thể đổi sang khu vực khác khi một khu vực đang bị tấn công.\n\nKhu vực: [accent]{0}[] ở [accent]{1}[]
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 0761b47baf..b0f76b9d6e 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -772,6 +772,7 @@ sector.missingresources = [scarlet]建造核心所需资源不足
 sector.attacked = 区块[accent]{0}[white]受到攻击！
 sector.lost = 区块[accent]{0}[white]已丢失！
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = 更改图标
 sector.noswitch.title = 无法切换区块
 sector.noswitch = 你无法在当前区块遭受攻击时切换区块。\n\n区块：[accent]{0}[]位于[accent]{1}[]
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 3afb86a1f8..eb180bc7d4 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -768,6 +768,7 @@ sector.missingresources = [scarlet]核心資源不足
 sector.attacked = 地區 [accent]{0}[white] 遭受攻擊！
 sector.lost = 地區 [accent]{0}[white] 戰敗！
 sector.capture = Sector [accent]{0}[white]Captured!
+sector.capture.current = Sector Captured!
 sector.changeicon = 更改圖標
 sector.noswitch.title = 無法切換地區
 sector.noswitch = 當前地區遭受攻擊時，無法切換地區\n\n地區: [accent]{0}[] 於 [accent]{1}[]

From 844b6f9f02dafbcb747dc82eb227769dce1e8bb0 Mon Sep 17 00:00:00 2001
From: jexjws <hello_cmd@outlook.com>
Date: Mon, 26 Feb 2024 22:34:37 +0800
Subject: [PATCH 242/369] Update bundle_zh_CN.properties (#9583)

---
 core/assets/bundles/bundle_zh_CN.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index b0f76b9d6e..0ec6bb2d82 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -1930,7 +1930,7 @@ onset.commandmode = 按住[accent]shift[]键进入[accent]指挥模式[]。\n按
 onset.commandmode.mobile = 点击左下角的[accent]指挥[]进入[accent]指挥模式[]。\n按住屏幕，[accent]拖动[]框选单位。\n[accent]点击[]指挥所选单位移动或攻击。
 aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
 
-split.pickup = 核心单位可以拾取一些方块。\n拾取这个[accent]强化容器[]并将其放到[accent]载荷装载器[]中。\n（默认使用[拾取，]放下载荷）
+split.pickup = 核心单位可以拾取一些方块。\n拾取这个[accent]强化容器[]并将其放到[accent]载荷装载器[]中。\n（默认使用快捷键“[”拾取载荷，“]“放下载荷）
 split.pickup.mobile = 核心单位可以拾取一些方块。\n拾取这个[accent]强化容器[]并将其放到[accent]载荷装载器[]中。\n（长按以拾取或放下载荷）
 split.acquire = 你需要获取钨来生产单位。
 split.build = 单位必须被运输到墙的另一侧。\n在墙壁两侧各放置一个[accent]载荷质量驱动器[]。\n点击其中一个，然后点击另一个以连接它们。

From e3b24ac9800436893df09a008972ffaa62470415 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 26 Feb 2024 10:29:14 -0500
Subject: [PATCH 243/369] WIP logic display transform matrix support

---
 core/src/mindustry/logic/LExecutor.java       |  7 +-
 core/src/mindustry/logic/LStatements.java     |  7 ++
 .../world/blocks/logic/LogicDisplay.java      | 68 +++++++++++++++++--
 3 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index d991a727eb..8d02218748 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1025,14 +1025,17 @@ public class LExecutor{
                     exec.textBuffer.setLength(0);
                 }
             }else{
-                int num1 = exec.numi(p1);
+                int num1 = exec.numi(p1), xval = packSign(exec.numi(x)), yval = packSign(exec.numi(y));
 
                 if(type == LogicDisplay.commandImage){
                     num1 = exec.obj(p1) instanceof UnlockableContent u ? u.iconId : 0;
+                }else if(type == LogicDisplay.commandScale){
+                    xval = packSign((int)(exec.numf(x) / LogicDisplay.scaleStep));
+                    yval = packSign((int)(exec.numf(y) / LogicDisplay.scaleStep));
                 }
 
                 //add graphics calls, cap graphics buffer size
-                exec.graphicsBuffer.add(DisplayCmd.get(type, packSign(exec.numi(x)), packSign(exec.numi(y)), packSign(num1), packSign(exec.numi(p2)), packSign(exec.numi(p3)), packSign(exec.numi(p4))));
+                exec.graphicsBuffer.add(DisplayCmd.get(type, xval, yval, packSign(num1), packSign(exec.numi(p2)), packSign(exec.numi(p3)), packSign(exec.numi(p4))));
             }
         }
 
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 32b812ee2b..ceae4740c6 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -260,6 +260,13 @@ public class LStatements{
                             }, 2, cell -> cell.size(165, 50)));
                         }, Styles.logict, () -> {}).size(165, 40).color(s.color).left().padLeft(2);
                     }
+                    case translate, scale -> {
+                        fields(s, "x", x, v -> x = v);
+                        fields(s, "y", y, v -> y = v);
+                    }
+                    case rotate -> {
+                        fields(s, "degrees", p1, v -> p1 = v);
+                    }
                 }
             }).expand().left();
         }
diff --git a/core/src/mindustry/world/blocks/logic/LogicDisplay.java b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
index 2be75a1e05..8de36fbf91 100644
--- a/core/src/mindustry/world/blocks/logic/LogicDisplay.java
+++ b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
@@ -4,8 +4,10 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
+import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
+import arc.util.io.*;
 import mindustry.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
@@ -29,7 +31,15 @@ public class LogicDisplay extends Block{
         commandTriangle = 9,
         commandImage = 10,
         //note that this command actually only draws 1 character, unpacked in instruction
-        commandPrint = 11;
+        commandPrint = 11,
+
+        commandTranslate = 12,
+        commandScale = 13,
+        commandRotate = 14,
+        commandResetTransform = 15
+    ;
+
+    public static final float scaleStep = 0.05f;
 
     public int maxSides = 25;
 
@@ -58,6 +68,7 @@ public class LogicDisplay extends Block{
         public float color = Color.whiteFloatBits;
         public float stroke = 1f;
         public LongQueue commands = new LongQueue(256);
+        public @Nullable Mat transform;
 
         @Override
         public void draw(){
@@ -79,14 +90,18 @@ public class LogicDisplay extends Block{
             if(!commands.isEmpty()){
                 Draw.draw(Draw.z(), () -> {
                     Tmp.m1.set(Draw.proj());
+                    Tmp.m2.set(Draw.trans());
                     Draw.proj(0, 0, displaySize, displaySize);
+                    if(transform != null){
+                        Draw.trans(transform);
+                    }
                     buffer.begin();
                     Draw.color(color);
                     Lines.stroke(stroke);
 
                     while(!commands.isEmpty()){
                         long c = commands.removeFirst();
-                        byte type = DisplayCmd.type(c);
+                        int type = DisplayCmd.type(c);
                         int x = unpackSign(DisplayCmd.x(c)), y = unpackSign(DisplayCmd.y(c)),
                         p1 = unpackSign(DisplayCmd.p1(c)), p2 = unpackSign(DisplayCmd.p2(c)), p3 = unpackSign(DisplayCmd.p3(c)), p4 = unpackSign(DisplayCmd.p4(c));
 
@@ -117,11 +132,16 @@ public class LogicDisplay extends Block{
                                     Draw.rect(Tmp.tr1, x + Tmp.tr1.width/2f + glyph.xoffset, y + Tmp.tr1.height/2f + glyph.yoffset + Fonts.logic.getData().capHeight + Fonts.logic.getData().ascent, Tmp.tr1.width, Tmp.tr1.height);
                                 }
                             }
+                            case commandTranslate -> Draw.trans((transform == null ? (transform = new Mat()) : transform).translate(x, y));
+                            case commandScale -> Draw.trans((transform == null ? (transform = new Mat()) : transform).scale(x * scaleStep, y * scaleStep));
+                            case commandRotate-> Draw.trans((transform == null ? (transform = new Mat()) : transform).rotate(p1));
+                            case commandResetTransform -> Draw.trans((transform == null ? (transform = new Mat()) : transform).idt());
                         }
                     }
 
                     buffer.end();
                     Draw.proj(Tmp.m1);
+                    Draw.trans(Tmp.m2);
                     Draw.reset();
                 });
             }
@@ -135,6 +155,41 @@ public class LogicDisplay extends Block{
             Draw.blend();
         }
 
+        @Override
+        public byte version(){
+            return 1;
+        }
+
+        @Override
+        public void write(Writes write){
+            super.write(write);
+
+            if(transform != null){
+                write.bool(true);
+                for(int i = 0; i < transform.val.length; i++){
+                    write.f(transform.val[i]);
+                }
+            }else{
+                write.bool(false);
+            }
+        }
+
+        @Override
+        public void read(Reads read, byte revision){
+            super.read(read, revision);
+
+            if(revision >= 1){
+                boolean hasTransform = read.bool();
+                if(hasTransform){
+                    transform = new Mat();
+
+                    for(int i = 0; i < transform.val.length; i++){
+                        transform.val[i] = read.f();
+                    }
+                }
+            }
+        }
+
         @Override
         public void remove(){
             super.remove();
@@ -163,7 +218,12 @@ public class LogicDisplay extends Block{
         triangle,
         image,
         //note that this command actually only draws 1 character, unpacked in instruction
-        print;
+        print,
+        translate,
+        scale,
+        rotate,
+        reset
+        ;
 
         public static final GraphicsType[] all = values();
     }
@@ -171,7 +231,7 @@ public class LogicDisplay extends Block{
     @Struct
     static class DisplayCmdStruct{
         @StructField(4)
-        public byte type;
+        public int type;
 
         //at least 9 bits are required for full 360 degrees
         @StructField(10)

From be87153ac59e95c9dead1c142d4299232c2cda67 Mon Sep 17 00:00:00 2001
From: BankaiDev <114865515+MarlokytKaneki@users.noreply.github.com>
Date: Wed, 28 Feb 2024 21:25:02 +0300
Subject: [PATCH 244/369] Update servers_v7.json (#9598)

---
 servers_v7.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index 861b7a7f80..7a3050b15c 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -283,9 +283,5 @@
   { 
     "name": "Sever.VN",
     "address": ["srv24.godlike.club:26189"]
-  },
-  {
-    "name": "Crimson Star",
-    "address": ["185.103.101.121:25528", "81.94.159.193"]
   }
 ]

From d16db5b0bb923faf3da8ce179e8d048ab6e39b23 Mon Sep 17 00:00:00 2001
From: meiqiu <119494143+MEIQIUawa@users.noreply.github.com>
Date: Thu, 29 Feb 2024 02:33:59 +0800
Subject: [PATCH 245/369] Update servers_v7.json (#9577)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 7a3050b15c..4fa4d656f8 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -9,7 +9,7 @@
   },
   {
     "name": "meiqiuMDT",
-    "address": ["cn1.meiqiumdy.top:7000","cn1.meiqiumdt.top:7002","cn1.meiqiumdt.top:7006","cn1.meiqiumdt.top:7013"]
+    "address": ["cn1.meiqiumdy.top","cn1.meiqiumdt.top:7000","cn1.meiqiumdt.top:8000","cn1.meiqiumdt.top:7013"]
   },
   {
     "name": "Crux's Revelations",

From 0d795d59c83c20fad99b368e64e2b2ea343b997a Mon Sep 17 00:00:00 2001
From: GlFolker <63218676+GlennFolker@users.noreply.github.com>
Date: Fri, 1 Mar 2024 21:42:05 +0700
Subject: [PATCH 246/369] Per-tile edge regions (#9601)

* Delegate more methods into Planet

* Per-tile edges

* You win, IntelliJ
---
 .../world/blocks/environment/Floor.java       | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java
index db9ae24a3f..6089faf74f 100644
--- a/core/src/mindustry/world/blocks/environment/Floor.java
+++ b/core/src/mindustry/world/blocks/environment/Floor.java
@@ -77,7 +77,7 @@ public class Floor extends Block{
     public int blendId = -1;
 
     protected TextureRegion[][] edges;
-    protected Seq<Block> blenders = new Seq<>();
+    protected Seq<Floor> blenders = new Seq<>();
     protected Bits blended = new Bits(256);
     protected int[] dirs = new int[8];
     protected TextureRegion edgeRegion;
@@ -182,13 +182,17 @@ public class Floor extends Block{
     @Override
     public void drawBase(Tile tile){
         Mathf.rand.setSeed(tile.pos());
-        Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
+        Draw.rect(variantRegions[variant(tile.x, tile.y)], tile.worldx(), tile.worldy());
 
         Draw.alpha(1f);
         drawEdges(tile);
         drawOverlay(tile);
     }
 
+    public int variant(int x, int y){
+        return Mathf.randomSeed(Point2.pack(x, y), 0, Math.max(0, variantRegions.length - 1));
+    }
+
     public void drawOverlay(Tile tile){
         Floor floor = tile.overlay();
         if(floor != Blocks.air && floor != this){
@@ -236,8 +240,8 @@ public class Floor extends Block{
         for(int i = 0; i < 8; i++){
             Point2 point = Geometry.d8[i];
             Tile other = tile.nearby(point);
-            //special case: empty is, well, empty, so never draw emptyness on top, as that would just be an incorrect black texture
-            if(other != null && other.floor().cacheLayer == layer && other.floor().edges() != null && other.floor() != Blocks.empty){
+            //special case: empty is, well, empty, so never draw emptiness on top, as that would just be an incorrect black texture
+            if(other != null && other.floor().cacheLayer == layer && other.floor().edges(tile.x, tile.y) != null && other.floor() != Blocks.empty){
                 if(!blended.getAndSet(other.floor().id)){
                     blenders.add(other.floor());
                     dirs[i] = other.floorID();
@@ -258,8 +262,7 @@ public class Floor extends Block{
             Point2 point = Geometry.d8[i];
             Tile other = tile.nearby(point);
 
-            if(other != null && doEdge(tile, other, other.floor()) && other.floor().cacheLayer == realCache && other.floor().edges() != null && other.floor() != Blocks.empty){
-
+            if(other != null && doEdge(tile, other, other.floor()) && other.floor().cacheLayer == realCache && other.floor().edges(tile.x, tile.y) != null && other.floor() != Blocks.empty){
                 if(!blended.getAndSet(other.floor().id)){
                     blenders.add(other.floor());
                 }
@@ -273,12 +276,12 @@ public class Floor extends Block{
     protected void drawBlended(Tile tile, boolean checkId){
         blenders.sort(a -> a.id);
 
-        for(Block block : blenders){
+        for(Floor block : blenders){
             for(int i = 0; i < 8; i++){
                 Point2 point = Geometry.d8[i];
                 Tile other = tile.nearby(point);
                 if(other != null && other.floor() == block && (!checkId || dirs[i] == block.id)){
-                    TextureRegion region = edge((Floor)block, 1 - point.x, 1 - point.y);
+                    TextureRegion region = block.edge(tile.x, tile.y, 1 - point.x, 1 - point.y);
                     Draw.rect(region, tile.worldx(), tile.worldy());
                 }
             }
@@ -305,17 +308,23 @@ public class Floor extends Block{
         return blendId;
     }
 
+    /** Returns the edge array that should be used to draw at the specified tile position. */
+    protected TextureRegion[][] edges(int x, int y){
+        return blendGroup.asFloor().edges;
+    }
+
+    protected TextureRegion edge(int x, int y, int rx, int ry){
+        return edges(x, y)[rx][2 - ry];
+    }
+
+    @Deprecated
     protected TextureRegion[][] edges(){
-        return ((Floor)blendGroup).edges;
+        return edges(0, 0);
     }
 
     /** @return whether the edges from {@param other} should be drawn onto this tile **/
     protected boolean doEdge(Tile tile, Tile otherTile, Floor other){
-        return (other.realBlendId(otherTile) > realBlendId(tile) || edges() == null);
-    }
-
-    TextureRegion edge(Floor block, int x, int y){
-        return block.edges()[x][2 - y];
+        return (other.realBlendId(otherTile) > realBlendId(tile) || edges(tile.x, tile.y) == null);
     }
 
     public static class UpdateRenderState{
@@ -328,5 +337,4 @@ public class Floor extends Block{
             this.floor = floor;
         }
     }
-
 }

From dc45f240360cd58db87c4a834e7642b044e7a02c Mon Sep 17 00:00:00 2001
From: Arksource <93954648+ArkSourcer@users.noreply.github.com>
Date: Fri, 1 Mar 2024 10:42:30 -0400
Subject: [PATCH 247/369] Agua  IV (#9602)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Funny change

* Update servers_v7.json

* Update bundle_es.properties

Traductions for the bundle_es
By ArkSource

* Update servers_v7.json

* Agua prt 2

* Update servers_v7.json

* Update servers_v7.json

* Agua 2-3

* OWO PVP2

* OWO PVP AGUA2 100% REAL NO FAKE

* Que bueno que nadie lee estos PRs porque parecería retrasado haciéndolos

* Update servers_v7.json
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 4fa4d656f8..d7c1ea915e 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -25,7 +25,7 @@
   },
   {
     "name": "ShardDustry ES",
-    "address": ["94.130.132.149:35689","94.130.132.149:35438","45.158.9.198:31290","45.158.9.198:30529","94.130.132.149:35116","94.130.132.149:35160"]
+    "address": ["45.158.9.198:32389"]
   },
   {
     "name": "Tamazia",

From 430753e923767a5226f67b0cebf204068ce4f400 Mon Sep 17 00:00:00 2001
From: summoner001 <summoner001@users.noreply.github.com>
Date: Fri, 1 Mar 2024 16:12:13 +0000
Subject: [PATCH 248/369] Update bundle_hu.properties (#9544)

* Update bundle_hu.properties

Making some sentences more understandable.

* Update bundle_hu.properties

Making some sentences more understandable.

* Update bundle_hu.properties

Making some sentences more understandable.

* Update bundle_hu.properties

Follow the updates: Grammar & context fix

* Update bundle_hu.properties

Minor fixes

* Update bundle_hu.properties

Minor fixes

* Update bundle_hu.properties

minor fixes

* Update bundle_hu.properties

fixing typo

* Update bundle_hu.properties

fixes and follow the main bundle changes

* Update bundle_hu.properties

minor fix

* Update bundle_hu.properties

making texts more polished

* Update bundle_hu.properties

minor text polishing
---
 core/assets/bundles/bundle_hu.properties | 107 +++++++++++------------
 1 file changed, 53 insertions(+), 54 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 2f5a474d32..bad257446d 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -20,7 +20,7 @@ screenshot = Képernyőkép mentve ide: {0}
 screenshot.invalid = Túl nagy a pálya, nincs elég memória a képernyőképhez.
 gameover = A játéknak vége
 gameover.disconnect = A kapcsolat megszakadt
-gameover.pvp = A[accent] {0}[] csapat nyert!
+gameover.pvp = A(z)[accent] {0}[] csapat nyert!
 gameover.waiting = [accent]Várakozás a következő pályára...
 highscore = [accent]Új rekord!
 copied = Másolva.
@@ -92,7 +92,7 @@ stats.destroyed = Építmények Elpusztítva
 stats.deconstructed = Építmények Lebontva
 stats.playtime = Játszott Idő
 
-globalitems = [accent]Bolygó Nyersanyagai
+globalitems = [accent]A Bolygó Nyersanyagai
 map.delete = Biztosan törölni akarod a "[accent]{0}[]" pályát?
 level.highscore = Legmagasabb Pontszám: [accent]{0}
 level.select = Szint Kiválasztása
@@ -345,7 +345,7 @@ workshop.listing = Steam Műhely listázás szerkesztése
 ok = OK
 open = Megnyitás
 customize = Szabályok Módosítása
-cancel = Mégse
+cancel = Mégsem
 command = Parancs
 command.queue = Sorbaállít
 command.mine = Bányászás
@@ -393,14 +393,14 @@ commandmode.name = [accent]Parancs Mód
 commandmode.nounits = [nincs egység]
 wave = [accent]{0}. Hullám
 wave.cap = [accent]{0}./{1} Hullám
-wave.waiting = [lightgray]Következő hullám {0}
+wave.waiting = [lightgray]A következő hullám {0}
 wave.waveInProgress = [lightgray]Hullám folyamatban
 waiting = [lightgray]Várakozás...
 waiting.players = Várakozás a játékosokra...
-wave.enemies = [lightgray]{0} Megmaradt Ellenség
-wave.enemycores = [accent]{0}[lightgray] Ellenséges Mag
-wave.enemycore = [accent]{0}[lightgray] Ellenséges Mag
-wave.enemy = [lightgray]{0} Megmaradt Ellenség
+wave.enemies = [lightgray]{0}db Ellenség Maradt
+wave.enemycores = [accent]{0}db[lightgray] Ellenséges Mag
+wave.enemycore = [accent]{0}db[lightgray] Ellenséges Mag
+wave.enemy = [lightgray]{0}db Ellenség Maradt
 wave.guardianwarn = Egy Őrző érkezik [accent]{0}[] hullám múlva.
 wave.guardianwarn.one = Egy Őrző érkezik [accent]{0}[] hullám múlva.
 loadimage = Kép Betöltése
@@ -755,7 +755,7 @@ sectors.export = Export:
 sectors.import = Import:
 sectors.time = Idő:
 sectors.threat = Fenyegetés:
-sectors.wave = Hullámok:
+sectors.wave = Hullám:
 sectors.stored = Tárolt:
 sectors.resume = Folytatás
 sectors.launch = Indítás
@@ -771,17 +771,16 @@ sectors.go = Utazás
 sector.abandon = Elhagy
 sector.abandon.confirm = Ennek a szektornak a Magja(i) önmegsemmisítésre kerülnek.\nFolytatod?
 sector.curcapture = A Szektor Elfoglalva
-sector.curlost = A szektor Elveszett
-sector.missingresources = [scarlet]Nincs elég nyersanyag
+sector.curlost = A Szektor Elveszett
+sector.missingresources = [scarlet]Nincs Elég Nyersanyag
 sector.attacked = A(z) [accent]{0}[white] szektor támadás alatt áll!
-sector.lost = A(z) [accent]{0}[white] szektor elveszett!
-#note: the missing space in the line below is intentional
-sector.capture = A(z) [accent]{0}[white]Szektor Elfoglalva!
-sector.capture.current = Sector Captured!
+sector.lost = A(z) [accent]{0}[white] Szektor Elveszett!
+sector.capture = A(z) [accent]{0}[white] Szektor Elfoglalva!
+sector.capture.current = A Szektor Elfoglalva!
 sector.changeicon = Ikon Módosítása
-sector.noswitch.title = A szektorváltás Nem Lehetséges
+sector.noswitch.title = A Szektorváltás Nem Lehetséges
 sector.noswitch = Nem válthatsz szektort, amíg egy meglévő szektor támadás alatt áll.\n\nSzektor: [accent]{0}[] a(z) [accent]{1}[]-n
-sector.view = Szektor Megtekintése
+sector.view = A Szektor Megtekintése
 
 threat.low = Alacsony
 threat.medium = Közepes
@@ -966,7 +965,7 @@ stat.maxconsecutive = Maximum Egymást Követő
 stat.buildcost = Építés Ára
 stat.inaccuracy = Pontatlanság
 stat.shots = Lövések
-stat.reload = Tüzelési Ráta
+stat.reload = Tüzelési Sebesség
 stat.ammo = Lőszer
 stat.shieldhealth = Pajzs Élete
 stat.cooldowntime = Újratöltés Időtartama
@@ -1050,9 +1049,9 @@ bullet.incendiary = [stat]gyújtó
 bullet.homing = [stat]nyomkövető
 bullet.armorpierce = [stat]páncéltörő
 bullet.maxdamagefraction = [stat]{0}%[lightgray] sebzés határérték
-bullet.suppression = [stat]{0} sec[lightgray] javítás elnyomás ~ [stat]{1}[lightgray] csempe
-bullet.interval = [stat]{0}/sec[lightgray] időszakos töltények:
-bullet.frags = [stat]{0}[lightgray]x repesz lövedékek:
+bullet.suppression = [stat]{0} mp[lightgray] javítás elnyomás ~ [stat]{1}[lightgray] csempe
+bullet.interval = [stat]{0}/mp[lightgray] időszakos töltény(ek):
+bullet.frags = [stat]{0}[lightgray]x repesz lövedék(ek):
 bullet.lightning = [stat]{0}[lightgray]x villámcsapás ~ [stat]{1}[lightgray] sebzés
 bullet.buildingdamage = [stat]{0}%[lightgray] épület sebzés
 bullet.knockback = [stat]{0}[lightgray] hátralökés
@@ -1066,18 +1065,18 @@ bullet.range = [stat]{0}[lightgray] csempe tartomány
 
 unit.blocks = blokk
 unit.blockssquared = blokk²
-unit.powersecond = áram egység/sec
-unit.tilessecond = csempe/sec
-unit.liquidsecond = folyadék egység/sec
-unit.itemssecond = nyersanyag/sec
+unit.powersecond = áram egység/mp
+unit.tilessecond = csempe/mp
+unit.liquidsecond = folyadék egység/mp
+unit.itemssecond = nyersanyag/mp
 unit.liquidunits = folyadék egység
 unit.powerunits = áram egység
 unit.heatunits = hő egység
 unit.degrees = fok
 unit.seconds = másodperc
 unit.minutes = perc
-unit.persecond = /sec
-unit.perminute = /min
+unit.persecond = /mp
+unit.perminute = /perc
 unit.timesspeed = x sebesség
 unit.percent = %
 unit.shieldhealth = pajzs állapot
@@ -1173,7 +1172,7 @@ steam.friendsonly = Csak Barátok
 steam.friendsonly.tooltip = Csak a Steam-barátok tudnak csatlakozni a játékodhoz.\nHa nem jelölöd be ezt a négyzetet, a játékod nyilvános lesz - bárki csatlakozhat hozzá.
 public.beta = Ne feledd, hogy a játék béta verziójában nem tudsz nyilvános szobát nyitni.
 uiscale.reset = Az UI mérete megváltozott.\nAz "OK" gombbal megerősítheted ezt a méretet.\n[scarlet]Visszavonás és kilépés [accent] {0}[] másodperc múlva...
-uiscale.cancel = Mégse & Kilépés
+uiscale.cancel = Mégsem & Kilépés
 setting.bloom.name = Bloom
 keybind.title = Gyorsbillentyűk
 keybinds.mobile = [scarlet]A legtöbb billentyűfunkció mobilon nem működik. Csak a mozgás támogatott.
@@ -1921,11 +1920,11 @@ onset.ducts.mobile = Fedezd fel és építs \uf799 [accent]Szállítószalag[]ot
 onset.moremine = Bővítsd a bányászati kapacitást.\nÉpíts több Plazma Vágót, használj Sugár Csomópontokat és Szállítószalagokat.\nBányássz 200 Berilliumot.
 onset.graphite = Az összetettebb blokkokhoz szükség van \uf835 [accent]Grafit[]ra.\nÉpíts Plazma Vágókat, a Grafit kibányászásához.
 onset.research2 = Kezdd el a [accent]Gyárak[] fejlesztését.\nFedezd fel a \uf74d [accent]Sziklazúzó[]t és a \uf779 [accent]Szilícium Ívkemence[]t.
-onset.arcfurnace = A Szilícium Ívkemencének szüksége lesz \uf834 [accent]Homok[]ra és \uf835 [accent]Grafit[]ra, hogy \uf82f [accent]Szilícium[]t gyártson.\nTovábbá [accent]Áram[] is szükséges a működéséhez.
+onset.arcfurnace = A Szilícium Ívkemencének szüksége lesz \uf834 [accent]Homok[]ra és \uf835 [accent]Grafit[]ra, hogy \uf82f [accent]Szilícium[]ot gyártson.\nTovábbá [accent]Áram[] is szükséges a működéséhez.
 onset.crusher = Használj \uf74d [accent]Sziklazúzó[]t, hogy Homokot bányászhass.
 onset.fabricator = Használd az [accent]egységeket[], hogy felfedezd a pályát, megvédd az épületeket, és megtámadhasd velük az ellenséget. Fedezd fel és építs \uf6a2 [accent]Tank Gyár[]at.
 onset.makeunit = Állíts elő egy egységet.\nHasználd a "?" gombot, hogy megnézd a gyártási követelményeit.
-onset.turrets = Az egységek hatékonyak, de a [accent]lövegtornyok[] jobb védelmi képességeket biztosítanak, ha hatékonyan használják őket.\nÉpíts egy \uf6eb [accent]Breach[] lövegtornyot.\nA lövegtornyoknak szüksége van \uf748 [accent]lőszer[]re.
+onset.turrets = Az egységek hatékonyak, de a [accent]lövegtornyok[] jobb védelmi képességeket biztosítanak, ha hatékonyan alkalmazod őket.\nÉpíts egy \uf6eb [accent]Breach[] lövegtornyot.\nA lövegtornyoknak szüksége van \uf748 [accent]lőszer[]re.
 onset.turretammo = Lásd el a lövegtornyokat [accent]Berillium[] lőszerrel.
 onset.walls = A [accent]Falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts \uf6ee [accent]Berillium Fal[]akat a lövegtornyok körül.
 onset.enemies = Az ellenség közeledik, készülj fel a védekezésre.
@@ -1945,10 +1944,10 @@ split.container = Hasonlít a Konténerre, csak egységek szállítására is al
 
 item.copper.description = Széleskörűen felhasználható építkezésre és lövedékként.
 item.copper.details = Szokatlanul elterjedt fém a Serpulo-n. Gyenge szerkezetű, de megerősíthető.
-item.lead.description = Folyadékszállításban és elektromos eszközökben használható.
-item.lead.details = Sűrű. Közömbös. Széles körben használják elemekben.\nMegjegyzés: Valószínűleg mérgező a biológiai életformákra. Nem mintha sok maradt volna errefelé.
-item.metaglass.description = Folyadékok szállítására és tárolására használható.
-item.graphite.description = Elektromos alkatrészek alapanyaga és lövedék.
+item.lead.description = Folyadékszállító csővezetékek építésére használatos, de elektromos eszközökben is alkalmazható.
+item.lead.details = Sűrű. Közömbös. Széles körben használatos elemekben.\nMegjegyzés: Valószínűleg mérgező a biológiai életformákra. Nem mintha sok maradt volna errefelé.
+item.metaglass.description = Folyadékok szállítására és tárolására alkalmas blokkok építésére, továbbá lövedékként is használható.
+item.graphite.description = Elektromos alkatrészek alapanyagaként és lövedékként is használható.
 item.sand.description = Egyéb finom nyersanyagok gyártási alapanyaga.
 item.coal.description = Tüzelőanyag és gyártási alapanyag.
 item.coal.details = Fosszilizálódott növényi anyagnak tűnik, jóval a "seeding event" előttről.
@@ -1957,32 +1956,32 @@ item.thorium.description = Strapabíró szerkezetekben használható nukleáris
 item.scrap.description = Olvasztással és porítással finom nyersanyagok nyerhetők ki belőle.
 item.scrap.details = Ősi építmények és egységek hátrahagyott maradványai.
 item.silicon.description = Napelemek, összetett áramkörök és nyomkövető lövedékek fontos alapanyaga. Sosincs belőle elég.
-item.plastanium.description = Fejlett egységek alapanyagaként, hőszigetelésre és repeszes lövedékekhez használható.
-item.phase-fabric.description = Fejlett elektromos eszközökben és önjavító szerkezetekben használható.
-item.surge-alloy.description = Magas szintű fegyverzetekben és aktív védelemhez használható.
-item.spore-pod.description = Átalakítható Olajjá vagy robbanószerekké, de használható tüzelőanyagként is.
+item.plastanium.description = Fejlett egységek alapanyagaként, hőszigetelésre és repeszes lövedékekhez is használható.
+item.phase-fabric.description = Fejlett elektromos eszközökben és önjavító szerkezetekben is használható.
+item.surge-alloy.description = Magas szintű fegyverzetekben és aktív védelemhez is használható.
+item.spore-pod.description = Átalakítható Olajjá, vagy robbanószerekké, de használható tüzelőanyagként is.
 item.spore-pod.details = Spórák. Egy valószínűleg mesterséges életforma. Más életformák számára halálos gázt bocsátanak ki. Szélsőségesen invazív. Megfelelő körülmények között erősen gyúlékony.
-item.blast-compound.description = Bombák és robbanó lövedékek része.
-item.pyratite.description = Gyújtó lövedékekben és tüzelőanyag-alapú generátorokban használható.
+item.blast-compound.description = A bombák és a robbanó lövedékek egyik fő összetevője.
+item.pyratite.description = Gyújtó lövedékekben és tüzelőanyag-alapú generátorokban is használható.
 
 #Erekir
-item.beryllium.description = Sokféle épület- és lőszertípushoz használják Erekiren.
-item.tungsten.description = Fúrókban/vágókban, páncélokban és lőszerekben használatos. A fejlettebb szerkezetek építéséhez szükséges.
-item.oxide.description = Hővezetőként és Áramszigetelőként használják.
-item.carbide.description = Korszerű szerkezetekben, nehezebb egységekben és lőszerekben használatos.
+item.beryllium.description = Sokféle épület- és lőszertípushoz használatos az Erekiren.
+item.tungsten.description = Fúrókban/vágókban, páncélokban használatos, de lőszerként is alkalmazható. A fejlettebb szerkezetek építéséhez szükséges.
+item.oxide.description = Hővezetőként és Áramszigetelőként is használatos.
+item.carbide.description = Korszerű szerkezetekben, nehezebb egységekben használatos, de lőszerként is alkalmazható.
 
-liquid.water.description = Gépek hűtésére és Törmelékfeldolgozásra használható.
+liquid.water.description = Gépek hűtésére és Törmelékfeldolgozásra is használható.
 liquid.slag.description = Leválasztóban finomítva értékes fémek forrása, az ellenségre fröcskölve gyilkos fegyver.
-liquid.oil.description = Magas szintű nyersanyagok gyártására vagy gyújtólövedékként használható.
+liquid.oil.description = Magas szintű nyersanyagok gyártására, vagy gyújtólövedékként is használható.
 liquid.cryofluid.description = Hűtőfolyadék az erőművek, reaktorok, lövegtornyok és gyárak számára.
 
 #Erekir
-liquid.arkycite.description = Kémiai reakciókban használják energiatermelésre és anyagszintézisre.
-liquid.ozone.description = Oxidálószerként használják az anyaggyártásban és üzemanyagként. Mérsékelten robbanékony.
-liquid.hydrogen.description = A nyersanyagok kitermelésében, egységgyártásban és szerkezetjavításban használatos. Gyúlékony.
-liquid.cyanogen.description = Lőszerekhez, fejlett egységek építéséhez és különböző reakciókhoz használják a fejlett épületekben. Erősen gyúlékony.
-liquid.nitrogen.description = A nyersanyagok kitermelésében, gáztermelésnél és egységgyártásnál használják. Semleges gáz.
-liquid.neoplasm.description = A Neoplazma reaktor veszélyes biológiai mellékterméke. Gyorsan átterjed minden szomszédos víztartalmú épületre, amelyhez hozzáér és közben károsítja azokat. Sűrű folyadék.
+liquid.arkycite.description = Kémiai reakciókban használatos energiatermelésre és anyagszintézisre.
+liquid.ozone.description = Oxidálószerként használatos az anyaggyártásban és üzemanyagként. Mérsékelten robbanékony.
+liquid.hydrogen.description = A nyersanyagok kitermelésében, egységgyártásban és szerkezetjavításban is használatos. Gyúlékony.
+liquid.cyanogen.description = Lőszerként, vagy fejlett egységek építéséhez és különböző reakciókhoz használatos a fejlett épületekben. Erősen gyúlékony.
+liquid.nitrogen.description = A nyersanyagok kitermelésében, gáztermelésnél és egységgyártásnál is használatos. Semleges gáz.
+liquid.neoplasm.description = A Neoplázia Reaktor veszélyes biológiai mellékterméke. Gyorsan átterjed minden szomszédos víztartalmú épületre, amelyhez hozzáér és közben károsítja azokat. Sűrű folyadék.
 liquid.neoplasm.details = Neoplazma. Egy kontrollálhatatlan, gyorsan osztódó, iszap állagú, szintetikus sejtmassza. Hőálló. Rendkívül veszélyes minden Vízzel kapcsolatos szerkezetre.\n\nTúl összetett és instabil a szabványos elemzésekhez. Potenciális alkalmazási területe ismeretlen. Ajánlott a Salak medencékben való elégetése.
 
 block.derelict = \uf77e [lightgray]Elhagyatott
@@ -2113,7 +2112,7 @@ block.repair-point.description = Folyamatosan gyógyítja a legközelebbi sérü
 block.segment.description = Megsemmisíti a beérkező lövedékeket. A lézerrel szemben hatástalan.
 block.parallax.description = Vonónyalábot bocsát ki, amivel magához vonzza és sebzi a repülő egységeket.
 block.tsunami.description = Erős folyadékhullámokat lő az ellenségre. Eloltja a tüzet, ha Vízzel van feltöltve.
-block.silicon-crucible.description = Szilíciumot finomít Homokból és Szénből. Piratitot használ kiegészítő Hőforrásként. Forró környezetben hatékonyabb.
+block.silicon-crucible.description = Szilíciumot finomít Homokból és Szénből. Piratitot használ kiegészítő hőforrásként. Forró környezetben hatékonyabb.
 block.disassembler.description = Ritka ásványi elemeket választ ki Salakból. Képes Tóriumot kiválasztani.
 block.overdrive-dome.description = Megnöveli a környező gyárak termelési sebességét. Tóritkvarcot és Szilíciumot igényel.
 block.payload-conveyor.description = Képes egységeket szállítani.
@@ -2533,4 +2532,4 @@ lenum.texturesize = A textúra mérete csempékben. A nulla érték a jelölő s
 lenum.autoscale = A jelölő skálázása a játékos nagyítási szintjének megfelelően.
 lenum.posi = Indexelt pozíció, vonal- és négyszögjelzőkhöz használatos, ahol a nulla index az első pozíció.
 lenum.uvi = A textúra pozíciója nullától egyig, négyzet jelölőkhöz használatos.
-lenum.colori = Indexelt pozíció, vonal- és négyzet jelölőkhöz használatos, ahol a nulla index az első szín.
+lenum.colori = Indexelt szín, vonal- és négyzet jelölőkhöz használatos, ahol a nulla index az első szín.

From aa896362dc0aa70fb1c708b918eade090e010213 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Fri, 1 Mar 2024 09:50:28 -0800
Subject: [PATCH 249/369] Shader getShaderFi check for mod files (#9599)

* Shader getShaderFi check for mod files

* Just use tree.get()

It defaults to files.internal() if nothing is found. Actually, I think this also has the added benefit of allowing mods to override vanilla shaders by having a frag with an identical name.
---
 core/src/mindustry/graphics/Shaders.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java
index eb1aa22a4e..109b5388ba 100644
--- a/core/src/mindustry/graphics/Shaders.java
+++ b/core/src/mindustry/graphics/Shaders.java
@@ -474,6 +474,6 @@ public class Shaders{
     }
 
     public static Fi getShaderFi(String file){
-        return Core.files.internal("shaders/" + file);
+        return tree.get("shaders/" + file);
     }
 }

From 2a95bc3092bd88f26a7b3a41344c1444028c06cb Mon Sep 17 00:00:00 2001
From: Atomic-Laboratory <146392884+Atomic-Laboratory@users.noreply.github.com>
Date: Fri, 1 Mar 2024 21:13:55 -0500
Subject: [PATCH 250/369] One last ip/port update for Atomic Servers (#9604)

I have moved hosts to one in germany again. UK branch completely overwhelmed for weeks with no support. This will hopefully be the last time I have to request to have the IPs/Ports changed
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index d7c1ea915e..af0fc63d6e 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -254,7 +254,7 @@
   },
   {
     "name": "Atomic",
-    "address": ["atomic-uk.ddns.net:25595", "atomic-uk.ddns.net:25587", "atomic-uk.ddns.net:25584", "atomic-uk.ddns.net:25590"]
+    "address": ["atomic-de.ddns.net:35876", "atomic-de.ddns.net:35663", "atomic-de.ddns.net:35724", "atomic-de.ddns.net:35847"]
   },
   {
     "name": "SkyPlex",

From 277291ce09ec88adeb31c6c218c71607fbb3f56e Mon Sep 17 00:00:00 2001
From: buthed010203 <naguiar010203@gmail.com>
Date: Sat, 2 Mar 2024 10:49:11 -0500
Subject: [PATCH 251/369] Cleanup GameState (#9610)

* Cleanup GameState

* Braint
---
 core/src/mindustry/core/GameState.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java
index 7c89abe05d..17d3b3bfe9 100644
--- a/core/src/mindustry/core/GameState.java
+++ b/core/src/mindustry/core/GameState.java
@@ -86,11 +86,12 @@ public class GameState{
     }
 
     public boolean isPaused(){
-        return is(State.paused);
+        return state == State.paused;
     }
 
+    /** @return whether there is an unpaused game in progress. */
     public boolean isPlaying(){
-        return (state == State.playing) || (state == State.paused && !isPaused());
+        return state == State.playing;
     }
 
     /** @return whether the current state is *not* the menu. */

From 2c4dd5153fa7dd149ddf8325e961220d18716bf0 Mon Sep 17 00:00:00 2001
From: summoner001 <summoner001@users.noreply.github.com>
Date: Sat, 2 Mar 2024 16:57:33 +0100
Subject: [PATCH 252/369] Update bundle_hu.properties, description.txt and
 full_description.txt (#9609)

* Update bundle_hu.properties

Hungarian language use Sentence case instead of Title Case. The incorrect sentences have been corrected. Many errors have been polished.

* Update full_description.txt

Polishing the translations

* Update description.txt

Polishing the translation

* Update full_description.txt

polishing the translation

* Update description.txt

polishing the translation

* Update bundle_hu.properties

polishing
---
 core/assets/bundles/bundle_hu.properties      | 860 +++++++++---------
 .../android/hu-HU/full_description.txt        |  20 +-
 .../metadata/steam/hungarian/description.txt  |  26 +-
 3 files changed, 453 insertions(+), 453 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index bad257446d..10fd7cb682 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -50,7 +50,7 @@ mods.browser.noreleases = [scarlet]Nem találhatóak a kiadások\n[accent]Nem le
 mods.browser.latest = [lightgray][Legújabb]
 mods.browser.releases = Kiadások
 mods.github.open = Tároló
-mods.github.open-release = Kiadások Oldala
+mods.github.open-release = Kiadások oldala
 mods.browser.sortdate = Rendezés dátum szerint
 mods.browser.sortstars = Rendezés értékelés szerint
 
@@ -74,38 +74,38 @@ schematic.edit = Vázlat szerkesztése
 schematic.info = {0}x{1}, {2} blokk
 schematic.disabled = [scarlet]Vázlatok letiltva[]\nNem használhatsz vázlatokat ezen a [accent]pályán[], vagy [accent]szerveren.
 schematic.tags = Címkék:
-schematic.edittags = Címkék Szerkesztése
-schematic.addtag = Címke Hozzáadása
-schematic.texttag = Szöveg Címke
+schematic.edittags = Címkék szerkesztése
+schematic.addtag = Címke hozzáadása
+schematic.texttag = Szöveg címke
 schematic.icontag = Ikon címke
-schematic.renametag = Címke Átnevezése
+schematic.renametag = Címke átnevezése
 schematic.tagged = {0} Címkézve
 schematic.tagdelconfirm = Teljesen törlöd ezt a címkét?
 schematic.tagexists = Ez a címke már létezik.
 
 stats = Statisztika
-stats.wave = Hullámok Legyőzve
-stats.unitsCreated = Egységek Létrehozva
-stats.enemiesDestroyed = Ellenségek Megsemmisítve
-stats.built = Építmények Építve
-stats.destroyed = Építmények Elpusztítva
-stats.deconstructed = Építmények Lebontva
-stats.playtime = Játszott Idő
+stats.wave = Hullámok legyőzve
+stats.unitsCreated = Egységek létrehozva
+stats.enemiesDestroyed = Ellenségek megsemmisítve
+stats.built = Építmények építve
+stats.destroyed = Építmények elpusztítva
+stats.deconstructed = Építmények lebontva
+stats.playtime = Játékban töltött idő
 
-globalitems = [accent]A Bolygó Nyersanyagai
+globalitems = [accent]A bolygó nyersanyagai
 map.delete = Biztosan törölni akarod a "[accent]{0}[]" pályát?
 level.highscore = Legmagasabb Pontszám: [accent]{0}
-level.select = Szint Kiválasztása
+level.select = Szint kiválasztása
 level.mode = Játékmód:
 coreattack = < A Mag támadás alatt van! >
 nearpoint = [[ [scarlet]AZONNAL HAGYD EL A LEDOBÁSI PONTOT![] ]\nA megsemmisülés fenyeget!
-database = Mag Adatbázis
+database = Mag adatbázis
 database.button = Adatbázis
-savegame = Játék Mentése
-loadgame = Játék Betöltése
-joingame = Csatlakozás Egy Játékhoz
-customgame = Egyedi Játék
-newgame = Új Játék
+savegame = Játék mentése
+loadgame = Játék betöltése
+joingame = Csatlakozás egy játékhoz
+customgame = Egyedi játék
+newgame = Új játék
 none = <semmi>
 none.found = [lightgray]<nincs találat>
 none.inmap = [lightgray]<nincs a pályán>
@@ -114,46 +114,46 @@ position = Pozíció
 close = Bezárás
 website = Weboldal
 quit = Kilépés
-save.quit = Mentés & Kilépés
+save.quit = Mentés és kilépés
 maps = Pályák
-maps.browse = Pályák Böngészése
+maps.browse = Pályák böngészése
 continue = Folytatás
 maps.none = [lightgray]Nem található ilyen pálya!
 invalid = Érvénytelen
-pickcolor = Válassz Színt
-preparingconfig = Konfiguráció Előkészítése
-preparingcontent = Tartalom Előkészítése
-uploadingcontent = Tartalom Feltöltése
-uploadingpreviewfile = Előnézeti Fájl Feltöltése
-committingchanges = Változások Rögzítése
+pickcolor = Válassz színt
+preparingconfig = Konfiguráció előkészítése
+preparingcontent = Tartalom előkészítése
+uploadingcontent = Tartalom feltöltése
+uploadingpreviewfile = Előnézeti fájl feltöltése
+committingchanges = Változások rögzítése
 done = Kész
 feature.unsupported = Ez az eszköz nem támogatja ezt a funkciót.
 
 mods.initfailed = [red]⚠[] Az előző Mindustry munkamenet nem tudott inicializálódni. Ez valószínű egy rosszúl működő Mod miatt történt.\n\nAz "összeomlások" elkerülése érdekében, [red]minden Mod le lett tiltva.[]
 mods = Modok
 mods.none = [lightgray]Nem találhatóak Modok!
-mods.guide = Mod Készítési Útmutató
-mods.report = Hiba Jelentése
-mods.openfolder = Mappa Megnyitása
-mods.viewcontent = Tartalom Megtekintése
+mods.guide = Mod készítési útmutató
+mods.report = Hiba jelentése
+mods.openfolder = Mappa megnyitása
+mods.viewcontent = Tartalom megtekintése
 mods.reload = Újratöltés
 mods.reloadexit = A játék újraindul, hogy betöltődjenek a Modok.
 mod.installed = [[Telepítve]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aktív
 mod.disabled = [red]Inaktív
-mod.multiplayer.compatible = [gray]Többjátékos Kompatibilis
+mod.multiplayer.compatible = [gray]Többjátékos kompatibilis
 mod.disable = Letiltás
 mod.content = Tartalom:
 mod.delete.error = Nem lehet törölni a Modot. Lehet, hogy egy másik folyamat használja.
 
-mod.incompatiblegame = [red]Elavult Játék
+mod.incompatiblegame = [red]Elavult játék
 mod.incompatiblemod = [red]Inkompatibilis
-mod.blacklisted = [red]Nem Támogatott
-mod.unmetdependencies = [red]Teljesítetlen Függőségek
-mod.erroredcontent = [red]Hibás Tartalom
-mod.circulardependencies = [red]Körkörös Függőségek
-mod.incompletedependencies = [red]Hiányos Függőségek
+mod.blacklisted = [red]Nem támogatott
+mod.unmetdependencies = [red]Teljesítetlen függőségek
+mod.erroredcontent = [red]Hibás tartalom
+mod.circulardependencies = [red]Körkörös függőségek
+mod.incompletedependencies = [red]Hiányos függőségek
 
 mod.requiresversion.details = Szükséges játékverzió: [accent]{0}[]\nA játék ezen verziója elavult! Ez a Mod egy újabb verziót kíván (valószínűleg egy Béta, vagy egy Alfa kiadást) a működéshez.
 mod.outdatedv7.details = Ez a Mod nem kompatibilis a játék legújabb verziójával! A Mod készítőjének frissítenie kell azt és hozzá kell adnia a [accent]minGameVersion: 136[]-t a [accent]mod.json[] fájlhoz.
@@ -170,12 +170,12 @@ mod.noerrorplay = [red]Vannak hibás Modok.[] Kapcsold ki, vagy javítsd ki őke
 mod.nowdisabled = [red]A '{0}' Modnak nincs megfelelő függősége:[accent] {1}\n[lightgray]Ezeket előbb le kell tölteni.\nEz a Mod automatikusan törölve lesz.
 mod.enable = Engedélyezés
 mod.requiresrestart = A játék kilép a módosítások alkalmazásához.
-mod.reloadrequired = [red]Újratöltés Szükséges
-mod.import = Mod Importálása
-mod.import.file = Fájl Importálása
+mod.reloadrequired = [red]Újratöltés szükséges
+mod.import = Mod importálása
+mod.import.file = Fájl importálása
 mod.import.github = Importálás GitHub-ról
 mod.jarwarn = [scarlet]A JAR Modok eredendően nem biztonságosak.[]\nGyőződj meg arról, hogy ezt a Modot megbízható forrásból importálod!
-mod.item.remove = Ez az elem része a(z) [accent] '{0}'[] Modnak. A törléshez távolítsd el a Modot.
+mod.item.remove = Ez az elem része a(z)[accent] '{0}'[] Modnak. A törléséhez távolítsd el a Modot.
 mod.remove.confirm = Ez a Mod törölve lesz.
 mod.author = [lightgray]Készítő:[] {0}
 mod.missing = Ez a mentés nemrég törölt, vagy frissített Modokat tartalmaz. Elképzelhető, hogy nem fog működni. Biztosan betöltöd?\n[lightgray]Modok:\n{0}
@@ -187,24 +187,24 @@ about.button = Rólunk
 name = Név:
 noname = Előbb válassz egy[accent] nevet[].
 search = Keresés:
-planetmap = Bolygó Térkép
-launchcore = Mag Indítása
-filename = Fájl Név:
+planetmap = Bolygó térkép
+launchcore = Mag indítása
+filename = Fájl név:
 unlocked = Új tartalom kinyitva!
-available = Új kutatás áll rendelkezésre!
-unlock.incampaign = < Oldd fel a kampányban a részletekért >
-campaign.select = Válassz Kezdő Kampányt
+available = Új fejlesztés áll rendelkezésre!
+unlock.incampaign = < Oldd fel a hadjáratban a részletekért >
+campaign.select = Válassz kezdő hadjáratot
 campaign.none = [lightgray]Válassz egy bolygót a kezdéshez.\nEzt bármikor megváltoztathatod.
-campaign.erekir = Újabb, csiszoltabb tartalom. Általában lineáris kampány.\n\nSokkal bonyolultabb. Magasabb minőségű pályák és élmények.
-campaign.serpulo = Régebbi tartalom. A klasszikus élmények. Nyíltabb végű.\n\nPotenciálisan kiegyensúlyozatlan pályák és kampány. Kevésbé csiszolt.
+campaign.erekir = Újabb, csiszoltabb tartalom. Általában lineáris játékmenet.\n\nSokkal bonyolultabb. Magasabb minőségű pályák és élmények.
+campaign.serpulo = Régebbi tartalom. A klasszikus élmények. Nyíltabb végű.\n\nPotenciálisan kiegyensúlyozatlan pályák és hadjárat. Kevésbé csiszolt.
 completed = [accent]Kész
-techtree = Fejlődési Fa
-techtree.select = Fejlődési Fa Kiválasztás
+techtree = Fejlesztési fa
+techtree.select = Fejlesztési fa kiválasztása
 techtree.serpulo = Serpulo
 techtree.erekir = Erekir
 research.load = Betöltés
 research.discard = Eldobás
-research.list = [lightgray]Fedezd Fel:
+research.list = [lightgray]Fedezd fel:
 research = Felfedezés
 researched = [lightgray]{0} felfedezve.
 research.progress = {0}% kész
@@ -232,9 +232,9 @@ server.kicked.serverRestarting = Ez a szerver újraindul.
 server.versions = A te játékverziód:[accent] {0}[]\nA szerver verziója:[accent] {1}[]
 host.info = A [accent]hosztolás[] gomb szervert nyit a [scarlet]6567[] porton.\nEzen a [lightgray] wifin vagy a helyi hálózaton [] bárki láthatja a szervert a szerverlistáján.\n\nHa azt szeretnéd, hogy az emberek bárhonnan, IP-címmel csatlakozhassanak, [accent]port továbbítás[] szükséges.\n\n[lightgray]Megjegyzés: Ha valakinek problémái vannak a LAN-játékhoz való csatlakozással, győződj meg arról, hogy a tűzfal beállításaiban engedélyezted-e a Mindustry hozzáférését a helyi hálózathoz. Ne feledd, hogy a nyilvános hálózatok néha nem teszik lehetővé a szerverek felderítését.
 join.info = Itt megadhatsz egy [accent]szerver IP[]-címet a csatlakozáshoz, vagy felfedezhetsz [accent]helyi hálózati[], vagy [accent]globális[] szervereket a csatlakozáshoz.\nA LAN és WAN többjátékos mód is támogatott.\n\n[lightgray]Ha valakihez IP alapján szeretnél csatlakozni, akkor meg kell tudnod a partnered IP címét. Az IP-címeteket az interneten a "mi az IP-címem?" szövegre való kereséssel is megtalálhatjátok.
-hostserver = Többjátékos Játék Hosztolása
-invitefriends = Barátok Meghívása
-hostserver.mobile = Játék Hosztolása
+hostserver = Többjátékos játék hosztolása
+invitefriends = Barátok meghívása
+hostserver.mobile = Játék hosztolása
 host = Hosztolás
 hosting = [accent]Szerver megnyitása...
 hosts.refresh = Frissítés
@@ -245,25 +245,25 @@ hosts.none = [lightgray]Nem található helyi játék!
 host.invalid = [scarlet]Nem sikerült csatlakozni a hoszthoz.
 
 servers.local = Helyi Szerverek
-servers.local.steam = Nyitott Játékok & Helyi Szerverek
-servers.remote = Távoli Szerverek
-servers.global = Közösségi Szerverek
+servers.local.steam = Nyitott játékok és helyi szerverek
+servers.remote = Távoli szerverek
+servers.global = Közösségi szerverek
 
 servers.disclaimer = A közösségi szervereket [accent]nem[] a fejlesztő birtokolja és ellenőrzi.\n\nA szerverek tartalmazhatnak olyan felhasználók által létrehozott tartalmat, amely nem minden korosztály számára megfelelő.
 servers.showhidden = Rejtett Szerverek Megjelenítése
 server.shown = Látható
 server.hidden = Rejtett
 
-viewplayer = Játékos Figyelése: [accent]{0}
-trace = Játékos Követése
+viewplayer = Játékos figyelése: [accent]{0}
+trace = Játékos követése
 trace.playername = Játékos neve: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = Azonosító: [accent]{0}
 trace.language = Nyelv: [accent]{0}
-trace.mobile = Mobil Kliens: [accent]{0}
-trace.modclient = Nem Hivatalos Kliens: [accent]{0}
-trace.times.joined = Csatlakozások Száma: [accent]{0}
-trace.times.kicked = Kirúgások Száma: [accent]{0}
+trace.mobile = Mobil kliens: [accent]{0}
+trace.modclient = Nem hivatalos kliens: [accent]{0}
+trace.times.joined = Csatlakozások száma: [accent]{0}
+trace.times.kicked = Kirúgások száma: [accent]{0}
 trace.ips = IP-k:
 trace.names = Nevek:
 invalidid = Érvénytelen kliens azonosító (ID)! Küldj hibajelentést.
@@ -271,28 +271,28 @@ invalidid = Érvénytelen kliens azonosító (ID)! Küldj hibajelentést.
 player.ban = Kitiltás
 player.kick = Kirúgás
 player.trace = Követés
-player.admin = Admin Választás
-player.team = Csapat Váltás
+player.admin = Admin választás
+player.team = Csapat váltás
 
 server.bans = Tiltások
 server.bans.none = Nincsenek tiltott játékosok!
 server.admins = Adminok
 server.admins.none = Nem található admin!
-server.add = Szerver Hozzáadása
+server.add = Szerver hozzáadása
 server.delete = Biztosan törlöd ezt a szervert?
-server.edit = Szerver Szerkesztése
-server.outdated = [scarlet]Elavult Szerver![]
-server.outdated.client = [scarlet]Elavult Kliens![]
+server.edit = Szerver szerkesztése
+server.outdated = [scarlet]Elavult szerver![]
+server.outdated.client = [scarlet]Elavult kliens![]
 server.version = [gray]v{0} {1}
-server.custombuild = [accent]Saját Összeállítás
+server.custombuild = [accent]Saját összeállítás
 confirmban = Biztosan tiltod "{0}[white]" játékost?
 confirmkick = Biztosan kirúgod "{0}[white]" játékost?
 confirmunban = Biztosan újra engedélyezed ezt a játékost?
 confirmadmin = Biztosan előlépteted "{0}[white]" játékost adminná?
 confirmunadmin = Biztosan meg akarod szüntetni "{0}[white]" játékosnak az adminisztrátori státuszát?
-votekick.reason = Kiszavazás Oka
+votekick.reason = Kiszavazás oka
 votekick.reason.message = Valóban kiakarod szavazni "{0}[white]"-t?\nHa igen, írd le miért:
-joingame.title = Csatlakozás A Játékhoz
+joingame.title = Csatlakozás a játékhoz
 joingame.ip = Cím:
 disconnect = Lecsatlakozva.
 disconnect.error = Csatlakozási hiba.
@@ -302,36 +302,36 @@ disconnect.data = Nem sikerült betölteni a világ adatot!
 cantconnect = Nem sikerült csatlakozni a(z) ([accent]{0}[]) játékhoz.
 connecting = [accent]Csatlakozás...
 reconnecting = [accent]Újracsatlakozás...
-connecting.data = [accent]Világ Adat Betöltése...
+connecting.data = [accent]Világ adat betöltése...
 server.port = Port:
 server.addressinuse = A cím már használatban van!
 server.invalidport = Érvénytelen port!
 server.error = [scarlet]Hosztolási szerver hiba.
-save.new = Új Mentés
+save.new = Új mentés
 save.overwrite = Biztosan felülírod\nezt a mentést?
-save.nocampaign = A kampányból származó egyes mentési fájlok nem importálhatók.
+save.nocampaign = A hadjáratból származó egyes mentési fájlok nem importálhatók.
 overwrite = Felülírás
 save.none = Nem található mentés!
 savefail = Nem sikerült elmenteni a játékot!
 save.delete.confirm = Biztosan törlöd ezt a mentést?
 save.delete = Törlés
-save.export = Mentés Exportálása
+save.export = Mentés exportálása
 save.import.invalid = [accent]Ez a mentés érvénytelen!
 save.import.fail = [scarlet]Nem sikerült importálni a(z) [accent]{0}[] mentést
 save.export.fail = [scarlet]Nem sikerült exportálni a(z) [accent]{0}[] mentést
-save.import = Mentés Importálása
+save.import = Mentés importálása
 save.newslot = Mentés neve:
 save.rename = Átnevezés
 save.rename.text = Új név:
 selectslot = Válassz ki egy mentést.
 slot = [accent]Rekesz {0}
-editmessage = Üzenet Szerkesztése
+editmessage = Üzenet szerkesztése
 save.corrupted = A mentési fájl sérült vagy érvénytelen!
 empty = <üres>
 on = Be
 off = Ki
 save.search = Keresés a mentett játékok között...
-save.autosave = Automatikus Mentés: {0}
+save.autosave = Automatikus mentés: {0}
 save.map = Térkép: {0}
 save.wave = Hullám: {0}
 save.mode = Játékmód: {0}
@@ -344,25 +344,25 @@ view.workshop = Megtekintés a Steam Műhelyben
 workshop.listing = Steam Műhely listázás szerkesztése
 ok = OK
 open = Megnyitás
-customize = Szabályok Módosítása
+customize = Szabályok módosítása
 cancel = Mégsem
 command = Parancs
-command.queue = Sorbaállít
+command.queue = Sorba állít
 command.mine = Bányászás
 command.repair = Javítás
 command.rebuild = Újraépítés
-command.assist = Segítség Játékosnak
+command.assist = Segítség a játékosnak
 command.move = Mozgás
 command.boost = Erősítés
-command.enterPayload = Berakodás Rakományszállítóba
-command.loadUnits = Egységek Felvétele
-command.loadBlocks = Blokkok Felvétele
-command.unloadPayload = Kirakodás Rakományszállítóból
-stance.stop = Parancsok Visszavonása
+command.enterPayload = Berakodás rakományszállítóba
+command.loadUnits = Egységek felvétele
+command.loadBlocks = Blokkok felvétele
+command.unloadPayload = Kirakodás rakományszállítóból
+stance.stop = Parancsok visszavonása
 stance.shoot = Magatartás: Lövés
-stance.holdfire = Magatartás: Tüzet Szüntess
-stance.pursuetarget = Magatartás: Célpont Követése
-stance.patrol = Magatartás: Járőrözési Útvonal
+stance.holdfire = Magatartás: Tüzet szüntess
+stance.pursuetarget = Magatartás: Célpont követése
+stance.patrol = Magatartás: Járőrözési útvonal
 stance.ram = Magatartás: Ütközés\n[lightgray]Egyenes vonalú mozgás, nincs útkeresés
 openlink = Link megnyitása
 copylink = Link másolása
@@ -374,7 +374,7 @@ crash.none = Nem található összeomlási napló.
 crash.exported = Összeomlási napló exportálva.
 data.export = Adat Exportálása
 data.import = Adat Importálása
-data.openfolder = Adat Mappa Megnyitása
+data.openfolder = Adat mappa megnyitása
 data.exported = Adat exportálva.
 data.invalid = Ez nem egy érvényes játékadat.
 data.import.confirm = Külső adat importálása felülírja[scarlet] minden[] jelenlegi játékadatodat.\n[accent]Nem vonható vissza![]\n\nAmint kész az importálás, a játék azonnal kilép.
@@ -389,7 +389,7 @@ pausebuilding = Használd a(z) [accent][[{0}][] gombot, hogy megállítsd az ép
 resumebuilding = Használd a(z) [scarlet][[{0}][] gombot, hogy folytasd az építkezést.
 enablebuilding = Használd a(z) [scarlet][[{0}][] gombot, hogy jóváhagyd az építkezést.
 showui = A kezelőfelület elrejtve.\nNyomd meg a(z) [accent][[{0}][] gombot a kezelőfelület megjelenítéséhez.
-commandmode.name = [accent]Parancs Mód
+commandmode.name = [accent]Parancs mód
 commandmode.nounits = [nincs egység]
 wave = [accent]{0}. Hullám
 wave.cap = [accent]{0}./{1} Hullám
@@ -403,24 +403,24 @@ wave.enemycore = [accent]{0}db[lightgray] Ellenséges Mag
 wave.enemy = [lightgray]{0}db Ellenség Maradt
 wave.guardianwarn = Egy Őrző érkezik [accent]{0}[] hullám múlva.
 wave.guardianwarn.one = Egy Őrző érkezik [accent]{0}[] hullám múlva.
-loadimage = Kép Betöltése
-saveimage = Kép Mentése
+loadimage = Kép betöltése
+saveimage = Kép mentése
 unknown = Ismeretlen
 custom = Egyedi
 builtin = Beépített
 map.delete.confirm = Biztosan törlöd ezt a pályát? Ez a művelet nem vonható vissza!
-map.random = [accent]Véletlenszerű Pálya
+map.random = [accent]Véletlenszerű pálya
 map.nospawn = Ez a pálya nem rendelkezik Maggal, amellyel a játékos kezdhet! Adj hozzá egy {0} Magot ehhez a pályához a szerkesztőben!
 map.nospawn.pvp = Ezen a pályán nincs ellenséges Mag, amellyel a másik csapat kezdhet! Adj hozzá egy [scarlet]nem narancssárga[] Magot ehhez a pályához a szerkesztőben!
 map.nospawn.attack = Ezen a pályán nincs ellenséges Mag! Adj hozzá egy {0} Magot ehhez a pályához a szerkesztőben!
 map.invalid = Hiba történt a pálya betöltésekor: sérült vagy érvénytelen fájl.
-workshop.update = Elem Frissítése
+workshop.update = Elem frissítése
 workshop.error = Hiba történt a Steam Műhely részleteinek lekérdezésekor: {0}
 map.publish.confirm = Biztos, hogy közzéteszed ezt a pályát?\n\n[lightgray]Győződj meg róla, hogy elfogadtad a Steam Műhely EULA-t, különben a pályáid nem jelennek meg!
 workshop.menu = Válaszd ki, hogy mit szeretnél csinálni ezzel az elemmel.
-workshop.info = Elem Infó
+workshop.info = Elem infó
 changelog = Változásnapló (opcionális):
-updatedesc = Cím & Leírás Felülírása
+updatedesc = Cím és leírás felülírása
 eula = Steam EULA
 missing = Ezt az elemet törölték vagy áthelyezték.\n[lightgray]A Steam Műhely adatait automatikusan leválasztották.
 publishing = [accent]Publikálás...
@@ -431,11 +431,11 @@ steam.error = Nem sikerült inicializálni a Steam szolgáltatásokat.\nHiba: {0
 editor.planet = Bolygó:
 editor.sector = Szektor:
 editor.seed = Seed:
-editor.cliffs = Falak Sziklákká
+editor.cliffs = Falak sziklákká
 editor.brush = Méret
-editor.openin = Megnyitás A Szerkesztőben
-editor.oregen = Érc Generálás
-editor.oregen.info = Érc Generálás:
+editor.openin = Megnyitás a szerkesztőben
+editor.oregen = Érc generálás
+editor.oregen.info = Érc generálás:
 editor.mapinfo = Általános
 editor.author = Készítő:
 editor.description = Leírás:
@@ -444,17 +444,17 @@ editor.waves = Hullámok:
 editor.rules = Szabályok:
 editor.generation = Generálás:
 editor.objectives = Célok
-editor.locales = Helyi Csomagok
-editor.ingame = Szerkesztés A Játékban
-editor.playtest = Teszt A Játékban
-editor.publish.workshop = Közzététel A Steam Műhelyben
-editor.newmap = Új Pálya
+editor.locales = Helyi csomagok
+editor.ingame = Szerkesztés a játékban
+editor.playtest = Teszt a játékban
+editor.publish.workshop = Közzététel a Steam Műhelyben
+editor.newmap = Új pálya
 editor.center = Ugrás középre
 editor.search = Pályák keresése...
-editor.filters = Pályák Szűrése
+editor.filters = Pályák szűrése
 editor.filters.mode = Játékmódok:
-editor.filters.type = Pálya Típus:
-editor.filters.search = Keresés Ebben:
+editor.filters.type = Pálya típus:
+editor.filters.search = Keresés ebben:
 editor.filters.author = Készítő
 editor.filters.description = Leírás
 editor.shiftx = X eltolás
@@ -470,7 +470,7 @@ waves.shields = pajzs/hullám
 waves.to = -
 waves.spawn = Kezdőpont:
 waves.spawn.all = <mind>
-waves.spawn.select = Kezdőpont Kiválasztása
+waves.spawn.select = Kezdőpont kiválasztása
 waves.spawn.none = [scarlet]nem találhatóak kezdőpontok a pályán
 waves.max = max egységek
 waves.guardian = Őrző
@@ -482,15 +482,15 @@ waves.load = Másolás a vágólapról
 waves.invalid = Nem lehet beilleszteni a vágólapról.
 waves.copied = Hullámok másolva.
 waves.none = Nincs ellenség megadva.\nVedd figyelembe, hogy az üresen hagyott hullám elrendezések automatikusan lecserélődnek az alapértelmezett elrendezésre.
-waves.sort = Rendezési Szempont
-waves.sort.reverse = Rendezés Visszafelé
+waves.sort = Rendezési szempont
+waves.sort.reverse = Rendezés visszafelé
 waves.sort.begin = Indul
 waves.sort.health = Élet
 waves.sort.type = Típus
 waves.search = Hullám keresése...
-waves.filter = Egység Szűrő
-waves.units.hide = Mindent Elrejt
-waves.units.show = Mindent Mutat
+waves.filter = Egység szűrő
+waves.units.hide = Mindent elrejt
+waves.units.show = Mindent mutat
 
 #these are intentionally in lower case
 wavemode.counts = típusokra bontva
@@ -501,10 +501,10 @@ editor.default = [lightgray]<Alapbeállítás>
 details = Részletek...
 edit = Szerkesztés...
 variables = Változók
-logic.globals = Beépített Változók
+logic.globals = Beépített változók
 editor.name = Név:
-editor.spawn = Egység Megidézése
-editor.removeunit = Egység Eltávolítása
+editor.spawn = Egység megidézése
+editor.removeunit = Egység eltávolítása
 editor.teams = Csapatok
 editor.errorload = Hiba a fájl betöltése közben.
 editor.errorsave = Hiba a fájl mentése közben.
@@ -516,37 +516,37 @@ editor.errorname = A pályának nincs neve. Mentést próbálsz betölteni?
 editor.errorlocales = Hiba az érvénytelen Helyi Csomagok beolvasásakor.
 editor.update = Frissítés
 editor.randomize = Véletlenszerű
-editor.moveup = Mozgás Fel
-editor.movedown = Mozgás Le
+editor.moveup = Mozgás felfelé
+editor.movedown = Mozgás lefelé
 editor.copy = Másolás
 editor.apply = Alkalmazás
 editor.generate = Generálás
-editor.sectorgenerate = Szektor Generálása
+editor.sectorgenerate = Szektor generálása
 editor.resize = Átméretezés
-editor.loadmap = Pálya Betöltése
-editor.savemap = Pálya Mentése
+editor.loadmap = Pálya betöltése
+editor.savemap = Pálya mentése
 editor.savechanges = [scarlet]Nem mentett módosításaid vannak!\n\n[]Szeretnéd elmenteni őket?
 editor.saved = Mentve!
 editor.save.noname = A pályádnak nincs neve! Állíts be egyet a 'pálya infó' menüben.
 editor.save.overwrite = A pályád felülír egy beépített pályát! Válassz egy másik nevet az 'pálya infó' menüben!
 editor.import.exists = [scarlet]Nem lehet importálni:[] Már létezik "{0}" nevű beépített pálya!
 editor.import = Importálás...
-editor.importmap = Pálya Importálása
+editor.importmap = Pálya importálása
 editor.importmap.description = Létező pálya importálása
-editor.importfile = Fájl Importálása
+editor.importfile = Fájl importálása
 editor.importfile.description = Egy külső pálya fájl importálása
-editor.importimage = Képfájl Importálása
+editor.importimage = Képfájl importálása
 editor.importimage.description = Egy külső pálya képfájl importálása
 editor.export = Exportálás...
-editor.exportfile = Fájl Exportálása
+editor.exportfile = Fájl exportálása
 editor.exportfile.description = Exportálás egy pálya fájlba
-editor.exportimage = Domborzat Kép Exportálása
+editor.exportimage = Domborzat kép exportálása
 editor.exportimage.description = Csak alapvető domborzatot tartalmazó képfájl exportálása
-editor.loadimage = Domborzat Importálása
-editor.saveimage = Domborzat Exportálása
+editor.loadimage = Domborzat importálása
+editor.saveimage = Domborzat exportálása
 editor.unsaved = Biztos ki akarsz lépni?\n[scarlet]A nem mentett módosításaid elvesznek!
-editor.resizemap = Pálya Átméretezése
-editor.mapname = Pálya Neve:
+editor.resizemap = Pálya átméretezése
+editor.mapname = Pálya neve:
 editor.overwrite = [accent]Vigyázz!\nEzzel felülírsz egy már létező pályát.
 editor.overwrite.confirm = [scarlet]Vigyázz![] Ilyen nevű pálya már létezik:\n"[accent]{0}[]"\nBiztosan felülírod?
 editor.exists = Ilyen nevű pálya már létezik.
@@ -569,24 +569,24 @@ toolmode.fillerase.description = Törölje az azonos típusú blokkokat.
 toolmode.drawteams = Csoportok Rajzolása
 toolmode.drawteams.description = Csoportok rajzolása blokkok helyett.
 #unused
-toolmode.underliquid = Folyadékok Alá
+toolmode.underliquid = Folyadékok alá
 toolmode.underliquid.description = Padlók rajzolása a folyadék blokkok alá.
 
 filters.empty = [lightgray]Még nincs szűrő! Adj hozzá egyet a lenti gombra kattintva!
 
 filter.distort = Torzítás
 filter.noise = Zaj
-filter.enemyspawn = Ellenséges Kezdőpont Kiválasztása
-filter.spawnpath = Útvonal A Kezdőponthoz
-filter.corespawn = Mag Kiválasztása
+filter.enemyspawn = Ellenséges kezdőpont kiválasztása
+filter.spawnpath = Útvonal a kezdőponthoz
+filter.corespawn = Mag kiválasztása
 filter.median = Medián
-filter.oremedian = Érc Medián
+filter.oremedian = Érc medián
 filter.blend = Vegyes
-filter.defaultores = Alapértelmezett Ércek
+filter.defaultores = Alapértelmezett ércek
 filter.ore = Érc
-filter.rivernoise = Vízfolyás Zaj
+filter.rivernoise = Vízfolyás zaj
 filter.mirror = Tükrözés
-filter.clear = Blokkok Törlése
+filter.clear = Blokkok törlése
 filter.option.ignore = Elutasít
 filter.scatter = Szórás
 filter.terrain = Domborzat
@@ -604,17 +604,17 @@ filter.option.rotate = Forgatás
 filter.option.amount = Mennyiség
 filter.option.block = Blokk
 filter.option.floor = Talaj
-filter.option.flooronto = Cél Talaj
+filter.option.flooronto = Cél talaj
 filter.option.target = Cél
 filter.option.replacement = Csere
 filter.option.wall = Fal
 filter.option.ore = Érc
-filter.option.floor2 = Másodlagos Talaj
-filter.option.threshold2 = Másodlagos Küszöbérték
+filter.option.floor2 = Másodlagos talaj
+filter.option.threshold2 = Másodlagos küszöbérték
 filter.option.radius = Sugár
 filter.option.percentile = Arány
 
-locales.info = Itt adhatsz hozzá különböző Helyi Csomagokat a térképedhez. A Helyi Csomagok minden tulajdonságának van egy neve és egy értéke. Ezeket a tulajdonságokat a Világ Processzorok és a Célkitűzések azok neveivel használhatják. Támogatják a szövegformázást (a helyőrzőket az aktuális értékükkel helyettesítik).\n\n[cyan]Példa tulajdonság:\n[]name: [accent]időzítő[]\nvalue: [accent]Példa időzítő, hátralévő idő: {0}[]\n\n[cyan]Használat:\n[]Beállítás Célkitűzés szövegeként: [accent]@időzítő\n\n[]Írja be egy Világ Processzorba:\n[accent]localeprint "időzítő"\nformat time\n[gray](ahol az idő egy külön kiszámított változó)
+locales.info = Itt adhatsz hozzá különböző Helyi Csomagokat a pályádhoz. A Helyi Csomagok minden tulajdonságának van egy neve és egy értéke. Ezeket a tulajdonságokat a Világ Processzorok és a Célkitűzések azok neveivel használhatják. Támogatják a szövegformázást (a helyőrzőket az aktuális értékükkel helyettesítik).\n\n[cyan]Példa tulajdonság:\n[]name: [accent]időzítő[]\nvalue: [accent]Példa időzítő, hátralévő idő: {0}[]\n\n[cyan]Használat:\n[]Beállítás Célkitűzés szövegeként: [accent]@időzítő\n\n[]Írja be egy Világ Processzorba:\n[accent]localeprint "időzítő"\nformat time\n[gray](ahol az idő egy külön kiszámított változó)
 locales.deletelocale = Biztos, hogy törölni akarod ezt a Helyi Csomagot?
 locales.applytoall = Változások alkalmazása az összes Helyi Csomagra
 locales.addtoother = Hozzáadás más Helyi Csomaghoz
@@ -622,7 +622,7 @@ locales.rollback = Visszaállítás az utoljára elfogadottra
 locales.filter = Tulajdonság szűrő
 locales.searchname = Név keresés...
 locales.searchvalue = Érték keresés...
-locales.searchlocale = Helyi Csomag keresés...
+locales.searchlocale = Helyi csomag keresés...
 locales.byname = Név szerint
 locales.byvalue = Érték szerint
 locales.showcorrect = Azon tulajdonságok megjelenítése, amelyek mindenhol egyedi értékekkel rendelkeznek és jelen vannak minden Helyi Csomagban.
@@ -630,13 +630,13 @@ locales.showmissing = Azon tulajdonságok megjelenítése, amelyek hiányoznak B
 locales.showsame = Azon tulajdonságok megjelenítése, amelyek azonos értékekkel rendelkeznek bizonyos Helyi Csomagokban
 locales.viewproperty = Megtekintés minden Helyi Csomagban
 locales.viewing = "{0}" tulajdonság megtekintése
-locales.addicon = Ikon Hozzáadása
+locales.addicon = Ikon hozzáadása
 
 width = Szélesség:
 height = Magasság:
 menu = Menü
 play = Játék
-campaign = Kampány
+campaign = Hadjárat
 load = Betöltés
 save = Mentés
 fps = FPS: {0}
@@ -649,7 +649,7 @@ settings = Beállítások
 tutorial = Oktatóanyag
 tutorial.retake = Oktatóanyag újrajátszása
 editor = Szerkesztő
-mapeditor = Pálya Szerkesztő
+mapeditor = Pálya szerkesztő
 
 abandon = Feladás
 abandon.text = Ez a szektor és minden nyersanyaga az ellenség kezére kerül.
@@ -657,8 +657,8 @@ locked = Lezárva
 complete = [lightgray]Feltételek:
 requirement.wave = Juss el a {0}. hullámig a(z) {1} szektorban
 requirement.core = Pusztítsd el az ellenséges Magot a(z) {0} szektorban
-requirement.research = Fedezd Fel: {0}
-requirement.produce = Gyártsd Le: {0}
+requirement.research = Fedezd fel: {0}
+requirement.produce = Gyártsd le: {0}
 requirement.capture = Foglald el a(z) {0} szektort
 requirement.onplanet = Szektor elfoglalása a(z) {0}-n
 requirement.onsector = Landolj a(z) {0} szektorban
@@ -666,20 +666,20 @@ launch.text = Indítás
 research.multiplayer = Csak a hoszt fedezhet fel nyersanyagokat.
 map.multiplayer = Csak a hoszt tekintheti meg a szektorokat.
 uncover = Felfedés
-configure = Rakomány Szerkesztése
+configure = Rakomány szerkesztése
 
 objective.research.name = Kutatás
 objective.produce.name = Megszerzés
-objective.item.name = Nyersanyag Megszerzése
-objective.coreitem.name = Mag Nyersanyag
-objective.buildcount.name = Építés Számláló
-objective.unitcount.name = Egység Számláló
-objective.destroyunits.name = Egység Megsemmisítése
+objective.item.name = Nyersanyag megszerzése
+objective.coreitem.name = Mag nyersanyag
+objective.buildcount.name = Építés számláló
+objective.unitcount.name = Egység számláló
+objective.destroyunits.name = Egység megsemmisítése
 objective.timer.name = Időzítő
-objective.destroyblock.name = Blokk Megsemmisítése
-objective.destroyblocks.name = Blokkok Megsemmisítése
-objective.destroycore.name = Mag Megsemmisítése
-objective.commandmode.name = Parancs Mód
+objective.destroyblock.name = Blokk megsemmisítése
+objective.destroyblocks.name = Blokkok megsemmisítése
+objective.destroycore.name = Mag megsemmisítése
+objective.commandmode.name = Parancs mód
 objective.flag.name = Jelölő
 
 marker.shapetext.name = Szövegforma
@@ -694,18 +694,18 @@ marker.outline = Körvonal
 
 objective.research = [accent]Fejleszd ki:\n[]{0}[lightgray]{1}
 objective.produce = [accent]Termelj:\n[]{0}[lightgray]{1}
-objective.destroyblock = [accent]Semmisítsd Meg:\n[]{0}[lightgray]{1}
-objective.destroyblocks = [accent]Semmisítsd Meg: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
+objective.destroyblock = [accent]Semmisítsd meg:\n[]{0}[lightgray]{1}
+objective.destroyblocks = [accent]Semmisítsd meg: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
 objective.item = [accent]Termelj: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
-objective.coreitem = [accent]Szállítás A Magba:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Szállítás a Magba:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
 objective.build = [accent]Építs: [][lightgray]{0}[]db\n{1}[lightgray]{2}
-objective.buildunit = [accent]Gyárts Egységeket: [][lightgray]{0}[]db\n{1}[lightgray]{2}
-objective.destroyunits = [accent]Semmisíts Meg: [][lightgray]{0}[]db Egységet
+objective.buildunit = [accent]Gyárts egységeket: [][lightgray]{0}[]db\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Semmisíts meg: [][lightgray]{0}[]db Egységet
 objective.enemiesapproaching = [accent]Ellenség érkezik: [lightgray]{0}[] múlva
 objective.enemyescelating = [accent]Az ellenséges gyártás fokozódik: [lightgray]{0}[] múlva
 objective.enemyairunits = [accent]Az ellenséges légi egységek gyártása elkezdődik: [lightgray]{0}[] múlva
 objective.destroycore = [accent]Semmisítsd Meg Az Ellenséges Magot
-objective.command = [accent]Irányítsd Az Egységeket
+objective.command = [accent]Irányítsd az egységeket
 objective.nuclearlaunch = [accent]⚠ Nukleáris kilövés észlelve: [lightgray]{0}
 
 announce.nuclearstrike = [red]⚠ BEÉRKEZŐ NUKLEÁRIS CSAPÁS ⚠\n[lightgray]Azonnal építs tartalék Magokat!
@@ -713,14 +713,14 @@ announce.nuclearstrike = [red]⚠ BEÉRKEZŐ NUKLEÁRIS CSAPÁS ⚠\n[lightgray]
 loadout = Rakomány
 resources = Nyersanyagok
 resources.max = Maximum
-bannedblocks = Tiltott Blokkok
+bannedblocks = Tiltott blokkok
 objectives = Feladatok
-bannedunits = Tiltott Egységek
-bannedunits.whitelist = Tiltott Egységek Fehérlistára
-bannedblocks.whitelist = Tiltott Blokkok Fehérlistára
-addall = Összes Hozzáadása
+bannedunits = Tiltott egységek
+bannedunits.whitelist = Tiltott egységek fehérlistára
+bannedblocks.whitelist = Tiltott blokkok fehérlistára
+addall = Összes hozzáadása
 launch.from = Indítás a(z) [accent]{0} szektorból
-launch.capacity = Nyersanyag Kapacitás Az Indításhoz: [accent]{0}
+launch.capacity = Nyersanyag kapacitás az indításhoz: [accent]{0}
 launch.destination = Úticél: {0}
 configure.invalid = A mennyiségnek 0 és {0} között kell lennie.
 add = Hozzáadás...
@@ -761,8 +761,8 @@ sectors.resume = Folytatás
 sectors.launch = Indítás
 sectors.select = Kiválasztás
 sectors.nonelaunch = [lightgray]semmi (nap)
-sectors.rename = Szektor Átnevezése
-sectors.enemybase = [scarlet]Ellenséges Bázis
+sectors.rename = Szektor átnevezése
+sectors.enemybase = [scarlet]Ellenséges bázis
 sectors.vulnerable = [scarlet]Sebezhető
 sectors.underattack = [scarlet]Támadás alatt! [accent]{0}% sérült
 sectors.underattack.nodamage = [scarlet]Nincs meghódítva
@@ -770,17 +770,17 @@ sectors.survives = [accent]Túlél {0} hullámot
 sectors.go = Utazás
 sector.abandon = Elhagy
 sector.abandon.confirm = Ennek a szektornak a Magja(i) önmegsemmisítésre kerülnek.\nFolytatod?
-sector.curcapture = A Szektor Elfoglalva
-sector.curlost = A Szektor Elveszett
-sector.missingresources = [scarlet]Nincs Elég Nyersanyag
+sector.curcapture = A szektor elfoglalva
+sector.curlost = A szektor elveszett
+sector.missingresources = [scarlet]Nincs elég nyersanyag
 sector.attacked = A(z) [accent]{0}[white] szektor támadás alatt áll!
-sector.lost = A(z) [accent]{0}[white] Szektor Elveszett!
-sector.capture = A(z) [accent]{0}[white] Szektor Elfoglalva!
-sector.capture.current = A Szektor Elfoglalva!
-sector.changeicon = Ikon Módosítása
-sector.noswitch.title = A Szektorváltás Nem Lehetséges
+sector.lost = A(z) [accent]{0}[white] szektor elveszett!
+sector.capture = A(z) [accent]{0}[white] szektor elfoglalva!
+sector.capture.current = A szektor elfoglalva!
+sector.changeicon = Ikon módosítása
+sector.noswitch.title = A szektorváltás nem lehetséges
 sector.noswitch = Nem válthatsz szektort, amíg egy meglévő szektor támadás alatt áll.\n\nSzektor: [accent]{0}[] a(z) [accent]{1}[]-n
-sector.view = A Szektor Megtekintése
+sector.view = A szektor megtekintése
 
 threat.low = Alacsony
 threat.medium = Közepes
@@ -875,7 +875,7 @@ status.muddy.name = Sáros
 status.melting.name = Olvadó
 status.sapped.name = Kiszáradt
 status.electrified.name = Elektromos
-status.spore-slowed.name = Spóra Lassított
+status.spore-slowed.name = Spóra lassított
 status.tarred.name = Kátrányozott
 status.overdrive.name = Túlhajtás
 status.overclock.name = Túlhúzás
@@ -885,7 +885,7 @@ status.unmoving.name = Mozdulatlan
 status.boss.name = Őrző
 
 settings.language = Nyelvek
-settings.data = Játék Adatok
+settings.data = Játék adatok
 settings.reset = Alapértelmezett
 settings.rebind = Újrakötés
 settings.resetKey = Visszaállítás
@@ -893,15 +893,15 @@ settings.controls = Irányítás
 settings.game = Játék
 settings.sound = Hangok
 settings.graphics = Grafika
-settings.cleardata = Játék Adatok Törlése...
+settings.cleardata = Játék adatok törlése...
 settings.clear.confirm = Biztosan törlöd ezeket az adatokat?\nA műveletet nem lehet visszavonni!
 settings.clearall.confirm = [scarlet] FIGYELEM! []\nEz törli az összes adatot, beleértve a mentéseket, pályákat, felfedezéseket és a billentyű beállításokat.\nAz 'OK' gomb megnyomásával a játék minden adatot töröl és automatikusan kilép.
 settings.clearsaves.confirm = Biztosan törlöd az összes mentést?
-settings.clearsaves = Mentések Törlése
-settings.clearresearch = Kutatás Törlése
+settings.clearsaves = Mentések törlése
+settings.clearresearch = Kutatás törlése
 settings.clearresearch.confirm = Biztosan törlöd az összes kutatást?
-settings.clearcampaignsaves = Kampány Mentések Törlése
-settings.clearcampaignsaves.confirm = Biztosan törlöd az összes kampány mentést?
+settings.clearcampaignsaves = Hadjárat mentések törlése
+settings.clearcampaignsaves.confirm = Biztosan törlöd az összes hadjárat mentést?
 paused = [accent]< Megállítva >
 clear = Törlés
 banned = [scarlet]Kitiltva
@@ -920,59 +920,59 @@ stat.showinmap = <pálya betöltése a megtekintéshez>
 stat.description = Rendeltetés
 stat.input = Bemenet
 stat.output = Kimenet
-stat.maxefficiency = Maximális Hatékonyság
+stat.maxefficiency = Maximális hatékonyság
 stat.booster = Erősítő
-stat.tiles = Szükséges Talaj
-stat.affinities = Módosító Körülmények
+stat.tiles = Szükséges talaj
+stat.affinities = Módosító körülmények
 stat.opposites = Eltérések
-stat.powercapacity = Elektromos Kapacitás
+stat.powercapacity = Elektromos kapacitás
 stat.powershot = Áram/Lövés
 stat.damage = Sebzés
-stat.targetsair = Repülő Célpontok
-stat.targetsground = Földi Célpontok
-stat.itemsmoved = Haladási Sebesség
-stat.launchtime = Kilövések Közti Idő
+stat.targetsair = Repülő célpontok
+stat.targetsground = Földi célpontok
+stat.itemsmoved = Haladási sebesség
+stat.launchtime = Kilövések közti idő
 stat.shootrange = Hatótáv
 stat.size = Méret
 stat.displaysize = Felbontás
-stat.liquidcapacity = Folyadék Kapacitás
-stat.powerrange = Áram Hatótáv
-stat.linkrange = Kapcsolat Hatótáv
+stat.liquidcapacity = Folyadék kapacitás
+stat.powerrange = Áram hatótáv
+stat.linkrange = Kapcsolat hatótáv
 stat.instructions = Instrukciók
-stat.powerconnections = Maximális Kapcsolat
+stat.powerconnections = Maximális kapcsolat
 stat.poweruse = Áramhasználat
 stat.powerdamage = Áram/Sebzés
-stat.itemcapacity = Nyersanyag Kapacitás
-stat.memorycapacity = Memória Méret
-stat.basepowergeneration = Alap Áramtermelés
-stat.productiontime = Gyártás Hossza
-stat.repairtime = Teljes Javítás Hossza
-stat.repairspeed = Javítási Sebesség
+stat.itemcapacity = Nyersanyag kapacitás
+stat.memorycapacity = Memória méret
+stat.basepowergeneration = Alap áramtermelés
+stat.productiontime = Gyártási idő
+stat.repairtime = Teljes javítási idő
+stat.repairspeed = Javítási sebesség
 stat.weapons = Fegyverek
 stat.bullet = Töltény
-stat.moduletier = Modul Szintje
-stat.unittype = Egység Típus
+stat.moduletier = Modul szintje
+stat.unittype = Egység típus
 stat.speedincrease = Gyorsítás
 stat.range = Hatótáv
 stat.drilltier = Kitermelhető
-stat.drillspeed = Alap Kitermelési Sebesség
-stat.boosteffect = Erősítés Hatása
-stat.maxunits = Maximális Aktív Egység
+stat.drillspeed = Alap kitermelési sebesség
+stat.boosteffect = Erősítés hatása
+stat.maxunits = Maximális aktív egység
 stat.health = Életpontok
 stat.armor = Páncél
-stat.buildtime = Építés Időtartama
-stat.maxconsecutive = Maximum Egymást Követő
-stat.buildcost = Építés Ára
+stat.buildtime = Építés időtartama
+stat.maxconsecutive = Maximum egymást követő
+stat.buildcost = Építési költsége
 stat.inaccuracy = Pontatlanság
 stat.shots = Lövések
-stat.reload = Tüzelési Sebesség
+stat.reload = Tüzelési sebesség
 stat.ammo = Lőszer
-stat.shieldhealth = Pajzs Élete
-stat.cooldowntime = Újratöltés Időtartama
+stat.shieldhealth = Pajzs élete
+stat.cooldowntime = Újratöltés időtartama
 stat.explosiveness = Robbanékonyság
-stat.basedeflectchance = Alap Hárítási Esély
-stat.lightningchance = Villámlás Esélye
-stat.lightningdamage = Villámlás Sebzése
+stat.basedeflectchance = Alap hárítási esély
+stat.lightningchance = Villámlás esélye
+stat.lightningdamage = Villámlás sebzése
 stat.flammability = Éghetőség
 stat.radioactivity = Radioaktivitás
 stat.charge = Töltés
@@ -987,42 +987,42 @@ stat.payloadcapacity = Rakomány kapacitás
 stat.abilities = Képességek
 stat.canboost = Erősíthető
 stat.flying = Repül
-stat.ammouse = Lőszer Használat
-stat.damagemultiplier = Sebzés Szorzó
-stat.healthmultiplier = Életerő Szorzó
-stat.speedmultiplier = Sebesség Szorzó
-stat.reloadmultiplier = Újratöltés Szorzó
-stat.buildspeedmultiplier = Építési Sebesség Szorzó
+stat.ammouse = Lőszer használat
+stat.damagemultiplier = Sebzés szorzó
+stat.healthmultiplier = Életerő szorzó
+stat.speedmultiplier = Sebesség szorzó
+stat.reloadmultiplier = Újratöltés szorzó
+stat.buildspeedmultiplier = Építési sebesség szorzó
 stat.reactive = Reakciók
 stat.immunities = Immunitások
 stat.healing = Gyógyulás
 
 ability.forcefield = Erőtér
-ability.repairfield = Javító Mező
-ability.statusfield = Állapot Mező
+ability.repairfield = Javító mező
+ability.statusfield = Állapot mező
 ability.unitspawn = Gyár
-ability.shieldregenfield = Pajzs Regeneráló Mező
+ability.shieldregenfield = Pajzs regeneráló mező
 ability.movelightning = Villámcsapás
-ability.shieldarc = Pajzs Ív
-ability.suppressionfield = Javítás Elnyomás
-ability.energyfield = Energia Mező
-ability.energyfield.sametypehealmultiplier = [lightgray]Azonos Típusú Gyógyítás: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Célpontok Maximális Száma: [white]{0}
+ability.shieldarc = Pajzs ív
+ability.suppressionfield = Javítás elnyomás
+ability.energyfield = Energia mező
+ability.energyfield.sametypehealmultiplier = [lightgray]Azonos típusú gyógyítás: [white]{0}%
+ability.energyfield.maxtargets = [lightgray]Célpontok maximális száma: [white]{0}
 ability.regen = Regeneráció
 
-bar.onlycoredeposit = Csak A Mag Elhelyezése Megengedett
-bar.drilltierreq = Erősebb Fúró/Vágó Szükséges
-bar.noresources = Hiányzó Nyersanyagok
-bar.corereq = Mag Szükséges
-bar.corefloor = Mag Zónacsempe Szükséges
-bar.cargounitcap = A Rakományszállító Egység Teljes Kapacitáson
-bar.drillspeed = Termelési Sebesség: {0}/s
-bar.pumpspeed = Termelési Sebesség: {0}/s
+bar.onlycoredeposit = Csak a Mag elhelyezése megengedett
+bar.drilltierreq = Erősebb Fúró/Vágó szükséges
+bar.noresources = Hiányzó nyersanyagok
+bar.corereq = Mag szükséges
+bar.corefloor = Mag zónacsempe szükséges
+bar.cargounitcap = A rakományszállító egység teljes kapacitáson
+bar.drillspeed = Termelési sebesség: {0}/s
+bar.pumpspeed = Termelési sebesség: {0}/s
 bar.efficiency = Hatásfok: {0}%
 bar.boost = Erősítés: +{0}%
 bar.powerbalance = Áram: {0}/s
 bar.powerstored = Tárolt: {0}/{1}
-bar.poweramount = Áram Kimenet: {0}
+bar.poweramount = Áram kimenet: {0}
 bar.poweroutput = Áramtermelés: {0}
 bar.powerlines = Kapcsolatok: {0}/{1}
 bar.items = Nyersanyagok: {0}
@@ -1036,15 +1036,15 @@ bar.heatpercent = Hő: {0} ({1}%)
 bar.power = Áram
 bar.progress = Építés állapota
 bar.loadprogress = Állapot
-bar.launchcooldown = Lehűlés Indítása
+bar.launchcooldown = Lehűlés indítása
 bar.input = Bemenet
 bar.output = Kimenet
 bar.strength = [stat]{0}[lightgray]x erő
 
-units.processorcontrol = [lightgray]Processzor Vezérelt
+units.processorcontrol = [lightgray]Processzor vezérelt
 
 bullet.damage = [stat]{0}[lightgray] sebzés
-bullet.splashdamage = [stat]{0}[lightgray] területi sebzés ~[stat] {1}[lightgray] mező
+bullet.splashdamage = [stat]{0}[lightgray] területi sebzés ~[stat] {1}[lightgray] csempe
 bullet.incendiary = [stat]gyújtó
 bullet.homing = [stat]nyomkövető
 bullet.armorpierce = [stat]páncéltörő
@@ -1063,7 +1063,7 @@ bullet.multiplier = [stat]{0}[lightgray]x lövedék szorzó
 bullet.reload = [stat]{0}[lightgray]x tüzelési sebesség
 bullet.range = [stat]{0}[lightgray] csempe tartomány
 
-unit.blocks = blokk
+unit.blocks = csempe (blokk)
 unit.blockssquared = blokk²
 unit.powersecond = áram egység/mp
 unit.tilessecond = csempe/mp
@@ -1092,102 +1092,102 @@ category.liquids = Folyadékok
 category.items = Nyersanyagok
 category.crafting = Bemenet/Kimenet
 category.function = Funkció
-category.optional = Lehetséges Erősítés
-setting.skipcoreanimation.name = Mag Indítás/Leszállás Animáció Kihagyása
-setting.landscape.name = Fekvő Mód Zárolása
+category.optional = Lehetséges erősítés
+setting.skipcoreanimation.name = Mag indítás/leszállás animáció kihagyása
+setting.landscape.name = Fekvő mód zárolása
 setting.shadows.name = Árnyékok
-setting.blockreplace.name = Automatikus Blokk Javaslatok
-setting.linear.name = Lineáris Szűrés
+setting.blockreplace.name = Automatikus blokk javaslatok
+setting.linear.name = Lineáris szűrés
 setting.hints.name = Tanácsok
-setting.logichints.name = Logikai Tanácsok
-setting.backgroundpause.name = Szüneteltetés A Háttérben
-setting.buildautopause.name = Automatikus Szünet Építéskor
-setting.doubletapmine.name = Bányászás Dupla-Koppintással
-setting.commandmodehold.name = Tartsd Lenyomva A Parancs Módhoz
-setting.distinctcontrolgroups.name = Egységenként Legfeljebb Egy Ellenőrző Csoport
-setting.modcrashdisable.name = Modok Letiltása Indítási Összeomláskor
-setting.animatedwater.name = Animált Felületek
-setting.animatedshields.name = Animált Pajzsok
-setting.playerindicators.name = Játékos Mutató
-setting.indicators.name = Ellenség Mutató
-setting.autotarget.name = Automatikus Célzás
-setting.keyboard.name = Irányítás Egérrel És Billentyűzettel
-setting.touchscreen.name = Irányítás Érintőképernyővel
+setting.logichints.name = Logikai tanácsok
+setting.backgroundpause.name = Szüneteltetés a háttérben
+setting.buildautopause.name = Automatikus szünet építéskor
+setting.doubletapmine.name = Bányászás dupla-koppintással
+setting.commandmodehold.name = Tartsd lenyomva a parancs módhoz
+setting.distinctcontrolgroups.name = Egységenként legfeljebb egy ellenőrző csoport
+setting.modcrashdisable.name = Modok letiltása indítási összeomláskor
+setting.animatedwater.name = Animált felületek
+setting.animatedshields.name = Animált pajzsok
+setting.playerindicators.name = Játékos mutató
+setting.indicators.name = Ellenség mutató
+setting.autotarget.name = Automatikus célzás
+setting.keyboard.name = Irányítás egérrel és billentyűzettel
+setting.touchscreen.name = Irányítás érintőképernyővel
 setting.fpscap.name = Max FPS
 setting.fpscap.none = Nincs
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI Méretezése
+setting.uiscale.name = UI méretezése
 setting.uiscale.description = A módosítások alkalmazásához újraindítás szükséges.
-setting.swapdiagonal.name = Mindig Átlós Elhelyezés
+setting.swapdiagonal.name = Mindig átlós elhelyezés
 setting.difficulty.training = Kiképzés
 setting.difficulty.easy = Könnyű
 setting.difficulty.normal = Normál
 setting.difficulty.hard = Nehéz
 setting.difficulty.insane = Őrült
 setting.difficulty.name = Nehézség:
-setting.screenshake.name = Képernyő Rázkódása
-setting.bloomintensity.name = Bloom Intenzitás
+setting.screenshake.name = Képernyő rázkódása
+setting.bloomintensity.name = Bloom intenzitás
 setting.bloomblur.name = Bloom Blur
-setting.effects.name = Effektek Megjelenítése
-setting.destroyedblocks.name = Elpusztított Épületek Megjelenítése
-setting.blockstatus.name = Blokk Állapotának Megjelenítése
-setting.conveyorpathfinding.name = Szállítószalag Útvonalkeresés Építéskor
-setting.sensitivity.name = Kontroller Érzékenység
-setting.saveinterval.name = Mentési Időköz
+setting.effects.name = Effektek megjelenítése
+setting.destroyedblocks.name = Elpusztított épületek megjelenítése
+setting.blockstatus.name = Blokk állapotának megjelenítése
+setting.conveyorpathfinding.name = Szállítószalag útvonalkeresés építéskor
+setting.sensitivity.name = Kontroller érzékenység
+setting.saveinterval.name = Mentési időköz
 setting.seconds = {0} másodperc
 setting.milliseconds = {0} ezredmásodperc
-setting.fullscreen.name = Teljes Képernyő
-setting.borderlesswindow.name = Keret Nélküli Ablak
-setting.borderlesswindow.name.windows = Keret Nélküli Teljes Képernyő
+setting.fullscreen.name = Teljes képernyő
+setting.borderlesswindow.name = Keret nélküli ablak
+setting.borderlesswindow.name.windows = Keret nélküli teljes képernyő
 setting.borderlesswindow.description = A változások alkalmazásához újraindításra lehet szükség.
-setting.fps.name = FPS & Ping mutatása
-setting.console.name = Konzol Engedélyezése
-setting.smoothcamera.name = Egyenletes Kamera
+setting.fps.name = FPS és Ping mutatása
+setting.console.name = Konzol engedélyezése
+setting.smoothcamera.name = Egyenletes kamera
 setting.vsync.name = VSync
 setting.pixelate.name = Pixeles
-setting.minimap.name = Minitérkép Mutatása
-setting.coreitems.name = A Magban Lévő Nyersanyagok Megjelenítése
-setting.position.name = A Játékos Pozíciójának Megjelenítése
-setting.mouseposition.name = Egér Pozíciójának Megjelenítése
-setting.musicvol.name = Zene Hangerő
-setting.atmosphere.name = Mutassa A Bolygó Atmoszférát
-setting.drawlight.name = Sötét/Világos Fényhatások
-setting.ambientvol.name = Környezeti Hangerő
-setting.mutemusic.name = Zene Némítása
-setting.sfxvol.name = SFX Hangerő
-setting.mutesound.name = Hang Némítása
-setting.crashreport.name = Névtelen Összeomlási Jelentések
-setting.savecreate.name = Automatikus Mentés
-setting.steampublichost.name = Nyilvános Játék Láthatósága
-setting.playerlimit.name = Játékos Limit
-setting.chatopacity.name = Csevegő Átlátszatlansága
-setting.lasersopacity.name = Villanyvezeték Átlátszatlansága
-setting.bridgeopacity.name = Híd Átlátszatlansága
-setting.playerchat.name = Játékos Szóbuborékok Megjelenítése
-setting.showweather.name = Időjárás Grafika Megjelenítése
-setting.hidedisplays.name = Logikai Kijelzők Elrejtése
+setting.minimap.name = Minitérkép mutatása
+setting.coreitems.name = A Magban lévő nyersanyagok megjelenítése
+setting.position.name = A játékos pozíciójának megjelenítése
+setting.mouseposition.name = Egér pozíciójának megjelenítése
+setting.musicvol.name = Zene hangerő
+setting.atmosphere.name = A bolygó atmoszféra mutatása
+setting.drawlight.name = Sötét/világos fényhatások
+setting.ambientvol.name = Környezeti hangerő
+setting.mutemusic.name = Zene némítása
+setting.sfxvol.name = SFX hangerő
+setting.mutesound.name = Hang némítása
+setting.crashreport.name = Névtelen összeomlási jelentések
+setting.savecreate.name = Automatikus mentés
+setting.steampublichost.name = Nyilvános játék láthatósága
+setting.playerlimit.name = Játékos limit
+setting.chatopacity.name = Csevegő átlátszatlansága
+setting.lasersopacity.name = Villanyvezeték átlátszatlansága
+setting.bridgeopacity.name = Híd átlátszatlansága
+setting.playerchat.name = Játékos szóbuborékok megjelenítése
+setting.showweather.name = Időjárás grafika megjelenítése
+setting.hidedisplays.name = Logikai kijelzők elrejtése
 setting.macnotch.name = A felület igazítása a bevágás megjelenítéséhez
 setting.macnotch.description = A változtatások alkalmazásához újra kell indítani
-steam.friendsonly = Csak Barátok
+steam.friendsonly = Csak barátok
 steam.friendsonly.tooltip = Csak a Steam-barátok tudnak csatlakozni a játékodhoz.\nHa nem jelölöd be ezt a négyzetet, a játékod nyilvános lesz - bárki csatlakozhat hozzá.
 public.beta = Ne feledd, hogy a játék béta verziójában nem tudsz nyilvános szobát nyitni.
 uiscale.reset = Az UI mérete megváltozott.\nAz "OK" gombbal megerősítheted ezt a méretet.\n[scarlet]Visszavonás és kilépés [accent] {0}[] másodperc múlva...
-uiscale.cancel = Mégsem & Kilépés
+uiscale.cancel = Mégsem és kilépés
 setting.bloom.name = Bloom
 keybind.title = Gyorsbillentyűk
 keybinds.mobile = [scarlet]A legtöbb billentyűfunkció mobilon nem működik. Csak a mozgás támogatott.
 category.general.name = Általános
 category.view.name = Nézet
-category.command.name = Egység Parancs
+category.command.name = Egység parancs
 category.multiplayer.name = Többjátékos
-category.blocks.name = Blokk Választás
+category.blocks.name = Blokk választás
 placement.blockselectkeys = \n[lightgray]Kulcs: [{0},
 keybind.respawn.name = Újraéledés
-keybind.control.name = Egység Irányítása
-keybind.clear_building.name = Épület Törlése
+keybind.control.name = Egység irányítása
+keybind.clear_building.name = Épület törlése
 keybind.press = Nyomj meg egy gombot...
 keybind.press.axis = Nyomj meg egy kart, vagy gombot...
-keybind.screenshot.name = Pálya Képernyőkép
+keybind.screenshot.name = Pálya képernyőkép
 keybind.toggle_power_lines.name = Villanyvezetékek be/ki
 keybind.toggle_block_status.name = Blokk állapot be/ki
 keybind.move_x.name = Mozgás vízszintesen
@@ -1195,80 +1195,80 @@ keybind.move_y.name = Mozgás függőlegesen
 keybind.mouse_move.name = Egér Követése
 keybind.pan.name = Felderítés
 keybind.boost.name = Erősítés
-keybind.command_mode.name = Parancs Mód
-keybind.command_queue.name = Egység Parancsok Sorba Állítása
-keybind.create_control_group.name = Vezérlő Csoport Készítése
-keybind.cancel_orders.name = Parancsok Visszavonása
+keybind.command_mode.name = Parancs mód
+keybind.command_queue.name = Egység parancsok sorba állítása
+keybind.create_control_group.name = Vezérlő csoport készítése
+keybind.cancel_orders.name = Parancsok visszavonása
 
-keybind.unit_stance_shoot.name = Egység Magatartása: Lövés
-keybind.unit_stance_hold_fire.name = Egység Magatartása: Tüzet Szüntess
-keybind.unit_stance_pursue_target.name = Egység Magatartása: Célpont Követése
-keybind.unit_stance_patrol.name = Egység Magatartása: Járőrözés
-keybind.unit_stance_ram.name = Egység Magatartása: Ütközés
+keybind.unit_stance_shoot.name = Egység magatartása: Lövés
+keybind.unit_stance_hold_fire.name = Egység magatartása: Tüzet Szüntess
+keybind.unit_stance_pursue_target.name = Egység magatartása: Célpont Követése
+keybind.unit_stance_patrol.name = Egység magatartása: Járőrözés
+keybind.unit_stance_ram.name = Egység magatartása: Ütközés
 
-keybind.unit_command_move = Egység Parancs: Mozgás
-keybind.unit_command_repair = Egység Parancs: Javítás
-keybind.unit_command_rebuild = Egység Parancs: Újraépítés
-keybind.unit_command_assist = Egység Parancs: Támogatás
-keybind.unit_command_mine = Egység Parancs: Bányászás
-keybind.unit_command_boost = Egység Parancs: Erősítés
-keybind.unit_command_load_units = Egység Parancs: Egységek Berakodása
-keybind.unit_command_load_blocks = Egység Parancs: Blokkok Berakodása
-keybind.unit_command_unload_payload = Egység Parancs: Kirakodás A Rakományszállítóból
+keybind.unit_command_move = Egység parancs: Mozgás
+keybind.unit_command_repair = Egység parancs: Javítás
+keybind.unit_command_rebuild = Egység parancs: Újraépítés
+keybind.unit_command_assist = Egység parancs: Támogatás
+keybind.unit_command_mine = Egység parancs: Bányászás
+keybind.unit_command_boost = Egység parancs: Erősítés
+keybind.unit_command_load_units = Egység parancs: Egységek berakodása
+keybind.unit_command_load_blocks = Egység parancs: Blokkok berakodása
+keybind.unit_command_unload_payload = Egység parancs: Kirakodás a rakományszállítóból
 
-keybind.rebuild_select.name = Régió Újjáépítése
-keybind.schematic_select.name = Terület Kijelölése
-keybind.schematic_menu.name = Vázlat Menü
-keybind.schematic_flip_x.name = Vázlat Tükrözése Vízszintesen
-keybind.schematic_flip_y.name = Vázlat Tükrözése Függőlegesen
-keybind.category_prev.name = Előző Kategória
-keybind.category_next.name = Következő Kategória
-keybind.block_select_left.name = Blokk Váltás Balra
-keybind.block_select_right.name = Blokk Váltás Jobbra
-keybind.block_select_up.name = Blokk Váltás Fel
-keybind.block_select_down.name = Blokk Váltás Le
-keybind.block_select_01.name = Kategória/Blokk Választás 1
-keybind.block_select_02.name = Kategória/Blokk Választás 2
-keybind.block_select_03.name = Kategória/Blokk Választás 3
-keybind.block_select_04.name = Kategória/Blokk Választás 4
-keybind.block_select_05.name = Kategória/Blokk Választás 5
-keybind.block_select_06.name = Kategória/Blokk Választás 6
-keybind.block_select_07.name = Kategória/Blokk Választás 7
-keybind.block_select_08.name = Kategória/Blokk Választás 8
-keybind.block_select_09.name = Kategória/Blokk Választás 9
-keybind.block_select_10.name = Kategória/Blokk Választás 10
-keybind.fullscreen.name = Teljes Képernyő be/ki
+keybind.rebuild_select.name = Régió újjáépítése
+keybind.schematic_select.name = Terület kijelölése
+keybind.schematic_menu.name = Vázlat menü
+keybind.schematic_flip_x.name = Vázlat tükrözése vízszintesen
+keybind.schematic_flip_y.name = Vázlat tükrözése függőlegesen
+keybind.category_prev.name = Előző kategória
+keybind.category_next.name = Következő kategória
+keybind.block_select_left.name = Blokk váltás balra
+keybind.block_select_right.name = Blokk váltás jobbra
+keybind.block_select_up.name = Blokk váltás fel
+keybind.block_select_down.name = Blokk váltás le
+keybind.block_select_01.name = Kategória/blokk választás 1
+keybind.block_select_02.name = Kategória/blokk választás 2
+keybind.block_select_03.name = Kategória/blokk választás 3
+keybind.block_select_04.name = Kategória/blokk választás 4
+keybind.block_select_05.name = Kategória/blokk választás 5
+keybind.block_select_06.name = Kategória/blokk választás 6
+keybind.block_select_07.name = Kategória/blokk választás 7
+keybind.block_select_08.name = Kategória/blokk választás 8
+keybind.block_select_09.name = Kategória/blokk választás 9
+keybind.block_select_10.name = Kategória/blokk választás 10
+keybind.fullscreen.name = Teljes képernyő be/ki
 keybind.select.name = Kiválasztás/Lövés
-keybind.diagonal_placement.name = Átlós Élhelyezés
-keybind.pick.name = Blokk Másolása
-keybind.break_block.name = Blokk Törlése
-keybind.select_all_units.name = Minden Egység Kijelölése
-keybind.select_all_unit_factories.name = Minden Egységgyár Kijelölése
-keybind.deselect.name = Blokk Választás Törlése
-keybind.pickupCargo.name = Rakomány Felvétele
-keybind.dropCargo.name = Rakomány Lerakása
+keybind.diagonal_placement.name = Átlós elhelyezés
+keybind.pick.name = Blokk másolása
+keybind.break_block.name = Blokk törlése
+keybind.select_all_units.name = Minden egység kijelölése
+keybind.select_all_unit_factories.name = Minden egység-gyár kijelölése
+keybind.deselect.name = Blokk választás törlése
+keybind.pickupCargo.name = Rakomány felvétele
+keybind.dropCargo.name = Rakomány lerakása
 keybind.shoot.name = Lövés
 keybind.zoom.name = Nagyítás
 keybind.menu.name = Menü
 keybind.pause.name = Szünet
-keybind.pause_building.name = Építés Szüneteltetése/Folytatása
+keybind.pause_building.name = Építés szüneteltetése/folytatása
 keybind.minimap.name = Minitérkép
-keybind.planet_map.name = Bolygó Térkép
+keybind.planet_map.name = Bolygó térkép
 keybind.research.name = Kutatás
-keybind.block_info.name = Blokk Infó
+keybind.block_info.name = Blokk infó
 keybind.chat.name = Csevegés
-keybind.player_list.name = Játékos Lista
+keybind.player_list.name = Játékosok listája
 keybind.console.name = Konzol
 keybind.rotate.name = Forgatás
-keybind.rotateplaced.name = Meglévő Forgatása (Tartsd Nyomva)
-keybind.toggle_menus.name = Menük Váltása
-keybind.chat_history_prev.name = Csevegés Görgetése Felfelé
-keybind.chat_history_next.name = Csevegés Görgetése Lefelé
-keybind.chat_scroll.name = Csevegés Görgetés
-keybind.chat_mode.name = Csevegés Mód Megváltoztatása
-keybind.drop_unit.name = Egység Eldobása
-keybind.zoom_minimap.name = Zoom A Minitérképen
-mode.help.title = Játékmódok Leírása
+keybind.rotateplaced.name = Meglévő forgatása (tartsd nyomva)
+keybind.toggle_menus.name = Menük váltása
+keybind.chat_history_prev.name = Csevegés görgetése felfelé
+keybind.chat_history_next.name = Csevegés görgetése lefelé
+keybind.chat_scroll.name = Csevegés görgetése
+keybind.chat_mode.name = Csevegés mód megváltoztatása
+keybind.drop_unit.name = Egység eldobása
+keybind.zoom_minimap.name = Zoom a minitérképen
+mode.help.title = Játékmódok leírása
 mode.survival.name = Túlélő
 mode.survival.description = A normál mód. Korlátozott nyersanyag és automatikusan érkező hullámok.\n[gray]Szükséges hozzá egy ellenséges kezdőpont a pályán.
 mode.sandbox.name = Homokozó
@@ -1278,57 +1278,57 @@ mode.pvp.name = PvP
 mode.pvp.description = Harcolj más játékosok ellen.\n[gray]Szükséges hozzá legalább két különböző színű Mag a pályán.
 mode.attack.name = Támadás
 mode.attack.description = Pusztítsd el az ellenség bázisát. \n[gray]Szükséges hozzá egy piros Mag a pályán.
-mode.custom = Egyéni Szabályok
+mode.custom = Egyéni szabályok
 
 rules.invaliddata = Érvénytelen adatok a vágólapon.
-rules.hidebannedblocks = Tiltott Blokkok Elrejtése
-rules.infiniteresources = Végtelen Nyersanyagforrás
-rules.onlydepositcore = Csak Magok Elhelyezése Engedélyezett
-rules.derelictrepair = Az Elhagyatott Blokkok Javításának Engedélyezése
-rules.reactorexplosions = Reaktor Robbanás
-rules.coreincinerates = Többlet Nyersanyagok Megsemmisítése A Magban
-rules.disableworldprocessors = Világprocesszorok Letiltása
-rules.schematic = Vázlatok Engedélyezése
-rules.wavetimer = Hullám Időzítő
-rules.wavesending = Hullám Küldése
+rules.hidebannedblocks = Tiltott blokkok elrejtése
+rules.infiniteresources = Végtelen nyersanyagforrás
+rules.onlydepositcore = Csak Magok elhelyezése engedélyezett
+rules.derelictrepair = Az elhagyatott blokkok javításának engedélyezése
+rules.reactorexplosions = Reaktor robbanás
+rules.coreincinerates = Többlet nyersanyagok megsemmisítése a Magban
+rules.disableworldprocessors = Világprocesszorok letiltása
+rules.schematic = Vázlatok engedélyezése
+rules.wavetimer = Hullám időzítő
+rules.wavesending = Hullám küldése
 rules.waves = Hullámok
-rules.attack = Támadás Mód
+rules.attack = Támadás mód
 rules.buildai = Épületalkotó AI
-rules.buildaitier = Épületalkotó AI Szintje
+rules.buildaitier = Épületalkotó AI szintje
 rules.rtsai = RTS AI [red](WIP)
-rules.rtsminsquadsize = Minimális Osztag Méret
-rules.rtsmaxsquadsize = Maximális Osztag Méret
-rules.rtsminattackweight = Minimális Támadási "lépéselőny"
-rules.cleanupdeadteams = A legyőzött Csapatépületek Törlése (PvP)
-rules.corecapture = Mag Elfoglalása Megsemmisítéskor
-rules.polygoncoreprotection = Poligonális Mag Védelem
-rules.placerangecheck = Elhelyezési Tartomány Ellenőrzése
-rules.enemyCheat = Végtelen Ellenséges Csapat Erőforrások
-rules.blockhealthmultiplier = Épület Életpont Szorzó
-rules.blockdamagemultiplier = Épület Sebzés Szorzó
-rules.unitbuildspeedmultiplier = Egység Gyártási Sebesség Szorzó
-rules.unitcostmultiplier = Egységköltség Szorzó
-rules.unithealthmultiplier = Egység Életpont Szorzó
-rules.unitdamagemultiplier = Egység Sebzés Szorzó
-rules.unitcrashdamagemultiplier = Egység Ütközési Sebzés Szorzó
-rules.solarmultiplier = Napenergia Szorzó
-rules.unitcapvariable = A Magok Befolyásolják A Legyártható Egységek Darabszámát
-rules.unitcap = Alap Egység-Darabszám
-rules.limitarea = Játékterület Korlátozása A Pályán
-rules.enemycorebuildradius = Ellenséges Mag Körüli Tiltott Zóna Sugara:[lightgray] (mező)
-rules.wavespacing = Hullámok Közötti Szünet Időzítés:[lightgray] (mp)
-rules.initialwavespacing = Az Első Hullám Előtti Szünet Időrtama:[lightgray] (mp)
-rules.buildcostmultiplier = Építési Költség Szorzó
-rules.buildspeedmultiplier = Építési Sebesség Szorzó
-rules.deconstructrefundmultiplier = Bontási Visszatérítés Szorzó
-rules.waitForWaveToEnd = Az Ellenség Kivárja A Korábbi Hullám Végét
-rules.wavelimit = Az Utolsó Hullám Után Legyen Vége A Játéknak
-rules.dropzoneradius = Ledobási Zóna Sugara:[lightgray] (mező)
-rules.unitammo = Az Egységeknek Lőszer Kell [red](törölhető)
-rules.enemyteam = Elenséges Csapat
-rules.playerteam = Saját Csapat
+rules.rtsminsquadsize = Minimális osztag méret
+rules.rtsmaxsquadsize = Maximális osztag méret
+rules.rtsminattackweight = Minimális támadási "lépéselőny"
+rules.cleanupdeadteams = A legyőzött csapatépületek törlése (PvP)
+rules.corecapture = Mag elfoglalása megsemmisítéskor
+rules.polygoncoreprotection = Poligonális Mag védelem
+rules.placerangecheck = Elhelyezési tartomány ellenőrzése
+rules.enemyCheat = Végtelen ellenséges csapat erőforrások
+rules.blockhealthmultiplier = Épület életpont szorzó
+rules.blockdamagemultiplier = Épület sebzés szorzó
+rules.unitbuildspeedmultiplier = Egység gyártási sebesség szorzó
+rules.unitcostmultiplier = Egységköltség szorzó
+rules.unithealthmultiplier = Egység életpont szorzó
+rules.unitdamagemultiplier = Egység sebzés szorzó
+rules.unitcrashdamagemultiplier = Egység ütközési sebzés szorzó
+rules.solarmultiplier = Napenergia szorzó
+rules.unitcapvariable = A Magok befolyásolják a legyártható egységek darabszámát
+rules.unitcap = Alap egység-darabszám
+rules.limitarea = Játékterület korlátozása a pályán
+rules.enemycorebuildradius = Ellenséges Mag körüli tiltott zóna sugara:[lightgray] (csempe)
+rules.wavespacing = A hullámok közötti szünetek ideje:[lightgray] (mp)
+rules.initialwavespacing = Az első hullám előtti szünet ideje:[lightgray] (mp)
+rules.buildcostmultiplier = Építési költség szorzó
+rules.buildspeedmultiplier = Építési sebesség szorzó
+rules.deconstructrefundmultiplier = Bontási visszatérítés szorzó
+rules.waitForWaveToEnd = Az ellenség kivárja a korábbi hullám végét
+rules.wavelimit = Az utolsó hullám után legyen vége a játéknak
+rules.dropzoneradius = A ledobási zóna sugara:[lightgray] (csempe)
+rules.unitammo = Az egységeknek lőszer kell [red](törölhető)
+rules.enemyteam = Elenséges csapat
+rules.playerteam = Saját csapat
 rules.title.waves = Hullámok
-rules.title.resourcesbuilding = Nyersanyagforrások & Épületek
+rules.title.resourcesbuilding = Nyersanyagforrások és épületek
 rules.title.enemy = Ellenségek
 rules.title.unit = Egységek
 rules.title.experimental = Kísérleti
@@ -1339,7 +1339,7 @@ rules.lighting = Világítás
 rules.fog = Köd
 rules.fire = Tűz
 rules.anyenv = <Bármelyik>
-rules.explosions = Épület/Egység Robbanás Sebzés
+rules.explosions = Épület/egység robbanás sebzés
 rules.ambientlight = Háttérvilágítás
 rules.weather = Időjárás
 rules.weather.frequency = Gyakoriság:
@@ -1486,7 +1486,7 @@ block.kiln.name = Kemence
 block.graphite-press.name = Grafit Préselő
 block.multi-press.name = Grafit Sajtoló
 block.constructing = {0} [lightgray](Építés)
-block.spawn.name = Ellenséges Kezdőpont
+block.spawn.name = Ellenséges kezdőpont
 block.core-shard.name = Szilánk
 block.core-foundation.name = Alapítvány
 block.core-nucleus.name = Magnum
@@ -1835,8 +1835,8 @@ block.neoplasia-reactor.name = Neoplázia Reaktor
 
 block.switch.name = Kapcsoló
 block.micro-processor.name = Mikroprocesszor
-block.logic-processor.name = Logikaiprocesszor
-block.hyper-processor.name = Hiperprocesszor
+block.logic-processor.name = Logikai-Processzor
+block.hyper-processor.name = Hiper-Processzor
 block.logic-display.name = Logikai Kijelző
 block.large-logic-display.name = Nagy Logikai Kijelző
 block.memory-cell.name = Memória Cella
@@ -1861,8 +1861,8 @@ hint.breaking = [accent]Jobb-Egérgomb[]ot nyomva kijelölheted az útban lévő
 hint.breaking.mobile = Használd a \ue817 [accent]Kalapács[] gombot jobb lent és töröld vele az útban lévő épületeket.\n\nTartsd lenyomva az ujjad és húzd, hogy nagyobb területet tudj kijelölni.
 hint.blockInfo = Egy blokk információinak megtekintéséhez válaszd ki a blokkot az [accent]Építés menüben[], majd válaszd a [accent][[?][] gombot a jobb oldalon.
 hint.derelict = Az [accent]Elhagyatott[] szerkezetek régi bázisok maradványai, amelyek már nem működnek.\n\nEzeket a maradványokat le lehet [accent]bontani[] nyersanyagokért, vagy megjavítani őket.
-hint.research = Használd a \ue875 [accent]Fejlődési Fa[] gombot, hogy felfedezz új technológiákat.
-hint.research.mobile = Használd a \ue875 [accent]Fejlődési Fa[] gombot a \ue88c [accent]Menü[]ben, hogy felfedezz új technológiákat.
+hint.research = Használd a \ue875 [accent]Fejlesztési Fa[] gombot, hogy felfedezz új technológiákat.
+hint.research.mobile = Használd a \ue875 [accent]Fejlesztési Fa[] gombot a \ue88c [accent]Menü[]ben, hogy felfedezz új technológiákat.
 hint.unitControl = Nyomd le a [accent][[Bal-CTRL][] gombot és kattints [accent]Jobb-Egérgomb[]al az irányítani kívánt szövetséges egységre, vagy -lövegtoronyra, hogy átvedd fölötte az irányítást.
 hint.unitControl.mobile = [accent][[Dupla koppintás][]sal átveheted az irányítást szövetséges egységek, vagy -lövegtornyok felett.
 hint.unitSelectControl = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd hosszan a [accent]Bal-SHIFT[] gombot.\nParancs Módban az egységek kijelöléséhez kattints és húzd az egeret. [accent]Jobb-Egérgomb[]-al kattints az egységek mozgatásához egy helyszínre, vagy az ellenséges célpontra.
@@ -1883,7 +1883,7 @@ hint.waveFire = A [accent]Wave[] lövegtornyok, ha Víz van bennük, automatikus
 hint.generator = \uf879 A [accent]Belső-égetésű Erőmű[] Szenet éget, és átadja az Áramot a vele érintkező épületeknek.\n\nÁramot nagyobb távolságra is szállíthatsz \uf87f [accent]Villanyoszlop[]ok segítségével.
 hint.guardian = Az [accent]Őrző[]knek páncélja van. A gyenge lövedékeknek, mint a [accent]Réz[], vagy az [accent]Ólom[] [scarlet]nincs hatásuk[] az Őrző páncéljára.\n\nHasználj magasabb szintű lövegtornyokat, vagy \uf835 [accent]Grafit[] lövedéket a \uf861Duo/\uf859Salvo lövegtornyokban, hogy leszedd az Őrzőket.
 hint.coreUpgrade = A Magot fejlesztheted, ha [accent]magasabb szintű Magot teszel rá[].\n\nHelyezz egy [accent]Alapítvány[] Magot a [accent]Szilánk[] Magra. Figyelj rá, hogy ne legyenek az új Mag területén épületek.
-hint.presetLaunch = A szürke [accent]kampány szektorok[]ba, amilyen például a [accent]Fagyott Erdő[], bárhonnan kilőhetsz. Nem kell szomszédos területtel rendelkezned.\n\nA [accent]számozott szektorok[], mint ez is, [accent]opcionálisak[].
+hint.presetLaunch = A szürke [accent]hadjárat szektorok[]ba, amilyen például a [accent]Fagyott Erdő[], bárhonnan kilőhetsz. Nem kell szomszédos területtel rendelkezned.\n\nA [accent]számozott szektorok[], mint ez is, [accent]opcionálisak[].
 hint.presetDifficulty = Ebben a szektorban [scarlet]magas az ellenséges fenyegetettségi szint[].\nAz ilyen szektorokba való indulás [accent]nem ajánlott[] megfelelő technológia és felkészülés nélkül.
 hint.coreIncinerate = Ha a Magodban egy nyersanyag elérte a maximumot, a beérkező ilyen nyersanyagaid azonnal [accent]megsemmisítésre kerülnek[].
 hint.factoryControl = Egy egységgyár [accent]kimeneti célpontjának[] beállításához Parancs Módban kattints egy gyárblokkra, majd kattints a Jobb-Egérgombbal egy helyre.\nAz előállított egységek automatikusan odamennek.
@@ -1892,7 +1892,7 @@ hint.factoryControl.mobile = Egy egységgyár [accent]kimeneti célpontjának[]
 gz.mine = Menj a földön lévő \uf8c4 [accent]Rézérc[] közelébe, és kattints a bányászat megkezdéséhez.
 gz.mine.mobile = Menj a földön lévő \uf8c4 [accent]Rézérc[] közelébe, és koppints a bányászat megkezdéséhez.
 gz.research = Nyisd meg a \ue875 Fejlődési Fát.\nFedezd fel a \uf870 [accent]Mechanikus Fúró[]t, majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy Rézfoltra, hogy elhelyezd.
-gz.research.mobile = Nyisd meg a \ue875 Fejlődési Fát.\nFedezd fel a \uf870 [akcentus]Mechanikus Fúró[]t, majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy Rézfoltra, hogy elhelyezd.\n\nNyomd meg a \ue800 [accent]Pipa[]t a jobb alsó sarokban a megerősítéshez.
+gz.research.mobile = Nyisd meg a \ue875 Fejlődési Fát.\nFedezd fel a \uf870 [accent]Mechanikus Fúró[]t, majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy Rézfoltra, hogy elhelyezd.\n\nNyomd meg a \ue800 [accent]Pipa[]t a jobb alsó sarokban a megerősítéshez.
 gz.conveyors = Fedezd fel és építs \uf896 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Magba.\n\nKattints és húzd az egeret bármely irányba, hogy hosszabb Szállítószalagot készíthess.\n[accent]Görgővel[] a szállítás irányát tudod megváltoztatni.
 gz.conveyors.mobile = Fedezd fel és építs \uf896 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Magba.\n\nTartsd rajta az ujjad egy másodpercig, és húzd bármely irányba, hogy hosszabb Szállítószalagot készíthess.
 gz.drills = Bővítsd a bányászati kapacitást.\nÉpíts több Mechanikus Fúrót.\nBányássz 100 Rezet.
diff --git a/fastlane/metadata/android/hu-HU/full_description.txt b/fastlane/metadata/android/hu-HU/full_description.txt
index 41cbf4324b..103c1fa665 100644
--- a/fastlane/metadata/android/hu-HU/full_description.txt
+++ b/fastlane/metadata/android/hu-HU/full_description.txt
@@ -1,9 +1,9 @@
 A Mindustry egy gyárépítő játék Toronyvédő és RTS elemekkel. Készíts bonyolult ellátási láncokat, hogy lőszert juttass a lövegtornyokba, termelj az építkezéshez használható nyersanyagokat, és állíts elő egységeket. Irányítsd az egységeket, hogy elfoglald az ellenséges bázisokat, és bővítsd a termelésedet. Védd meg a magodat a hullámokban támadó ellenségtől.
 
-<h2>A Játékmenet Szolgáltatásai</h2>
+<h2>A játékmenet szolgáltatásai</h2>
  
 - Használd a gyártó-blokkokat a legkülönfélébb fejlett nyersanyagok létrehozásához
-- Védd meg építményeidet a hullámokban támadó ellenségektől
+- Védd meg az építményeidet a hullámokban támadó ellenségektől
 - Játssz vállvetve a barátaiddal a platformokon átívelő többjátékos módban, vagy hívd ki őket csapat alapú PvP meccsekre
 - Oszd szét a folyadékokat, és küzdj meg az állandó kihívásokkal, mint például a tűzkitörések, vagy az ellenséges repülőgépek rajtaütéseivel
 - Hozd ki a legtöbbet a termelésből az opcionális hűtő- és kenőanyag-ellátással
@@ -12,23 +12,23 @@ A Mindustry egy gyárépítő játék Toronyvédő és RTS elemekkel. Készíts
 - Használd az egységeidet a hatékonyan felszerelt ellenséges bázisok ellen
 
 
-<h2>Kampány</h2>
+<h2>Hadjárat</h2>
 
 - Hódítsd meg a Serpulo és az Erekir bolygót, miközben 35 kézzel készített pályán és 250+ procedurálisan generált szektoron keresztül haladsz
 - Foglalj el területeket és építs gyárakat, hogy nyersanyagokat termelhess, miközben más szektorokban játszol
 - Védd meg a szektorokat az időszakos invázióktól
 - Koordináld az erőforrások elosztását a szektorok között az indítóállások felhasználásával
-- Fedezz fel új blokkokat a fejlődés elősegítése érdekében
+- Fedezz fel új épületeket, gyárakat a fejlődés elősegítése érdekében
 - Hívd meg barátaidat, hogy együtt teljesítsék a küldetéseket
-- 250+ technológiai blokk használatának elsajátítása
+- 250+ technológiai épület használatának elsajátítása
 - 50+ különböző típusú drón, mech és hajó
 
 
-<h2>Egyéni és Platformokon Átívelő Többjátékos Módok</h2>
+<h2>Egyéni és platformokon átívelő többjátékos módok</h2>
 
-- 16+ beépített pálya az egyéni játékokhoz a két teljes kampány mellett
-- Játssz kooperatív, PvP vagy homokozóban
+- 16+ beépített pálya az egyéni játékokhoz, a két teljes értékű hadjárat mellett
+- Játssz kooperatív módban, PvP-ben, vagy a homokozóban
 - Hozz létre nyilvános dedikált szervert, vagy hívd meg a barátaidat a saját privát munkamenetedre
-- Testre szabható játékszabályok: Változtasd meg a blokk költségeket, az ellenséges statisztikákat, a kezdő elemeket, a hullámok időzítését és így tovább
-- Teljes funkcionalitású térképszerkesztő szkript támogatással
+- Testre szabható játékszabályok: Változtasd meg az épületek építési költségeit, az ellenséges statisztikákat, a kezdő elemeket, a hullámok időzítését és így tovább
+- Teljes funkcionalitású térképszerkesztő, parancsfájl támogatással
 - Beépített mod böngésző és mod támogatás
diff --git a/fastlane/metadata/steam/hungarian/description.txt b/fastlane/metadata/steam/hungarian/description.txt
index 97d526afda..0931b27198 100644
--- a/fastlane/metadata/steam/hungarian/description.txt
+++ b/fastlane/metadata/steam/hungarian/description.txt
@@ -1,10 +1,10 @@
 A Mindustry egy gyárépítő játék Toronyvédő és RTS elemekkel. Készíts bonyolult ellátási láncokat, hogy lőszert juttass a lövegtornyokba, termelj az építkezéshez használható nyersanyagokat, és állíts elő egységeket. Irányítsd az egységeket, hogy elfoglald az ellenséges bázisokat, és bővítsd a termelésedet. Védd meg a magodat a hullámokban támadó ellenségtől.
 
-Játszd végig a kampányt egyedül, vagy vállvetve a barátaiddal a platformokon átívelő többjátékos módban, vagy hívd ki őket csapat alapú PvP meccsekre
+Játszd végig a hadjáratokat egyedül, vagy vállvetve a barátaiddal a platformokon átívelő többjátékos módban, vagy hívd ki őket csapat alapú PvP meccsekre
 
 [img]{STEAM_APP_IMAGE}/extras/factory.gif[/img]
 
-[h2]Gyár Építés[/h2]
+[h2]Gyár építés[/h2]
 
 [list]
 [*] Hozz létre bonyolult szállítószalagokból álló ellátási láncokat, hogy lőszert juttass a lövegtornyokba és termelj nyersanyagokat az építkezésekhez
@@ -25,7 +25,7 @@ Játszd végig a kampányt egyedül, vagy vállvetve a barátaiddal a platformok
 
 [img]{STEAM_APP_IMAGE}/extras/rts3.png[/img]
 
-[h2]Valós Idejű Stratégia[/h2]
+[h2]Valós idejű stratégia[/h2]
 
 [list]
 [*] Állíts fel összeszerelősorokat a gépesített egységek hadainak előállításához
@@ -33,30 +33,30 @@ Játszd végig a kampányt egyedül, vagy vállvetve a barátaiddal a platformok
 [*] Foglalj el minél több területet, hogy még több magot helyezhess el, és további erőforrásokhoz férhess hozzá a terjeszkedéshez
 [/list]
 
-[h2]Kampány[/h2]
+[h2]Hadjárat[/h2]
 
 [list]
-[*] Játssz végig két különböző bolygókampányt
+[*] Játssz végig a két különböző bolygó hadjáratait
 [*] Hódítsd meg a Serpulo és az Erekir bolygót, miközben 35 kézzel készített pályán és 250+ procedurálisan generált szektoron keresztül haladsz
 [*] Foglalj el területeket és építs gyárakat, hogy nyersanyagokat termelhess, miközben más szektorokban játszol
 [*] Védd meg a szektorokat az időszakos invázióktól
 [*] Koordináld az erőforrások elosztását a szektorok között az indítóállások felhasználásával
-[*] Fedezz fel új blokkokat a fejlődés elősegítése érdekében
+[*] Fedezz fel új épületeket, gyárakat a fejlődés elősegítése érdekében
 [*] Hívd meg barátaidat, hogy együtt teljesítsék a küldetéseket
-[*] 250+ technológiai blokk használatának elsajátítása
+[*] 250+ technológiai épület használatának elsajátítása
 [*] 50+ különböző típusú drón, mech és hajó
 [*] 80+ teljesítendő feladat
 [/list]
 
-[h2]Közösség és Moddolás[/h2]
+[h2]Közösség és moddolás[/h2]
 
 [list]
-[*] Használd a steam workshop-ot a közösség által készített pályák és vázlatok böngészéséhez.
+[*] Használd a Steam Workshop-ot a közösség által készített pályák és vázlatok böngészéséhez.
 [*] Csatlakozz nyilvános közösségi szerverekhez, hogy másokkal játszhass platformokon keresztül
-[*] Játssz kooperatív, PvP vagy homokozóban
+[*] Játssz kooperatív, PvP-ben, vagy homokozóban
 [*] A közösségi szerverek támogatják az egyéni pályák és játékmódok bővítményeit
 [*] Hozz létre nyilvános dedikált szervert, vagy hívd meg a barátaidat a saját privát munkamenetedre
-[*] Testre szabható játékszabályok: Változtasd meg a blokk költségeket, az ellenséges statisztikákat, a kezdő elemeket, a hullámok időzítését és így tovább
-[*] A beépített pályaszerkesztővel saját pályákat készíthetsz, hogy játszhass és megoszthasd a közösséggel
-[*] Böngéssz a közösség által készített modok között, hogy még több tartalmat adhass hozzá, vagy keverj belőlük egy újat
+[*] Testre szabható játékszabályok: Változtasd meg az épületek építési költségeit, az ellenséges statisztikákat, a kezdő elemeket, a hullámok időzítését és így tovább
+[*] A beépített pályaszerkesztővel saját pályákat készíthetsz, hogy játszhass másokkal és megoszthasd a közösséggel
+[*] Böngéssz a közösség által készített modok között, hogy még több tartalmat adhass hozzá a játékodhoz, vagy keverj belőlük egy újat
 [/list]

From 9bedc0bcd4f9c3f09f7111cb7ea0621f33ff0c72 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 2 Mar 2024 22:49:54 -0500
Subject: [PATCH 253/369] Added world switch to bundle

---
 core/assets/bundles/bundle.properties  |  1 +
 core/src/mindustry/content/Blocks.java | 34 +++++++++++++-------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 427f9b00ef..e9805b2eb0 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1566,6 +1566,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Message
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Overflow Gate
 block.underflow-gate.name = Underflow Gate
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 62af440a16..08eb582a78 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -5502,23 +5502,6 @@ public class Blocks{
             );
         }};
 
-        mechRefabricator = new Reconstructor("mech-refabricator"){{
-            requirements(Category.units, with(Items.beryllium, 250, Items.tungsten, 120, Items.silicon, 150));
-            regionSuffix = "-dark";
-
-            size = 3;
-            consumePower(2.5f);
-            consumeLiquid(Liquids.hydrogen, 3f / 60f);
-            consumeItems(with(Items.silicon, 50, Items.tungsten, 40));
-
-            constructTime = 60f * 45f;
-            researchCostMultiplier = 0.75f;
-
-            upgrades.addAll(
-            new UnitType[]{UnitTypes.merui, UnitTypes.cleroi}
-            );
-        }};
-
         shipRefabricator = new Reconstructor("ship-refabricator"){{
             requirements(Category.units, with(Items.beryllium, 200, Items.tungsten, 100, Items.silicon, 150, Items.oxide, 40));
             regionSuffix = "-dark";
@@ -5537,6 +5520,23 @@ public class Blocks{
             researchCost = with(Items.beryllium, 500, Items.tungsten, 200, Items.silicon, 300, Items.oxide, 80);
         }};
 
+        mechRefabricator = new Reconstructor("mech-refabricator"){{
+            requirements(Category.units, with(Items.beryllium, 250, Items.tungsten, 120, Items.silicon, 150));
+            regionSuffix = "-dark";
+
+            size = 3;
+            consumePower(2.5f);
+            consumeLiquid(Liquids.hydrogen, 3f / 60f);
+            consumeItems(with(Items.silicon, 50, Items.tungsten, 40));
+
+            constructTime = 60f * 45f;
+            researchCostMultiplier = 0.75f;
+
+            upgrades.addAll(
+            new UnitType[]{UnitTypes.merui, UnitTypes.cleroi}
+            );
+        }};
+
         //yes very silly name
         primeRefabricator = new Reconstructor("prime-refabricator"){{
             requirements(Category.units, with(Items.thorium, 250, Items.oxide, 200, Items.tungsten, 200, Items.silicon, 400));

From 76cb36fdea60ea38814765bfaf7f7fde1e812f41 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az881-428.kxqfgnpkrxgetcyd3drl2yrtfd.ex.internal.cloudapp.net>
Date: Sun, 3 Mar 2024 03:50:48 +0000
Subject: [PATCH 254/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 1 +
 core/assets/bundles/bundle_bg.properties    | 1 +
 core/assets/bundles/bundle_ca.properties    | 1 +
 core/assets/bundles/bundle_cs.properties    | 1 +
 core/assets/bundles/bundle_da.properties    | 1 +
 core/assets/bundles/bundle_de.properties    | 1 +
 core/assets/bundles/bundle_es.properties    | 1 +
 core/assets/bundles/bundle_et.properties    | 1 +
 core/assets/bundles/bundle_eu.properties    | 1 +
 core/assets/bundles/bundle_fi.properties    | 1 +
 core/assets/bundles/bundle_fil.properties   | 1 +
 core/assets/bundles/bundle_fr.properties    | 1 +
 core/assets/bundles/bundle_hu.properties    | 1 +
 core/assets/bundles/bundle_id_ID.properties | 1 +
 core/assets/bundles/bundle_it.properties    | 1 +
 core/assets/bundles/bundle_ja.properties    | 1 +
 core/assets/bundles/bundle_ko.properties    | 1 +
 core/assets/bundles/bundle_lt.properties    | 1 +
 core/assets/bundles/bundle_nl.properties    | 1 +
 core/assets/bundles/bundle_nl_BE.properties | 1 +
 core/assets/bundles/bundle_pl.properties    | 1 +
 core/assets/bundles/bundle_pt_BR.properties | 1 +
 core/assets/bundles/bundle_pt_PT.properties | 1 +
 core/assets/bundles/bundle_ro.properties    | 1 +
 core/assets/bundles/bundle_ru.properties    | 1 +
 core/assets/bundles/bundle_sr.properties    | 1 +
 core/assets/bundles/bundle_sv.properties    | 1 +
 core/assets/bundles/bundle_th.properties    | 1 +
 core/assets/bundles/bundle_tk.properties    | 1 +
 core/assets/bundles/bundle_tr.properties    | 1 +
 core/assets/bundles/bundle_uk_UA.properties | 1 +
 core/assets/bundles/bundle_vi.properties    | 1 +
 core/assets/bundles/bundle_zh_CN.properties | 1 +
 core/assets/bundles/bundle_zh_TW.properties | 1 +
 34 files changed, 34 insertions(+)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index af909fceee..fd5e66eab9 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -1532,6 +1532,7 @@ block.inverted-sorter.name = Інвертаваны сартавальнік
 block.message.name = Паведамленне
 block.reinforced-message.name = Узмоцненнае Паведамленне
 block.world-message.name = Паведамленне Свету
+block.world-switch.name = World Switch
 block.illuminator.name = Асвятляльнік
 block.overflow-gate.name = Залішнi затвор
 block.underflow-gate.name = Залішнi шлюз
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 561b0879e1..5c2be5299c 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -1543,6 +1543,7 @@ block.inverted-sorter.name = Обърнат сортирач
 block.message.name = Съобщение
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Осветител
 block.overflow-gate.name = Преливаща Порта
 block.underflow-gate.name = Обратна Преливаща Порта
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index cbbadfcbf9..ba8dd79da9 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -1550,6 +1550,7 @@ block.inverted-sorter.name = Classificador invers
 block.message.name = Missatge
 block.reinforced-message.name = Missatge destacat
 block.world-message.name = Missatge mundial
+block.world-switch.name = World Switch
 block.illuminator.name = Il·luminador
 block.overflow-gate.name = Porta de desbordament
 block.underflow-gate.name = Porta de subdesbordament
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 2b0f9c4a5b..89866a9e19 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -1546,6 +1546,7 @@ block.inverted-sorter.name = Obrácená třídička
 block.message.name = Zpráva
 block.reinforced-message.name = Posílená Zpráva
 block.world-message.name = Světová Zpráva
+block.world-switch.name = World Switch
 block.illuminator.name = Osvětlovač
 block.overflow-gate.name = Brána s přepadem
 block.underflow-gate.name = Brána s podtokem
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 4c450e7b3d..01f2b2e2d7 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Omvendt Filter
 block.message.name = Besked
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Lyskilde
 block.overflow-gate.name = Overflods-låge
 block.underflow-gate.name = Underflods-låge
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 604dae62ab..01de9b4f23 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -1560,6 +1560,7 @@ block.inverted-sorter.name = Invertierter Sortierer
 block.message.name = Nachricht
 block.reinforced-message.name = Verstärkte Nachricht
 block.world-message.name = Weltnachricht
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminierer
 block.overflow-gate.name = Überlauftor
 block.underflow-gate.name = Unterlauftor
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 02eb2c1cf7..1cd964966b 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -1556,6 +1556,7 @@ block.inverted-sorter.name = Clasificador invertido
 block.message.name = Mensaje
 block.reinforced-message.name = Mensaje reforzado
 block.world-message.name = Mensaje estático
+block.world-switch.name = World Switch
 block.illuminator.name = Iluminador
 block.overflow-gate.name = Compuerta de desborde
 block.underflow-gate.name = Compuerta de subdesbordamiento
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 95eb26a4b3..72423c0523 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Sõnum
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Ülevooluvärav
 block.underflow-gate.name = Underflow Gate
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 9de7c79905..8536471718 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -1536,6 +1536,7 @@ block.inverted-sorter.name = Alderantzizko antolatzailea
 block.message.name = Mezua
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Gainezkatze atea
 block.underflow-gate.name = Underflow Gate
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index c72ec15423..588a00b290 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -1535,6 +1535,7 @@ block.inverted-sorter.name = Käänteinen Lajittelija
 block.message.name = Viesti
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Lamppu
 block.overflow-gate.name = Ylivuotoportti
 block.underflow-gate.name = Alivuotoportti
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index b807827ce0..a59f2d7103 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -1533,6 +1533,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Message
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Overflow Gate
 block.underflow-gate.name = Underflow Gate
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index c43c5cbe36..e53a97e6b7 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -1565,6 +1565,7 @@ block.inverted-sorter.name = Trieur Inversé
 block.message.name = Bloc de Message
 block.reinforced-message.name = Bloc de Message Renforcé
 block.world-message.name = Bloc de Message Global
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminateur
 block.overflow-gate.name = Barrière de Débordement
 block.underflow-gate.name = Barrière de Refoulement
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 10fd7cb682..713cd21502 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1566,6 +1566,7 @@ block.inverted-sorter.name = Inverz Válogató
 block.message.name = Üzenet
 block.reinforced-message.name = Megerősített Üzenet
 block.world-message.name = Világ Üzenet
+block.world-switch.name = World Switch
 block.illuminator.name = Világítótest
 block.overflow-gate.name = Alul-folyó Kapu
 block.underflow-gate.name = Túlfolyó Kapu
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index 2d7df0159d..f79faeb13c 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -1556,6 +1556,7 @@ block.inverted-sorter.name = Penyortir Terbalik
 block.message.name = Pesan
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Lampu
 block.overflow-gate.name = Gerbang Luap
 block.underflow-gate.name = Gerbang Luap Terbalik
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 9e62453ad9..04b136afa3 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -1544,6 +1544,7 @@ block.inverted-sorter.name = Filtro Inverso
 block.message.name = Messaggio
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Lanterna
 block.overflow-gate.name = Separatore per Eccesso
 block.underflow-gate.name = Separatore per Eccesso Inverso
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index cf0ddd9af3..5cdb6a3b08 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -1547,6 +1547,7 @@ block.inverted-sorter.name = 反転ソーター
 block.message.name = メッセージブロック
 block.reinforced-message.name = 強化されたメッセージブロック
 block.world-message.name = ワールドメッセージブロック
+block.world-switch.name = World Switch
 block.illuminator.name = イルミネーター
 block.overflow-gate.name = オーバーフローゲート
 block.underflow-gate.name = アンダーフローゲート
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index e019bacac1..985fe6169b 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -1546,6 +1546,7 @@ block.inverted-sorter.name = 반전 필터
 block.message.name = 메모 블록
 block.reinforced-message.name = 보강된 메모 블록
 block.world-message.name = 월드 메모 블록
+block.world-switch.name = World Switch
 block.illuminator.name = 조명
 block.overflow-gate.name = 포화 필터
 block.underflow-gate.name = 불포화 필터
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 9b2748ec60..41fbe42f2e 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Atbulinis Rūšiuotojas
 block.message.name = Žinutė
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Šviestuvas
 block.overflow-gate.name = Perpildymo Užtvara
 block.underflow-gate.name = Neperpildymo Užtvara
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 40dc6f948e..8197533136 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -1546,6 +1546,7 @@ block.inverted-sorter.name = Omgekeerder Sorteerder
 block.message.name = Bericht
 block.reinforced-message.name = Gepansterd Bericht
 block.world-message.name = Wereldbericht
+block.world-switch.name = World Switch
 block.illuminator.name = Lamp
 block.overflow-gate.name = Overstroom Poort
 block.underflow-gate.name = Onderstroom Poort
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 58fc14e283..d1ff0bf906 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Message
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Overflow Gate
 block.underflow-gate.name = Underflow Gate
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index 2acef9ccdc..ca7379c73a 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -1553,6 +1553,7 @@ block.inverted-sorter.name = Odwrotny Sortownik
 block.message.name = Wiadomość
 block.reinforced-message.name = Wzmocniona Wiadomość
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Rozświetlacz
 block.overflow-gate.name = Brama Przepełnieniowa
 block.underflow-gate.name = Brama Niedomiaru
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 783d4b55fd..f483bcddd6 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -1553,6 +1553,7 @@ block.inverted-sorter.name = Ordenador invertido
 block.message.name = Mensagem
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Iluminador
 block.overflow-gate.name = Portão de Sobrecarga
 block.underflow-gate.name = Portão de Sobrecarga Invertido
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 089b9ab48f..f0be98d3ee 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Mensagem
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Portão Sobrecarregado
 block.underflow-gate.name = Portão Desobrecarregado
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index 8dfbe2f380..dfd0c2fe99 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -1547,6 +1547,7 @@ block.inverted-sorter.name = Sortator Invers
 block.message.name = Mesaj
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Iluminator
 block.overflow-gate.name = Poartă de Revărsare
 block.underflow-gate.name = Poartă de Subversare
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 51907dbd98..fabcc731f3 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -1547,6 +1547,7 @@ block.inverted-sorter.name = Инвертированный сортировщи
 block.message.name = Сообщение
 block.reinforced-message.name = Усиленное сообщение
 block.world-message.name = Мировое сообщение
+block.world-switch.name = World Switch
 block.illuminator.name = Осветитель
 block.overflow-gate.name = Избыточный затвор
 block.underflow-gate.name = Избыточный шлюз
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 3582786290..3aa614ff85 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -1549,6 +1549,7 @@ block.inverted-sorter.name = Naopaki Sorter
 block.message.name = Poruka
 block.reinforced-message.name = Armirana Poruka
 block.world-message.name = Svetovna Poruka
+block.world-switch.name = World Switch
 block.illuminator.name = Svetlo
 block.overflow-gate.name = Prelivna Kapija
 block.underflow-gate.name = Podlivna Kapija
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 9443d418b6..8e8f39c352 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Meddelande
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Överflödesgrind
 block.underflow-gate.name = Underflow Gate
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 6afd8357ec..d054c1e508 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -1554,6 +1554,7 @@ block.inverted-sorter.name = เครื่องคัดแยกกลับ
 block.message.name = กล่องข้อความ
 block.reinforced-message.name = กล่องข้อความเสริมกำลัง
 block.world-message.name = กล่องข้อความโลก
+block.world-switch.name = World Switch
 block.illuminator.name = ตัวเปล่งแสง
 block.overflow-gate.name = ประตูระบาย
 block.underflow-gate.name = ประตูระบายข้าง
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index f857cf8b78..ed6d2c3abc 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -1534,6 +1534,7 @@ block.inverted-sorter.name = Inverted Sorter
 block.message.name = Message
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = Illuminator
 block.overflow-gate.name = Kapali dagatici
 block.underflow-gate.name = Underflow Gate
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 57081daccb..c7ad849212 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -1545,6 +1545,7 @@ block.inverted-sorter.name = Ters Ayıklayıcı
 block.message.name = Mesaj Bloğu
 block.reinforced-message.name = Güçlendirilmiş Mesaj Bloğu
 block.world-message.name = Evrensel Mesaj Bloğu
+block.world-switch.name = World Switch
 block.illuminator.name = Aydınlatıcı
 block.overflow-gate.name = Taşma Geçidi
 block.underflow-gate.name = Yana Taşma Geçidi
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 03e23829c9..ba3cab15f8 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -1558,6 +1558,7 @@ block.inverted-sorter.name = Зворотний сортувальник
 block.message.name = Повідомлення
 block.reinforced-message.name = Посилене повідомлення
 block.world-message.name = Світове повідомлення
+block.world-switch.name = World Switch
 block.illuminator.name = Освітлювач
 block.overflow-gate.name = Надмірний затвор
 block.underflow-gate.name = Недостатній затвор
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 74c756b956..b13ddd0693 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -1549,6 +1549,7 @@ block.inverted-sorter.name = Bộ lọc ngược
 block.message.name = Thông điệp
 block.reinforced-message.name = Thông điệp [Gia cố]
 block.world-message.name = Thông điệp thế giới
+block.world-switch.name = World Switch
 block.illuminator.name = Đèn
 block.overflow-gate.name = Cổng tràn
 block.underflow-gate.name = Cổng tràn ngược
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 0ec6bb2d82..7597bd60b4 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -1559,6 +1559,7 @@ block.inverted-sorter.name = 反向分类器
 block.message.name = 信息板
 block.reinforced-message.name = 强化信息板
 block.world-message.name = 世界信息板
+block.world-switch.name = World Switch
 block.illuminator.name = 照明器
 block.overflow-gate.name = 溢流门
 block.underflow-gate.name = 反向溢流门
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index eb180bc7d4..abf6226433 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -1555,6 +1555,7 @@ block.inverted-sorter.name = 反向分類器
 block.message.name = 訊息板
 block.reinforced-message.name = Reinforced Message
 block.world-message.name = World Message
+block.world-switch.name = World Switch
 block.illuminator.name = 照明燈
 block.overflow-gate.name = 溢流器
 block.underflow-gate.name = 反向溢流器

From f18a61d579a1bb11bff16f5261bf7e7d3ec35b07 Mon Sep 17 00:00:00 2001
From: Cubical box <67639725+BlueTheCube@users.noreply.github.com>
Date: Sun, 3 Mar 2024 13:29:03 +0800
Subject: [PATCH 255/369] add shield to settable list (#9612)

---
 core/src/mindustry/logic/LAccess.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java
index 0724018f59..8812bc5815 100644
--- a/core/src/mindustry/logic/LAccess.java
+++ b/core/src/mindustry/logic/LAccess.java
@@ -67,7 +67,7 @@ public enum LAccess{
         all = values(),
         senseable = Seq.select(all, t -> t.params.length <= 1).toArray(LAccess.class),
         controls = Seq.select(all, t -> t.params.length > 0).toArray(LAccess.class),
-        settable = {x, y, rotation, speed, armor, health, team, flag, totalPower, payloadType};
+        settable = {x, y, rotation, speed, armor, health, shield, team, flag, totalPower, payloadType};
 
     LAccess(String... params){
         this.params = params;

From 4300df638d5e699bf8213a4f0a64c41e70d027a4 Mon Sep 17 00:00:00 2001
From: StalkerBaran <120944331+StalkerBaran@users.noreply.github.com>
Date: Sun, 3 Mar 2024 21:10:48 +0700
Subject: [PATCH 256/369] Update servers_v7.json (#9615)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index af0fc63d6e..83e14a4557 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -222,7 +222,7 @@
   },
   {
     "name": "MeowIsland",
-    "address": ["nexus.minecraft.rent:25598", "nexus.minecraft.rent:25596", "jupiter.minecraft.rent:25651", "orion.minecraft.rent:25573"]
+    "address": ["nexus.minecraft.rent:25598", "nexus.minecraft.rent:25596", "jupiter.minecraft.rent:25651", "pandora.minecraft.rent:25620"]
   },
   {
     "name": "3MIDustry",

From fd257bf37639b9af552b399aec549da5e3d76ace Mon Sep 17 00:00:00 2001
From: TheRadioactiveBanana
 <89061718+TheRadioactiveBanana@users.noreply.github.com>
Date: Sun, 3 Mar 2024 20:29:12 +0530
Subject: [PATCH 257/369] Moving rapid pvp from UK to Europe (#9617)

* Moving rapid pvp from UK to Europe

* making a bit more room, removing unused india edge node
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 83e14a4557..287662c1d6 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -133,7 +133,7 @@
   },
   {
     "name": "Eradication Mindustry",
-    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "77.100.100.249:7000", "77.100.100.249:7001", "77.100.100.249:7002", "141.148.196.135:7000", "130.61.220.99:7000", "130.61.220.99:7001"]
+    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "77.100.100.249:7000", "77.100.100.249:7001", "130.61.220.99:7000", "130.61.220.99:7001", "130.61.220.99:7002", "130.61.220.99:7003", "130.61.220.99:7004"]
   },
   {
     "name": "Conservatory",

From c0aef322d3c0ab1ce8550bcae889649c6096aa44 Mon Sep 17 00:00:00 2001
From: BankaiDev <114865515+MarlokytKaneki@users.noreply.github.com>
Date: Sun, 3 Mar 2024 20:22:45 +0300
Subject: [PATCH 258/369] Update servers_v7.json (#9613)

---
 servers_v7.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index 287662c1d6..486d4231fb 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -3,6 +3,11 @@
     "name": "STP",
     "address": ["23.88.73.88:25617"]
   },
+  {
+    "name": "Meow Empire ≫ MEM PROJECT",
+    "address": ["a2.corenodes.host:25514"]
+
+  },
   {
     "name" : "LesGarsCools",
     "address": ["est1.be"]

From ac15b94978e4de6a4aa6c867ba34547a8c08f713 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 3 Mar 2024 14:19:27 -0500
Subject: [PATCH 259/369] Significant sprite packing memory leak fixes

additional thanks to GlFolker for reporting issues with undisposed content icon pixmaps
---
 core/src/mindustry/ctype/UnlockableContent.java           | 2 ++
 core/src/mindustry/graphics/MultiPacker.java              | 8 ++++++--
 core/src/mindustry/type/UnitType.java                     | 3 +++
 core/src/mindustry/world/Block.java                       | 8 ++++++++
 core/src/mindustry/world/blocks/environment/Floor.java    | 1 +
 core/src/mindustry/world/blocks/environment/OreBlock.java | 2 ++
 gradle.properties                                         | 2 +-
 7 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java
index faf53c8363..43190baa9e 100644
--- a/core/src/mindustry/ctype/UnlockableContent.java
+++ b/core/src/mindustry/ctype/UnlockableContent.java
@@ -115,6 +115,7 @@ public abstract class UnlockableContent extends MappableContent{
                     var result = Pixmaps.outline(base, outlineColor, outlineRadius);
                     Drawf.checkBleed(result);
                     packer.add(page, regName, result);
+                    result.dispose();
                 }
             }
         }
@@ -126,6 +127,7 @@ public abstract class UnlockableContent extends MappableContent{
             var result = Pixmaps.outline(base, outlineColor, outlineRadius);
             Drawf.checkBleed(result);
             packer.add(PageType.main, name, result);
+            result.dispose();
         }
     }
 
diff --git a/core/src/mindustry/graphics/MultiPacker.java b/core/src/mindustry/graphics/MultiPacker.java
index 8d5fb2dd8d..e5f473a765 100644
--- a/core/src/mindustry/graphics/MultiPacker.java
+++ b/core/src/mindustry/graphics/MultiPacker.java
@@ -97,8 +97,12 @@ public class MultiPacker implements Disposable{
 
     @Override
     public void dispose(){
-        for(PixmapPacker packer : packers){
-            packer.dispose();
+        for(int i = 0; i < PageType.all.length; i ++){
+            var packer = packers[i];
+            //the UI packer's image is later used when merging with the font, don't dispose it
+            if(i != PageType.ui.ordinal()){
+                packer.forceDispose();
+            }
         }
     }
 
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 09dacda4db..d7dfcf16fe 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -969,6 +969,7 @@ public class UnitType extends UnlockableContent implements Senseable{
                 Drawf.checkBleed(outlined);
 
                 packer.add(PageType.main, regionName + "-outline", outlined);
+                outlined.dispose();
             }
         }
 
@@ -1021,7 +1022,9 @@ public class UnitType extends UnlockableContent implements Senseable{
                     }
 
                     packer.add(PageType.main, name + "-treads" + r + "-" + i, frame);
+                    frame.dispose();
                 }
+                slice.dispose();
             }
         }
     }
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index a401c896a7..5dcf542400 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -1294,6 +1294,8 @@ public class Block extends UnlockableContent implements Senseable{
             }
         }
 
+        Seq<Pixmap> toDispose = new Seq<>();
+
         //generate paletted team regions
         if(teamRegion != null && teamRegion.found()){
             for(Team team : Team.all){
@@ -1318,6 +1320,7 @@ public class Block extends UnlockableContent implements Senseable{
                     Drawf.checkBleed(out);
 
                     packer.add(PageType.main, name + "-team-" + team.name, out);
+                    toDispose.add(out);
                 }
             }
 
@@ -1337,6 +1340,7 @@ public class Block extends UnlockableContent implements Senseable{
             Pixmap out = last = Pixmaps.outline(region, outlineColor, outlineRadius);
             Drawf.checkBleed(out);
             packer.add(PageType.main, atlasRegion.name, out);
+            toDispose.add(out);
         }
 
         var toOutline = new Seq<TextureRegion>();
@@ -1350,6 +1354,7 @@ public class Block extends UnlockableContent implements Senseable{
                 Drawf.checkBleed(outlined);
 
                 packer.add(PageType.main, regionName + "-outline", outlined);
+                toDispose.add(outlined);
             }
         }
 
@@ -1367,12 +1372,15 @@ public class Block extends UnlockableContent implements Senseable{
             packer.add(PageType.main, "block-" + name + "-full", base);
 
             editorBase = new PixmapRegion(base);
+            toDispose.add(base);
         }else{
             if(gen[0] != null) packer.add(PageType.main, "block-" + name + "-full", Core.atlas.getPixmap(gen[0]));
             editorBase = gen[0] == null ? Core.atlas.getPixmap(fullIcon) : Core.atlas.getPixmap(gen[0]);
         }
 
         packer.add(PageType.editor, name + "-icon-editor", editorBase);
+
+        toDispose.each(Pixmap::dispose);
     }
 
     public int planRotation(int rot){
diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java
index 6089faf74f..dfd29de65b 100644
--- a/core/src/mindustry/world/blocks/environment/Floor.java
+++ b/core/src/mindustry/world/blocks/environment/Floor.java
@@ -177,6 +177,7 @@ public class Floor extends Block{
         }
 
         packer.add(PageType.environment, name + "-edge", result);
+        result.dispose();
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/environment/OreBlock.java b/core/src/mindustry/world/blocks/environment/OreBlock.java
index 15bf3448d5..f6da9d5f89 100644
--- a/core/src/mindustry/world/blocks/environment/OreBlock.java
+++ b/core/src/mindustry/world/blocks/environment/OreBlock.java
@@ -69,6 +69,8 @@ public class OreBlock extends OverlayFloor{
                 packer.add(PageType.editor, "editor-block-" + name + "-full", image);
                 packer.add(PageType.main, "block-" + name + "-full", image);
             }
+
+            image.dispose();
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index 73d2c94b6c..50034acf47 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=580916ccfd
+archash=8d5651a6ad

From 9e503efd2f4a0fa1720cb90bcd3874a0b2662f7f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 3 Mar 2024 17:09:23 -0500
Subject: [PATCH 260/369] Fixed sync issues with large objective trees

---
 core/src/mindustry/core/Logic.java         |  6 ++---
 core/src/mindustry/core/NetClient.java     | 16 +++++++++---
 core/src/mindustry/game/MapObjectives.java | 29 ++++++----------------
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java
index e722afb8f1..6af657678f 100644
--- a/core/src/mindustry/core/Logic.java
+++ b/core/src/mindustry/core/Logic.java
@@ -357,7 +357,8 @@ public class Logic implements ApplicationListener{
 
         //map is over, no more world processor objective stuff
         state.rules.disableWorldProcessors = true;
-        state.rules.objectives.clear();
+
+        Call.clearObjectives();
 
         //save, just in case
         if(!headless && !net.client()){
@@ -460,9 +461,6 @@ public class Logic implements ApplicationListener{
 
                 if(!state.isEditor()){
                     state.rules.objectives.update();
-                    if(state.rules.objectives.checkChanged() && net.server()){
-                        Call.setObjectives(state.rules.objectives);
-                    }
                 }
 
                 if(state.rules.waves && state.rules.waveTimer && !state.gameOver){
diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index 914e8eb003..8171a89797 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -340,15 +340,23 @@ public class NetClient implements ApplicationListener{
         state.rules = rules;
     }
 
+    //NOTE: avoid using this, runs into packet/buffer size limitations
     @Remote(variants = Variant.both)
     public static void setObjectives(MapObjectives executor){
         state.rules.objectives = executor;
     }
 
-    @Remote(called = Loc.server)
-    public static void objectiveCompleted(String[] flagsRemoved, String[] flagsAdded){
-        state.rules.objectiveFlags.removeAll(flagsRemoved);
-        state.rules.objectiveFlags.addAll(flagsAdded);
+    @Remote(variants = Variant.both, called = Loc.server)
+    public static void clearObjectives(){
+        state.rules.objectives.clear();
+    }
+
+    @Remote(variants = Variant.both, called = Loc.server)
+    public static void completeObjective(int index){
+        var obj = state.rules.objectives.get(index);
+        if(obj != null){
+            obj.done();
+        }
     }
 
     @Remote(variants = Variant.both)
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index 94b57d4d59..fe7a3b235d 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -39,8 +39,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
      * @see #eachRunning(Cons)
      */
     public Seq<MapObjective> all = new Seq<>(4);
-    /** @see #checkChanged() */
-    protected transient boolean changed;
 
     static{
         registerObjective(
@@ -126,21 +124,13 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         eachRunning(obj -> {
             //objectives cannot get completed on the client, but they do try to update for timers and such
             if(obj.update() && !net.client()){
-                obj.completed = true;
-                obj.done();
+                Call.completeObjective(all.indexOf(obj));
             }
-
-            changed |= obj.changed;
-            obj.changed = false;
         });
     }
 
-    /** @return True if map rules should be synced. Reserved for {@link Vars#logic}; do not invoke directly! */
-    public boolean checkChanged(){
-        boolean has = changed;
-        changed = false;
-
-        return has;
+    public @Nullable MapObjective get(int index){
+        return index < 0 || index >= all.size ? null : all.get(index);
     }
 
     /** @return Whether there are any qualified objectives at all. */
@@ -149,7 +139,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     }
 
     public void clear(){
-        if(all.size > 0) changed = true;
         all.clear();
     }
 
@@ -191,7 +180,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         /** Whether this objective has been done yet. This is internally set. */
         private boolean completed;
         /** Internal value. Do not modify! */
-        private transient boolean depFinished, changed;
+        private transient boolean depFinished;
 
         /** @return True if this objective is done and should be removed from the executor. */
         public abstract boolean update();
@@ -201,13 +190,9 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         /** Called once after {@link #update()} returns true, before this objective is removed. */
         public void done(){
-            changed();
-            Call.objectiveCompleted(flagsRemoved, flagsAdded);
-        }
-
-        /** Notifies the executor that map rules should be synced. */
-        protected void changed(){
-            changed = true;
+            state.rules.objectiveFlags.removeAll(flagsRemoved);
+            state.rules.objectiveFlags.addAll(flagsAdded);
+            completed = true;
         }
 
         /** @return True if all {@link #parents} are completed, rendering this objective able to execute. */

From afb16bc80d8e401a8b305e4a32da9958f19f58b5 Mon Sep 17 00:00:00 2001
From: IamTheOneWhoCooks <143221703+IamTheOneWhoCooks@users.noreply.github.com>
Date: Thu, 7 Mar 2024 16:08:30 +0100
Subject: [PATCH 261/369] Update bundle_cs.properties (#8975)

Co-authored-by: Anuken <arnukren@gmail.com>
---
 core/assets/bundles/bundle_cs.properties | 112 +++++++++++------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 89866a9e19..64343ae1da 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -153,12 +153,12 @@ mod.unmetdependencies = [red]Nesplněné Dependencies
 mod.erroredcontent = [scarlet]V obsahu jsou chyby[]
 mod.circulardependencies = [red]Kruhové Dependencies
 mod.incompletedependencies = [red]Nedokončené Dependencies
-mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function.
-mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file.
-mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it.
-mod.missingdependencies.details = This mod is missing dependencies: {0}
-mod.erroredcontent.details = This game caused errors when loading. Ask the mod author to fix them.
-mod.circulardependencies.details = This mod has dependencies that depends on each other.
+mod.requiresversion.details = Vyžaduje verzi hry: [accent]{0}[]\nVaše hra je zastaralá. Tento mod vyžaduje novější verzi hry (možná beta/alfa verze) aby fungoval.
+mod.outdatedv7.details = Tento mod není kompatibilní s nejnovější verzí hry. Autor ho musí aktualizovat a přidat [accent]minGameVersion: 136[] ho do [accent]mod.json[] složky.
+mod.blacklisted.details = Tento mod byl ručně zařazen na černou listinu, protože způsobuje pády nebo jiné problémy s touto verzí hry. Nepoužívejte jej.
+mod.missingdependencies.details = Tomuto módu chybí závislosti: {0}
+mod.erroredcontent.details = Tato hra způsobovala chyby při načítání. Požádejte autora módu o jejich opravu.
+mod.circulardependencies.details = Tento mod má závislosti, které na sobě navzájem závisí.
 mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
 mod.requiresversion = Requires game version: [red]{0}
 mod.errors = Při načítání obsahu hry se vyskytly problémy.
@@ -261,13 +261,13 @@ trace.modclient = Upravený klient hry: [accent]{0}[]
 trace.times.joined = Krát Připojen: [accent]{0}
 trace.times.kicked = Krát Vyhozen: [accent]{0}
 trace.ips = IPs:
-trace.names = Names:
+trace.names = Jména:
 invalidid = Neplatná adresa IP klienta! Zašli prosím zprávu o chybě.
 player.ban = Ban
-player.kick = Kick
+player.kick = Vyhodit
 player.trace = Trace
-player.admin = Toggle Admin
-player.team = Change Team
+player.admin = Přepínání správce
+player.team = Změnit tým
 server.bans = Zákazy
 server.bans.none = Žádní hráči se zákazem nebyli nalezeni.
 server.admins = Správci
@@ -340,13 +340,13 @@ ok = OK
 open = Otevřít
 customize = Přizpůsobit pravidla
 cancel = Zrušit
-command = Command
-command.queue = [lightgray][Queuing]
-command.mine = Mine
-command.repair = Repair
-command.rebuild = Rebuild
-command.assist = Assist Player
-command.move = Move
+command = Velet
+command.mine = Těžit
+command.repair = Opravovat
+command.rebuild = Přestavět
+command.assist = Asistovat hráči
+command.move = Pohyb
+
 command.boost = Boost
 command.enterPayload = Enter Payload Block
 command.loadUnits = Load Units
@@ -362,7 +362,7 @@ openlink = Otevřít odkaz
 copylink = Zkopírovat odkaz
 back = Zpět
 max = Max
-objective = Map Objective
+objective = Úkol mapy
 crash.export = Exportovat záznamy o zhroucení hry
 crash.none = Záznamy o zhroucení hry nebyly nalezeny.
 crash.exported = Záznamy o zhroucení hry byly exportovány.
@@ -383,7 +383,7 @@ pausebuilding = [accent][[{0}][] zastaví stavění
 resumebuilding = [scarlet][[{0}][] bude pokračovat ve stavění
 enablebuilding = [scarlet][[{0}][] povolí stavení
 showui = UI je skryto.\nZmáčkni [accent][[{0}][] pro jeho zobrazení.
-commandmode.name = [accent]Command Mode
+commandmode.name = [accent]Velící zežim
 commandmode.nounits = [no units]
 wave = [accent]Vlna číslo {0}[]
 wave.cap = [accent]Vlna {0} z {1}[]
@@ -706,7 +706,7 @@ bannedunits.whitelist = Banned Units As Whitelist
 bannedblocks.whitelist = Banned Blocks As Whitelist
 addall = Přidat vše
 launch.from = Vysláno z: [accent]{0}
-launch.capacity = Launching Item Capacity: [accent]{0}
+launch.capacity = Odpalovací kapacita: [accent]{0}
 launch.destination = Cíl: {0}
 configure.invalid = Hodnota musí být číslo mezi 0 a {0}.
 add = Přidat...
@@ -736,8 +736,8 @@ sectorlist.attacked = {0} pod útokem
 sectors.unexplored = [lightgray]Neprozkoumáno
 sectors.resources = Zdroje:
 sectors.production = Výroba:
-sectors.export = Export:
-sectors.import = Import:
+sectors.export = Exportovat:
+sectors.import = Importovat:
 sectors.time = Čas:
 sectors.threat = Ohrožení:
 sectors.wave = Vlna:
@@ -814,43 +814,43 @@ sector.windsweptIslands.description = Vzdálen od pevniny je tento řetízek ost
 sector.extractionOutpost.description = Vzdálená pevnost, postavená nepřítelem za účelem vysílání zdrojů do okolních sektorů.\n\nDoprava položek napříč sektory je nezbytná pro lapení dalších sektorů. Znič základnu. Vyzkoumej jejich Vysílací plošiny.
 sector.impact0078.description = Zde leží zbytky mezihvězdné lodi, která vstoupila do tohoto systému.\n\nZachraň z vraku vše, co se dá. Vyzkoumej nepoškozenou technologii.
 sector.planetaryTerminal.description = Konečný cíl.\n\nTato pobřežní základna obsahuje konstrukce schopné vyslat jádra na okolní planety. Je mimořádně dobře opevněna.\n\nVyrob námořní jednotky. Odstraň nepřítele tak rychle, jak umíš. Vyzkoumej vysílací konstrukci.
-sector.coastline.description = Remnants of naval unit technology have been detected at this location. Repel the enemy attacks, capture this sector, and acquire the technology.
-sector.navalFortress.description = The enemy has established a base on a remote, naturally-fortified island. Destroy this outpost. Acquire their advanced naval craft technology, and research it.
-sector.onset.name = The Onset
+sector.coastline.description = V této lokaci byly objeveny pozůstatky techniky námořních jednotek. Odražte nepřátelské útoky, dobijte tento sektor a získejte technologii.
+sector.navalFortress.description = Nepřítel si vybudoval základnu na odlehlém, přírodou opevněném ostrově. Zničte tuto základnu. Získejte jejich pokročilou technologii námořních plavidel a vyzkoumejte ji.
+sector.onset.name = Nástup
 sector.aegis.name = Aegis
-sector.lake.name = Lake
-sector.intersect.name = Intersect
+sector.lake.name = Jezero
+sector.intersect.name = Průsečík
 sector.atlas.name = Atlas
-sector.split.name = Split
-sector.basin.name = Basin
-sector.marsh.name = Marsh
-sector.peaks.name = Peaks
-sector.ravine.name = Ravine
-sector.caldera-erekir.name = Caldera
-sector.stronghold.name = Stronghold
-sector.crevice.name = Crevice
-sector.siege.name = Siege
-sector.crossroads.name = Crossroads
-sector.karst.name = Karst
-sector.origin.name = Origin
-sector.onset.description = Commence the conquest of Erekir. Gather resources, produce units, and begin researching technology.
+sector.split.name = Rozdělení
+sector.basin.name = Povodí
+sector.marsh.name = Marš
+sector.peaks.name = Vrcholy
+sector.ravine.name = Rokle
+sector.caldera-erekir.name = Kaldera
+sector.stronghold.name = Pevnost
+sector.crevice.name = Štěrbina
+sector.siege.name = Obléhání
+sector.crossroads.name = Křižovatka
+sector.karst.name = Kras
+sector.origin.name = Původ
+sector.onset.description = Zahajte dobývání Erekiru. Shromážděte zdroje, vyrobte jednotky a začněte zkoumat technologie.
 
-sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area.
-sector.lake.description = This sector's slag lake greatly limits viable units. A hover unit is the only option.\nResearch the [accent]ship fabricator[] and produce an [accent]elude[] unit as soon as possible.
-sector.intersect.description = Scans suggest that this sector will be attacked from multiple sides soon after landing.\nSet up defenses quickly and expand as soon as possible.\n[accent]Mech[] units will be required for the area's rough terrain.
-sector.atlas.description = This sector contains varied terrain and will require a variety of units to attack effectively.\nUpgraded units may also be necessary to get past some of the tougher enemy bases detected here.\nResearch the [accent]Electrolyzer[] and the [accent]Tank Refabricator[].
-sector.split.description = The minimal enemy presence in this sector makes it perfect for testing new transport tech.
-sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold.
-sector.marsh.description = This sector has an abundance of arkycite, but has limited vents.\nBuild [accent]Chemical Combustion Chambers[] to generate power.
-sector.peaks.description = The mountainous terrain in this sector make most units useless. Flying units will be required.\nBe aware of enemy anti-air installations. It may be possible to disable some of these installations by targeting their supporting buildings.
-sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets.
-sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation.
-sector.stronghold.description = The large enemy encampment in this sector guards significant deposits of [accent]thorium[].\nUse it to develop higher tier units and turrets.
-sector.crevice.description = The enemy will send fierce attack forces to take out your base in this sector.\nDeveloping [accent]carbide[] and the [accent]Pyrolysis Generator[] may be imperative for survival.
-sector.siege.description = This sector features two parallel canyons that will force a two-pronged attack.\nResearch [accent]cyanogen[] to gain the capability to create even stronger tank units.\nCaution: enemy long-range missiles have been detected. The missiles may be shot down before impact.
-sector.crossroads.description = The enemy bases in this sector have been established in varying terrain. Research different units to adapt.\nAdditionally, some bases are protected by shields. Figure out how they are powered.
-sector.karst.description = This sector is rich in resources, but will be attacked by the enemy once a new core lands.\nTake advantage of the resources and research [accent]phase fabric[].
-sector.origin.description = The final sector with a significant enemy presence.\nNo probable research opportunities remain - focus solely on destroying all enemy cores.
+sector.aegis.description = Tento sektor obsahuje ložiska wolframu.\nVyzkoumej [accent]Nárazový vrták[] k vytěžení této suroviny, a znič nepřátelskou základnu.
+sector.lake.description = Struskové jezero v tomto sektoru značně omezuje použitelné jednotky. Jedinou možností je vznášecí jednotka.\nVyzkoumej [accent]továrna na výrobu lodí[] a vyrob [accent]elude[] jednotku co nejdříve
+sector.intersect.description = Podle průzkumů bude tento sektor brzy po přistání napaden z více stran.\nRychle vytvořte obranu a co nejdříve expandujte.\n[accent]Mech[] jednotky budou zapotřebí pro překročení teréu v oblasti.
+sector.atlas.description = Tento sektor obsahuje rozmanitý terén a pro efektivní útok bude vyžadovat různé jednotky.\nPro překonání některých těžších nepřátelských základen zde mohou být nutné i vylepšené jednotky.\nVyzkoumej [accent]Electrolyzér[] a [accent]Přestavovač tanků[].
+sector.split.description = Minimální přítomnost nepřátel v tomto sektoru je ideální pro testování nových dopravních technologií.
+sector.basin.description = V tomto sektoru byla zjištěna velká přítomnost nepřátel.\nRychle postavte jednotky a získejte nepřátelská jádra, abyste se prosadili.
+sector.marsh.description =Tento sektor má hojnost arkycitu, ale má omezené průduchy.\nPostav [accent]Chemické spalovací komory[] k výrobě energie.
+sector.peaks.description = Hornatý terén v tomto sektoru činí většinu jednotek nepoužitelnými. Bude zapotřebí létajících jednotek.\nDejte si pozor na nepřátelská protiletecká zařízení. Některá z těchto zařízení je možné vyřadit zaměřením jejich podpůrných budov.
+sector.ravine.description = V sektoru nebyla zjištěna žádná nepřátelská jádra, ačkoli se jedná o důležitou dopravní trasu pro nepřítele. Očekávejte rozmanitost nepřátelských sil.\nVyrob [accent]rázová slitina[]. Postav [accent]Aflict[] věže.
+sector.caldera-erekir.description = Zdroje zjištěné v tomto sektoru jsou rozptýleny na několika ostrovech. \nVyzkoumejte a nasaďte dopravu pomocí dronů.
+sector.stronghold.description = Rozsáhlé nepřátelské ležení v tomto sektoru střeží významná ložiska [accent]thoria[].\nPoužijte ho na vývoj jednotek a věží vyšší úrovně.
+sector.crevice.description = Nepřítel vyšle ostré útočné síly, aby zničily vaši základnu v tomto sektoru.\nVývoj [accent]karbid[] a [accent]Pyrolytický generátor[] může být nezbytný pro přežití.
+sector.siege.description = V tomto sektoru se nacházejí dva paralelní kaňony, které si vynutí útok dvěma směry.\nVyzkoumej [accent]kyan[] pro získání schopnosti vytvářet ještě silnější tankové jednotky.\nPozor: byly detekovány nepřátelské rakety dlouhého doletu. Rakety mohou být sestřeleny před dopadem.
+sector.crossroads.description = Nepřátelské základny v tomto sektoru jsou rozmístěny v různém terénu. Výzkumem různých jednotek se jim přizpůsobíte.\nNěkteré základny jsou navíc chráněny štíty. Zjistěte, jak jsou napájeny.
+sector.karst.description = Tento sektor je bohatý na zdroje, ale jakmile se zde objeví nové jádro, bude napaden nepřítelem.\nVyužijte zdroje a vyzkoumej [accent]fázová tkanina[].
+sector.origin.description = Poslední sektor s výrazným výskytem nepřátel.\nŽádné pravděpodobné možnosti výzkumu nezbývají - soustřeďte se výhradně na zničení všech nepřátelských jader.
 
 status.burning.name = Hořící
 status.freezing.name = Mrazící

From 6a7a4171072eb49a65c6ea1ecca46659179e0657 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az1426-611.rca3p110zaveja4ulz44at14fe.dx.internal.cloudapp.net>
Date: Thu, 7 Mar 2024 15:09:27 +0000
Subject: [PATCH 262/369] Automatic bundle update

---
 core/assets/bundles/bundle_cs.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 64343ae1da..65e16af2d7 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -341,6 +341,7 @@ open = Otevřít
 customize = Přizpůsobit pravidla
 cancel = Zrušit
 command = Velet
+command.queue = Queue
 command.mine = Těžit
 command.repair = Opravovat
 command.rebuild = Přestavět
@@ -841,7 +842,7 @@ sector.intersect.description = Podle průzkumů bude tento sektor brzy po přist
 sector.atlas.description = Tento sektor obsahuje rozmanitý terén a pro efektivní útok bude vyžadovat různé jednotky.\nPro překonání některých těžších nepřátelských základen zde mohou být nutné i vylepšené jednotky.\nVyzkoumej [accent]Electrolyzér[] a [accent]Přestavovač tanků[].
 sector.split.description = Minimální přítomnost nepřátel v tomto sektoru je ideální pro testování nových dopravních technologií.
 sector.basin.description = V tomto sektoru byla zjištěna velká přítomnost nepřátel.\nRychle postavte jednotky a získejte nepřátelská jádra, abyste se prosadili.
-sector.marsh.description =Tento sektor má hojnost arkycitu, ale má omezené průduchy.\nPostav [accent]Chemické spalovací komory[] k výrobě energie.
+sector.marsh.description = Tento sektor má hojnost arkycitu, ale má omezené průduchy.\nPostav [accent]Chemické spalovací komory[] k výrobě energie.
 sector.peaks.description = Hornatý terén v tomto sektoru činí většinu jednotek nepoužitelnými. Bude zapotřebí létajících jednotek.\nDejte si pozor na nepřátelská protiletecká zařízení. Některá z těchto zařízení je možné vyřadit zaměřením jejich podpůrných budov.
 sector.ravine.description = V sektoru nebyla zjištěna žádná nepřátelská jádra, ačkoli se jedná o důležitou dopravní trasu pro nepřítele. Očekávejte rozmanitost nepřátelských sil.\nVyrob [accent]rázová slitina[]. Postav [accent]Aflict[] věže.
 sector.caldera-erekir.description = Zdroje zjištěné v tomto sektoru jsou rozptýleny na několika ostrovech. \nVyzkoumejte a nasaďte dopravu pomocí dronů.

From 844c6c021a1e67d02913f901bfd9761ece68724a Mon Sep 17 00:00:00 2001
From: GeoNew2011 <152255543+GeoNew2011@users.noreply.github.com>
Date: Fri, 8 Mar 2024 21:14:35 +0300
Subject: [PATCH 263/369] Update servers_v7.json (#9627)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 486d4231fb..0ff771763c 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -279,7 +279,7 @@
   },
   {
     "name": "Erepulo",
-    "address": ["95.84.198.97:5401", "95.84.198.97:5402", "95.84.198.97:5403"]
+    "address": ["95.84.198.97:5401", "95.84.198.97:5402", "95.84.198.97:5403", "95.84.198.97:2357"]
   },
   {
     "name": "MineCore",

From d7dc180a3fd1227349fe3ff6a24bc4753a25c953 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 8 Mar 2024 21:04:35 -0500
Subject: [PATCH 264/369] Fixed #9628

---
 core/src/mindustry/input/InputHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index c43c8e8fed..a3e65423dd 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -1179,7 +1179,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
         var last = lastSchematic;
 
-        ui.showTextInput("@schematic.add", "@name", "", text -> {
+        ui.showTextInput("@schematic.add", "@name", 1000, "", text -> {
             Schematic replacement = schematics.all().find(s -> s.name().equals(text));
             if(replacement != null){
                 ui.showConfirm("@confirm", "@schematic.replace", () -> {

From b49b1b28f10527b65c1e3f1a047547f5aeee3e3d Mon Sep 17 00:00:00 2001
From: summoner001 <summoner001@users.noreply.github.com>
Date: Sat, 9 Mar 2024 16:05:25 +0000
Subject: [PATCH 265/369] Update bundle_hu.properties (#9614)

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian tranlation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

fixing and polishing the hungarian translation

* Update bundle_hu.properties

fixing anf polishing the hungarian translation

* Update bundle_hu.properties

fixing and polishing the hungarian translation

* Update bundle_hu.properties

fixing and polishing the hungarian translation

* Update bundle_hu.properties

fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation.

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishging the hungarian translation

* Update bundle_hu.properties

fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation.

* Update bundle_hu.properties

Fixing and polishing the hungarian translation.

* Update bundle_hu.properties

Fixing and polishing the hungarian translation.

* Update bundle_hu.properties

Fixing and polishing the hunagrian tranlation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation

* Update bundle_hu.properties

Fixing and polishing the hungarian translation
---
 core/assets/bundles/bundle_hu.properties | 560 +++++++++++------------
 1 file changed, 280 insertions(+), 280 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 713cd21502..25762a0f33 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -14,7 +14,7 @@ link.f-droid.description = F-Droid katalógus listázás
 link.wiki.description = Hivatalos Mindustry wiki
 link.suggestions.description = Új funkciók ajánlása
 link.bug.description = Találtál egy szoftver hibát? Itt jelentheted
-linkopen = Ez a szerver egy linket küldött neked. Biztos vagy benne, hogy megnyitod?\n\n[sky]{0}
+linkopen = Ez a kiszolgáló egy linket küldött neked. Biztos vagy benne, hogy megnyitod?\n\n[sky]{0}
 linkfail = Nem sikerült megnyitni a linket!\nAz URL a vágólapra lett másolva.
 screenshot = Képernyőkép mentve ide: {0}
 screenshot.invalid = Túl nagy a pálya, nincs elég memória a képernyőképhez.
@@ -35,7 +35,7 @@ load.mod = Modok
 load.scripts = Szkriptek
 
 be.update = Új Bleeding Edge verzió áll rendelkezésre:
-be.update.confirm = Letöltöd és újraindítod?
+be.update.confirm = Letöltöd és újraindítod a játékot?
 be.updating = Frissítés...
 be.ignore = Most nem
 be.noupdates = Nem található frissítés.
@@ -72,7 +72,7 @@ schematic.saved = Vázlat elmentve.
 schematic.delete.confirm = Ez a vázlat törölve lesz.
 schematic.edit = Vázlat szerkesztése
 schematic.info = {0}x{1}, {2} blokk
-schematic.disabled = [scarlet]Vázlatok letiltva[]\nNem használhatsz vázlatokat ezen a [accent]pályán[], vagy [accent]szerveren.
+schematic.disabled = [scarlet]Vázlatok letiltva[]\nNem használhatsz vázlatokat ezen a [accent]pályán[], vagy [accent]kiszolgálón.
 schematic.tags = Címkék:
 schematic.edittags = Címkék szerkesztése
 schematic.addtag = Címke hozzáadása
@@ -93,17 +93,17 @@ stats.deconstructed = Építmények lebontva
 stats.playtime = Játékban töltött idő
 
 globalitems = [accent]A bolygó nyersanyagai
-map.delete = Biztosan törölni akarod a "[accent]{0}[]" pályát?
-level.highscore = Legmagasabb Pontszám: [accent]{0}
+map.delete = Biztosan törölni akarod a(z) "[accent]{0}[]" pályát?
+level.highscore = Legmagasabb pontszám: [accent]{0}
 level.select = Szint kiválasztása
 level.mode = Játékmód:
-coreattack = < A Mag támadás alatt van! >
+coreattack = < A Támaszpont támadás alatt van! >
 nearpoint = [[ [scarlet]AZONNAL HAGYD EL A LEDOBÁSI PONTOT![] ]\nA megsemmisülés fenyeget!
-database = Mag adatbázis
+database = Támaszpont adatbázis
 database.button = Adatbázis
 savegame = Játék mentése
 loadgame = Játék betöltése
-joingame = Csatlakozás egy játékhoz
+joingame = Kapcsolódás egy játékhoz
 customgame = Egyedi játék
 newgame = Új játék
 none = <semmi>
@@ -188,7 +188,7 @@ name = Név:
 noname = Előbb válassz egy[accent] nevet[].
 search = Keresés:
 planetmap = Bolygó térkép
-launchcore = Mag indítása
+launchcore = Támaszpont indítása
 filename = Fájl név:
 unlocked = Új tartalom kinyitva!
 available = Új fejlesztés áll rendelkezésre!
@@ -204,53 +204,53 @@ techtree.serpulo = Serpulo
 techtree.erekir = Erekir
 research.load = Betöltés
 research.discard = Eldobás
-research.list = [lightgray]Fedezd fel:
-research = Felfedezés
-researched = [lightgray]{0} felfedezve.
+research.list = [lightgray]Fejleszd ki:
+research = Fejlesztési fa
+researched = [lightgray]{0} kifejlesztve.
 research.progress = {0}% kész
 players = {0} játékos
 players.single = {0} játékos
 players.search = Keresés
 players.notfound = [gray]Nem található játékos
-server.closing = [accent]Szerver bezárása...
-server.kicked.kick = Ki lettél rúgva a szerverről!
+server.closing = [accent]Kiszolgáló bezárása...
+server.kicked.kick = Ki lettél rúgva a kiszolgálóról!
 server.kicked.whitelist = Nem vagy a fehérlistán.
-server.kicked.serverClose = A szerver be lett zárva.
+server.kicked.serverClose = A kiszolgáló be lett zárva.
 server.kicked.vote = Ki lettél szavazva. Viszlát!
 server.kicked.clientOutdated = Elavult játékverziót használsz! Frissítsd a játékot!
-server.kicked.serverOutdated = Elavult a szerver! Kérd meg a tulajdonost, hogy frissítse!
-server.kicked.banned = Ki vagy tiltva erről a szerverről.
-server.kicked.typeMismatch = Ez a szerver nem kompatibilis a jelenlegi játékverzióddal.
-server.kicked.playerLimit = Ez a szerver tele van. Várd ki a sorodat.
-server.kicked.recentKick = Nemrég lettél kirúgva.\nVárj egy kicsit az újbóli csatlakozáshoz.
-server.kicked.nameInUse = Már van egy ilyen nevű játékos\nezen a szerveren.
+server.kicked.serverOutdated = Elavult a kiszolgáló! Kérd meg a tulajdonost, hogy frissítse!
+server.kicked.banned = Ki vagy tiltva erről a kiszolgálóról.
+server.kicked.typeMismatch = Ez a kiszolgáló nem kompatibilis a jelenlegi játékverzióddal.
+server.kicked.playerLimit = Ez a kiszolgáló tele van. Várd ki a sorodat.
+server.kicked.recentKick = Nemrég lettél kirúgva.\nVárj egy kicsit az újbóli kapcsolódással.
+server.kicked.nameInUse = Már van egy ilyen nevű játékos\nezen a kiszolgálón.
 server.kicked.nameEmpty = A kiválasztott név érvénytelen.
-server.kicked.idInUse = Már csatlakozva vagy ehhez a szerverhez! Nem lehet egyszerre két fiókot használni.
-server.kicked.customClient = Ez a szerver nem támogatja a saját készítésű játék-összeállításokat. Használj egy hivatalos változatot.
+server.kicked.idInUse = Már kapcsolódva vagy ehhez a kiszolgálóhoz! Nem lehet egyszerre két fiókot használni.
+server.kicked.customClient = Ez a kiszolgáló nem támogatja a saját készítésű játék-összeállításokat. Használj egy hivatalos változatot.
 server.kicked.gameover = Vége a játéknak!
-server.kicked.serverRestarting = Ez a szerver újraindul.
-server.versions = A te játékverziód:[accent] {0}[]\nA szerver verziója:[accent] {1}[]
-host.info = A [accent]hosztolás[] gomb szervert nyit a [scarlet]6567[] porton.\nEzen a [lightgray] wifin vagy a helyi hálózaton [] bárki láthatja a szervert a szerverlistáján.\n\nHa azt szeretnéd, hogy az emberek bárhonnan, IP-címmel csatlakozhassanak, [accent]port továbbítás[] szükséges.\n\n[lightgray]Megjegyzés: Ha valakinek problémái vannak a LAN-játékhoz való csatlakozással, győződj meg arról, hogy a tűzfal beállításaiban engedélyezted-e a Mindustry hozzáférését a helyi hálózathoz. Ne feledd, hogy a nyilvános hálózatok néha nem teszik lehetővé a szerverek felderítését.
-join.info = Itt megadhatsz egy [accent]szerver IP[]-címet a csatlakozáshoz, vagy felfedezhetsz [accent]helyi hálózati[], vagy [accent]globális[] szervereket a csatlakozáshoz.\nA LAN és WAN többjátékos mód is támogatott.\n\n[lightgray]Ha valakihez IP alapján szeretnél csatlakozni, akkor meg kell tudnod a partnered IP címét. Az IP-címeteket az interneten a "mi az IP-címem?" szövegre való kereséssel is megtalálhatjátok.
-hostserver = Többjátékos játék hosztolása
+server.kicked.serverRestarting = Ez a kiszolgáló újraindul.
+server.versions = A te játékverziód:[accent] {0}[]\nA kiszolgáló verziója:[accent] {1}[]
+host.info = A [accent]Kiszolgáló indítása[] gomb egy kiszolgálót indít a [scarlet]6567[] porton.\nEzen a [lightgray] Wi-Fi-n, vagy a helyi hálózaton [] bárki láthatja a kiszolgálót a kiszolgálólistán.\n\nHa azt szeretnéd, hogy az emberek bárhonnan, IP-címmel kapcsolódhassanak, akkor [accent]porttovábbítás[] szükséges.\n\n[lightgray]Megjegyzés: ha valakinek problémái vannak a LAN-játékhoz való kapcsolódással, győződj meg arról, hogy a tűzfal beállításaiban engedélyezted-e a Mindustry hozzáférését a helyi hálózathoz. Ne feledd, hogy a nyilvános hálózatok néha nem teszik lehetővé a kiszolgálók felderítését.
+join.info = Itt megadhatsz egy [accent]kiszolgáló IP[]-címet a kapcsolódáshoz, vagy felfedezhetsz [accent]helyi hálózati[], vagy [accent]globális[] kiszolgálókat a kapcsolódáshoz.\nA LAN és WAN többjátékos mód is támogatott.\n\n[lightgray]Ha valakihez IP alapján szeretnél kapcsolódni, akkor meg kell tudnod a partnered IP címét. Az IP-címeteket az interneten a "mi az IP-címem?" szövegre való kereséssel is megtalálhatjátok.
+hostserver = Többjátékos játék
 invitefriends = Barátok meghívása
-hostserver.mobile = Játék hosztolása
-host = Hosztolás
-hosting = [accent]Szerver megnyitása...
+hostserver.mobile = Többjátékos játék
+host = Kiszolgáló nyitása
+hosting = [accent]Kiszolgáló megnyitása...
 hosts.refresh = Frissítés
 hosts.discovering = LAN játékok felderítése
 hosts.discovering.any = Játékok felderítése
-server.refreshing = Szerver frissítése
+server.refreshing = Kiszolgáló frissítése
 hosts.none = [lightgray]Nem található helyi játék!
-host.invalid = [scarlet]Nem sikerült csatlakozni a hoszthoz.
+host.invalid = [scarlet]Nem sikerült kapcsolódni a kiszolgálóhoz.
 
-servers.local = Helyi Szerverek
-servers.local.steam = Nyitott játékok és helyi szerverek
-servers.remote = Távoli szerverek
-servers.global = Közösségi szerverek
+servers.local = Helyi kiszolgálók
+servers.local.steam = Nyitott játékok és helyi kiszolgálók
+servers.remote = Távoli kiszolgálók
+servers.global = Közösségi kiszolgálók
 
-servers.disclaimer = A közösségi szervereket [accent]nem[] a fejlesztő birtokolja és ellenőrzi.\n\nA szerverek tartalmazhatnak olyan felhasználók által létrehozott tartalmat, amely nem minden korosztály számára megfelelő.
-servers.showhidden = Rejtett Szerverek Megjelenítése
+servers.disclaimer = A közösségi kiszolgálókat [accent]nem[] a fejlesztő birtokolja és ellenőrzi.\n\nA kiszolgálók tartalmazhatnak olyan felhasználók által létrehozott tartalmat, amely nem minden korosztály számára megfelelő.
+servers.showhidden = Rejtett kiszolgálók megjelenítése
 server.shown = Látható
 server.hidden = Rejtett
 
@@ -262,7 +262,7 @@ trace.id = Azonosító: [accent]{0}
 trace.language = Nyelv: [accent]{0}
 trace.mobile = Mobil kliens: [accent]{0}
 trace.modclient = Nem hivatalos kliens: [accent]{0}
-trace.times.joined = Csatlakozások száma: [accent]{0}
+trace.times.joined = Kapcsolódások száma: [accent]{0}
 trace.times.kicked = Kirúgások száma: [accent]{0}
 trace.ips = IP-k:
 trace.names = Nevek:
@@ -278,10 +278,10 @@ server.bans = Tiltások
 server.bans.none = Nincsenek tiltott játékosok!
 server.admins = Adminok
 server.admins.none = Nem található admin!
-server.add = Szerver hozzáadása
-server.delete = Biztosan törlöd ezt a szervert?
-server.edit = Szerver szerkesztése
-server.outdated = [scarlet]Elavult szerver![]
+server.add = Kiszolgáló hozzáadása
+server.delete = Biztosan törlöd ezt a kiszolgálót?
+server.edit = Kiszolgáló szerkesztése
+server.outdated = [scarlet]Elavult kiszolgáló![]
 server.outdated.client = [scarlet]Elavult kliens![]
 server.version = [gray]v{0} {1}
 server.custombuild = [accent]Saját összeállítás
@@ -292,24 +292,24 @@ confirmadmin = Biztosan előlépteted "{0}[white]" játékost adminná?
 confirmunadmin = Biztosan meg akarod szüntetni "{0}[white]" játékosnak az adminisztrátori státuszát?
 votekick.reason = Kiszavazás oka
 votekick.reason.message = Valóban kiakarod szavazni "{0}[white]"-t?\nHa igen, írd le miért:
-joingame.title = Csatlakozás a játékhoz
+joingame.title = Kapcsolódás a játékhoz
 joingame.ip = Cím:
-disconnect = Lecsatlakozva.
-disconnect.error = Csatlakozási hiba.
+disconnect = Lekapcsolódva.
+disconnect.error = Kapcsolódási hiba.
 disconnect.closed = Kapcsolat bontva.
 disconnect.timeout = Időtúllépés.
 disconnect.data = Nem sikerült betölteni a világ adatot!
-cantconnect = Nem sikerült csatlakozni a(z) ([accent]{0}[]) játékhoz.
-connecting = [accent]Csatlakozás...
-reconnecting = [accent]Újracsatlakozás...
+cantconnect = Nem sikerült kapcsolódni a(z) ([accent]{0}[]) játékhoz.
+connecting = [accent]Kapcsolódás...
+reconnecting = [accent]Újrakapcsolódás...
 connecting.data = [accent]Világ adat betöltése...
 server.port = Port:
 server.addressinuse = A cím már használatban van!
 server.invalidport = Érvénytelen port!
-server.error = [scarlet]Hosztolási szerver hiba.
+server.error = [scarlet]Kiszolgáló hiba.
 save.new = Új mentés
 save.overwrite = Biztosan felülírod\nezt a mentést?
-save.nocampaign = A hadjáratból származó egyes mentési fájlok nem importálhatók.
+save.nocampaign = A hadjáratból származó egyes mentési fájlok nem importálhatóak.
 overwrite = Felülírás
 save.none = Nem található mentés!
 savefail = Nem sikerült elmenteni a játékot!
@@ -354,35 +354,35 @@ command.rebuild = Újraépítés
 command.assist = Segítség a játékosnak
 command.move = Mozgás
 command.boost = Erősítés
-command.enterPayload = Berakodás rakományszállítóba
+command.enterPayload = Berakodás a rakományszállítóba
 command.loadUnits = Egységek felvétele
 command.loadBlocks = Blokkok felvétele
-command.unloadPayload = Kirakodás rakományszállítóból
+command.unloadPayload = Kirakodás a rakományszállítóból
 stance.stop = Parancsok visszavonása
-stance.shoot = Magatartás: Lövés
-stance.holdfire = Magatartás: Tüzet szüntess
-stance.pursuetarget = Magatartás: Célpont követése
-stance.patrol = Magatartás: Járőrözési útvonal
-stance.ram = Magatartás: Ütközés\n[lightgray]Egyenes vonalú mozgás, nincs útkeresés
+stance.shoot = Viselkedés: lövés
+stance.holdfire = Viselkedés: tüzet szüntess
+stance.pursuetarget = Viselkedés: célpont követése
+stance.patrol = Viselkedés: járőrözési útvonal
+stance.ram = Viselkedés: ütközés\n[lightgray]Egyenes vonalú mozgás, nincs útkeresés
 openlink = Link megnyitása
 copylink = Link másolása
 back = Vissza
 max = Max
 objective = A pálya célja
-crash.export = Összeomlási napló exportálása
-crash.none = Nem található összeomlási napló.
-crash.exported = Összeomlási napló exportálva.
-data.export = Adat Exportálása
-data.import = Adat Importálása
-data.openfolder = Adat mappa megnyitása
-data.exported = Adat exportálva.
+crash.export = Az összeomlási napló exportálása
+crash.none = Nem található az összeomlási napló.
+crash.exported = Az összeomlási napló exportálva.
+data.export = Adatok exportálása
+data.import = Adatok importálása
+data.openfolder = Adatok mappájának megnyitása
+data.exported = Adatok exportálva.
 data.invalid = Ez nem egy érvényes játékadat.
-data.import.confirm = Külső adat importálása felülírja[scarlet] minden[] jelenlegi játékadatodat.\n[accent]Nem vonható vissza![]\n\nAmint kész az importálás, a játék azonnal kilép.
+data.import.confirm = A külső adatok importálása felülírja[scarlet] minden[] jelenlegi játékadatodat.\n[accent]Nem vonható vissza![]\n\nAmint kész az importálás, a játék azonnal kilép.
 quit.confirm = Biztosan kilépsz?
 loading = [accent]Betöltés...
 downloading = [accent]Letöltés...
 saving = [accent]Mentés...
-respawn = Nyomd meg a(z) [accent][[{0}][] gombot, hogy újraéledj a Magban.
+respawn = Nyomd meg a(z) [accent][[{0}][] gombot, hogy drónként újraéledj.
 cancelbuilding = Használd a(z) [accent][[{0}][] gombot, hogy töröld a tervrajzot.
 selectschematic = Használd a(z) [accent][[{0}][] gombot, hogy kijelölj és másolj.
 pausebuilding = Használd a(z) [accent][[{0}][] gombot, hogy megállítsd az építkezést.
@@ -391,16 +391,16 @@ enablebuilding = Használd a(z) [scarlet][[{0}][] gombot, hogy jóváhagyd az é
 showui = A kezelőfelület elrejtve.\nNyomd meg a(z) [accent][[{0}][] gombot a kezelőfelület megjelenítéséhez.
 commandmode.name = [accent]Parancs mód
 commandmode.nounits = [nincs egység]
-wave = [accent]{0}. Hullám
-wave.cap = [accent]{0}./{1} Hullám
-wave.waiting = [lightgray]A következő hullám {0}
+wave = [accent]{0}. hullám
+wave.cap = [accent]{0}./{1} hullám
+wave.waiting = [lightgray]A következő hullám elkezdődik: {0} mp múlva
 wave.waveInProgress = [lightgray]Hullám folyamatban
 waiting = [lightgray]Várakozás...
 waiting.players = Várakozás a játékosokra...
-wave.enemies = [lightgray]{0}db Ellenség Maradt
-wave.enemycores = [accent]{0}db[lightgray] Ellenséges Mag
-wave.enemycore = [accent]{0}db[lightgray] Ellenséges Mag
-wave.enemy = [lightgray]{0}db Ellenség Maradt
+wave.enemies = [lightgray]{0}db ellenség maradt
+wave.enemycores = [accent]{0}db[lightgray] ellenséges Támaszpont
+wave.enemycore = [accent]{0}db[lightgray] ellenséges Támaszpont
+wave.enemy = [lightgray]{0}db ellenség maradt
 wave.guardianwarn = Egy Őrző érkezik [accent]{0}[] hullám múlva.
 wave.guardianwarn.one = Egy Őrző érkezik [accent]{0}[] hullám múlva.
 loadimage = Kép betöltése
@@ -410,9 +410,9 @@ custom = Egyedi
 builtin = Beépített
 map.delete.confirm = Biztosan törlöd ezt a pályát? Ez a művelet nem vonható vissza!
 map.random = [accent]Véletlenszerű pálya
-map.nospawn = Ez a pálya nem rendelkezik Maggal, amellyel a játékos kezdhet! Adj hozzá egy {0} Magot ehhez a pályához a szerkesztőben!
-map.nospawn.pvp = Ezen a pályán nincs ellenséges Mag, amellyel a másik csapat kezdhet! Adj hozzá egy [scarlet]nem narancssárga[] Magot ehhez a pályához a szerkesztőben!
-map.nospawn.attack = Ezen a pályán nincs ellenséges Mag! Adj hozzá egy {0} Magot ehhez a pályához a szerkesztőben!
+map.nospawn = Ez a pálya nem rendelkezik Támaszponttal, amellyel a játékos kezdhet! Adj hozzá egy {0} Támaszpontot ehhez a pályához a szerkesztőben!
+map.nospawn.pvp = Ezen a pályán nincs ellenséges Támaszpont, amellyel a másik csapat kezdhet! Adj hozzá egy [scarlet]nem narancssárga[] Támaszpontot ehhez a pályához a szerkesztőben!
+map.nospawn.attack = Ezen a pályán nincs ellenséges Támaszpont! Adj hozzá egy {0} Támaszpontot ehhez a pályához a szerkesztőben!
 map.invalid = Hiba történt a pálya betöltésekor: sérült vagy érvénytelen fájl.
 workshop.update = Elem frissítése
 workshop.error = Hiba történt a Steam Műhely részleteinek lekérdezésekor: {0}
@@ -490,7 +490,7 @@ waves.sort.type = Típus
 waves.search = Hullám keresése...
 waves.filter = Egység szűrő
 waves.units.hide = Mindent elrejt
-waves.units.show = Mindent mutat
+waves.units.show = Mindent megjelenít
 
 #these are intentionally in lower case
 wavemode.counts = típusokra bontva
@@ -529,7 +529,7 @@ editor.savechanges = [scarlet]Nem mentett módosításaid vannak!\n\n[]Szeretné
 editor.saved = Mentve!
 editor.save.noname = A pályádnak nincs neve! Állíts be egyet a 'pálya infó' menüben.
 editor.save.overwrite = A pályád felülír egy beépített pályát! Válassz egy másik nevet az 'pálya infó' menüben!
-editor.import.exists = [scarlet]Nem lehet importálni:[] Már létezik "{0}" nevű beépített pálya!
+editor.import.exists = [scarlet]Nem lehet importálni:[] Már létezik a(z) "{0}" nevű beépített pálya!
 editor.import = Importálás...
 editor.importmap = Pálya importálása
 editor.importmap.description = Létező pálya importálása
@@ -554,7 +554,7 @@ editor.selectmap = Válassz ki egy pályát a betöltéshez:
 
 toolmode.replace = Csere
 toolmode.replace.description = Csak szilárd blokkokra rajzol.
-toolmode.replaceall = Összes Cseréje
+toolmode.replaceall = Összes cseréje
 toolmode.replaceall.description = Az összes blokkot lecseréli a pályán.
 toolmode.orthogonal = Merőleges
 toolmode.orthogonal.description = Csak merőleges vonalakat rajzol.
@@ -578,7 +578,7 @@ filter.distort = Torzítás
 filter.noise = Zaj
 filter.enemyspawn = Ellenséges kezdőpont kiválasztása
 filter.spawnpath = Útvonal a kezdőponthoz
-filter.corespawn = Mag kiválasztása
+filter.corespawn = Támaszpont kiválasztása
 filter.median = Medián
 filter.oremedian = Érc medián
 filter.blend = Vegyes
@@ -656,29 +656,29 @@ abandon.text = Ez a szektor és minden nyersanyaga az ellenség kezére kerül.
 locked = Lezárva
 complete = [lightgray]Feltételek:
 requirement.wave = Juss el a {0}. hullámig a(z) {1} szektorban
-requirement.core = Pusztítsd el az ellenséges Magot a(z) {0} szektorban
-requirement.research = Fedezd fel: {0}
+requirement.core = Pusztítsd el az ellenséges Támaszpontot a(z) {0} szektorban
+requirement.research = Fejleszd ki: {0}
 requirement.produce = Gyártsd le: {0}
 requirement.capture = Foglald el a(z) {0} szektort
 requirement.onplanet = Szektor elfoglalása a(z) {0}-n
 requirement.onsector = Landolj a(z) {0} szektorban
 launch.text = Indítás
-research.multiplayer = Csak a hoszt fedezhet fel nyersanyagokat.
-map.multiplayer = Csak a hoszt tekintheti meg a szektorokat.
+research.multiplayer = Csak a kiszolgáló fedezhet fel nyersanyagokat.
+map.multiplayer = Csak a kiszolgáló tekintheti meg a szektorokat.
 uncover = Felfedés
 configure = Rakomány szerkesztése
 
-objective.research.name = Kutatás
+objective.research.name = Fejlesztés
 objective.produce.name = Megszerzés
 objective.item.name = Nyersanyag megszerzése
-objective.coreitem.name = Mag nyersanyag
+objective.coreitem.name = Támaszpont nyersanyag
 objective.buildcount.name = Építés számláló
 objective.unitcount.name = Egység számláló
 objective.destroyunits.name = Egység megsemmisítése
 objective.timer.name = Időzítő
 objective.destroyblock.name = Blokk megsemmisítése
 objective.destroyblocks.name = Blokkok megsemmisítése
-objective.destroycore.name = Mag megsemmisítése
+objective.destroycore.name = Támaszpont megsemmisítése
 objective.commandmode.name = Parancs mód
 objective.flag.name = Jelölő
 
@@ -697,27 +697,27 @@ objective.produce = [accent]Termelj:\n[]{0}[lightgray]{1}
 objective.destroyblock = [accent]Semmisítsd meg:\n[]{0}[lightgray]{1}
 objective.destroyblocks = [accent]Semmisítsd meg: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
 objective.item = [accent]Termelj: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
-objective.coreitem = [accent]Szállítás a Magba:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.coreitem = [accent]Szállítás a Támaszpontba:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
 objective.build = [accent]Építs: [][lightgray]{0}[]db\n{1}[lightgray]{2}
 objective.buildunit = [accent]Gyárts egységeket: [][lightgray]{0}[]db\n{1}[lightgray]{2}
 objective.destroyunits = [accent]Semmisíts meg: [][lightgray]{0}[]db Egységet
-objective.enemiesapproaching = [accent]Ellenség érkezik: [lightgray]{0}[] múlva
-objective.enemyescelating = [accent]Az ellenséges gyártás fokozódik: [lightgray]{0}[] múlva
-objective.enemyairunits = [accent]Az ellenséges légi egységek gyártása elkezdődik: [lightgray]{0}[] múlva
-objective.destroycore = [accent]Semmisítsd Meg Az Ellenséges Magot
+objective.enemiesapproaching = [accent]Ellenség érkezik: [lightgray]{0}[] mp múlva
+objective.enemyescelating = [accent]Az ellenséges gyártás fokozódik: [lightgray]{0}[] mp múlva
+objective.enemyairunits = [accent]Az ellenséges légi egységek gyártása elkezdődik: [lightgray]{0}[] mp múlva
+objective.destroycore = [accent]Semmisítsd meg az ellenséges Támaszpontot
 objective.command = [accent]Irányítsd az egységeket
 objective.nuclearlaunch = [accent]⚠ Nukleáris kilövés észlelve: [lightgray]{0}
 
-announce.nuclearstrike = [red]⚠ BEÉRKEZŐ NUKLEÁRIS CSAPÁS ⚠\n[lightgray]Azonnal építs tartalék Magokat!
+announce.nuclearstrike = [red]⚠ BEÉRKEZŐ NUKLEÁRIS CSAPÁS ⚠\n[lightgray]Azonnal építs tartalék Támaszpontokat!
 
 loadout = Rakomány
 resources = Nyersanyagok
 resources.max = Maximum
-bannedblocks = Tiltott blokkok
+bannedblocks = Tiltott épületek
 objectives = Feladatok
 bannedunits = Tiltott egységek
 bannedunits.whitelist = Tiltott egységek fehérlistára
-bannedblocks.whitelist = Tiltott blokkok fehérlistára
+bannedblocks.whitelist = Tiltott épületek fehérlistára
 addall = Összes hozzáadása
 launch.from = Indítás a(z) [accent]{0} szektorból
 launch.capacity = Nyersanyag kapacitás az indításhoz: [accent]{0}
@@ -726,12 +726,12 @@ configure.invalid = A mennyiségnek 0 és {0} között kell lennie.
 add = Hozzáadás...
 guardian = Őrző
 
-connectfail = [scarlet]Csatlakozási hiba:\n\n[accent]{0}
-error.unreachable = A szervert nem lehet elérni.\nBiztosan jól írtad be a címet?
+connectfail = [scarlet]Kapcsolódási hiba:\n\n[accent]{0}
+error.unreachable = A kiszolgálót nem lehet elérni.\nBiztosan jól írtad be a címet?
 error.invalidaddress = Érvénytelen cím.
-error.timedout = Időtúllépés!\nGyőződj meg róla, hogy a "port forwarding" be van kapcsolva a hoszt gépen és a cím helyes!
-error.mismatch = Csomaghiba:\nLehetséges kliens/szerver verzió eltérés.\nGyőződj meg róla, hogy te és a hoszt is a Mindustry legfrissebb verzióját használjátok!
-error.alreadyconnected = Már csatlakozva vagy.
+error.timedout = Időtúllépés!\nGyőződj meg róla, hogy a "porttovábbítás" be van kapcsolva a kiszolgáló gépen és a cím helyes!
+error.mismatch = Csomaghiba:\nLehetséges kliens/kiszolgáló verzió eltérés.\nGyőződj meg róla, hogy te és a kiszolgáló is a Mindustry legfrissebb verzióját használjátok!
+error.alreadyconnected = Már kapcsolódva vagy.
 error.mapnotfound = A pálya fájl nem található!
 error.io = Internet I/O hiba.
 error.any = Ismeretlen internet hiba.
@@ -753,10 +753,10 @@ sectors.resources = Nyersanyagok:
 sectors.production = Termelés:
 sectors.export = Export:
 sectors.import = Import:
-sectors.time = Idő:
+sectors.time = A szektorban eltöltött idő:
 sectors.threat = Fenyegetés:
 sectors.wave = Hullám:
-sectors.stored = Tárolt:
+sectors.stored = Eltárolt nyersanyagok:
 sectors.resume = Folytatás
 sectors.launch = Indítás
 sectors.select = Kiválasztás
@@ -769,7 +769,7 @@ sectors.underattack.nodamage = [scarlet]Nincs meghódítva
 sectors.survives = [accent]Túlél {0} hullámot
 sectors.go = Utazás
 sector.abandon = Elhagy
-sector.abandon.confirm = Ennek a szektornak a Magja(i) önmegsemmisítésre kerülnek.\nFolytatod?
+sector.abandon.confirm = Ennek a szektornak a Támaszpontja(i) önmegsemmisítésre kerülnek.\nFolytatod?
 sector.curcapture = A szektor elfoglalva
 sector.curlost = A szektor elveszett
 sector.missingresources = [scarlet]Nincs elég nyersanyag
@@ -815,22 +815,22 @@ sector.navalFortress.name = Tengerészeti Erőd
 
 sector.groundZero.description = Az ideális helyszín, hogy ismét belekezdjünk. Alacsony ellenséges fenyegetés. Némi nyersanyag.\nGyűjts annyi Rezet és Ólmot, amennyit csak tudsz.\nHaladj tovább.
 sector.frozenForest.description = Még itt, a hegyekhez közel is elterjedtek a spórák. A fagypont alatti hőmérséklet nem tudja örökké fogva tartani őket.\n\nFedezd fel az elektromosság erejét! Építs Belső Égetésű Erőművet! Használj Foltozót!
-sector.saltFlats.description = A sivatag peremén terül el a Sós Síkságok néven ismert síkság. Kevés nyersanyag található errefelé.\n\nAz ellenség egy raktárkomplexumot létesített itt. Pusztítsd el a Magot! Kő kövön ne maradjon!
-sector.craters.description = Régen háborúk folytak ezen a helyen és csak egy kráter maradt utánuk. De szerencsédre az évezredek alatt feltöltődött Vízzel így letudod hűteni vele a Fúróidat és Lövegeidet. Persze előtte használd a Homokot, hogy legyen üveged!
-sector.ruinousShores.description = A romokon túl fekszik a vízpart. Egykor itt állt egy parti védelmi vonal. Mára nem sok maradt belőle. Csak a legegyszerűbb védelmi épületek maradtak sértetlenek, bármi más csak törmelékként van jelen.\nFolytasd a terjeszkedést! Fedezd fel a régi technológiákat!
+sector.saltFlats.description = A sivatag peremén terül el a Sós Síkságok néven ismert síkság. Kevés nyersanyag található errefelé.\n\nAz ellenség egy raktárkomplexumot létesített itt. Pusztítsd el a Támaszpontot! Kő kövön ne maradjon!
+sector.craters.description = Régen háborúk folytak ezen a helyen és csak egy kráter maradt utánuk. Szerencsédre a kráter évezredek alatt feltöltődött Vízzel így letudod hűteni vele a Fúróidat és Lövegeidet. Persze előtte használd a Homokot, hogy legyen üveged!
+sector.ruinousShores.description = A romokon túl fekszik a vízpart. Egykor itt állt egy parti védelmi vonal. Mára nem sok maradt belőle. Csak a legegyszerűbb védelmi épületek maradtak sértetlenek, minden más csak törmelékként van jelen.\nFolytasd a terjeszkedést! Fedezd fel a régi technológiákat!
 sector.stainedMountains.description = Mélyebben benn a szárazföldön fekszenek a hegyek, a spóráktól még érintetlenül.\nTermeld ki a bőséges Titán készleteket a körzetben. Tanuld meg felhasználni!.\n\nAz ellenség itt nagyobb létszámban van jelen. Ne hagyj nekik időt, hogy a legerősebb egységeiket hadba állíthassák!
 sector.overgrowth.description = Ez a terület közelebb esik a spórák forrásához, a spórák már kinőtték.\nAz ellenség egy helyőrséget létesített itt. Építs Mace egységeket! Pusztítsd el a bázist!
 sector.tarFields.description = Egy Olajtermelő övezet peremvidéke a hegyek és a sivatag között. Egy azon kevés szektorok közül, ahol még hasznosítható kátránykészletek találhatóak.\nBár a terület elhagyatott, veszélyes ellenséges erők fészkelnek a közelben. Ne becsüld alá őket!\n\n[lightgray]Fedezd fel az Olajfeldolgozási lehetőségeket, ha tudod!
 sector.desolateRift.description = Egy extrém veszélyes zóna. Nyersanyagokban gazdag, de szűkös a hely. Magas kockázat. Hagyd el, amint lehet! Ne tévesszen meg a hosszú szünet az ellenség támadásai között!
 sector.nuclearComplex.description = Egy néhai létesítmény a Tórium kitermelésére és feldolgozására, romokban.\n[lightgray]Fedezd fel a Tóriumot és sokrétű felhasználását!\n\nAz ellenség nagy létszámban van jelen, és folyamatosan megfigyelés alatt tartják a környéket.
-sector.fungalPass.description = Átmenet a magas hegyek és a mélyebben fekvő, spórák uralta lapály között. Egy kisebb ellenséges megfigyelő állomás található itt.\nSemmisítsd meg!\nHasználj Dagger és Crawler egységeket! Pusztítsd el a két Magot!
-sector.biomassFacility.description = A Spórák származási helye. Ebben a létesítményben fejlesztették ki őket és eredetileg itt került sor a gyártásukra.\nFejlszd ki az itt található technológiákat! Használd a Spórákat üzemanyag és Műanyagok gyártására!\n\n[lightgray]A létesítmény pusztulása nyomán a spórák elszabadultak. A helyi ökoszisztémában semmi sem tudta felvenni a versenyt egy ennyire invazív életformával.
-sector.windsweptIslands.description = Távolabb a partvonalon túl fekszik ez az elszigetelt szigetcsoport. Feljegyzések szerint egykor [accent]Műanyag[] gyártása zajlott itt.\n\nVerd vissza az ellenség vízi egységeit! Állíts fel egy bázist a szigeteken! Fejleszd ki az itt talált gyárakat!
-sector.extractionOutpost.description = Egy távoli ellenséges támaszpont, amelyet az ellenség azért épített, hogy nyersanyagokat juttasson el más szektorokba.\n\nA szektorok közötti szállítási technológia elengedhetetlen a további hódításhoz. Pusztítsd el a bázist. Fedezd fel a Kilövő Állást.
-sector.impact0078.description = Itt fekszenek a roncsai az első csillagközi űrhajónak, amely a csillagrendszerbe érkezett.\n\nMents ki a romokból amit csak tudsz! Fedezd fel az épen maradt technológiákat.
-sector.planetaryTerminal.description = A végső célpont.\n\nEzen a vízparti bázison található egy olyan építmény, amely képes Magokat kilőni közeli bolygókra. Folyamatosan őrzik.\n\nKészíts vízi egységeket! Ártalmatlanítsd az ellenséget amilyen gyorsan csak tudod! Fedezd fel a kilövőszerkezetet!
-sector.coastline.description = Ezen a helyen egy haditengerészeti egység technológiájának maradványait fedezték fel. Verd vissza az ellenséges támadásokat, foglald el ezt a szektort, és szerezd meg a technológiát.
-sector.navalFortress.description = Az ellenség bázist létesített egy távoli, természetesen-megerősített szigeten. Pusztítsd el ezt az előőrsöt. Szerezd meg a fejlett hadihajó-technológiájukat, és fedezd fel.
+sector.fungalPass.description = Átmenet a magas hegyek és a mélyebben fekvő, spórák uralta lapály között. Egy kisebb ellenséges megfigyelő állomás található itt.\nSemmisítsd meg!\nHasználj Dagger és Crawler egységeket! Pusztítsd el a két Támaszpontot!
+sector.biomassFacility.description = A Spórák származási helye. Ebben a létesítményben fejlesztették ki őket és eredetileg itt került sor a gyártásukra.\nFedezd fel az itt található technológiákat! Használd a Spóra Kapszulákat üzemanyag- és Műanyagok gyártására!\n\n[lightgray]A létesítmény pusztulása nyomán a spórák elszabadultak és szétszóródtak a légkörben. A helyi ökoszisztémában semmi sem tudta felvenni a versenyt egy ennyire invazív életformával.
+sector.windsweptIslands.description = Távolabb a partvonalon túl fekszik ez az elszigetelt szigetcsoport. A feljegyzések szerint egykor [accent]Műanyag[] gyártása zajlott itt.\n\nVerd vissza az ellenség vízi egységeit! Állíts fel egy bázist a szigeteken! Fedezd fel az itt talált gyárakat!
+sector.extractionOutpost.description = Egy távoli ellenséges támaszpont, amelyet az ellenség azért épített, hogy nyersanyagokat juttasson el más szektorokba.\n\nA szektorok közötti szállítási technológia elengedhetetlen a további hódításhoz. Pusztítsd el a bázist. Fejleszd ki a Kilövő Állást.
+sector.impact0078.description = Itt fekszenek a roncsai az első csillagközi űrhajónak, amely ebbe a csillagrendszerbe érkezett.\n\nMents ki a romok alól mindent amit csak tudsz! Fedezd fel az épen maradt technológiákat.
+sector.planetaryTerminal.description = A végső célpont.\n\nEzen a vízparti bázison található egy olyan építmény, amely képes Támaszpontokat kilőni a közeli bolygókra. Folyamatosan őrzik.\n\nKészíts vízi egységeket! Ártalmatlanítsd az ellenséget amilyen gyorsan csak tudod! Találd meg a kilövőszerkezetet!
+sector.coastline.description = Ezen a helyen egy haditengerészeti egység technológiájának maradványait azonosították. Verd vissza az ellenséges támadásokat, foglald el ezt a szektort, és szerezd meg a technológiát.
+sector.navalFortress.description = Az ellenség bázist létesített egy távoli, természetesen-megerősített szigeten. Pusztítsd el ezt az előőrsöt. Szerezd meg a fejlett hadihajó-technológiájukat, és fejleszd ki te is.
 
 sector.onset.name = A Kezdet
 sector.aegis.name = Égisz
@@ -850,23 +850,23 @@ sector.crossroads.name = Keresztutak
 sector.karst.name = Karszt
 sector.origin.name = Eredet
 
-sector.onset.description = Kezdd meg az Erekir meghódítását. Gyűjts nyersanyagokat, állíts elő egységeket, és kezdd el a technológiai kutatásokat.
-sector.aegis.description = Ez a szektor Volfrám lelőhelyeket tartalmaz.\nFedezd fel az [accent]Ütve Fúró[]t, hogy ki tudd bányászni ezt a nyersanyagot, és elpusztítani az ellenséges bázist a szektorban.
-sector.lake.description = Az Ebben a szektorban lévő Salakos tó nagymértékben korlátozza az ütőképes egységek használatát. A lebegőegységek az egyetlen lehetőség.\nFedezd fel a [accent]Repülőgép Gyár[]at és állíts elő egy [accent]Elude[] egységet, amilyen hamar csak lehet.
+sector.onset.description = Kezdd meg az Erekir meghódítását. Gyűjts nyersanyagokat, állíts elő egységeket, és kezdd el a technológiai fejlesztéseket.
+sector.aegis.description = Ez a szektor Volfrám lelőhelyeket tartalmaz.\nFejleszd ki az [accent]Ütvefúró[]t, hogy ki tudd bányászni ezt a nyersanyagot és elpusztítani az ellenséges bázist a szektorban.
+sector.lake.description = Az Ebben a szektorban lévő Salakos tó nagymértékben korlátozza az ütőképes egységek használatát. A lebegőegységek használata az egyetlen lehetőség.\nFejleszd ki a [accent]Repülőgép Gyár[]at és állíts elő egy [accent]Elude[] egységet, amilyen hamar csak lehet.
 sector.intersect.description = A letapogatások arra utalnak, hogy ezt a szektort a leszállás után hamarosan több oldalról is megtámadják.\nÁllítsd fel gyorsan a védelmedet, és terjeszkedj minél hamarabb.\n[accent]Mech[] egységekre lesz szükség a terület zord terepviszonyai miatt.
-sector.atlas.description = Ez a szektor változatos terepet tartalmaz, és az ütőképes támadáshoz többféle egységre lesz szükség.\nAz itt felfedezett ellenséges bázisok némelyikén való átjutáshoz is szükség lehet továbbfejlesztett egységekre.\nFedezd fel az [accent]Elektrolizátor[]t és a [accent]Tank Újratervező[]t.
+sector.atlas.description = Ez a szektor változatos terepet tartalmaz, és az ütőképes támadáshoz többféle egységre lesz szükség.\nAz itt felfedezett ellenséges bázisok némelyikén való átjutáshoz is szükség lehet továbbfejlesztett egységekre.\nFejleszd ki az [accent]Elektrolizátor[]t és a [accent]Tank Újratervező[]t.
 sector.split.description = A minimális ellenséges jelenlét miatt ez a szektor tökéletes az új nyersanyagszállító technológiák tesztelésére.
-sector.basin.description = Jelentős ellenséges jelenlét lett érzékelve ebben a szektorban.\nÉpíts gyorsan egységeket, és foglalj el ellenséges Magokat, hogy megvethesd a lábad.
-sector.marsh.description = Ebben a szektorban rengeteg Arkycit található, de kevés a Víznyelő.\nÉpíts [accent]Kémiai Égető Kamra[]t az áramfejlesztéshez.
+sector.basin.description = Jelentős ellenséges jelenlét lett érzékelve ebben a szektorban.\nÉpíts gyorsan egységeket, és foglalj el ellenséges Támaszpontokat, hogy megvethesd a lábad.
+sector.marsh.description = Ebben a szektorban rengeteg Arkycit található, de kevés a Víznyelő.\nÉpíts [accent]Kémiai Égető Kamrá[]t az áramfejlesztéshez.
 sector.peaks.description = A hegyvidéki terep ebben a szektorban a legtöbb egységet használhatatlanná teszi. Repülő egységekre lesz szükség.\nVigyázz az ellenséges légvédelmi létesítményekkel. Lehetséges, hogy az ilyen létesítményeket hatástalanítani lehet a támogató épületeik célba vételével.
-sector.ravine.description = A szektorban nincs észlelve ellenséges Mag, bár ez egy fontos szállítási útvonal az ellenség számára. Várhatóan változatos ellenséges erőkkel kell számolni. Gyárts [accent]Elektrometál[]t. Építs [accent]Afflict[] lövegtornyokat.
-sector.caldera-erekir.description = Ebben a szektorban a feltárható nyersanyagok több szigeten szétszóródva találhatóak.\nFedezd fel és helyezd üzembe a drónalapú szállítmányozást.
+sector.ravine.description = A szektorban nincs észlelve ellenséges Támaszpont, bár ez egy fontos szállítási útvonal az ellenség számára. Várhatóan változatos ellenséges erőkkel kell számolni. Gyárts [accent]Elektrometál[]t. Építs [accent]Afflict[] lövegtornyokat.
+sector.caldera-erekir.description = Ebben a szektorban a feltárható nyersanyagok több szigeten szétszóródva találhatóak.\nFejleszd ki és helyezd üzembe a drónalapú szállítmányozást.
 sector.stronghold.description = A nagy ellenséges tábor ebben a szektorban jelentős [accent]Tórium[] készleteket őriz.\nHasználd magasabb szintű egységek és lövegtornyok fejlesztésére.
-sector.crevice.description = Az ellenség kegyetlen támadóerőket fog küldeni, hogy kiiktassa a bázisodat ebben a szektorban.\nGyűjts [accent]Karbid[]ot, majd fedezd fel és építs [accent]Pirolízis Erőmű[]vet, mert lehet, hogy nélkülözhetetlenek a túléléshez.
-sector.siege.description = Ebben a szektorban két párhuzamos kanyon található, amelyek két irányból érkező támadásokat tesznek lehetővé.\nFedezd fel a [accent]Cianogén[]t, hogy még erősebb tankegységeket hozhass létre.\nVigyázat: Ellenséges, nagy hatótávolságú rakéták észlelve. A rakéták a becsapódásuk előtt megsemmisíthetők.
+sector.crevice.description = Ebben a szektorban az ellenség kegyetlen támadóerőket fog mozgósítani, hogy kiiktassa a bázisodat.\nGyűjts [accent]Karbid[]ot, majd fejleszd ki és építs [accent]Pirolízis Erőmű[]vet, mert lehet, hogy nélkülözhetetlenek lesznek a túléléshez.
+sector.siege.description = Ebben a szektorban két párhuzamos kanyon található, amelyek két irányból érkező támadásokat tesznek lehetővé.\nFejleszd ki a [accent]Cianogén[]t, hogy még erősebb tankegységeket hozhass létre.\nVigyázat: Ellenséges, nagy hatótávolságú rakéták észlelve. A rakéták a becsapódásuk előtt megsemmisíthetők.
 sector.crossroads.description = Az ellenséges támaszpontok ebben a szektorban változó terepviszonyok között alakultak ki. Ahhoz, hogy alkalmazkodni tudj kutass különböző egységek után.\nEzenkívül egyes bázisokat pajzsok védenek. Találd ki, hogyan táplálják őket.
-sector.karst.description = Ez a szektor gazdag a nyersanyagokban, de amint egy új Mag leszáll, az ellenség megtámadja azt.\nHasználd ki a nyersanyagokat és fedezd fel a [accent]Tóritkvarc[]ot.
-sector.origin.description = Az utolsó szektor, jelentős ellenséges jelenléttel.\nNem valószínű, hogy maradt további kutatási-, vagy fejlesztési lehetőség - koncentrálj az ellenséges Magok elpusztítására.
+sector.karst.description = Ez a szektor gazdag a nyersanyagokban, de amint egy új Támaszpont leszáll, az ellenség megtámadja azt.\nHasználd ki a nyersanyagokat és fedezd fel a [accent]Tóritkvarc[]ot.
+sector.origin.description = Az utolsó szektor, jelentős ellenséges jelenléttel.\nNem valószínű, hogy maradt további fejlesztési lehetőség - koncentrálj az ellenséges Támaszpontok elpusztítására.
 
 status.burning.name = Égő
 status.freezing.name = Fagyasztó
@@ -885,7 +885,7 @@ status.unmoving.name = Mozdulatlan
 status.boss.name = Őrző
 
 settings.language = Nyelvek
-settings.data = Játék adatok
+settings.data = Játékadatok
 settings.reset = Alapértelmezett
 settings.rebind = Újrakötés
 settings.resetKey = Visszaállítás
@@ -893,13 +893,13 @@ settings.controls = Irányítás
 settings.game = Játék
 settings.sound = Hangok
 settings.graphics = Grafika
-settings.cleardata = Játék adatok törlése...
+settings.cleardata = Játékadatok törlése...
 settings.clear.confirm = Biztosan törlöd ezeket az adatokat?\nA műveletet nem lehet visszavonni!
 settings.clearall.confirm = [scarlet] FIGYELEM! []\nEz törli az összes adatot, beleértve a mentéseket, pályákat, felfedezéseket és a billentyű beállításokat.\nAz 'OK' gomb megnyomásával a játék minden adatot töröl és automatikusan kilép.
 settings.clearsaves.confirm = Biztosan törlöd az összes mentést?
 settings.clearsaves = Mentések törlése
-settings.clearresearch = Kutatás törlése
-settings.clearresearch.confirm = Biztosan törlöd az összes kutatást?
+settings.clearresearch = Fejlesztések törlése
+settings.clearresearch.confirm = Biztosan törlöd az összes fejlesztést?
 settings.clearcampaignsaves = Hadjárat mentések törlése
 settings.clearcampaignsaves.confirm = Biztosan törlöd az összes hadjárat mentést?
 paused = [accent]< Megállítva >
@@ -925,7 +925,7 @@ stat.booster = Erősítő
 stat.tiles = Szükséges talaj
 stat.affinities = Módosító körülmények
 stat.opposites = Eltérések
-stat.powercapacity = Elektromos kapacitás
+stat.powercapacity = Maximális tárolási kapacitás
 stat.powershot = Áram/Lövés
 stat.damage = Sebzés
 stat.targetsair = Repülő célpontok
@@ -955,14 +955,14 @@ stat.unittype = Egység típus
 stat.speedincrease = Gyorsítás
 stat.range = Hatótáv
 stat.drilltier = Kitermelhető
-stat.drillspeed = Alap kitermelési sebesség
+stat.drillspeed = Alap termelési sebesség
 stat.boosteffect = Erősítés hatása
 stat.maxunits = Maximális aktív egység
 stat.health = Életpontok
 stat.armor = Páncél
-stat.buildtime = Építés időtartama
+stat.buildtime = Építési időtartam
 stat.maxconsecutive = Maximum egymást követő
-stat.buildcost = Építési költsége
+stat.buildcost = Építési költség
 stat.inaccuracy = Pontatlanság
 stat.shots = Lövések
 stat.reload = Tüzelési sebesség
@@ -981,8 +981,8 @@ stat.viscosity = Viszkozitás
 stat.temperature = Hőmérséklet
 stat.speed = Sebesség
 stat.buildspeed = Építési sebesség
-stat.minespeed = Kitermelési sebesség
-stat.minetier = Kitermelési szint
+stat.minespeed = Termelési sebesség
+stat.minetier = Termelési szint
 stat.payloadcapacity = Rakomány kapacitás
 stat.abilities = Képességek
 stat.canboost = Erősíthető
@@ -1010,19 +1010,19 @@ ability.energyfield.sametypehealmultiplier = [lightgray]Azonos típusú gyógyí
 ability.energyfield.maxtargets = [lightgray]Célpontok maximális száma: [white]{0}
 ability.regen = Regeneráció
 
-bar.onlycoredeposit = Csak a Mag elhelyezése megengedett
+bar.onlycoredeposit = Csak a Támaszpont elhelyezése megengedett
 bar.drilltierreq = Erősebb Fúró/Vágó szükséges
 bar.noresources = Hiányzó nyersanyagok
-bar.corereq = Mag szükséges
-bar.corefloor = Mag zónacsempe szükséges
+bar.corereq = Támaszpont szükséges
+bar.corefloor = Támaszpont zónacsempe szükséges
 bar.cargounitcap = A rakományszállító egység teljes kapacitáson
-bar.drillspeed = Termelési sebesség: {0}/s
-bar.pumpspeed = Termelési sebesség: {0}/s
+bar.drillspeed = Termelés: {0}/mp
+bar.pumpspeed = Termelés: {0}/mp
 bar.efficiency = Hatásfok: {0}%
 bar.boost = Erősítés: +{0}%
-bar.powerbalance = Áram: {0}/s
-bar.powerstored = Tárolt: {0}/{1}
-bar.poweramount = Áram kimenet: {0}
+bar.powerbalance = Áram: {0}/mp
+bar.powerstored = Eltárolva: {0}/{1}
+bar.poweramount = Kapacitás: {0}
 bar.poweroutput = Áramtermelés: {0}
 bar.powerlines = Kapcsolatok: {0}/{1}
 bar.items = Nyersanyagok: {0}
@@ -1063,7 +1063,7 @@ bullet.multiplier = [stat]{0}[lightgray]x lövedék szorzó
 bullet.reload = [stat]{0}[lightgray]x tüzelési sebesség
 bullet.range = [stat]{0}[lightgray] csempe tartomány
 
-unit.blocks = csempe (blokk)
+unit.blocks = csempe
 unit.blockssquared = blokk²
 unit.powersecond = áram egység/mp
 unit.tilessecond = csempe/mp
@@ -1093,7 +1093,7 @@ category.items = Nyersanyagok
 category.crafting = Bemenet/Kimenet
 category.function = Funkció
 category.optional = Lehetséges erősítés
-setting.skipcoreanimation.name = Mag indítás/leszállás animáció kihagyása
+setting.skipcoreanimation.name = Támaszpont indítás/leszállás animáció kihagyása
 setting.landscape.name = Fekvő mód zárolása
 setting.shadows.name = Árnyékok
 setting.blockreplace.name = Automatikus blokk javaslatok
@@ -1102,7 +1102,7 @@ setting.hints.name = Tanácsok
 setting.logichints.name = Logikai tanácsok
 setting.backgroundpause.name = Szüneteltetés a háttérben
 setting.buildautopause.name = Automatikus szünet építéskor
-setting.doubletapmine.name = Bányászás dupla-koppintással
+setting.doubletapmine.name = Bányászás dupla kattintással/koppintással
 setting.commandmodehold.name = Tartsd lenyomva a parancs módhoz
 setting.distinctcontrolgroups.name = Egységenként legfeljebb egy ellenőrző csoport
 setting.modcrashdisable.name = Modok letiltása indítási összeomláskor
@@ -1128,9 +1128,9 @@ setting.difficulty.name = Nehézség:
 setting.screenshake.name = Képernyő rázkódása
 setting.bloomintensity.name = Bloom intenzitás
 setting.bloomblur.name = Bloom Blur
-setting.effects.name = Effektek megjelenítése
+setting.effects.name = Hatások megjelenítése
 setting.destroyedblocks.name = Elpusztított épületek megjelenítése
-setting.blockstatus.name = Blokk állapotának megjelenítése
+setting.blockstatus.name = Épületek állapotának megjelenítése
 setting.conveyorpathfinding.name = Szállítószalag útvonalkeresés építéskor
 setting.sensitivity.name = Kontroller érzékenység
 setting.saveinterval.name = Mentési időköz
@@ -1140,17 +1140,17 @@ setting.fullscreen.name = Teljes képernyő
 setting.borderlesswindow.name = Keret nélküli ablak
 setting.borderlesswindow.name.windows = Keret nélküli teljes képernyő
 setting.borderlesswindow.description = A változások alkalmazásához újraindításra lehet szükség.
-setting.fps.name = FPS és Ping mutatása
+setting.fps.name = FPS, memória használat és ping megjelenítése
 setting.console.name = Konzol engedélyezése
 setting.smoothcamera.name = Egyenletes kamera
 setting.vsync.name = VSync
 setting.pixelate.name = Pixeles
-setting.minimap.name = Minitérkép mutatása
-setting.coreitems.name = A Magban lévő nyersanyagok megjelenítése
+setting.minimap.name = Minitérkép megjelenítése
+setting.coreitems.name = A Támaszpontban lévő nyersanyagok megjelenítése
 setting.position.name = A játékos pozíciójának megjelenítése
 setting.mouseposition.name = Egér pozíciójának megjelenítése
 setting.musicvol.name = Zene hangerő
-setting.atmosphere.name = A bolygó atmoszféra mutatása
+setting.atmosphere.name = Bolygó atmoszféra megjelenítése
 setting.drawlight.name = Sötét/világos fényhatások
 setting.ambientvol.name = Környezeti hangerő
 setting.mutemusic.name = Zene némítása
@@ -1169,7 +1169,7 @@ setting.hidedisplays.name = Logikai kijelzők elrejtése
 setting.macnotch.name = A felület igazítása a bevágás megjelenítéséhez
 setting.macnotch.description = A változtatások alkalmazásához újra kell indítani
 steam.friendsonly = Csak barátok
-steam.friendsonly.tooltip = Csak a Steam-barátok tudnak csatlakozni a játékodhoz.\nHa nem jelölöd be ezt a négyzetet, a játékod nyilvános lesz - bárki csatlakozhat hozzá.
+steam.friendsonly.tooltip = Csak a Steam-barátok tudnak kapcsolódni a játékodhoz.\nHa nem jelölöd be ezt a négyzetet, a játékod nyilvános lesz - bárki kapcsolódhat hozzá.
 public.beta = Ne feledd, hogy a játék béta verziójában nem tudsz nyilvános szobát nyitni.
 uiscale.reset = Az UI mérete megváltozott.\nAz "OK" gombbal megerősítheted ezt a méretet.\n[scarlet]Visszavonás és kilépés [accent] {0}[] másodperc múlva...
 uiscale.cancel = Mégsem és kilépés
@@ -1189,10 +1189,10 @@ keybind.press = Nyomj meg egy gombot...
 keybind.press.axis = Nyomj meg egy kart, vagy gombot...
 keybind.screenshot.name = Pálya képernyőkép
 keybind.toggle_power_lines.name = Villanyvezetékek be/ki
-keybind.toggle_block_status.name = Blokk állapot be/ki
+keybind.toggle_block_status.name = Épület állapot be/ki
 keybind.move_x.name = Mozgás vízszintesen
 keybind.move_y.name = Mozgás függőlegesen
-keybind.mouse_move.name = Egér Követése
+keybind.mouse_move.name = Egér követése
 keybind.pan.name = Felderítés
 keybind.boost.name = Erősítés
 keybind.command_mode.name = Parancs mód
@@ -1200,21 +1200,21 @@ keybind.command_queue.name = Egység parancsok sorba állítása
 keybind.create_control_group.name = Vezérlő csoport készítése
 keybind.cancel_orders.name = Parancsok visszavonása
 
-keybind.unit_stance_shoot.name = Egység magatartása: Lövés
-keybind.unit_stance_hold_fire.name = Egység magatartása: Tüzet Szüntess
-keybind.unit_stance_pursue_target.name = Egység magatartása: Célpont Követése
-keybind.unit_stance_patrol.name = Egység magatartása: Járőrözés
-keybind.unit_stance_ram.name = Egység magatartása: Ütközés
+keybind.unit_stance_shoot.name = Egység viselkedése: lövés
+keybind.unit_stance_hold_fire.name = Egység viselkedése: tüzet szüntess
+keybind.unit_stance_pursue_target.name = Egység viselkedése: célpont követése
+keybind.unit_stance_patrol.name = Egység viselkedése: járőrözés
+keybind.unit_stance_ram.name = Egység viselkedése: ütközés
 
-keybind.unit_command_move = Egység parancs: Mozgás
-keybind.unit_command_repair = Egység parancs: Javítás
-keybind.unit_command_rebuild = Egység parancs: Újraépítés
-keybind.unit_command_assist = Egység parancs: Támogatás
-keybind.unit_command_mine = Egység parancs: Bányászás
-keybind.unit_command_boost = Egység parancs: Erősítés
-keybind.unit_command_load_units = Egység parancs: Egységek berakodása
-keybind.unit_command_load_blocks = Egység parancs: Blokkok berakodása
-keybind.unit_command_unload_payload = Egység parancs: Kirakodás a rakományszállítóból
+keybind.unit_command_move = Egység parancs: mozgás
+keybind.unit_command_repair = Egység parancs: javítás
+keybind.unit_command_rebuild = Egység parancs: újraépítés
+keybind.unit_command_assist = Egység parancs: támogatás
+keybind.unit_command_mine = Egység parancs: bányászás
+keybind.unit_command_boost = Egység parancs: erősítés
+keybind.unit_command_load_units = Egység parancs: egységek berakodása a rakományszállítóba
+keybind.unit_command_load_blocks = Egység parancs: blokkok berakodása a rakományszállítóba
+keybind.unit_command_unload_payload = Egység parancs: kirakodás a rakományszállítóból
 
 keybind.rebuild_select.name = Régió újjáépítése
 keybind.schematic_select.name = Terület kijelölése
@@ -1243,7 +1243,7 @@ keybind.diagonal_placement.name = Átlós elhelyezés
 keybind.pick.name = Blokk másolása
 keybind.break_block.name = Blokk törlése
 keybind.select_all_units.name = Minden egység kijelölése
-keybind.select_all_unit_factories.name = Minden egység-gyár kijelölése
+keybind.select_all_unit_factories.name = Minden egység gyár kijelölése
 keybind.deselect.name = Blokk választás törlése
 keybind.pickupCargo.name = Rakomány felvétele
 keybind.dropCargo.name = Rakomány lerakása
@@ -1254,7 +1254,7 @@ keybind.pause.name = Szünet
 keybind.pause_building.name = Építés szüneteltetése/folytatása
 keybind.minimap.name = Minitérkép
 keybind.planet_map.name = Bolygó térkép
-keybind.research.name = Kutatás
+keybind.research.name = Fejlesztés
 keybind.block_info.name = Blokk infó
 keybind.chat.name = Csevegés
 keybind.player_list.name = Játékosok listája
@@ -1275,18 +1275,18 @@ mode.sandbox.name = Homokozó
 mode.sandbox.description = Végtelen nyersanyagforrás, nincs időzítés a hullámokhoz.
 mode.editor.name = Szerkesztő
 mode.pvp.name = PvP
-mode.pvp.description = Harcolj más játékosok ellen.\n[gray]Szükséges hozzá legalább két különböző színű Mag a pályán.
+mode.pvp.description = Harcolj más játékosok ellen.\n[gray]Szükséges hozzá legalább két különböző színű Támaszpont a pályán.
 mode.attack.name = Támadás
-mode.attack.description = Pusztítsd el az ellenség bázisát. \n[gray]Szükséges hozzá egy piros Mag a pályán.
+mode.attack.description = Pusztítsd el az ellenség bázisát. \n[gray]Szükséges hozzá egy piros Támaszpont a pályán.
 mode.custom = Egyéni szabályok
 
-rules.invaliddata = Érvénytelen adatok a vágólapon.
-rules.hidebannedblocks = Tiltott blokkok elrejtése
+rules.invaliddata = Érvénytelen adatok vannak a vágólapon.
+rules.hidebannedblocks = Tiltott épületek elrejtése
 rules.infiniteresources = Végtelen nyersanyagforrás
-rules.onlydepositcore = Csak Magok elhelyezése engedélyezett
-rules.derelictrepair = Az elhagyatott blokkok javításának engedélyezése
+rules.onlydepositcore = Csak Támaszpontok elhelyezése engedélyezett
+rules.derelictrepair = Az elhagyatott épületek javításának engedélyezése
 rules.reactorexplosions = Reaktor robbanás
-rules.coreincinerates = Többlet nyersanyagok megsemmisítése a Magban
+rules.coreincinerates = Többlet nyersanyagok megsemmisítése a Támaszpontban
 rules.disableworldprocessors = Világprocesszorok letiltása
 rules.schematic = Vázlatok engedélyezése
 rules.wavetimer = Hullám időzítő
@@ -1300,8 +1300,8 @@ rules.rtsminsquadsize = Minimális osztag méret
 rules.rtsmaxsquadsize = Maximális osztag méret
 rules.rtsminattackweight = Minimális támadási "lépéselőny"
 rules.cleanupdeadteams = A legyőzött csapatépületek törlése (PvP)
-rules.corecapture = Mag elfoglalása megsemmisítéskor
-rules.polygoncoreprotection = Poligonális Mag védelem
+rules.corecapture = Támaszpont elfoglalása megsemmisítéskor
+rules.polygoncoreprotection = Poligonális Támaszpont védelem
 rules.placerangecheck = Elhelyezési tartomány ellenőrzése
 rules.enemyCheat = Végtelen ellenséges csapat erőforrások
 rules.blockhealthmultiplier = Épület életpont szorzó
@@ -1312,10 +1312,10 @@ rules.unithealthmultiplier = Egység életpont szorzó
 rules.unitdamagemultiplier = Egység sebzés szorzó
 rules.unitcrashdamagemultiplier = Egység ütközési sebzés szorzó
 rules.solarmultiplier = Napenergia szorzó
-rules.unitcapvariable = A Magok befolyásolják a legyártható egységek darabszámát
+rules.unitcapvariable = A Támaszpontok befolyásolják a legyártható egységek darabszámát
 rules.unitcap = Alap egység-darabszám
 rules.limitarea = Játékterület korlátozása a pályán
-rules.enemycorebuildradius = Ellenséges Mag körüli tiltott zóna sugara:[lightgray] (csempe)
+rules.enemycorebuildradius = Ellenséges Támaszpont körüli tiltott zóna sugara:[lightgray] (csempe)
 rules.wavespacing = A hullámok közötti szünetek ideje:[lightgray] (mp)
 rules.initialwavespacing = Az első hullám előtti szünet ideje:[lightgray] (mp)
 rules.buildcostmultiplier = Építési költség szorzó
@@ -1566,7 +1566,7 @@ block.inverted-sorter.name = Inverz Válogató
 block.message.name = Üzenet
 block.reinforced-message.name = Megerősített Üzenet
 block.world-message.name = Világ Üzenet
-block.world-switch.name = World Switch
+block.world-switch.name = Világ Kapcsoló
 block.illuminator.name = Világítótest
 block.overflow-gate.name = Alul-folyó Kapu
 block.underflow-gate.name = Túlfolyó Kapu
@@ -1651,7 +1651,7 @@ block.foreshadow.name = Foreshadow
 block.container.name = Konténer
 block.launch-pad.name = Kilövő Állás
 block.segment.name = Segment
-block.ground-factory.name = Szárazföldi-Egység Gyár
+block.ground-factory.name = Földi Egység Gyár
 block.air-factory.name = Repülőgép Gyár
 block.naval-factory.name = Hadihajó Gyár
 block.additive-reconstructor.name = Additív Újratervező
@@ -1709,7 +1709,7 @@ block.red-stone-vent.name = Vörös Kő Kürtő
 block.crystalline-vent.name = Kristályos Kürtő
 block.redmat.name = Vörös Padló
 block.bluemat.name = Kék Padló
-block.core-zone.name = Mag Zóna
+block.core-zone.name = Támaszpont Zóna
 block.regolith-wall.name = Regolit Fal
 block.yellow-stone-wall.name = Sárga Kő Fal
 block.rhyolite-wall.name = Riolit Fal
@@ -1795,7 +1795,7 @@ block.vent-condenser.name = Vízleválasztó
 block.cliff-crusher.name = Sziklazúzó
 block.plasma-bore.name = Plazma Vágó
 block.large-plasma-bore.name = Nagy Plazma Vágó
-block.impact-drill.name = Ütve Fúró
+block.impact-drill.name = Ütvefúró
 block.eruption-drill.name = Erupciós Fúró
 block.core-bastion.name = Bástya
 block.core-citadel.name = Citadella
@@ -1836,8 +1836,8 @@ block.neoplasia-reactor.name = Neoplázia Reaktor
 
 block.switch.name = Kapcsoló
 block.micro-processor.name = Mikroprocesszor
-block.logic-processor.name = Logikai-Processzor
-block.hyper-processor.name = Hiper-Processzor
+block.logic-processor.name = Logikai Processzor
+block.hyper-processor.name = Hiper Processzor
 block.logic-display.name = Logikai Kijelző
 block.large-logic-display.name = Nagy Logikai Kijelző
 block.memory-cell.name = Memória Cella
@@ -1854,52 +1854,52 @@ hint.skip = Kihagyás
 hint.desktopMove = Használd a [accent][[WASD][] gombokat a mozgáshoz.
 hint.zoom = Használd az egér [accent]Görgőjét[] a zoomhoz..
 hint.desktopShoot = Használd a [accent]Bal-Egérgomb[]ot a lövéshez.
-hint.depositItems = A nyersanyagokat áthelyezheted húzással a drónból a Magba.
+hint.depositItems = A nyersanyagokat áthelyezheted húzással a drónból a Támaszpontba.
 hint.respawn = Ahhoz, hogy drónként újraéledj, nyomd meg a [accent][[V][] gombot.
 hint.respawn.mobile = Átvetted az irányítást egy egység, vagy lövegtorony felett. Ahhoz, hogy drónként újraéledj, [accent]érintsd meg az avatárt a bal felső sarokban.[]
 hint.desktopPause = Nyomd meg a [accent][[Szóköz][]t, hogy szüneteltesd, vagy folytasd a játékot.
-hint.breaking = [accent]Jobb-Egérgomb[]ot nyomva kijelölheted az útban lévő épületeket a lebontásukhoz.
+hint.breaking = A [accent]Jobb-Egérgomb[]ot nyomva kijelölheted az útban lévő épületeket a lebontásukhoz.
 hint.breaking.mobile = Használd a \ue817 [accent]Kalapács[] gombot jobb lent és töröld vele az útban lévő épületeket.\n\nTartsd lenyomva az ujjad és húzd, hogy nagyobb területet tudj kijelölni.
-hint.blockInfo = Egy blokk információinak megtekintéséhez válaszd ki a blokkot az [accent]Építés menüben[], majd válaszd a [accent][[?][] gombot a jobb oldalon.
+hint.blockInfo = Egy épület információinak megtekintéséhez válaszd ki az épületet az [accent]Építés menüben[], majd válaszd a [accent][[?][] gombot a jobb oldalon.
 hint.derelict = Az [accent]Elhagyatott[] szerkezetek régi bázisok maradványai, amelyek már nem működnek.\n\nEzeket a maradványokat le lehet [accent]bontani[] nyersanyagokért, vagy megjavítani őket.
 hint.research = Használd a \ue875 [accent]Fejlesztési Fa[] gombot, hogy felfedezz új technológiákat.
 hint.research.mobile = Használd a \ue875 [accent]Fejlesztési Fa[] gombot a \ue88c [accent]Menü[]ben, hogy felfedezz új technológiákat.
-hint.unitControl = Nyomd le a [accent][[Bal-CTRL][] gombot és kattints [accent]Jobb-Egérgomb[]al az irányítani kívánt szövetséges egységre, vagy -lövegtoronyra, hogy átvedd fölötte az irányítást.
+hint.unitControl = Nyomd le a [accent][[Bal-CTRL][] gombot és kattints a [accent]Jobb-Egérgomb[]al az irányítani kívánt szövetséges egységre, vagy -lövegtoronyra, hogy átvedd fölötte az irányítást.
 hint.unitControl.mobile = [accent][[Dupla koppintás][]sal átveheted az irányítást szövetséges egységek, vagy -lövegtornyok felett.
-hint.unitSelectControl = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd hosszan a [accent]Bal-SHIFT[] gombot.\nParancs Módban az egységek kijelöléséhez kattints és húzd az egeret. [accent]Jobb-Egérgomb[]-al kattints az egységek mozgatásához egy helyszínre, vagy az ellenséges célpontra.
+hint.unitSelectControl = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd hosszan a [accent]Bal-SHIFT[] gombot.\nParancs Módban az egységek kijelöléséhez kattints és húzd az egeret. A [accent]Jobb-Egérgomb[]-al kattints az egységek mozgatásához egy helyszínre, vagy az ellenséges célpontra.
 hint.unitSelectControl.mobile = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd meg a [accent]Parancs Mód[] gombot a bal alsó sarokban.\nParancs módban az egységek kiválasztásához érintsd meg a kijelzőt és húzással jelöld ki az egységeket. Koppints az egységek mozgatásához egy helyszínre, vagy ellenséges az célpontra.
-hint.launch = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Magot a következő szektorba, úgy, hogy megnyitod a \ue827 [accent]Térkép[]et a jobb alsó sarokban, és átpásztázol az új helyszínre.
-hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Magot egy közeli szektorba, úgy, hogy kiválasztasz egy szektort a \ue88c [accent]Menü[]ben a \ue827 [accent]Térkép[]ről.
-hint.schematicSelect = Az [accent][[F][] nyomva tartásával kijelölhetsz és másolhatsz épületeket.\n\nKattints a [accent][[görgővel][], hogy egy épületet lemásolj.
-hint.rebuildSelect = Tartsd nyomva a [accent][[B][] és húzással jelöld ki a megsemmisített blokkterveket.\nEz automatikusan újraépíti őket.
-hint.rebuildSelect.mobile = Válaszd a \ue874 másolás gombot, majd koppints \ue80f újjáépítés gombra, és húzd a megsemmisült blokktervek kijelöléséhez.\nEz automatikusan újraépíti őket.
-hint.conveyorPathfind = Tartsd nyomva a [accent][[Bal-CTRL][] gombot a szállítószalagok lerakása közben, hogy a játék útvnalat generáljon.
+hint.launch = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Támaszpontot a következő szektorba, úgy, hogy megnyitod a \ue827 [accent]Bolygó térkép[]et a jobb alsó sarokban, és átpásztázol az új helyszínre.
+hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Támaszpontot egy közeli szektorba, úgy, hogy kiválasztasz egy szektort a \ue88c [accent]Menü[]ben a \ue827 [accent]Bolygó térkép[]ről.
+hint.schematicSelect = Az [accent][[F][] nyomva tartásával egyszerre több épületet is kijelölhetsz és másolhatsz.\n\nAz egér [accent][[Görgővel][] viszont, csak egy épületet tudsz kijelölni és lemásolni.
+hint.rebuildSelect = Tartsd nyomva a [accent][[B][] és húzással jelöld ki a megsemmisített épületterveket.\nEz automatikusan újraépíti őket.
+hint.rebuildSelect.mobile = Válaszd a \ue874 másolás gombot, majd koppints \ue80f újjáépítés gombra, és húzd a megsemmisült épülettervek kijelöléséhez.\nEz automatikusan újraépíti őket.
+hint.conveyorPathfind = Tartsd nyomva a [accent][[Bal-CTRL][] gombot a szállítószalagok lerakása közben, hogy a játék útvonalat generáljon.
 hint.conveyorPathfind.mobile = Engedélyezd az \ue844 [accent]Átlós Mód[]ot és tegyél le egyszerre több szállítószalagot, hogy a játék útvonalat generáljon.
 hint.boost = Tartsd nyomva a [accent][[Bal-SHIFT][] gombot, hogy átrepülj az akadályok felett.\n\nErre nem minden földi egység képes.
-hint.payloadPickup = A [accent][[[] gombbal kis épületeket vagy egységeket emelhetsz fel.
-hint.payloadPickup.mobile = [accent]Tartsd nyomva az ujjad[] egy kis épületen vagy egységen, hogy felemeld.
+hint.payloadPickup = A [accent][[[] gombbal kis épületeket, vagy egységeket emelhetsz fel.
+hint.payloadPickup.mobile = [accent]Tartsd nyomva az ujjad[] egy kis épületen, vagy egységen, hogy felemeld.
 hint.payloadDrop = A [accent]][] megnyomásával lerakhatod a rakományodat.
 hint.payloadDrop.mobile = [accent]Tartsd hosszan az ujjad[] egy üres területen, hogy letedd a rakományodat.
 hint.waveFire = A [accent]Wave[] lövegtornyok, ha Víz van bennük, automatikusan eloltják a közeli tüzeket.
-hint.generator = \uf879 A [accent]Belső-égetésű Erőmű[] Szenet éget, és átadja az Áramot a vele érintkező épületeknek.\n\nÁramot nagyobb távolságra is szállíthatsz \uf87f [accent]Villanyoszlop[]ok segítségével.
+hint.generator = A \uf879 [accent]Belső-égetésű Erőmű[] Szenet éget, és átadja az Áramot a vele érintkező épületeknek.\n\nÁramot nagyobb távolságra is szállíthatsz \uf87f [accent]Villanyoszlop[]ok segítségével.
 hint.guardian = Az [accent]Őrző[]knek páncélja van. A gyenge lövedékeknek, mint a [accent]Réz[], vagy az [accent]Ólom[] [scarlet]nincs hatásuk[] az Őrző páncéljára.\n\nHasználj magasabb szintű lövegtornyokat, vagy \uf835 [accent]Grafit[] lövedéket a \uf861Duo/\uf859Salvo lövegtornyokban, hogy leszedd az Őrzőket.
-hint.coreUpgrade = A Magot fejlesztheted, ha [accent]magasabb szintű Magot teszel rá[].\n\nHelyezz egy [accent]Alapítvány[] Magot a [accent]Szilánk[] Magra. Figyelj rá, hogy ne legyenek az új Mag területén épületek.
+hint.coreUpgrade = A Támaszpontot fejlesztheted, ha [accent]magasabb szintű Támaszpontot teszel rá[].\n\nHelyezz egy [accent]Alapítvány[] Támaszpontot a [accent]Szilánk[] Támaszpontra. Figyelj rá, hogy ne legyenek az új Támaszpont területén épületek.
 hint.presetLaunch = A szürke [accent]hadjárat szektorok[]ba, amilyen például a [accent]Fagyott Erdő[], bárhonnan kilőhetsz. Nem kell szomszédos területtel rendelkezned.\n\nA [accent]számozott szektorok[], mint ez is, [accent]opcionálisak[].
 hint.presetDifficulty = Ebben a szektorban [scarlet]magas az ellenséges fenyegetettségi szint[].\nAz ilyen szektorokba való indulás [accent]nem ajánlott[] megfelelő technológia és felkészülés nélkül.
-hint.coreIncinerate = Ha a Magodban egy nyersanyag elérte a maximumot, a beérkező ilyen nyersanyagaid azonnal [accent]megsemmisítésre kerülnek[].
-hint.factoryControl = Egy egységgyár [accent]kimeneti célpontjának[] beállításához Parancs Módban kattints egy gyárblokkra, majd kattints a Jobb-Egérgombbal egy helyre.\nAz előállított egységek automatikusan odamennek.
-hint.factoryControl.mobile = Egy egységgyár [accent]kimeneti célpontjának[] beállításához Parancs Módban koppints egy gyárblokkra, majd koppints egy helyre.\nAz előállított egységek automatikusan odamennek.
+hint.coreIncinerate = Ha a Támaszpontodban egy nyersanyag elérte a maximumot, a beérkező ilyen nyersanyagaid azonnal [accent]megsemmisítésre kerülnek[].
+hint.factoryControl = Egy egységgyár [accent]kimeneti célpontjának[] beállításához Parancs Módban kattints egy gyárépületre, majd kattints a Jobb-Egérgombbal egy helyre.\nAz előállított egységek automatikusan odamennek.
+hint.factoryControl.mobile = Egy egységgyár [accent]kimeneti célpontjának[] beállításához Parancs Módban koppints egy gyárépületre, majd koppints egy helyre.\nAz előállított egységek automatikusan odamennek.
 
 gz.mine = Menj a földön lévő \uf8c4 [accent]Rézérc[] közelébe, és kattints a bányászat megkezdéséhez.
 gz.mine.mobile = Menj a földön lévő \uf8c4 [accent]Rézérc[] közelébe, és koppints a bányászat megkezdéséhez.
-gz.research = Nyisd meg a \ue875 Fejlődési Fát.\nFedezd fel a \uf870 [accent]Mechanikus Fúró[]t, majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy Rézfoltra, hogy elhelyezd.
-gz.research.mobile = Nyisd meg a \ue875 Fejlődési Fát.\nFedezd fel a \uf870 [accent]Mechanikus Fúró[]t, majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy Rézfoltra, hogy elhelyezd.\n\nNyomd meg a \ue800 [accent]Pipa[]t a jobb alsó sarokban a megerősítéshez.
-gz.conveyors = Fedezd fel és építs \uf896 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Magba.\n\nKattints és húzd az egeret bármely irányba, hogy hosszabb Szállítószalagot készíthess.\n[accent]Görgővel[] a szállítás irányát tudod megváltoztatni.
-gz.conveyors.mobile = Fedezd fel és építs \uf896 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Magba.\n\nTartsd rajta az ujjad egy másodpercig, és húzd bármely irányba, hogy hosszabb Szállítószalagot készíthess.
+gz.research = Nyisd meg a \ue875 Fejlesztési fát.\nFejleszd ki a \uf870 [accent]Mechanikus Fúró[]t, majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy Rézfoltra, hogy elhelyezd.
+gz.research.mobile = Nyisd meg a \ue875 Fejlesztési fát.\nFejleszd ki a \uf870 [accent]Mechanikus Fúró[]t, majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy Rézfoltra, hogy elhelyezd.\n\nNyomd meg a \ue800 [accent]Pipa[]t a jobb alsó sarokban a megerősítéshez.
+gz.conveyors = Fejleszd ki és építs \uf896 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Támaszpontba.\n\nKattints és húzd az egeret bármely irányba, hogy hosszabb Szállítószalagot készíthess.\n[accent]Görgővel[] a szállítás irányát tudod megváltoztatni.
+gz.conveyors.mobile = Fejleszd ki és építs \uf896 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Támaszpontba.\n\nTartsd rajta az ujjad egy másodpercig, és húzd bármely irányba, hogy hosszabb Szállítószalagot készíthess.
 gz.drills = Bővítsd a bányászati kapacitást.\nÉpíts több Mechanikus Fúrót.\nBányássz 100 Rezet.
-gz.lead = \uf837 [accent]Ólom[] egy másik gyakran használt nyersanyag.\nÉpíts fúrókat az Ólom kitermelésére.
-gz.moveup = \ue804 Lépj tovább a többi feladatért.
-gz.turrets = Fedezd fel és építs 2 darab \uf861 [accent]Duo[] lövegtornyot, hogy védd a Magot.\nA Duo lövegtornyoknak szükségük van \uf838 [accent]lőszer[]re, amelyeket Szállítószalaggal juttahatsz el hozzájuk.
+gz.lead = Az \uf837 [accent]Ólom[] egy másik gyakran használt nyersanyag.\nÉpíts fúrókat az Ólom kitermelésére.
+gz.moveup = \ue804 Menj tovább a többi feladatért.
+gz.turrets = Fejleszd ki és építs 2 darab \uf861 [accent]Duo[] lövegtornyot, hogy védd a Támaszpontot.\nA Duo lövegtornyoknak szükségük van \uf838 [accent]lőszer[]re, amelyeket Szállítószalaggal juttathatsz el hozzájuk.
 gz.duoammo = Lásd el a Duo lövegtornyokat [accent]Rézzel[]. Használj Szállítószalagot.
 gz.walls = A [accent]Falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts \uf8ae [accent]Réz Fal[]akat a lövegtornyok körül.
 gz.defend = Az ellenség közeledik, készülj fel a védekezésre.
@@ -1911,19 +1911,19 @@ gz.zone2 = Bármi, ami a hatósugarában épült, elpusztul, amikor egy hullám
 gz.zone3 = Egy hullám most kezdődik.\nKészülj fel.
 gz.finish = Építs több lövegtornyot, bányássz több nyersanyagot\nés védekezz az ellenséges hullámok ellen, hogy [accent]elfoglald a szektort[].
 
-onset.mine = Kattints Bal-Egérgommbal a \uf748 [accent]Berillium[]ra, hogy kibányászd a falakból.\n\nHasználd a [accent][[WASD] gombokat a mozgáshoz.
+onset.mine = Kattints a Bal-Egérgommbal a \uf748 [accent]Berillium[]ra, hogy kibányászd a falakból.\n\nHasználd a [accent][[WASD] gombokat a mozgáshoz.
 onset.mine.mobile = Koppints a \uf748 [accent]Berillium[]ra, hogy kibányászd a falakból.
-onset.research = Nyisd meg a \ue875 Fejlődési Fát.\nFedezd fel és építs egy \uf73e [accent]Kondenzációs Turbina[]t a kürtőn.\nEz [accent]Áram[]ot fog generálni.
-onset.bore = Fedezd fel és építs \uf741 [accent]Plazma Vágó[]t.\nEz automatikusan bányássza ki a nyersanyagokat a falakból.
-onset.power = Ahhoz, hogy [accent]Áram[]mal lásd el a Plazma Fúrót, Fedezd fel és építs \uf73d [accent]Sugár Csomópont[]okat.\nSegítségükkel összekötheted a Kondenzációs Turbinát a Plazma Vágóval.
-onset.ducts = Fedezd fel és építs \uf799 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat eljuttasd a fúróktól/vágóktól a Magba\nKattints és húzd az egeret bármely irányba, hogy hosszabb Szállítószalagot készíthess.\n[accent]Görgővel[] a szállítás irányát tudod megváltoztatni.
-onset.ducts.mobile = Fedezd fel és építs \uf799 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Magba.\n\nTartsd rajta az ujjad egy másodpercig, és húzd bármely irányba, hogy hosszabb Szállítószalagot készíthess.
+onset.research = Nyisd meg a \ue875 Fejlesztési fát.\nFejleszd ki és építs egy \uf73e [accent]Kondenzációs Turbina[]t a kürtőn.\nEz [accent]Áram[]ot fog generálni.
+onset.bore = Fejleszd ki és építs \uf741 [accent]Plazma Vágó[]t.\nEz automatikusan bányássza ki a nyersanyagokat a falakból.
+onset.power = Ahhoz, hogy [accent]Áram[]mal lásd el a Plazma Fúrót, Fejleszd ki és építs \uf73d [accent]Sugár Csomópont[]okat.\nSegítségükkel összekötheted a Kondenzációs Turbinát a Plazma Vágóval.
+onset.ducts = Fejleszd ki és építs \uf799 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat eljuttasd a fúróktól/vágóktól a Támaszpontba\nKattints és húzd az egeret bármely irányba, hogy hosszabb Szállítószalagot készíthess.\n[accent]Görgővel[] a szállítás irányát tudod megváltoztatni.
+onset.ducts.mobile = Fejleszd ki és építs \uf799 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Támaszpontba.\n\nTartsd rajta az ujjad egy másodpercig, és húzd bármely irányba, hogy hosszabb Szállítószalagot készíthess.
 onset.moremine = Bővítsd a bányászati kapacitást.\nÉpíts több Plazma Vágót, használj Sugár Csomópontokat és Szállítószalagokat.\nBányássz 200 Berilliumot.
-onset.graphite = Az összetettebb blokkokhoz szükség van \uf835 [accent]Grafit[]ra.\nÉpíts Plazma Vágókat, a Grafit kibányászásához.
-onset.research2 = Kezdd el a [accent]Gyárak[] fejlesztését.\nFedezd fel a \uf74d [accent]Sziklazúzó[]t és a \uf779 [accent]Szilícium Ívkemence[]t.
+onset.graphite = Az összetettebb épületekhez szükség van \uf835 [accent]Grafit[]ra.\nÉpíts Plazma Vágókat, a Grafit kibányászásához.
+onset.research2 = Kezdd el a [accent]Gyárak[] fejlesztését.\nFejleszd ki a \uf74d [accent]Sziklazúzó[]t és a \uf779 [accent]Szilícium Ívkemence[]t.
 onset.arcfurnace = A Szilícium Ívkemencének szüksége lesz \uf834 [accent]Homok[]ra és \uf835 [accent]Grafit[]ra, hogy \uf82f [accent]Szilícium[]ot gyártson.\nTovábbá [accent]Áram[] is szükséges a működéséhez.
 onset.crusher = Használj \uf74d [accent]Sziklazúzó[]t, hogy Homokot bányászhass.
-onset.fabricator = Használd az [accent]egységeket[], hogy felfedezd a pályát, megvédd az épületeket, és megtámadhasd velük az ellenséget. Fedezd fel és építs \uf6a2 [accent]Tank Gyár[]at.
+onset.fabricator = Használd az [accent]egységeket[], hogy felfedezd a pályát, megvédd az épületeket, és megtámadhasd velük az ellenséget. Fejleszd ki és építs \uf6a2 [accent]Tank Gyár[]at.
 onset.makeunit = Állíts elő egy egységet.\nHasználd a "?" gombot, hogy megnézd a gyártási követelményeit.
 onset.turrets = Az egységek hatékonyak, de a [accent]lövegtornyok[] jobb védelmi képességeket biztosítanak, ha hatékonyan alkalmazod őket.\nÉpíts egy \uf6eb [accent]Breach[] lövegtornyot.\nA lövegtornyoknak szüksége van \uf748 [accent]lőszer[]re.
 onset.turretammo = Lásd el a lövegtornyokat [accent]Berillium[] lőszerrel.
@@ -1931,14 +1931,14 @@ onset.walls = A [accent]Falak[] megakadályozhatják, hogy az épületekben kár
 onset.enemies = Az ellenség közeledik, készülj fel a védekezésre.
 onset.defenses = [accent]Állíts fel védelmet:[lightgray] {0}
 onset.attack = Az ellenség most sebezhető. Ellentámadásra fel.
-onset.cores = Új Mag csak a [accent]Mag Csempé[]re építhető.\nAz új Magok előretolt bázisként működnek, és megosztják a nyersanyagkészletüket más Magokkal.\nÉpíts egy új \uf725 Magot.
+onset.cores = Új Támaszpont csak a [accent]Támaszpont Csempé[]re építhető.\nAz új Támaszpontok előretolt bázisként működnek, és megosztják a nyersanyagkészletüket más Támaszpontokkal.\nÉpíts egy új \uf725 Támaszpontot.
 onset.detect = Az ellenség 2 percen belül észrevesz téged.\nÁllíts fel védelmet, bányássz és termelj.
 onset.commandmode = Tartsd nyomva a [accent]shift[] gombot, hogy belépj a [accent]Parancs Mód[]ba.\n[accent]Bal egérgomb lenyomásával és húzással[] tudod kijelölni az egységeket.\nKattints [accent]Jobb egérgomb[]al egy pontra, vagy ellenségre, hogy a kiválasztott egységeket mozgásra, vagy támadásra utasítsd.
 onset.commandmode.mobile = Nyomd meg a [accent]Parancs[] gombot, hogy belépj a [accent]Parancs Mód[]ba.\nTartsd a kijelzőn az ujjad, majd [accent]húzd[] azt az egységek kiválasztásához.\n[accent]Koppints[] egy pontra, vagy ellenségre, hogy a kiválasztott egységeket mozgásra, vagy támadásra utasítsd.
-aegis.tungsten = Volfrámot [accent]Ütve Fúró[]val tudsz bányászni.\nEnnek az épületnek szüksége van [accent]Víz[]re és [accent]Áram[]ra.
+aegis.tungsten = Volfrámot [accent]Ütvefúró[]val tudsz bányászni.\nEnnek az épületnek szüksége van [accent]Víz[]re és [accent]Áram[]ra.
 
-split.pickup = Egyes blokkok a Mag Drónjával felvehetőek.\nVegyél fel egy [accent]Konténer[]t és helyezd bele egy [accent]Rakomány Csomagoló[]ba.\n(Az alapértelmezett gombok [ és ] a felvételhez és a lerakáshoz.)
-split.pickup.mobile = Egyes blokkok a Mag Drónjával felvehetőek.\nVegyél fel egy [accent]Konténer[]t és helyezd bele egy [accent]Rakomány Csomagoló[]ba.\nAhhoz felvegyél, vagy lerakj valamit koppints rá hosszan)
+split.pickup = Egyes blokkok a Támaszpont drónjával felvehetőek.\nVegyél fel egy [accent]Konténer[]t és helyezd bele egy [accent]Rakomány Csomagoló[]ba.\n(Az alapértelmezett gombok [ és ] a felvételhez és a lerakáshoz.)
+split.pickup.mobile = Egyes blokkok a Támaszpont drónjával felvehetőek.\nVegyél fel egy [accent]Konténer[]t és helyezd bele egy [accent]Rakomány Csomagoló[]ba.\nAhhoz felvegyél, vagy lerakj valamit koppints rá hosszan)
 split.acquire = Az egységek építéséhez Volfrámot kell szerezned.
 split.build = Az egységeket a fal másik oldalára kell eljuttatni.\nÉpíts 2 [accent]Rakomány Tömegmozgató[]t egyet-egyet a fal mindkét oldalán\nÁllítsd be a szállítási kapcsolatukat úgy, hogy kiválasztod az egyiket, majd kiválasztod a másikat.
 split.container = Hasonlít a Konténerre, csak egységek szállítására is alkalmas a [accent]Rakomány Tömegmozgató[]val.\nÉpíts egy egységgyárat egy tömegmozgató mellé, hogy feltöltsd őket, majd küldd át őket a falon, hogy megtámadják az ellenséges bázist.
@@ -1947,11 +1947,11 @@ item.copper.description = Széleskörűen felhasználható építkezésre és l
 item.copper.details = Szokatlanul elterjedt fém a Serpulo-n. Gyenge szerkezetű, de megerősíthető.
 item.lead.description = Folyadékszállító csővezetékek építésére használatos, de elektromos eszközökben is alkalmazható.
 item.lead.details = Sűrű. Közömbös. Széles körben használatos elemekben.\nMegjegyzés: Valószínűleg mérgező a biológiai életformákra. Nem mintha sok maradt volna errefelé.
-item.metaglass.description = Folyadékok szállítására és tárolására alkalmas blokkok építésére, továbbá lövedékként is használható.
+item.metaglass.description = Folyadékok szállítására és tárolására alkalmas csővezetékek és épületek építésére, továbbá lövedékként is használható.
 item.graphite.description = Elektromos alkatrészek alapanyagaként és lövedékként is használható.
 item.sand.description = Egyéb finom nyersanyagok gyártási alapanyaga.
 item.coal.description = Tüzelőanyag és gyártási alapanyag.
-item.coal.details = Fosszilizálódott növényi anyagnak tűnik, jóval a "seeding event" előttről.
+item.coal.details = Fosszilizálódott növényi anyagnak tűnik, jóval a "spóra incidens" előttről.
 item.titanium.description = Folyadékok szállítására, fúrókban és légi járművekben használható.
 item.thorium.description = Strapabíró szerkezetekben használható nukleáris tüzelőanyagként.
 item.scrap.description = Olvasztással és porítással finom nyersanyagok nyerhetők ki belőle.
@@ -1966,7 +1966,7 @@ item.blast-compound.description = A bombák és a robbanó lövedékek egyik fő
 item.pyratite.description = Gyújtó lövedékekben és tüzelőanyag-alapú generátorokban is használható.
 
 #Erekir
-item.beryllium.description = Sokféle épület- és lőszertípushoz használatos az Erekiren.
+item.beryllium.description = Sokféle épület- és lőszertípushoz használatos az Erekir-en.
 item.tungsten.description = Fúrókban/vágókban, páncélokban használatos, de lőszerként is alkalmazható. A fejlettebb szerkezetek építéséhez szükséges.
 item.oxide.description = Hővezetőként és Áramszigetelőként is használatos.
 item.carbide.description = Korszerű szerkezetekben, nehezebb egységekben használatos, de lőszerként is alkalmazható.
@@ -2063,9 +2063,9 @@ block.phase-conduit.description = Folyadékot szállít épületek és terepakad
 block.power-node.description = Áramot vezet az összekapcsolt épületekhez. Az érintkező épületekkel automatikusan kapcsolatban van.
 block.power-node-large.description = Nagyobb Villanyoszlop nagyobb hatótávolsággal.
 block.surge-tower.description = Hosszútávú Villanyoszlop, csak kevés kapcsolatra képes.
-block.diode.description = Tárolt Áramot irányít át egy irányba, de csak akkor, ha a fogadó oldalon van kevesebb tárolva.
-block.battery.description = Áramot raktároz el, ha túltermelés van. Leadja az Áramot, ha hiány van.
-block.battery-large.description = Áramot raktároz el, ha túltermelés van. Leadja az Áramot, ha hiány van. Nagyobb kapacitású a sima Akkumulátornál.
+block.diode.description = Az eltárolt Áramot irányítja át egy megadott irányba, de csak akkor, ha a fogadó oldalon van kevesebb tárolva.
+block.battery.description = Áramot tárol el, ha túltermelés van. Leadja az Áramot, ha hiány van.
+block.battery-large.description = Áramot tárol el, ha túltermelés van. Leadja az Áramot, ha hiány van. Nagyobb kapacitású a sima Akkumulátornál.
 block.combustion-generator.description = Áramot termel éghető anyagok elégetésével.
 block.thermal-generator.description = Forró környezetben Áramot termel.
 block.steam-generator.description = Áramot termel éghető anyagok elégetésével és Víz gőzzé alakításával.
@@ -2081,13 +2081,13 @@ block.laser-drill.description = Lézerek használatával még gyorsabban tud dol
 block.blast-drill.description = A technológia csúcsa. Rengeteg Áramot használ.
 block.water-extractor.description = Képes a talajvíz kiszivattyúzására. Akkor használd, ha nincs elérhető Víz a felszínen.
 block.cultivator.description = A légkörben szálló spórákat kapszulákba sűríti.
-block.cultivator.details = Visszaszerzett technológia. Hatalmas tömegű biomassza gyártására alkalmas a lehető leghatékonyabban. Valószínűleg a Serpulot ma borító spórák kezdeti inkubátora.
+block.cultivator.details = Visszaszerzett technológia. Hatalmas tömegű biomassza gyártására alkalmas a lehető leghatékonyabban. Valószínűleg a Serpulo-t ma borító spórák kezdeti inkubátora.
 block.oil-extractor.description = Nagy mennyiségben használ Vizet, Homokot és Áramot, hogy Olajat nyerjen ki a földből.
-block.core-shard.description = Mag. Ha elpusztul, a szektor elveszett.
+block.core-shard.description = Támaszpont. Ha elpusztul, a szektor elveszett.
 block.core-shard.details = Az első modell. Kompakt. Önsokszorosító. Egyszer használatos gyorsítófúvókákkal van felszerelve, nem bolygóközi utazásra tervezték.
-block.core-foundation.description = Mag. Páncélozott. Több nyersanyagot tárol, mint a Szilánk.
+block.core-foundation.description = Támaszpont. Páncélozott. Több nyersanyagot tárol, mint a Szilánk.
 block.core-foundation.details = A második modell.
-block.core-nucleus.description = Mag. Megerősített páncélzattal. Hatalmas mennyiségű nyersanyag tárolására képes.
+block.core-nucleus.description = Támaszpont. Megerősített páncélzattal. Hatalmas mennyiségű nyersanyag tárolására képes.
 block.core-nucleus.details = A harmadik, végső modell.
 block.vault.description = Nagy mennyiséget tárol minden nyersanyagtípusból. A tartalma kirakodó segítségével nyerhető ki.
 block.container.description = Kis mennyiséget tárol minden nyersanyagtípusból. A tartalma kirakodó segítségével nyerhető ki.
@@ -2128,18 +2128,18 @@ block.tetrative-reconstructor.description = Ötös szintre fejleszti a beérkez
 block.switch.description = Kétállású kapcsoló. Az állapota leolvasható és módosítható processzorokkal.
 block.micro-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek, vagy épületek irányítására is.
 block.logic-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek, vagy épületek irányítására is. Gyorsabb mint a Mikroprocesszor.
-block.hyper-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek, vagy épületek irányítására is. Gyorsabb mint a Logikai-Processzor.
+block.hyper-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek, vagy épületek irányítására is. Gyorsabb mint a Logikai Processzor.
 block.memory-cell.description = Információt tárol processzorok számára.
 block.memory-bank.description = Információt tárol processzorok számára. Nagyobb kapacitású.
 block.logic-display.description = Ábrák rajzolhatók rá processzorral.
 block.large-logic-display.description = Ábrák rajzolhatók rá processzorral.
-block.interplanetary-accelerator.description = Hatalmas elektromágneses gyorsítótorony. Képes Magokat szökési sebességre gyorsítani bolygóközi bevetéshez.
+block.interplanetary-accelerator.description = Hatalmas elektromágneses gyorsítótorony. Képes Támaszpontokat szökési sebességre gyorsítani bolygóközi bevetéshez.
 block.repair-turret.description = Folyamatosan javítja a közelében lévő legközelebbi sérült egységet. Opcionálisan elfogadja a Hűtőfolyadékot.
 
 #Erekir
-block.core-bastion.description = Mag. Páncélozott. Ha elpusztul, a szektor elveszett.
-block.core-citadel.description = Mag. Nagyon jól páncélozott. Több nyersanyagot tárol, mint a Bástya.
-block.core-acropolis.description = Mag. Kivételesen jól páncélozott. Több nyersanyagot tárol, mint a Citadella.
+block.core-bastion.description = Támaszpont. Páncélozott. Ha elpusztul, a szektor elveszett.
+block.core-citadel.description = Támaszpont. Nagyon jól páncélozott. Több nyersanyagot tárol, mint a Bástya.
+block.core-acropolis.description = Támaszpont. Kivételesen jól páncélozott. Több nyersanyagot tárol, mint a Citadella.
 block.breach.description = Átütő erejű Berillium-, vagy Volfrámlövedékeket lő ki az ellenséges célpontokra.
 block.diffuse.description = Széles kúpban lövi ki a lövedékeket. Visszalöki az ellenséges célpontokat.
 block.sublimate.description = Folyamatos lángcsóvát lő ki az ellenséges célpontokra. Átüti a páncélt.
@@ -2152,24 +2152,24 @@ block.smite.description = Átütő erejű, villámló lövedékeket lő ki.
 block.malign.description = Lézer töltetekből álló célzott sortüzet zúdít az ellenséges célpontokra. Nagy mennyiségű Hőt igényel.
 block.silicon-arc-furnace.description = Szilíciumot finomít Homokból és Grafitból.
 block.oxidation-chamber.description = A Berilliumot és az Ózont Oxiddá alakítja. Melléktermékként Hőt bocsát ki.
-block.electric-heater.description = Fűti a vele szemben álló blokkokat. Nagy mennyiségű Áramot igényel.
-block.slag-heater.description = Fűti a vele szemben álló blokkokat. Salakot igényel.
-block.phase-heater.description = Fűti a vele szemben álló blokkokat. Tóritkvarcot igényel.
-block.heat-redirector.description = Átirányítja a felgyülemlett Hőt más blokkokba.
+block.electric-heater.description = Fűti a vele szemben álló épületeket. Nagy mennyiségű Áramot igényel.
+block.slag-heater.description = Fűti a vele szemben álló épületeket. Salakot igényel.
+block.phase-heater.description = Fűti a vele szemben álló épületeket. Tóritkvarcot igényel.
+block.heat-redirector.description = Átirányítja a felgyülemlett Hőt más épületekbe.
 block.heat-router.description = A felgyülemlett Hőt három kimeneti irányba terjeszti.
 block.electrolyzer.description = A Vizet Hidrogén- és Ózongázzá alakítja.
 block.atmospheric-concentrator.description = Kondenzálja a Nitrogént a légkörből. Hőt igényel.
-block.surge-crucible.description = A Salakból és a Szilíciumból Elektrometált képez. Hőt igényel.
+block.surge-crucible.description = A Salakból és a Szilíciumból Elektrometált olvaszt. Hőt igényel.
 block.phase-synthesizer.description = Tóriumból, Homokból és Ózonból Tóritkvarcot szintetizál. Hőt igényel.
 block.carbide-crucible.description = A Grafitot és a Volfrámot Karbiddá olvasztja. Hőt igényel.
 block.cyanogen-synthesizer.description = Cianogént szintetizál Arkycitből és Grafitból. Hőt igényel.
 block.slag-incinerator.description = Elégeti a nem illékony tárgyakat, vagy folyadékokat. Salakot igényel.
 block.vent-condenser.description = A kürtőkből kiáramló gázokat Vízzé kondenzálja. Áramot igényel.
 block.plasma-bore.description = Ércfallal szemben elhelyezve, korlátlanul termeli ki a nyersanyagokat. Kis mennyiségű Áramot igényel.
-block.large-plasma-bore.description = Egy nagyobb plazma vágó. Képes a Volfrám és a Tórium bányászatára. Hidrogént és Áramot igényel.
+block.large-plasma-bore.description = Egy nagyobb Plazma Vágó. Képes a Volfrám és a Tórium bányászatára. Hidrogént és Áramot igényel.
 block.cliff-crusher.description = Felőrli a Homokfalakat és korlátlan ideig Homokot termel. Áramot igényel. A hatékonysága a fal típusától függően változik.
 block.impact-drill.description = Ha ércre helyezik, korlátlan ideig, sorozatokban termeli ki a nyersanyagokat. Áramot és Vizet igényel.
-block.eruption-drill.description = Továbbfejlesztett ütvefúró. Képes Tóriumot bányászni. Hidrogént igényel.
+block.eruption-drill.description = Továbbfejlesztett Ütvefúró. Képes Tóriumot bányászni. Hidrogént igényel.
 block.reinforced-conduit.description = Előre szállítja a folyadékokat. Nem fogadja el a nem csővezetékes bemeneteket oldalról.
 block.reinforced-liquid-router.description = Egyenletesen osztja el a folyadékokat minden oldalra.
 block.reinforced-liquid-tank.description = Nagy mennyiségű folyadékot tárol.
@@ -2187,19 +2187,19 @@ block.reinforced-surge-wall-large.description = Megvédi az építményeket az e
 block.shielded-wall.description = Megvédi az építményeket az ellenséges lövedékektől. Olyan pajzsot képez, amely a legtöbb lövedéket elnyeli, ha Áramot kap. Vezeti az Áramot.
 block.blast-door.description = Egy fal, amely kinyílik, ha a szövetséges földi egységek vannak a közelében. Kézzel nem irányítható.
 block.duct.description = Előre mozgatja a nyersanyagokat. Csak egyetlen nyersanyag tárolására alkalmas.
-block.armored-duct.description = Előre mozgatja a nyersanyagokat. Nem fogad el nem-szállító szalagos bemeneteket oldalról.
+block.armored-duct.description = Előre mozgatja a nyersanyagokat. Csak szállítószalagos bemeneteket fogad el oldalról.
 block.duct-router.description = A nyersanyagokat egyenlően osztja el három irányba. Csak a hátsó oldalról fogadja be a tárgyakat. Nyersanyag Válogatóként is konfigurálható.
 block.overflow-duct.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud. Nem használható közvetlenül Túlfolyó Kapu, vagy Alul-folyó Kapu mellett.
 block.duct-bridge.description = Nyersanyagok szállítására alkalmas épületek és terepakadályok fölött.
-block.duct-unloader.description = A kiválasztott nyersanyagokat kirakodja a mögötte lévő blokkból. Magokból nem lehet kirakodni.
+block.duct-unloader.description = A kiválasztott nyersanyagokat kirakodja a mögötte lévő épületekből. Támaszpontokból nem lehet kirakodni.
 block.underflow-duct.description = Csak akkor enged tovább nyersanyagokat előre, ha oldalra már nem tudja kiadni őket. Nem használható közvetlenül Túlfolyó Kapu, vagy Alul-folyó Kapu mellett.
 block.reinforced-liquid-junction.description = Két egymást keresztező csővezeték közötti csomópontként működik.
 block.surge-conveyor.description = A nyersanyagokat rakományokban mozgatja. Árammal felgyorsítható. Vezeti az Áramot.
 block.surge-router.description = Egyenletesen osztja el a nyersanyagokat három irányba a Szállítószalagról. Árammal felgyorsítható. Vezeti az Áramot.
-block.unit-cargo-loader.description = Teherhordó drónokat épít. A drónok automatikusan szétosztják a nyersanyagokat a megfelelő szűrővel rendelkező kirakodási pontokra.
+block.unit-cargo-loader.description = Teherszállító drónokat épít. A drónok automatikusan szétosztják a nyersanyagokat a megfelelő szűrővel rendelkező kirakodási pontokra.
 block.unit-cargo-unload-point.description = A teherszállító drónok kirakodási pontjaként működik. Csak a kiválasztott szűrőnek megfelelő nyersanyagokat fogadja be.
-block.beam-node.description = Az Áramot merőlegesen vezeti a többi blokkhoz. Kis mennyiségű energiát tárol.
-block.beam-tower.description = Az Áramot merőlegesen vezeti a többi blokkhoz. Nagy mennyiségű energiát tárol. Nagy hatótávolságú.
+block.beam-node.description = Az Áramot merőlegesen vezeti a többi épülethez. Kis mennyiségű energiát tárol.
+block.beam-tower.description = Az Áramot merőlegesen vezeti a többi épülethez. Nagy mennyiségű energiát tárol. Nagy hatótávolságú.
 block.turbine-condenser.description = A kürtőkből kiáramló gázokból Áramot termel. Kis mennyiségű Vizet termel.
 block.chemical-combustion-chamber.description = Arkycitből és Ózonból termel Áramot.
 block.pyrolysis-generator.description = Nagy mennyiségű Áramot termel Arkycitből és Salakból. Melléktermékként Vizet termel.
@@ -2207,8 +2207,8 @@ block.flux-reactor.description = Nagy mennyiségű Áramot termel Hő hatására
 block.neoplasia-reactor.description = Arkycit, Víz és Tóritkvarc felhasználásával nagy mennyiségű Áramot termel. Melléktermékként Hőt és veszélyes Neoplazmát termel.\nHevesen robban, ha a Neoplazmát nem távolítják el a reaktorból a csővezetékeken keresztül.
 block.build-tower.description = Automatikusan újjáépíti a hatósugarában lévő építményeket, és segíti a többi egységet az építkezésben.
 block.regen-projector.description = Lassan javítja a szövetséges építményeket egy négyzet alakú kerületben. Hidrogént igényel.
-block.reinforced-container.description = Kis mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a Mag tárolókapacitását.
-block.reinforced-vault.description = Nagy mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a Mag tárolókapacitását.
+block.reinforced-container.description = Kis mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a Támaszpont tárolókapacitását.
+block.reinforced-vault.description = Nagy mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a Támaszpont tárolókapacitását.
 block.tank-fabricator.description = Stell egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Tank Újratervezőbe fejlesztésre.
 block.ship-fabricator.description = Elude egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Repülőgép Újratervezőbe fejlesztésre.
 block.mech-fabricator.description = Merui egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Mech Újratervezőbe fejlesztésre.
@@ -2250,7 +2250,7 @@ unit.horizon.description = Bombákat szór földi célpontokra.
 unit.zenith.description = Rakétasorozatokat lő közeli ellenségekre.
 unit.antumbra.description = Lövedékek záporát zúdítja minden közeli ellenségre.
 unit.eclipse.description = Két átütő erejű lézersugarat és rengeteg lövedéket zúdít minden közeli ellenségre.
-unit.mono.description = Automatikusan bányászik Rezet és Ólmot a Magba juttatva őket.
+unit.mono.description = Automatikusan bányászik Rezet és Ólmot a Támaszpontba juttatva őket.
 unit.poly.description = Automatikusan újjáépíti az elpusztult épületeket és segít más egységeknek építkezni.
 unit.mega.description = Automatikusan javítja a sérült épületeket. Képes kis épületek és földi egységek szállítására.
 unit.quad.description = Nagy bombákat szór földi célpontokra, amelyek sebzik az ellenséget, de javítják a szövetséges épületeket. Képes közepes méretű földi egységek szállítására.
@@ -2279,12 +2279,12 @@ unit.merui.description = Nagy hatótávolságú ágyúkkal lövi az ellenséges
 unit.cleroi.description = Kettős lövedékeket lő ki az ellenséges célpontokra. Célba veszi az ellenséges lövedékeket a pontvédelmi tornyokkal. A legtöbb terepakadályt átlépi.
 unit.anthicus.description = Nagy hatótávolságú célkövető rakétákat lő ki az ellenséges célpontokra. A legtöbb terepakadályt átlépi.
 unit.tecta.description = Célkövető plazma rakétákat lő ki az ellenséges célpontokra. Irányított pajzzsal védi magát. A legtöbb terepakadályt átlépi.
-unit.collaris.description = Nagy hatótávolságú repesz-ágyúval lövi az ellenséges célpontokat. A legtöbb terepakadályt átlépi.
+unit.collaris.description = Nagy hatótávolságú repeszágyúval lövi az ellenséges célpontokat. A legtöbb terepakadályt átlépi.
 unit.elude.description = Célkövető golyópárokat lő ki az ellenséges célpontokra. Képes folyadéktestek felett lebegni.
 unit.avert.description = Forgó lövedékpárokat lő ki az ellenséges célpontokra.
-unit.obviate.description = Forgó, páros-villámgömböket lő ki az ellenséges célpontokra.
-unit.quell.description = Kettő darab, nagy hatótávolságú célkövető rakétát lő ki egyszerre az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító blokkokat.
-unit.disrupt.description = Három darab, nagy hatótávolságú célkövető rakétát lő ki egyszerre az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító blokkokat.
+unit.obviate.description = Forgó, páros villámgömböket lő ki az ellenséges célpontokra.
+unit.quell.description = Kettő darab, nagy hatótávolságú célkövető rakétát lő ki egyszerre az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító épületeket.
+unit.disrupt.description = Három darab, nagy hatótávolságú célkövető rakétát lő ki egyszerre az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító épületeket.
 unit.evoke.description = A Bástya védelmére szolgáló építményeket épít. Sugárral javítja az építményeket.
 unit.incite.description = A Citadella védelmére szolgáló építményeket épít. Sugárral javítja az építményeket.
 unit.emanate.description = Az Akropolisz védelmére szolgáló építményeket épít. Sugárral javítja az építményeket.
@@ -2305,9 +2305,9 @@ lst.operation = Végezzen el egy műveletet 1-2 változóval.
 lst.end = Ugrás az utasítási verem tetejére.
 lst.wait = Várjon bizonyos számú másodpercet.
 lst.stop = A processzor program futtatásának leállítása.
-lst.lookup = Egy nyersanyag/folyadék/egység/blokk típus keresése azonosító alapján.\nAz egyes típusok összesített száma a következőkkel érhető el:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.lookup = Egy nyersanyag/folyadék/egység/épület típus keresése azonosító alapján.\nAz egyes típusok összesített száma a következőkkel érhető el:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
 lst.jump = Feltételes ugrás egy másik utasításra.
-lst.unitbind = Összekapcsolás a következő egységtípussal és tárolja a(z) [accent]@unit[]-ban/-ben.
+lst.unitbind = Összekapcsolás a következő egységtípussal és tárolja a következőben: [accent]@unit[].
 lst.unitcontrol = Az aktuálisan összekapcsolt egység vezérlése.
 lst.unitradar = Egységek keresése az aktuálisan összekapcsolt egység körül.
 lst.unitlocate = Egy adott típusú pozíció/épület keresése bárhol a pályán.\nÖsszekapcsolt egységet igényel.
@@ -2318,7 +2318,7 @@ lst.applystatus = Állapothatás alkalmazása, vagy törlése egy egységről.
 lst.spawnwave = Egy tetszőleges helyen keletkező hullám szimulálása.\nNem növeli a hullámszámlálót.
 lst.explosion = Robbanás létrehozása egy helyen.
 lst.setrate = A processzor végrehajtási sebességének beállítása utasítás/ütemben.
-lst.fetch = Egységek, Magok, játékosok, vagy épületek keresése index szerint.\nAz indexek 0-nál kezdődnek és a visszaadott számuknál végződnek.
+lst.fetch = Egységek, Támaszpontok, játékosok, vagy épületek keresése index szerint.\nAz indexek 0-nál kezdődnek és a visszaadott számuknál végződnek.
 lst.packcolor = Tömöríti [0, 1] az RGBA komponenseket egyetlen számba a rajzoláshoz, vagy szabálymeghatározáshoz.
 lst.setrule = Állíts be egy játékszabályt.
 lst.flushmessage = Üzenet megjelenítése a képernyőn a szövegpufferből.\nMegvárja, amíg az előző üzenet befejeződik.
@@ -2326,7 +2326,7 @@ lst.cutscene = Manipulálja a játékos kameráját.
 lst.setflag = Egy globális jelölő beállítása, amely minden processzor által olvasható.
 lst.getflag = Ellenőrzi, hogy egy globális jelölő be van-e állítva.
 lst.setprop = Egy egység vagy épület tulajdonságát állítja be.
-lst.effect = Létrehoz egy részecske-effektet.
+lst.effect = Létrehoz egy részecske hatást.
 lst.sync = Egy változó szinkronizálása a hálózaton keresztül.\nMásodpercenként legfeljebb 10 alkalommal hívható meg.
 lst.makemarker = Új logikai jelölő létrehozása a világban.\nEgy azonosítót kell megadni a jelölő azonosításához.\nA jelölők száma jelenleg világonként 20 000-re van korlátozva.
 lst.setmarker = Egy jelölő tulajdonságának beállítása.\nA használt azonosítónak meg kell egyeznie a Make Marker utasításban megadottal.\n[accent]null []értékek figyelmen kívül lesznek hagyva.
@@ -2340,10 +2340,10 @@ lglobal.@e = Az e matematikai állandó (2.718...)
 lglobal.@degToRad = Szorozza meg ezt a számot a fokok radiánra való konvertálásához
 lglobal.@radToDeg = Szorozza meg ezt a számot a radiánok fokokká konvertálásához
 
-lglobal.@time = Az aktuális mentés játék-ideje, milliszekundumban
-lglobal.@tick = Az aktuális mentés játék-ideje, tick-ben (1 másodperc = 60 tick)
-lglobal.@second = Az aktuális mentés játék-ideje, másodpercben
-lglobal.@minute = Az aktuális mentés játék-ideje, percben
+lglobal.@time = Az aktuális mentés játékideje, milliszekundumban
+lglobal.@tick = Az aktuális mentés játékideje, tick-ben (1 másodperc = 60 tick)
+lglobal.@second = Az aktuális mentés játékideje, másodpercben
+lglobal.@minute = Az aktuális mentés játékideje, percben
 lglobal.@waveNumber = Az aktuális hullám száma, ha a hullámok engedélyezve vannak
 lglobal.@waveTime = Visszaszámláló a hullámokhoz, másodpercben
 lglobal.@mapw = A pálya szélessége csempékben
@@ -2358,7 +2358,7 @@ lglobal.sectionLookup = Keres
 lglobal.@this = A kódot végrehajtó logikai blokk
 lglobal.@thisx = A kódot végrehajtó blokk X koordinátája
 lglobal.@thisy = A kódot végrehajtó blokk Y koordinátája
-lglobal.@links = Az ehhez a processzorhoz kapcsolt blokkok összesített száma
+lglobal.@links = Az ehhez a processzorhoz kapcsolt épületek összesített száma
 lglobal.@ipt = A processzor utasítás végrehajtási sebessége tick-ben (60 tick = 1 másodperc)
 
 lglobal.@unitCount = A játékban található egységek típusainak összesített száma; a Keres utasítással együtt használjuk
@@ -2366,8 +2366,8 @@ lglobal.@blockCount = A játékban található blokkok típusainak összesített
 lglobal.@itemCount = A játékban található nyersanyagok típusainak összesített száma; a Keres utasítással együtt használjuk
 lglobal.@liquidCount = A játékban található folyadékok típusainak összesített száma; a Keres utasítással együtt használjuk
 
-lglobal.@server = Igaz, ha a kód szerveren, vagy egyjátékos módban fut, egyébként hamis
-lglobal.@client = Igaz, ha a kód egy szerverhez csatlakoztatott kliensen fut
+lglobal.@server = Igaz, ha a kód egy kiszolgálón, vagy egyjátékos módban fut, egyébként hamis
+lglobal.@client = Igaz, ha a kód egy kiszolgálóhoz kapcsolódott kliensen fut
 
 lglobal.@clientLocale = A kódot futtató kliens nyelvi beállítása. Például: hu_HU
 lglobal.@clientUnit = A kódot futtató kliens egysége
@@ -2421,7 +2421,7 @@ graphicstype.print = Szöveget rajzol a kiírási pufferből.\nTörli a kiírás
 
 lenum.always = Mindig igaz.
 lenum.idiv = Egész számok osztása.
-lenum.div = Osztás.\nVisszatér [accent]null[]-al/-el a nullával való osztásnál.
+lenum.div = Osztás.\nVisszatér [accent]null[]-val a nullával való osztásnál.
 lenum.mod = Moduló.
 lenum.equal = Egyenlő. Kényszeríti a típusokat.\nA nem nulla értékű objektumok értéke 1 lesz, egyébként 0.
 lenum.notequal = Nem egyenlő. Kényszeríti a típusokat.
@@ -2467,10 +2467,10 @@ lenum.player = Egy játékos által irányított egység.
 
 lenum.ore = Érclelőhely.
 lenum.damaged = Sérült szövetséges épület.
-lenum.spawn = Ellenséges kezdőpont.\nLehet egy Mag vagy egy pozíció.
+lenum.spawn = Ellenséges kezdőpont.\nLehet egy Támaszpont vagy egy pozíció.
 lenum.building = Épület egy adott csoportban.
 
-lenum.core = Bármilyen Mag.
+lenum.core = Bármilyen Támaszpont.
 lenum.storage = Raktárépület, pl. Vault.
 lenum.generator = Energiát termelő épületek.
 lenum.factory = Nyersanyagokat feldolgozó épületek.
@@ -2499,7 +2499,7 @@ control.of = Épület az irányításhoz.
 control.unit = Megcélozandó egység/épület.
 control.shoot = Akár lőni is lehet.
 
-unitlocate.enemy = Akár az ellenséges épületek felkutatása.
+unitlocate.enemy = Akár az ellenséges épületek felderítése.
 unitlocate.found = Függetlenül attól, hogy a tárgy meglett-e találva.
 unitlocate.building = Kimeneti változó a megtalált épülethez.
 unitlocate.outx = Kimeneti X koordináta.
@@ -2512,7 +2512,7 @@ lenum.unbind = A logikai vezérlés teljes kikapcsolása.\nSzokásos mestersége
 lenum.move = Mozgás a pontos pozícióba.
 lenum.approach = Közelítsen meg egy pozíciót egy sugárral.
 lenum.pathfind = Útkeresés az ellenséges kezdőponthoz.
-lenum.autopathfind = Automatikus útkeresés a legközelebbi ellenséges Maghoz, vagy ledobási ponthoz.\nEz ugyanaz, mint a normál hullámos ellenséges útkeresés.
+lenum.autopathfind = Automatikus útkeresés a legközelebbi ellenséges Támaszponthoz, vagy ledobási ponthoz.\nEz ugyanaz, mint a normál hullámos ellenséges útkeresés.
 lenum.target = Lőj egy helyet.
 lenum.targetp = Lőj egy célpontra sebesség-előrejelzéssel.
 lenum.itemdrop = Dobj le egy nyersanyagot.
@@ -2528,7 +2528,7 @@ lenum.within = Ellenőrizze, hogy az egység egy pozíció közelében van-e.
 lenum.boost = Erősítés indítás/leállítás.
 
 lenum.flushtext = A nyomtatási puffer tartalmának ürítése a jelölőre, ha alkalmazható.\nHa a fetch értéke igaz, megpróbálja lehívni a tulajdonságokat a pálya Helyi Csomagjából, vagy a játék csomagjából.
-lenum.texture = A textúra neve közvetlenül a játék textúra-atlaszából (kebab-case elnevezési stílus használatával).\nHa a printFlush értéke igaz, akkor a szöveges puffer tartalmát használja szöveges argumentumként.
+lenum.texture = A textúra neve közvetlenül a játék textúra atlaszából (kebab-case elnevezési stílus használatával).\nHa a printFlush értéke igaz, akkor a szöveges puffer tartalmát használja szöveges argumentumként.
 lenum.texturesize = A textúra mérete csempékben. A nulla érték a jelölő szélességét az eredeti textúra méretére skálázza.
 lenum.autoscale = A jelölő skálázása a játékos nagyítási szintjének megfelelően.
 lenum.posi = Indexelt pozíció, vonal- és négyszögjelzőkhöz használatos, ahol a nulla index az első pozíció.

From 94de7ee9912ae1342337eddc8112df93cc574063 Mon Sep 17 00:00:00 2001
From: Joan Josep <juanjo.ng.83@gmail.com>
Date: Sat, 9 Mar 2024 23:56:58 +0100
Subject: [PATCH 266/369] Update bundle_ca.properties (#9630)

---
 core/assets/bundles/bundle_ca.properties | 28 ++++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index ba8dd79da9..c323aadfd8 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -674,11 +674,11 @@ objective.destroycore.name = Destrueix el nucli
 objective.commandmode.name = Mode de comandament
 objective.flag.name = Bandera
 marker.shapetext.name = Forma del text
-marker.point.name = Point
+marker.point.name = Punt
 marker.shape.name = Forma
 marker.text.name = Text
 marker.line.name = Línia
-marker.quad.name = Quad
+marker.quad.name = Rectangle
 marker.background = Fons
 marker.outline = Contorn
 
@@ -763,8 +763,8 @@ sector.curlost = Sector perdut
 sector.missingresources = [scarlet]Recursos insuficients al nucli
 sector.attacked = Ataquen el sector [accent]{0}[white]!
 sector.lost = Heu perdut el sector [accent]{0}[white]!
-sector.capture = Sector [accent]{0}[white]Captured!
-sector.capture.current = Sector Captured!
+sector.capture = S’ha capturat el sector [accent]{0}[white]!
+sector.capture.current = Sector capturat!
 sector.changeicon = Canvia la icona
 sector.noswitch.title = Els sectors no es poden canviar.
 sector.noswitch = Potser no podeu canviar de sector perquè n’ataquen un altre.\n\nSector: [accent]{0}[] de [accent]{1}[]
@@ -1145,7 +1145,7 @@ setting.sfxvol.name = Volums dels efectes de so
 setting.mutesound.name = Silencia el so
 setting.crashreport.name = Envia informes d’error anònims
 setting.savecreate.name = Desa automàticament la partida
-setting.steampublichost.name = Public Game Visibility
+setting.steampublichost.name = Visibilitat de la partida pública
 setting.playerlimit.name = Límit de jugadors
 setting.chatopacity.name = Opacitat del xat
 setting.lasersopacity.name = Opacitat dels làsers d’energia
@@ -1550,7 +1550,7 @@ block.inverted-sorter.name = Classificador invers
 block.message.name = Missatge
 block.reinforced-message.name = Missatge destacat
 block.world-message.name = Missatge mundial
-block.world-switch.name = World Switch
+block.world-switch.name = Interruptor mundial
 block.illuminator.name = Il·luminador
 block.overflow-gate.name = Porta de desbordament
 block.underflow-gate.name = Porta de subdesbordament
@@ -1911,7 +1911,7 @@ onset.turrets = Les unitats són efectives, però les [accent]torretes[] proporc
 onset.turretammo = Subministreu [accent]munició de beril·li[] a la torreta.
 onset.walls = Els [accent]murs[] poden evitar que el dany arribi a les estructures importants.\nConstruïu alguns \uf6ee [accent]murs de beril·li[] al voltant de la torreta.
 onset.enemies = S’apropa un enemic. Prepareu la defensa.
-onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.defenses = [accent]Establiu defenses:[lightgray] {0}
 onset.attack = L’enemic és vulnerable. Contraataqueu.
 onset.cores = Els nuclis nous es poden construir en [accent]caselles de nucli[].\nEls nuclis nous funcionen com a bases i comparteixen un inventari de recursos amb altres nuclis.\nConstruïu un \uf725 nucli.
 onset.detect = L’enemic us detectarà d’aquí 2 minuts.\nEstabliu les defenses i les explotacions mineres i de producció.
@@ -2491,10 +2491,10 @@ lenum.build = Construeix una estructura.
 lenum.getblock = Obté un bloc i el seu tipus a les coordenades indicades.\nLa posició escollida ha d’estar a l’abast de la unitat.\nEls blocs que no són construccions tindran el tipus [accent]@solid[].
 lenum.within = Comprova si la unitat està a prop d’una posició.
 lenum.boost = Inicia/Detén el vol.
-lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
-lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
-lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
-lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
-lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
-lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
-lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.flushtext = Passa el contingut de la cua d’impressió al marcador, si es pot.\nSi s’estableix «fetch» a vertader, s’intentarà carregar les propietats de la traducció del mapa o del joc.
+lenum.texture = Nom de la textura directa de l’atles de textures del joc (amb l’estil de noms kebab-case).\nSi «printFlush» s’estableix a vertader, consumeix el contingut de la cua d’impressió com a argument de text.
+lenum.texturesize = Mida de la textura a les caselles. Un valor de zero indica que s’ha d'escalar l’amplada del marcador a la mida original de la textura.
+lenum.autoscale = Indica si cal escalar el marcador segons el nivell de zoom del jugador.
+lenum.posi = Posició indexada que es fa servir per a marcadors de línia i de rectangles on l’índex zero és la primera posició.
+lenum.uvi = Posició de la textura que va de zero a u i que es fa servir per a marcadors de tipus rectangle.
+lenum.colori = Posició indexada que es fa servir per a marcadors de línies i rectangles on l’índex zero és el primer color.

From df147bbc55d018cedb0c2c38eacdb345b3385c86 Mon Sep 17 00:00:00 2001
From: liangliangsan <88579991+liangliangsan@users.noreply.github.com>
Date: Sun, 10 Mar 2024 06:57:52 +0800
Subject: [PATCH 267/369] Update servers_v7.json (#9629)

* Update servers_v7.json

* Update servers_v7.json
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index 0ff771763c..ceb50c3195 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -1,4 +1,8 @@
 [
+  {
+    "name": "gods field",
+    "address": ["n2.akiracloud.net:10225"]
+  },
   {
     "name": "STP",
     "address": ["23.88.73.88:25617"]

From 4366f904eefcb27e2f25c8575688399899d4095b Mon Sep 17 00:00:00 2001
From: c6b2qb5g <160118416+c6b2qb5g@users.noreply.github.com>
Date: Sun, 10 Mar 2024 06:01:32 +0700
Subject: [PATCH 268/369] Update servers_v7.json (#9626)

---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index ceb50c3195..680b400025 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -292,5 +292,9 @@
   { 
     "name": "Sever.VN",
     "address": ["srv24.godlike.club:26189"]
+  },
+  {
+    "name": "NPTS",
+    "address": ["81.94.159.242"]
   }
 ]

From 332d3af893de74e1685e32c8c3014dd13a2299da Mon Sep 17 00:00:00 2001
From: Jason <131086642+JasonP01@users.noreply.github.com>
Date: Sun, 10 Mar 2024 15:51:15 +0200
Subject: [PATCH 269/369] Update servers_v7.json (#9631)

* Update servers_v7.json

Fix owner forgetting to renew c-n.ddns.net

* Add missing pvp and events ip

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* chore: Correct server adresses

---------

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>
Co-authored-by: phinner <62483793+phinner@users.noreply.github.com>
---
 servers_v7.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index 680b400025..dd09fc929f 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -98,7 +98,7 @@
   },
   {
     "name": "Chaotic Neutral",
-    "address": ["c-n.ddns.net:7012", "c-n.ddns.net:7013", "c-n.ddns.net:7014", "c-n.ddns.net:7015", "c-n.ddns.net:7016", "c-n.ddns.net:7017", "c-n.ddns.net:7003", "37.187.73.180:7021"]
+    "address": ["37.187.73.180:7011", "37.187.73.180:7012", "37.187.73.180:7013", "37.187.73.180:7014", "37.187.73.180:7015", "37.187.73.180:7016", "37.187.73.180:7017"]
   },
   {
     "name": "io",
@@ -112,10 +112,6 @@
     "name": "Phoenix Network",
     "address": ["phoenix-network.dev", "phoenix-network.dev:6464", "phoenix-network.dev:2023"]
   },
-  {
-    "name": "Xpdustry",
-    "address": ["37.187.73.180", "37.187.73.180:7000", "37.187.73.180:7001", "37.187.73.180:7002", "37.187.73.180:7003", "37.187.73.180:7004", "37.187.73.180:7005"]
-  },
   {
     "name": "LatamDustry",
     "address": ["45.158.9.23:5532", "45.158.9.23:5422", "45.158.9.23:5463", "45.158.9.23:5520"]
@@ -130,7 +126,7 @@
   },
   {
     "name": "Fish",
-    "address": ["162.248.101.95", "162.248.100.98", "162.248.100.133", "162.248.102.204", "c-n.ddns.net:7003"]
+    "address": ["162.248.101.95", "162.248.100.98", "162.248.100.133", "162.248.102.204", "37.187.73.180:7012"]
   },
   {
     "name": "OmniCorp Classic",

From 3f46080f4235043cf5febd6fff1a2fbbd5b12886 Mon Sep 17 00:00:00 2001
From: GlFolker <63218676+GlennFolker@users.noreply.github.com>
Date: Thu, 14 Mar 2024 23:12:28 +0700
Subject: [PATCH 270/369] Allow categorized sprite names to not be prefixed.
 (#9616)

* Delegate more methods into Planet

* Allow categorized sprite prefixes
---
 core/src/mindustry/mod/Mods.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
index 1eed765d19..391636571e 100644
--- a/core/src/mindustry/mod/Mods.java
+++ b/core/src/mindustry/mod/Mods.java
@@ -218,7 +218,10 @@ public class Mods implements Loadable{
                     }
                     //this returns a *runnable* which actually packs the resulting pixmap; this has to be done synchronously outside the method
                     return () -> {
-                        String fullName = (prefix ? mod.name + "-" : "") + baseName;
+                        //don't prefix with mod name if it's already prefixed by a category, e.g. `block-modname-content-full`.
+                        int hyphen = baseName.indexOf('-');
+                        String fullName = ((prefix && !(hyphen != -1 && baseName.substring(hyphen + 1).startsWith(mod.name + "-"))) ? mod.name + "-" : "") + baseName;
+
                         packer.add(getPage(file), fullName, new PixmapRegion(pix));
                         if(textureScale != 1.0f){
                             textureResize.put(fullName, textureScale);

From 60c6e03d3264275eb1ffaef5aa91eba22e284b37 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Thu, 14 Mar 2024 11:25:03 -0700
Subject: [PATCH 271/369] Weather with World Logic (#9621)

* Weather sense

Honestly, doesn't seem game changing enough to warrant privileged restriction.

* Weather set

* Rename "snow" to "snowing"

Fix conflict with the snow floor block, though I don't know if this'll have negative repercussions on saves.

* Don't last forever

* Cleanup and bundle

* add space
---
 core/assets/bundles/bundle.properties      |   2 +
 core/src/mindustry/content/Weathers.java   |   2 +-
 core/src/mindustry/core/ContentLoader.java |   8 ++
 core/src/mindustry/logic/GlobalVars.java   |   4 +
 core/src/mindustry/logic/LExecutor.java    |  43 +++++++-
 core/src/mindustry/logic/LStatement.java   |   2 +-
 core/src/mindustry/logic/LStatements.java  | 109 +++++++++++++++++++++
 core/src/mindustry/type/Weather.java       |   2 +-
 8 files changed, 168 insertions(+), 4 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index e9805b2eb0..260c5af651 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2315,6 +2315,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a unit.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Spawn a wave.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/src/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java
index f0ee71d4ea..d69a6b4b43 100644
--- a/core/src/mindustry/content/Weathers.java
+++ b/core/src/mindustry/content/Weathers.java
@@ -17,7 +17,7 @@ public class Weathers{
     suspendParticles;
 
     public static void load(){
-        snow = new ParticleWeather("snow"){{
+        snow = new ParticleWeather("snowing"){{
             particleRegion = "particle";
             sizeMax = 13f;
             sizeMin = 2.6f;
diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java
index 91e9c80824..7abaf35f29 100644
--- a/core/src/mindustry/core/ContentLoader.java
+++ b/core/src/mindustry/core/ContentLoader.java
@@ -314,6 +314,14 @@ public class ContentLoader{
         return getByName(ContentType.planet, name);
     }
 
+    public Seq<Weather> weathers(){
+        return getBy(ContentType.weather);
+    }
+
+    public Weather weather(String name){
+        return getByName(ContentType.weather, name);
+    }
+
     public Seq<UnitStance> unitStances(){
         return getBy(ContentType.unitStance);
     }
diff --git a/core/src/mindustry/logic/GlobalVars.java b/core/src/mindustry/logic/GlobalVars.java
index fa07475c7f..65df2c3821 100644
--- a/core/src/mindustry/logic/GlobalVars.java
+++ b/core/src/mindustry/logic/GlobalVars.java
@@ -125,6 +125,10 @@ public class GlobalVars{
             put("@" + type.name, type);
         }
 
+        for(Weather weather : Vars.content.weathers()){
+            put("@" + weather.name, weather);
+        }
+
         //store sensor constants
         for(LAccess sensor : LAccess.all){
             put("@" + sensor.name(), sensor);
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index 8d02218748..ba9b194364 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -13,8 +13,8 @@ import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
-import mindustry.game.*;
 import mindustry.game.EventType.*;
+import mindustry.game.*;
 import mindustry.game.MapObjectives.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
@@ -1511,6 +1511,47 @@ public class LExecutor{
         }
     }
 
+    public static class SenseWeatherI implements LInstruction{
+        public int type, to;
+
+        public SenseWeatherI(int type, int to){
+            this.type = type;
+            this.to = to;
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            exec.setbool(to, exec.obj(type) instanceof Weather weather && weather.isActive());
+        }
+    }
+
+    public static class SetWeatherI implements LInstruction{
+        public int type, state;
+
+        public SetWeatherI(int type, int state){
+            this.type = type;
+            this.state = state;
+        }
+
+        @Override
+        public void run(LExecutor exec){
+            if(exec.obj(type) instanceof Weather weather){
+                if(exec.bool(state)){
+                    if(!weather.isActive()){ //Create is not already active
+                        Tmp.v1.setToRandomDirection();
+                        Call.createWeather(weather, 1f, WeatherState.fadeTime, Tmp.v1.x, Tmp.v1.y);
+                    }else{
+                        weather.instance().life(WeatherState.fadeTime);
+                    }
+                }else{
+                    if(weather.isActive() && weather.instance().life > WeatherState.fadeTime){
+                        weather.instance().life(WeatherState.fadeTime);
+                    }
+                }
+            }
+        }
+    }
+
     public static class ApplyEffectI implements LInstruction{
         public boolean clear;
         public String effect;
diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java
index 939114cc89..42e0c2ee67 100644
--- a/core/src/mindustry/logic/LStatement.java
+++ b/core/src/mindustry/logic/LStatement.java
@@ -16,7 +16,7 @@ import mindustry.logic.LCanvas.*;
 import mindustry.logic.LExecutor.*;
 import mindustry.ui.*;
 
-import static mindustry.Vars.ui;
+import static mindustry.Vars.*;
 import static mindustry.logic.LCanvas.*;
 
 /**
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index ceae4740c6..e04293a8e7 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -1380,6 +1380,115 @@ public class LStatements{
         }
     }
 
+    @RegisterStatement("weathersensor")
+    public static class WeatherSenseStatement extends LStatement{
+        public String to = "result";
+        public String weather = "@rain";
+
+        private transient TextField tfield;
+
+        @Override
+        public void build(Table table){
+            field(table, to, str -> to = str);
+
+            table.add(" = weather ");
+
+            row(table);
+
+            tfield = field(table, weather, str -> weather = str).padRight(0f).get();
+
+            table.button(b -> {
+                b.image(Icon.pencilSmall);
+
+                b.clicked(() -> showSelectTable(b, (t, hide) -> {
+                    t.row();
+                    t.table(i -> {
+                        i.left();
+                        int c = 0;
+                        for(Weather w : Vars.content.weathers()){
+                            i.button(w.name, Styles.flatt, () -> {
+                                weather = "@" + w.name;
+                                tfield.setText(weather);
+                                hide.run();
+                            }).height(40f).uniformX().wrapLabel(false).growX();
+
+                            if(++c % 2 == 0) i.row();
+                        }
+                    }).left();
+                }));
+            }, Styles.logict, () -> {}).size(40f).padLeft(-1).color(table.color);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SenseWeatherI(builder.var(weather), builder.var(to));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
+    @RegisterStatement("weatherset")
+    public static class WeatherSetStatement extends LStatement{
+        public String weather = "@rain", state = "true";
+
+        private transient TextField tfield;
+
+        @Override
+        public void build(Table table){
+            table.add(" set weather ");
+
+            tfield = field(table, weather, str -> weather = str).padRight(0f).get();
+
+            table.button(b -> {
+                b.image(Icon.pencilSmall);
+
+                b.clicked(() -> showSelectTable(b, (t, hide) -> {
+                    t.row();
+                    t.table(i -> {
+                        i.left();
+                        int c = 0;
+                        for(Weather w : Vars.content.weathers()){
+                            i.button(w.name, Styles.flatt, () -> {
+                                weather = "@" + w.name;
+                                tfield.setText(weather);
+                                hide.run();
+                            }).height(40f).uniformX().wrapLabel(false).growX();
+
+                            if(++c % 2 == 0) i.row();
+                        }
+                    }).left();
+                }));
+            }, Styles.logict, () -> {}).size(40f).padLeft(-1).color(table.color);
+
+            table.add(" state ");
+
+            fields(table, state, str -> state = str);
+        }
+
+        @Override
+        public boolean privileged(){
+            return true;
+        }
+
+        @Override
+        public LInstruction build(LAssembler builder){
+            return new SetWeatherI(builder.var(weather), builder.var(state));
+        }
+
+        @Override
+        public LCategory category(){
+            return LCategory.world;
+        }
+    }
+
     @RegisterStatement("spawnwave")
     public static class SpawnWaveStatement extends LStatement{
         public String x = "10", y = "10", natural = "false";
diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java
index 286b7880fa..d8b7618ccc 100644
--- a/core/src/mindustry/type/Weather.java
+++ b/core/src/mindustry/type/Weather.java
@@ -314,7 +314,7 @@ public class Weather extends UnlockableContent{
     @EntityDef(value = {WeatherStatec.class}, pooled = true, isFinal = false)
     @Component(base = true)
     abstract static class WeatherStateComp implements Drawc, Syncc{
-        private static final float fadeTime = 60 * 4;
+        public static final float fadeTime = 60 * 4;
 
         Weather weather;
         float intensity = 1f, opacity = 0f, life, effectTimer;

From 824c6eedb39fba26b41ec8f0843595d2addc7fc0 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az775-130.ywbp5beigl5e3k0catohwgwj5f.cx.internal.cloudapp.net>
Date: Thu, 14 Mar 2024 18:25:49 +0000
Subject: [PATCH 272/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 2 ++
 core/assets/bundles/bundle_bg.properties    | 2 ++
 core/assets/bundles/bundle_ca.properties    | 2 ++
 core/assets/bundles/bundle_cs.properties    | 2 ++
 core/assets/bundles/bundle_da.properties    | 2 ++
 core/assets/bundles/bundle_de.properties    | 2 ++
 core/assets/bundles/bundle_es.properties    | 2 ++
 core/assets/bundles/bundle_et.properties    | 2 ++
 core/assets/bundles/bundle_eu.properties    | 2 ++
 core/assets/bundles/bundle_fi.properties    | 2 ++
 core/assets/bundles/bundle_fil.properties   | 2 ++
 core/assets/bundles/bundle_fr.properties    | 2 ++
 core/assets/bundles/bundle_hu.properties    | 2 ++
 core/assets/bundles/bundle_id_ID.properties | 2 ++
 core/assets/bundles/bundle_it.properties    | 2 ++
 core/assets/bundles/bundle_ja.properties    | 2 ++
 core/assets/bundles/bundle_ko.properties    | 2 ++
 core/assets/bundles/bundle_lt.properties    | 2 ++
 core/assets/bundles/bundle_nl.properties    | 2 ++
 core/assets/bundles/bundle_nl_BE.properties | 2 ++
 core/assets/bundles/bundle_pl.properties    | 2 ++
 core/assets/bundles/bundle_pt_BR.properties | 2 ++
 core/assets/bundles/bundle_pt_PT.properties | 2 ++
 core/assets/bundles/bundle_ro.properties    | 2 ++
 core/assets/bundles/bundle_ru.properties    | 2 ++
 core/assets/bundles/bundle_sr.properties    | 2 ++
 core/assets/bundles/bundle_sv.properties    | 2 ++
 core/assets/bundles/bundle_th.properties    | 2 ++
 core/assets/bundles/bundle_tk.properties    | 2 ++
 core/assets/bundles/bundle_tr.properties    | 2 ++
 core/assets/bundles/bundle_uk_UA.properties | 2 ++
 core/assets/bundles/bundle_vi.properties    | 2 ++
 core/assets/bundles/bundle_zh_CN.properties | 2 ++
 core/assets/bundles/bundle_zh_TW.properties | 2 ++
 34 files changed, 68 insertions(+)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index fd5e66eab9..e3a469caac 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -2264,6 +2264,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 5c2be5299c..bd83830718 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -2278,6 +2278,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index c323aadfd8..2e2b9b9827 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -2288,6 +2288,8 @@ lst.getblock = Obtén les dades d’un bloc en qualsevol posició.
 lst.setblock = Estableix les dades d’un bloc en qualsevol posició.
 lst.spawnunit = Fes aparèixer una unitat en una posició.
 lst.applystatus = Aplica o esborra un efecte d’estat d’una unitat.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simula l’aparició d’una onada enemiga en una posició arbitrària.\nEl comptador d’onades no s’incrementarà.
 lst.explosion = Crea una explosió en una posició.
 lst.setrate = Estableix la velocitat d’execució del processador en instruccions/tic.
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 65e16af2d7..cdd5a9fdae 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -2283,6 +2283,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 01f2b2e2d7..1e23ad4055 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -2264,6 +2264,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 01de9b4f23..04488a8786 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -2313,6 +2313,8 @@ lst.getblock = Lese Tile-Daten von jedem Standort.
 lst.setblock = Setze Tile-Daten an jedem Standort.
 lst.spawnunit = Einheit an einem Standort erstellen.
 lst.applystatus = Füge einer Einheit einen Effekt hinzu oder entferne ihn.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Schickt die nächste Welle.
 lst.explosion = Erstellt an einer beliebigen Stelle eine Explosion.
 lst.setrate = Setzt die Ausführungsgeschwindigkeit von Prozessoren in Anweisungen/tick.
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 1cd964966b..18a16ca4d9 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -2306,6 +2306,8 @@ lst.getblock = Obtiene los datos de un bloque en cualquier lugar.
 lst.setblock = Cambia los datos de un bloque en cualquier lugar.
 lst.spawnunit = Crea una unidad en una localización.
 lst.applystatus = Aplica o elimina un efecto de alteración de estado a una unidad.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simula la aparición de una oleada de enemigos en una localización arbitraria.\nNo incrementará el contador de oleadas.
 lst.explosion = Crea una explosión en una localización.
 lst.setrate = Establece la velocidad de ejecución de los procesadores lógicos en formato instrucción/tick.
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 72423c0523..a56915c145 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 8536471718..8ce90d62e5 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -2268,6 +2268,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 588a00b290..7a31835dde 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -2269,6 +2269,8 @@ lst.getblock = Selvitä laattadata missä tahansa sijainnissa.
 lst.setblock = Aseta laattadata missä tahansa sijainnissa.
 lst.spawnunit = Luo joukko tietyssä sijainnissa.
 lst.applystatus = Lisää tai poista statusefekti yksiköltä.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simuloi tason syntymistä mielivaltaisessa sijainnissa.\nEi vaikuta tasolaskuriin.
 lst.explosion = Luo räjähdys tietyssä sijainnissa.
 lst.setrate = Aseta prosessorin suoritusnopeus ohjeessa/sekunti.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index a59f2d7103..92bf22e804 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -2265,6 +2265,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index e53a97e6b7..ce9882b068 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -2314,6 +2314,8 @@ lst.getblock = Obtient les données d'une tuile à n'importe quel emplacement.
 lst.setblock = Définit les données d'une tuile à n'importe quel emplacement.
 lst.spawnunit = Fait apparaître une unité à un emplacement.
 lst.applystatus = Ajoute ou enlève un effet de statut d'une unité.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simule un déclenchement de vague à n'importe quel emplacement.\nCela n'incrémente pas le compteur de vaugues.
 lst.explosion = Crée une explosion à un emplacement.
 lst.setrate = Définit la vitesse d'exécution d'un processeur en instructions/tick.
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 25762a0f33..21f84cf25c 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -2315,6 +2315,8 @@ lst.getblock = Csempeadatok lekérdezése tetszőleges helyen.
 lst.setblock = Csempeadatok beállítása tetszőleges helyen.
 lst.spawnunit = Egység lerakása egy helyen.
 lst.applystatus = Állapothatás alkalmazása, vagy törlése egy egységről.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Egy tetszőleges helyen keletkező hullám szimulálása.\nNem növeli a hullámszámlálót.
 lst.explosion = Robbanás létrehozása egy helyen.
 lst.setrate = A processzor végrehajtási sebességének beállítása utasítás/ütemben.
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index f79faeb13c..9abf0debce 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -2304,6 +2304,8 @@ lst.getblock = Mendapatkan data petak di lokasi manapun.
 lst.setblock = Menentukan data petak di lokasi manapun.
 lst.spawnunit = Munculkan unit pada tempat yang ditentukan.
 lst.applystatus = Menerapkan atau menghapus status efek dari sebuah unit.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulasikan adanya gelombang pada lokasi acak.\nTidak akan ditambahkan pada jumlah gelombang keseluruhan.
 lst.explosion = Membuat sebuah ledakan pada lokasi yang ditentukan.
 lst.setrate = Menentukan kecepatan eksekusi prosesor dalam instruksi per tick.
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 04b136afa3..01262c1e95 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -2278,6 +2278,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 5cdb6a3b08..773c80759e 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -2282,6 +2282,8 @@ lst.getblock = 任意の座標のタイルの情報を取得します。
 lst.setblock = 任意の座標のタイルの情報を変更します。
 lst.spawnunit = 任意の座標にユニットをスポーンさせます。
 lst.applystatus = ユニットからステータス効果を適用または削除する。
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = 任意の座標で発生するウェーブをシミュレーションします。\nウェーブを進めません。
 lst.explosion = ある場所で爆発を起こします。
 lst.setrate = プロセッサーの実行速度を1命令/tickで設定します。
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 985fe6169b..ca902dbb80 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -2281,6 +2281,8 @@ lst.getblock = 특정 위치의 타일 정보를 불러옴
 lst.setblock = 특정 위치의 타일 정보 설정
 lst.spawnunit = 특정 위치에 기체 소환
 lst.applystatus = 기체에게 상태이상을 적용하거나 삭제
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = 특정 위치에 이전 단계를 실행\n실제 단계가 넘어가지 않습니다
 lst.explosion = 특정 위치에 폭발 생성
 lst.setrate = 프로세서 실행 속도를 틱당 연산량으로 설정
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 41fbe42f2e..0cf772d249 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 8197533136..fb8fbe5f10 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -2279,6 +2279,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index d1ff0bf906..e03d97d06c 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index ca7379c73a..5e19b1e4e4 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -2300,6 +2300,8 @@ lst.getblock = Uzyskaj dane dla dowolnej lokalizacji.
 lst.setblock = Ustaw dane dla dowolnej lokalizacji.
 lst.spawnunit = Odródź jednostkę w lokalizacji.
 lst.applystatus = Zastosuj lub wyczyść efekty statusu jednostki.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Symuluj falę odradzającą się w dowolnym miejscu.\nNie zwiększy licznika fali.
 lst.explosion = Stwórz eksplozję w lokalizacji.
 lst.setrate = Ustaw szybkość wykonywania procesora w instrukcjach/tick.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index f483bcddd6..8dcf3382bb 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -2299,6 +2299,8 @@ lst.getblock = Obtenha dados de blocos em qualquer local.
 lst.setblock = Defina os dados do bloco em qualquer local.
 lst.spawnunit = Gere uma unidade em um local.
 lst.applystatus = Aplique ou elimine um efeito de status de uma unidade.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Gerar uma onda.
 lst.explosion = Crie uma explosão em um local.
 lst.setrate = Defina a velocidade de execução do processador em instruções/tick.
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index f0be98d3ee..f5eb2863fa 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index dfd0c2fe99..eb1d0ce995 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -2283,6 +2283,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index fabcc731f3..268d96520c 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -2285,6 +2285,8 @@ lst.getblock = Получает данные о плитке в любом ме
 lst.setblock = Устанавливает плитку в любом месте.
 lst.spawnunit = Создает боевую единицу на локации.
 lst.applystatus = Применяет или снимает эффект статуса с боевой единицы.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Имитация волны, создаваемой в произвольном месте.\nСчетчик волн не увеличивается.
 lst.explosion = Создает взрыв на локации.
 lst.setrate = Устанавливает скорость выполнения процессора в инструкциях/тиках.
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 3aa614ff85..588f323ef7 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -2286,6 +2286,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Prizovi jedinicu na mestu.
 lst.applystatus = Dodaj ili ukloni statusni efekat na jedinicu/e.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Izazovi eksploziju na mestu.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 8e8f39c352..d20f0fd841 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index d054c1e508..56c4c85f16 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -2303,6 +2303,8 @@ lst.getblock = รับข้อมูลของช่องที่ตำ
 lst.setblock = ปรับแต่งข้อมูลของช่องที่ตำแหน่งใดๆ
 lst.spawnunit = เสกยูนิตมาที่ตำแหน่งที่กำหนดไว้
 lst.applystatus = ใส่หรือล้างเอฟเฟกต์สถานะจากยูนิต
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = จำลองคลื่นที่ตำแหน่งใดๆ
 lst.explosion = เสกระเบิดที่ตำแหน่ง
 lst.setrate = ตั้งค่าความเร็วการสั่งเป็นคำสั่งใน คำสั่ง/ติก
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index ed6d2c3abc..36106ee582 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -2266,6 +2266,8 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
 lst.setrate = Set processor execution speed in instructions/tick.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index c7ad849212..9eca8e0bea 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -2283,6 +2283,8 @@ lst.getblock = Herhangi bir yerdeki blok bilgisini al.
 lst.setblock = Herhangi bir yerdeki blok bilgisini değiştir.
 lst.spawnunit = Herhangi bir yerde birim var et.
 lst.applystatus = Bir Birime Durum Etkisi ekle.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Bellir bir noktada dalga başlat.\nDalga Zamanlayıcı Oluşturmaz!
 lst.explosion = Bir Noktada Patlama oluştur.
 lst.setrate = İşlemci Hızını Ayarla (işlem/tick)
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index ba3cab15f8..a6b59822ba 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -2310,6 +2310,8 @@ lst.getblock = Отримує дані плитки в будь-якому мі
 lst.setblock = Установлює дані плитки в будь-якому місці.
 lst.spawnunit = Породжує одиницю на певному місці.
 lst.applystatus = Застосовує або видаляє ефект стану з одиниці.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Змодельовує хвилю, що виникає у довільному місці.\nНе збільшує лічильник хвиль.
 lst.explosion = Створює вибух у певному місці.
 lst.setrate = Установлює швидкість виконання процесора в інструкціях за такт.
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index b13ddd0693..a8c7a612ae 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -2284,6 +2284,8 @@ lst.getblock = Lấy dữ liệu từ ô từ vị trí bất kì.
 lst.setblock = Chỉnh sửa dữ liệu từ ô từ vị trí bất kì.
 lst.spawnunit = Tạo ra quân từ vị trí.
 lst.applystatus = Áp dụng hoặc loại bỏ một hiệu ứng trạng thái cho một đơn vị.
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Mô phỏng một lượt xuất hiện ở vị trí tùy ý.\nSẽ không tăng số đếm lượt.
 lst.explosion = Tạo ra một vụ nổ tại vị trí đó.
 lst.setrate = Đặt tốc độ thực thi khối xử lý theo chỉ thị/tíc-tắc.
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 7597bd60b4..4b4b1ab1ae 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -2309,6 +2309,8 @@ lst.getblock = 获取任意位置的地块数据
 lst.setblock = 设置任意位置的地块数据
 lst.spawnunit = 在指定位置生成单位
 lst.applystatus = 添加或清除单位的一个状态效果
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = 在任意位置生成一波敌人\n并不记录在波数计数器中
 lst.explosion = 在某个位置生成爆炸
 lst.setrate = 在指令/时间刻的时间下设置处理器处理速度
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index abf6226433..93e43f4741 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -2295,6 +2295,8 @@ lst.getblock = 由位置取方塊數據
 lst.setblock = 由位置設置方塊數據
 lst.spawnunit = 在某一位置生成單位
 lst.applystatus = 爲單位添加或移除狀態效果
+lst.weathersensor = Check if a type of weather is active.
+lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = 在某一位置生成一波敵人\n不計入波數
 lst.explosion = 在某一位置製造爆炸
 lst.setrate = 以指令/每時刻設置處理器速度

From 40d06c87d17105a7400469e16e9e2761bb7df2a2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 14 Mar 2024 18:53:28 -0400
Subject: [PATCH 273/369] Mark disabled dependencies #9641

---
 core/src/mindustry/mod/Mods.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
index 1eed765d19..d0f6dc8d27 100644
--- a/core/src/mindustry/mod/Mods.java
+++ b/core/src/mindustry/mod/Mods.java
@@ -856,7 +856,7 @@ public class Mods implements Loadable{
                 return false;
                 // If dependency present, resolve it, or if it's not required, ignore it
             }else if(context.dependencies.containsKey(dependency.name)){
-                if(!context.ordered.contains(dependency.name) && !resolve(dependency.name, context) && dependency.required){
+                if(((!context.ordered.contains(dependency.name) && !resolve(dependency.name, context)) || !Core.settings.getBool("mod-" + dependency.name + "-enabled", true)) && dependency.required){
                     context.invalid.put(element, ModState.incompleteDependencies);
                     return false;
                 }

From 0311cfd27586c4680d87a9cac1e3b3f0a610dd55 Mon Sep 17 00:00:00 2001
From: Elixias <61173114+LixieWulf@users.noreply.github.com>
Date: Fri, 15 Mar 2024 09:08:23 -0600
Subject: [PATCH 274/369] Full icon overrides (#9642)

* Something to help with atlas consumption

* nightmares
---
 core/src/mindustry/ctype/UnlockableContent.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java
index 43190baa9e..434be84c4f 100644
--- a/core/src/mindustry/ctype/UnlockableContent.java
+++ b/core/src/mindustry/ctype/UnlockableContent.java
@@ -43,6 +43,8 @@ public abstract class UnlockableContent extends MappableContent{
     public TextureRegion uiIcon;
     /** Icon of the full content. Unscaled.*/
     public TextureRegion fullIcon;
+    /** Override for the full icon. Useful for mod content with duplicate icons. Overrides any other full icon.*/
+    public String fullOverride = "";
     /** The tech tree node for this content, if applicable. Null if not part of a tech tree. */
     public @Nullable TechNode techNode;
     /** Tech nodes for all trees that this content is part of. */
@@ -62,11 +64,12 @@ public abstract class UnlockableContent extends MappableContent{
     @Override
     public void loadIcon(){
         fullIcon =
+            Core.atlas.find(fullOverride,
             Core.atlas.find(getContentType().name() + "-" + name + "-full",
             Core.atlas.find(name + "-full",
             Core.atlas.find(name,
             Core.atlas.find(getContentType().name() + "-" + name,
-            Core.atlas.find(name + "1")))));
+            Core.atlas.find(name + "1"))))));
 
         uiIcon = Core.atlas.find(getContentType().name() + "-" + name + "-ui", fullIcon);
     }

From 5365014d4f72ea8bf55b18e20af47c33c5f8d6b3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 15 Mar 2024 14:14:53 -0400
Subject: [PATCH 275/369] Sector preset init fix

---
 core/src/mindustry/type/SectorPreset.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java
index 3c6b885d8d..b23c909de2 100644
--- a/core/src/mindustry/type/SectorPreset.java
+++ b/core/src/mindustry/type/SectorPreset.java
@@ -39,8 +39,10 @@ public class SectorPreset extends UnlockableContent{
     /** Internal use only! */
     public SectorPreset(String name, LoadedMod mod){
         super(name);
-        this.minfo.mod = mod;
-        this.generator = new FileMapGenerator(name, this);
+        if(mod != null){
+            this.minfo.mod = mod;
+        }
+        this.generator = new FileMapGenerator(this.name, this);
     }
 
     /** Internal use only! */

From 9a43a708afb6d8147cdfe71f5f01909eaed72358 Mon Sep 17 00:00:00 2001
From: TheRadioactiveBanana
 <89061718+TheRadioactiveBanana@users.noreply.github.com>
Date: Sat, 16 Mar 2024 09:47:17 +0530
Subject: [PATCH 276/369] Moving more ports from UK to EU (#9644)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index dd09fc929f..ad26421278 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -138,7 +138,7 @@
   },
   {
     "name": "Eradication Mindustry",
-    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "77.100.100.249:7000", "77.100.100.249:7001", "130.61.220.99:7000", "130.61.220.99:7001", "130.61.220.99:7002", "130.61.220.99:7003", "130.61.220.99:7004"]
+    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "130.61.22.183:7005", "130.61.220.99:7000", "130.61.220.99:7001", "130.61.220.99:7002", "130.61.220.99:7003", "130.61.220.99:7004", "130.61.220.99:7005"]
   },
   {
     "name": "Conservatory",

From 6aa744bc575aa88293a8a539e45a53dd182e0913 Mon Sep 17 00:00:00 2001
From: 112Hack <144626073+112Hack@users.noreply.github.com>
Date: Sat, 16 Mar 2024 07:17:41 +0300
Subject: [PATCH 277/369] Update servers_v7.json (#9639)

---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index ad26421278..247862f241 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -24,6 +24,10 @@
     "name": "Crux's Revelations",
     "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"]
   },
+  {
+    "name": "Chilldustry",
+    "address": ["trelesco.xyz"]
+  },
   {
     "name": "CMS Empire",
     "address": ["94.250.250.252","95.84.198.97"]

From a1e5566fe0395458d038e3a4a52c0f7c60ec80fc Mon Sep 17 00:00:00 2001
From: meiqiu <119494143+MEIQIUawa@users.noreply.github.com>
Date: Sat, 16 Mar 2024 12:17:49 +0800
Subject: [PATCH 278/369] Update servers_v7.json (#9636)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 247862f241..da5b67a9bc 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -18,7 +18,7 @@
   },
   {
     "name": "meiqiuMDT",
-    "address": ["cn1.meiqiumdy.top","cn1.meiqiumdt.top:7000","cn1.meiqiumdt.top:8000","cn1.meiqiumdt.top:7013"]
+    "address": ["cn1.meiqiumdt.top","cn1.meiqiumdt.top:7000","cn1.meiqiumdt.top:8000","cn1.meiqiumdt.top:7013","cn1.meiqiumdt.top:9000"]
   },
   {
     "name": "Crux's Revelations",

From 789264f3b663453b6a58062ddeabb8bb5bb7735b Mon Sep 17 00:00:00 2001
From: 00Bread00 <144006814+00Bread00@users.noreply.github.com>
Date: Sun, 17 Mar 2024 01:49:13 +1100
Subject: [PATCH 279/369] Update servers_v7.json (#9646)

add toast servers
---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index da5b67a9bc..5d551d6b87 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -1,4 +1,8 @@
 [
+  {
+    "name": "Toast Mindustry",
+    "address": ["192.3.139.5:6567", "192.3.139.5:6568", "192.3.139.5:6569", "104.168.64.154:6567", "104.168.64.154:6568", "104.168.64.154:6569"]
+  },
   {
     "name": "gods field",
     "address": ["n2.akiracloud.net:10225"]

From 553d3fc35173c07ad5e6f214d51fa4a7b7b8c0e9 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 17 Mar 2024 01:25:03 -0400
Subject: [PATCH 280/369] cool fix

---
 core/src/mindustry/type/SectorPreset.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java
index b23c909de2..3c6b885d8d 100644
--- a/core/src/mindustry/type/SectorPreset.java
+++ b/core/src/mindustry/type/SectorPreset.java
@@ -39,10 +39,8 @@ public class SectorPreset extends UnlockableContent{
     /** Internal use only! */
     public SectorPreset(String name, LoadedMod mod){
         super(name);
-        if(mod != null){
-            this.minfo.mod = mod;
-        }
-        this.generator = new FileMapGenerator(this.name, this);
+        this.minfo.mod = mod;
+        this.generator = new FileMapGenerator(name, this);
     }
 
     /** Internal use only! */

From 3162f043d2b4a74d832fbe3e0b60a49cfae3398d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 17 Mar 2024 12:24:11 -0400
Subject: [PATCH 281/369] Possible weapon autotarget fire fix

---
 core/src/mindustry/type/Weapon.java | 48 +++++++++++++++--------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index 1e4378ebe5..151a0f69ee 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -297,31 +297,9 @@ public class Weapon implements Cloneable{
             mount.warmup = Mathf.lerpDelta(mount.warmup, warmupTarget, shootWarmupSpeed);
         }
 
-        //rotate if applicable
-        if(rotate && (mount.rotate || mount.shoot) && can){
-            float axisX = unit.x + Angles.trnsx(unit.rotation - 90,  x, y),
-            axisY = unit.y + Angles.trnsy(unit.rotation - 90,  x, y);
-
-            mount.targetRotation = Angles.angle(axisX, axisY, mount.aimX, mount.aimY) - unit.rotation;
-            mount.rotation = Angles.moveToward(mount.rotation, mount.targetRotation, rotateSpeed * Time.delta);
-            if(rotationLimit < 360){
-                float dst = Angles.angleDist(mount.rotation, baseRotation);
-                if(dst > rotationLimit/2f){
-                    mount.rotation = Angles.moveToward(mount.rotation, baseRotation, dst - rotationLimit/2f);
-                }
-            }
-        }else if(!rotate){
-            mount.rotation = baseRotation;
-            mount.targetRotation = unit.angleTo(mount.aimX, mount.aimY);
-        }
-
         float
-        weaponRotation = unit.rotation - 90 + (rotate ? mount.rotation : baseRotation),
         mountX = unit.x + Angles.trnsx(unit.rotation - 90, x, y),
-        mountY = unit.y + Angles.trnsy(unit.rotation - 90, x, y),
-        bulletX = mountX + Angles.trnsx(weaponRotation, this.shootX, this.shootY),
-        bulletY = mountY + Angles.trnsy(weaponRotation, this.shootX, this.shootY),
-        shootAngle = bulletRotation(unit, mount, bulletX, bulletY);
+        mountY = unit.y + Angles.trnsy(unit.rotation - 90, x, y);
 
         //find a new target
         if(!controllable && autoTarget){
@@ -355,6 +333,30 @@ public class Weapon implements Cloneable{
             //logic will return shooting as false even if these return true, which is fine
         }
 
+        //rotate if applicable
+        if(rotate && (mount.rotate || mount.shoot) && can){
+            float axisX = unit.x + Angles.trnsx(unit.rotation - 90,  x, y),
+            axisY = unit.y + Angles.trnsy(unit.rotation - 90,  x, y);
+
+            mount.targetRotation = Angles.angle(axisX, axisY, mount.aimX, mount.aimY) - unit.rotation;
+            mount.rotation = Angles.moveToward(mount.rotation, mount.targetRotation, rotateSpeed * Time.delta);
+            if(rotationLimit < 360){
+                float dst = Angles.angleDist(mount.rotation, baseRotation);
+                if(dst > rotationLimit/2f){
+                    mount.rotation = Angles.moveToward(mount.rotation, baseRotation, dst - rotationLimit/2f);
+                }
+            }
+        }else if(!rotate){
+            mount.rotation = baseRotation;
+            mount.targetRotation = unit.angleTo(mount.aimX, mount.aimY);
+        }
+
+        float
+        weaponRotation = unit.rotation - 90 + (rotate ? mount.rotation : baseRotation),
+        bulletX = mountX + Angles.trnsx(weaponRotation, this.shootX, this.shootY),
+        bulletY = mountY + Angles.trnsy(weaponRotation, this.shootX, this.shootY),
+        shootAngle = bulletRotation(unit, mount, bulletX, bulletY);
+
         if(alwaysShooting) mount.shoot = true;
 
         //update continuous state

From 0a512e05c341f08ce3e3247d86ec374f987e3c03 Mon Sep 17 00:00:00 2001
From: jp-x-g <jpxg-dev@protonmail.com>
Date: Mon, 18 Mar 2024 06:30:18 -0700
Subject: [PATCH 282/369] Make a "unitCommandPosition" event so that unit
 commands issued to non-attack coordinates can still be listened for (#9650)

* Update InputHandler.java

Make commandTap fire a Trigger.unitCommandPosition (in the event that it doesn't fire a Trigger.unitCommandAttack)

* Update EventType.java

Add "unitCommandPosition" to Trigger, for when selected units are commanded to move to a position (without that position being an attack).
---
 core/src/mindustry/game/EventType.java     | 1 +
 core/src/mindustry/input/InputHandler.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java
index e7118db61c..39333fdf96 100644
--- a/core/src/mindustry/game/EventType.java
+++ b/core/src/mindustry/game/EventType.java
@@ -39,6 +39,7 @@ public class EventType{
         socketConfigChanged,
         update,
         unitCommandChange,
+        unitCommandPosition,
         unitCommandAttack,
         importMod,
         draw,
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index a3e65423dd..40e568f99a 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -1012,6 +1012,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
                 if(attack != null){
                     Events.fire(Trigger.unitCommandAttack);
+                }else{
+                    Events.fire(Trigger.unitCommandPosition);
                 }
 
                 int maxChunkSize = 200;

From 0c10a3e0562ade837d18f2c5c86e9ce1cda08e0e Mon Sep 17 00:00:00 2001
From: Cragent <117364120+Baldur404@users.noreply.github.com>
Date: Mon, 18 Mar 2024 21:30:30 +0800
Subject: [PATCH 283/369] Update servers_v7.json (#9653)

update a name
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 5d551d6b87..59304f998a 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -189,7 +189,7 @@
     "address": ["a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6568", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6569", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6570", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6571", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6572", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6573", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6574"]
   },
   {
-     "name": "Anana&ShenYv",
+     "name": "Anana",
      "address": ["mdtleague.top"]
   },
   {

From 51888a6853cf6517de45dda090f11572f1eb0e8d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 18 Mar 2024 10:00:15 -0400
Subject: [PATCH 284/369] Don't crash with file chooser errors

---
 .../mindustry/android/AndroidLauncher.java    | 98 ++++++++++---------
 1 file changed, 51 insertions(+), 47 deletions(-)

diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java
index da3944fe06..7febad64a7 100644
--- a/android/src/mindustry/android/AndroidLauncher.java
+++ b/android/src/mindustry/android/AndroidLauncher.java
@@ -101,64 +101,68 @@ public class AndroidLauncher extends AndroidApplication{
             }
 
             void showFileChooser(boolean open, String title, Cons<Fi> cons, String... extensions){
-                String extension = extensions[0];
+                try{
+                    String extension = extensions[0];
 
-                if(VERSION.SDK_INT >= VERSION_CODES.Q){
-                    Intent intent = new Intent(open ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_CREATE_DOCUMENT);
-                    intent.addCategory(Intent.CATEGORY_OPENABLE);
-                    intent.setType(extension.equals("zip") && !open && extensions.length == 1 ? "application/zip" : "*/*");
+                    if(VERSION.SDK_INT >= VERSION_CODES.Q){
+                        Intent intent = new Intent(open ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_CREATE_DOCUMENT);
+                        intent.addCategory(Intent.CATEGORY_OPENABLE);
+                        intent.setType(extension.equals("zip") && !open && extensions.length == 1 ? "application/zip" : "*/*");
 
-                    addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
-                        if(code == Activity.RESULT_OK && in != null && in.getData() != null){
-                            Uri uri = in.getData();
+                        addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
+                            if(code == Activity.RESULT_OK && in != null && in.getData() != null){
+                                Uri uri = in.getData();
 
-                            if(uri.getPath().contains("(invalid)")) return;
+                                if(uri.getPath().contains("(invalid)")) return;
 
-                            Core.app.post(() -> Core.app.post(() -> cons.get(new Fi(uri.getPath()){
-                                @Override
-                                public InputStream read(){
-                                    try{
-                                        return getContentResolver().openInputStream(uri);
-                                    }catch(IOException e){
-                                        throw new ArcRuntimeException(e);
+                                Core.app.post(() -> Core.app.post(() -> cons.get(new Fi(uri.getPath()){
+                                    @Override
+                                    public InputStream read(){
+                                        try{
+                                            return getContentResolver().openInputStream(uri);
+                                        }catch(IOException e){
+                                            throw new ArcRuntimeException(e);
+                                        }
                                     }
-                                }
 
-                                @Override
-                                public OutputStream write(boolean append){
-                                    try{
-                                        return getContentResolver().openOutputStream(uri);
-                                    }catch(IOException e){
-                                        throw new ArcRuntimeException(e);
+                                    @Override
+                                    public OutputStream write(boolean append){
+                                        try{
+                                            return getContentResolver().openOutputStream(uri);
+                                        }catch(IOException e){
+                                            throw new ArcRuntimeException(e);
+                                        }
                                     }
-                                }
-                            })));
-                        }
-                    });
-                }else if(VERSION.SDK_INT >= VERSION_CODES.M && !(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
+                                })));
+                            }
+                        });
+                    }else if(VERSION.SDK_INT >= VERSION_CODES.M && !(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
                     checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
-                    chooser = new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), open, file -> {
-                        if(!open){
-                            cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
-                        }else{
-                            cons.get(file);
-                        }
-                    });
+                        chooser = new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), open, file -> {
+                            if(!open){
+                                cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
+                            }else{
+                                cons.get(file);
+                            }
+                        });
 
-                    ArrayList<String> perms = new ArrayList<>();
-                    if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-                        perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
-                    }
-                    if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-                        perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
-                    }
-                    requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
-                }else{
-                    if(open){
-                        new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
+                        ArrayList<String> perms = new ArrayList<>();
+                        if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
+                            perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+                        }
+                        if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
+                            perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
+                        }
+                        requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
                     }else{
-                        super.showFileChooser(open, "@open", extension, cons);
+                        if(open){
+                            new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
+                        }else{
+                            super.showFileChooser(open, "@open", extension, cons);
+                        }
                     }
+                }catch(Throwable error){
+                    Core.app.post(() -> Vars.ui.showException(error));
                 }
             }
 

From fc036c2f067d9f2d4f217c3558eecb4672c838f2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 19 Mar 2024 09:27:55 -0400
Subject: [PATCH 285/369] Fixed a startup crash with certain mods

---
 core/src/mindustry/mod/Mods.java          | 19 ++++++++++++++++++-
 core/src/mindustry/type/SectorPreset.java |  6 ++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
index 08a3d1ae54..25a6e1cc4c 100644
--- a/core/src/mindustry/mod/Mods.java
+++ b/core/src/mindustry/mod/Mods.java
@@ -361,7 +361,24 @@ public class Mods implements Loadable{
             Log.debug("Time to generate icons: @", Time.elapsed());
 
             //dispose old atlas data
-            Core.atlas = packer.flush(filter, new TextureAtlas());
+            Core.atlas = packer.flush(filter, new TextureAtlas(){
+                PixmapRegion fake = new PixmapRegion(new Pixmap(1, 1));
+                boolean didWarn = false;
+
+                @Override
+                public PixmapRegion getPixmap(AtlasRegion region){
+                    var other = super.getPixmap(region);
+                    if(other.pixmap.isDisposed()){
+                        if(!didWarn){
+                            Log.err(new RuntimeException("Calling getPixmap outside of createIcons is not supported! This will be a crash in the future."));
+                            didWarn = true;
+                        }
+                        return fake;
+                    }
+
+                    return other;
+                }
+            });
 
             textureResize.each(e -> Core.atlas.find(e.key).scale = e.value);
 
diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java
index 3c6b885d8d..b23c909de2 100644
--- a/core/src/mindustry/type/SectorPreset.java
+++ b/core/src/mindustry/type/SectorPreset.java
@@ -39,8 +39,10 @@ public class SectorPreset extends UnlockableContent{
     /** Internal use only! */
     public SectorPreset(String name, LoadedMod mod){
         super(name);
-        this.minfo.mod = mod;
-        this.generator = new FileMapGenerator(name, this);
+        if(mod != null){
+            this.minfo.mod = mod;
+        }
+        this.generator = new FileMapGenerator(this.name, this);
     }
 
     /** Internal use only! */

From aa5660521aa56705360d30c169223f6366c7a37a Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Wed, 20 Mar 2024 01:27:17 +0700
Subject: [PATCH 286/369] Update servers_v7.json (#9655)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 59304f998a..b82d05d91c 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -243,7 +243,7 @@
   },
   {
     "name": "ABCXYZ Community",
-    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "5.9.8.124:28848", "srv1.godlike.club:28466"]
+    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "51.81.57.217:24902"]
   },
   {
     "name": "CroCraft Network",

From aea189730997cced188030b22a57b702c2bc8ce2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 19 Mar 2024 15:09:16 -0400
Subject: [PATCH 287/369] Fixed #9656

---
 core/src/mindustry/world/blocks/payloads/PayloadLoader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
index 1a8b7844fa..301789e54b 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
@@ -76,7 +76,7 @@ public class PayloadLoader extends PayloadBlock{
     public void init(){
         if(loadPowerDynamic){
             basePowerUse = consPower != null ? consPower.usage : 0f;
-            consumePowerDynamic((PayloadLoaderBuild loader) -> loader.hasBattery() && !loader.exporting ? maxPowerConsumption + basePowerUse : basePowerUse);
+            consumePowerDynamic((PayloadLoaderBuild loader) -> loader.shouldConsume() ? (loader.hasBattery() && !loader.exporting ? maxPowerConsumption + basePowerUse : basePowerUse) : 0f);
         }
 
         super.init();

From 45b7e2a7427793dab900c34ef265524f20ed2362 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 19 Mar 2024 16:09:24 -0400
Subject: [PATCH 288/369] Fixed #9658

---
 core/src/mindustry/input/DesktopInput.java | 2 +-
 core/src/mindustry/input/InputHandler.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index 6030263c0b..2c196660d4 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -451,7 +451,7 @@ public class DesktopInput extends InputHandler{
                 cursorType = cursor.build.getCursor();
             }
 
-            if(cursor.build != null && cursor.build.team == Team.derelict && Build.validPlace(cursor.block(), player.team(), cursor.build.tileX(), cursor.build.tileY(), cursor.build.rotation)){
+            if(cursor.build != null && player.team() != Team.derelict && cursor.build.team == Team.derelict && Build.validPlace(cursor.block(), player.team(), cursor.build.tileX(), cursor.build.tileY(), cursor.build.rotation)){
                 cursorType = ui.repairCursor;
             }
 
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 40e568f99a..77fa4e668c 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -1663,7 +1663,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     boolean tryRepairDerelict(Tile selected){
-        if(selected != null && selected.build != null && selected.build.block.unlockedNow() && selected.build.team == Team.derelict && Build.validPlace(selected.block(), player.team(), selected.build.tileX(), selected.build.tileY(), selected.build.rotation)){
+        if(selected != null && player.team() != Team.derelict && selected.build != null && selected.build.block.unlockedNow() && selected.build.team == Team.derelict && Build.validPlace(selected.block(), player.team(), selected.build.tileX(), selected.build.tileY(), selected.build.rotation)){
             player.unit().addBuild(new BuildPlan(selected.build.tileX(), selected.build.tileY(), selected.build.rotation, selected.block(), selected.build.config()));
             return true;
         }

From 476c79df4b2e3271e3e9cda0cc622e57fae3e031 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 19 Mar 2024 16:11:51 -0400
Subject: [PATCH 289/369] Fixed #9657

---
 core/src/mindustry/graphics/MinimapRenderer.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java
index 78d57bebea..e5f42b2c9a 100644
--- a/core/src/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/mindustry/graphics/MinimapRenderer.java
@@ -176,10 +176,7 @@ public class MinimapRenderer{
         if(fullView && net.active()){
             for(Player player : Groups.player){
                 if(!player.dead()){
-                    float rx = player.x / (world.width() * tilesize) * w;
-                    float ry = player.y / (world.height() * tilesize) * h;
-
-                    drawLabel(x + rx, y + ry, player.name, player.color);
+                    drawLabel(player.x, player.y, player.name, player.color);
                 }
             }
         }

From 98b64bd0961872a6df7e4b2bbf8f0554e0ce71e3 Mon Sep 17 00:00:00 2001
From: TheRadioactiveBanana
 <89061718+TheRadioactiveBanana@users.noreply.github.com>
Date: Thu, 21 Mar 2024 05:45:06 +0530
Subject: [PATCH 290/369] ok uk finally works ig (#9660)

Im not going to move the servers back *now*, probably near future though
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index b82d05d91c..56ddb236f8 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -146,7 +146,7 @@
   },
   {
     "name": "Eradication Mindustry",
-    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "130.61.22.183:7005", "130.61.220.99:7000", "130.61.220.99:7001", "130.61.220.99:7002", "130.61.220.99:7003", "130.61.220.99:7004", "130.61.220.99:7005"]
+    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "130.61.22.183:7005", "130.61.220.99:7000", "130.61.220.99:7001", "130.61.220.99:7002", "130.61.220.99:7003", "130.61.220.99:7004", "130.61.220.99:7005", "77.100.100.249:7000", "77.100.100.249:7001"]
   },
   {
     "name": "Conservatory",

From 714eca07d06df73ebdc868ae8b3d3698bc2ce854 Mon Sep 17 00:00:00 2001
From: HubsvVN <157294903+HubsvVN@users.noreply.github.com>
Date: Thu, 21 Mar 2024 07:42:45 +0700
Subject: [PATCH 291/369] Update servers_v7.json (#9661)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 56ddb236f8..d95da17b9b 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -295,7 +295,7 @@
   },
   { 
     "name": "Sever.VN",
-    "address": ["srv24.godlike.club:26189"]
+    "address": ["192.168.1.2:6567"]
   },
   {
     "name": "NPTS",

From 2539bb01955ccc3b7c77e245f2cb8a64ec722a5f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 21 Mar 2024 10:32:43 -0400
Subject: [PATCH 292/369] Fixed #9663

---
 core/src/mindustry/input/DesktopInput.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index 2c196660d4..031f5af2bf 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -568,7 +568,7 @@ public class DesktopInput extends InputHandler{
             schematicY += shiftY;
         }
 
-        if(Core.input.keyTap(Binding.deselect) && !isPlacing() && player.unit().plans.isEmpty() && !commandMode){
+        if(Core.input.keyTap(Binding.deselect) && !ui.minimapfrag.shown() && !isPlacing() && player.unit().plans.isEmpty() && !commandMode){
             player.unit().mineTile = null;
         }
 

From 32ae555ad6b2ee5579642f460d6de1ec4af7e3db Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 22 Mar 2024 15:02:59 -0400
Subject: [PATCH 293/369] Fixed power links in editor sector generate

---
 core/src/mindustry/editor/MapEditor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/editor/MapEditor.java b/core/src/mindustry/editor/MapEditor.java
index 37a10cca89..38839e6108 100644
--- a/core/src/mindustry/editor/MapEditor.java
+++ b/core/src/mindustry/editor/MapEditor.java
@@ -74,7 +74,7 @@ public class MapEditor{
         for(int i = 0; i < tiles.width * tiles.height; i++){
             Tile tile = tiles.geti(i);
             var build = tile.build;
-            if(build != null){
+            if(build != null && tile.isCenter()){
                 builds.add(build);
             }
             tiles.seti(i, new EditorTile(tile.x, tile.y, tile.floorID(), tile.overlayID(), build == null ? tile.blockID() : 0));

From 8fe08268924be759343c0855b11c785372f58fb1 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 22 Mar 2024 15:14:52 -0400
Subject: [PATCH 294/369] Better base core randomization

---
 core/src/mindustry/maps/generators/BaseGenerator.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/maps/generators/BaseGenerator.java b/core/src/mindustry/maps/generators/BaseGenerator.java
index e38c5206fe..9671a83a42 100644
--- a/core/src/mindustry/maps/generators/BaseGenerator.java
+++ b/core/src/mindustry/maps/generators/BaseGenerator.java
@@ -47,20 +47,20 @@ public class BaseGenerator{
         if(bases.cores.isEmpty()) return;
 
         Mathf.rand.setSeed(sector.id);
+        Mathf.rand.nextDouble();
 
         float bracketRange = 0.17f;
         float baseChance = Mathf.lerp(0.7f, 2.1f, difficulty);
         int wallAngle = 70; //180 for full coverage
         double resourceChance = 0.5 * baseChance;
         double nonResourceChance = 0.002 * baseChance;
-        BasePart coreschem = bases.cores.getFrac(difficulty);
         int passes = difficulty < 0.4 ? 1 : difficulty < 0.8 ? 3 : 5;
 
         Block wall = getDifficultyWall(1, difficulty), wallLarge = getDifficultyWall(2, difficulty);
 
         for(Tile tile : cores){
             tile.clearOverlay();
-            Schematics.placeLoadout(coreschem.schematic, tile.x, tile.y, team, false);
+            Schematics.placeLoadout(bases.cores.getFrac((difficulty + Mathf.rand.range(0.4f)) / 1.4f).schematic, tile.x, tile.y, team, false);
 
             //fill core with every type of item (even non-material)
             Building entity = tile.build;
@@ -81,7 +81,7 @@ public class BaseGenerator{
                         tryPlace(parts.getFrac(difficulty + Mathf.range(bracketRange)), tile.x, tile.y, team);
                     }
                 }else if(Mathf.chance(nonResourceChance)){
-                    tryPlace(bases.parts.getFrac(Mathf.random(1f)), tile.x, tile.y, team);
+                    tryPlace(bases.parts.getFrac(Mathf.rand.random(1f)), tile.x, tile.y, team);
                 }
             });
         }
@@ -235,7 +235,7 @@ public class BaseGenerator{
                             set(placed, item);
                         }
 
-                        Tile rand = world.tiles.getc(ex + Mathf.range(1), ey + Mathf.range(1));
+                        Tile rand = world.tiles.getc(ex + Mathf.rand.range(1), ey + Mathf.rand.range(1));
                         if(rand.floor().hasSurface()){
                             //random ores nearby to make it look more natural
                             set(rand, item);

From e97dc7a9603bf62caa7ba50fec137c4145a2e1f5 Mon Sep 17 00:00:00 2001
From: PolarStar <107398572+PoIarStar@users.noreply.github.com>
Date: Sun, 24 Mar 2024 22:03:08 +0300
Subject: [PATCH 295/369] Update servers_v7.json (#9671)

Merging servers
---
 servers_v7.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index d95da17b9b..ad5b28bdfb 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -28,13 +28,9 @@
     "name": "Crux's Revelations",
     "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"]
   },
-  {
-    "name": "Chilldustry",
-    "address": ["trelesco.xyz"]
-  },
   {
     "name": "CMS Empire",
-    "address": ["94.250.250.252","95.84.198.97"]
+    "address": ["trelesco.xyz","94.250.250.252","95.84.198.97"]
   },
   {
     "name": "ShardDustry Eventos",

From 4cacb79ccd2e6aaee7fc726c54b5af68327ea3e1 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Mon, 25 Mar 2024 10:31:03 -0700
Subject: [PATCH 296/369] Auto-add produce to liquids (#9666)

---
 core/src/mindustry/mod/ContentParser.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 093f9fd98f..40da31c7d1 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -1102,8 +1102,8 @@ public class ContentParser{
                 }
 
                 //all items have a produce requirement unless already specified
-                if(object instanceof Item i && !node.objectives.contains(o -> o instanceof Produce p && p.content == i)){
-                    node.objectives.add(new Produce(i));
+                if((unlock instanceof Item || unlock instanceof Liquid) && !node.objectives.contains(o -> o instanceof Produce p && p.content == unlock)){
+                    node.objectives.add(new Produce(unlock));
                 }
 
                 //remove old node from parent

From 88d37763daa3fbc37258dd93dd764f77133f1566 Mon Sep 17 00:00:00 2001
From: PolarStar <107398572+PoIarStar@users.noreply.github.com>
Date: Mon, 25 Mar 2024 21:11:30 +0300
Subject: [PATCH 297/369] Update servers_v7.json (#9674)

deleted outdated addresses
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index ad5b28bdfb..f003996b48 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -30,7 +30,7 @@
   },
   {
     "name": "CMS Empire",
-    "address": ["trelesco.xyz","94.250.250.252","95.84.198.97"]
+    "address": ["trelesco.xyz"]
   },
   {
     "name": "ShardDustry Eventos",

From ce22552bca1b3db64c1ce0fbca17b640cc66fe96 Mon Sep 17 00:00:00 2001
From: GaviTSRA <61122293+GaviTSRA@users.noreply.github.com>
Date: Mon, 25 Mar 2024 21:41:56 +0100
Subject: [PATCH 298/369] Add TSR Sandbox to v7 serverlist (#9672)

---
 servers_v7.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v7.json b/servers_v7.json
index f003996b48..3fdb7f9aa5 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -1,4 +1,8 @@
 [
+  {
+    "name": "TSR Network",
+    "address": ["de-prem-01.hosts.optikservers.com:35526"]
+  },
   {
     "name": "Toast Mindustry",
     "address": ["192.3.139.5:6567", "192.3.139.5:6568", "192.3.139.5:6569", "104.168.64.154:6567", "104.168.64.154:6568", "104.168.64.154:6569"]

From 9c3ff565082ba28be54b03b6986dc4a78e6dceff Mon Sep 17 00:00:00 2001
From: Hunggaming128 <160811008+Hunggaming128@users.noreply.github.com>
Date: Tue, 26 Mar 2024 03:42:05 +0700
Subject: [PATCH 299/369] Update servers_v7.json (#9669)

---
 servers_v7.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index 3fdb7f9aa5..7ef103cac1 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -293,12 +293,12 @@
     "name": "MineCore",
     "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"]
   },
-  { 
-    "name": "Sever.VN",
-    "address": ["192.168.1.2:6567"]
-  },
   {
     "name": "NPTS",
     "address": ["81.94.159.242"]
+  },
+  {
+    "name": "Skywar.VN",
+    "address": ["nur-de-01.blued.host:25736"]
   }
 ]

From 631e8a4fa47c5a98f8bc470a38f7b00fddbefcdd Mon Sep 17 00:00:00 2001
From: Jason <131086642+JasonP01@users.noreply.github.com>
Date: Mon, 25 Mar 2024 22:42:14 +0200
Subject: [PATCH 300/369] fix poly (#9662)

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>
---
 core/src/mindustry/content/UnitTypes.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 089f5d4e39..c9200be5e1 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -1318,6 +1318,7 @@ public class UnitTypes{
 
                     healPercent = 5.5f;
                     collidesTeam = true;
+                    reflectable = false;
                     backColor = Pal.heal;
                     trailColor = Pal.heal;
                 }};

From e595627895e2b332d44aeae78ae9ac493cc49021 Mon Sep 17 00:00:00 2001
From: Elixias <61173114+LixieWulf@users.noreply.github.com>
Date: Mon, 25 Mar 2024 17:20:26 -0600
Subject: [PATCH 301/369] . (#9676)

---
 .../mindustry/entities/bullet/ContinuousFlameBulletType.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java b/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java
index 4d67083cec..30dd5011fb 100644
--- a/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java
+++ b/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java
@@ -49,6 +49,7 @@ public class ContinuousFlameBulletType extends ContinuousBulletType{
         lifetime = 16f;
         hitColor = colors[1].cpy().a(1f);
         lightColor = hitColor;
+        lightOpacity = 0.7f;
         laserAbsorb = false;
         ammoMultiplier = 1f;
         pierceArmor = true;
@@ -87,7 +88,7 @@ public class ContinuousFlameBulletType extends ContinuousBulletType{
         }
 
         Tmp.v1.trns(b.rotation(), realLength * 1.1f);
-        Drawf.light(b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, 0.7f);
+        Drawf.light(b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, lightOpacity);
         Draw.reset();
     }
 

From 138bbdb1c9d18408ae047f5d9f991a57ccab93b0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 28 Mar 2024 10:01:20 -0400
Subject: [PATCH 302/369] Dispose item pixmaps

---
 core/src/mindustry/type/Item.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/mindustry/type/Item.java b/core/src/mindustry/type/Item.java
index f451b5f1a3..1c59b0d07a 100644
--- a/core/src/mindustry/type/Item.java
+++ b/core/src/mindustry/type/Item.java
@@ -146,6 +146,7 @@ public class Item extends UnlockableContent implements Senseable{
 
                     Pixmap res = Pixmaps.blend(pixmaps[i], pixmaps[(i + 1) % frames], f);
                     packer.add(PageType.main, name + "-t" + index, res);
+                    res.dispose();
                 }
             }
         }

From 67e9e6be27a76d7bc546f2cd51e43de366564a51 Mon Sep 17 00:00:00 2001
From: PolarStar <107398572+PoIarStar@users.noreply.github.com>
Date: Fri, 29 Mar 2024 21:58:44 +0300
Subject: [PATCH 303/369] Update servers_v7.json (#9680)

Added attack server
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 7ef103cac1..1b49614a5f 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -34,7 +34,7 @@
   },
   {
     "name": "CMS Empire",
-    "address": ["trelesco.xyz"]
+    "address": ["trelesco.xyz", "95.84.198.97"]
   },
   {
     "name": "ShardDustry Eventos",

From 5a278c626172d04f5faac387f6970d4314d10d77 Mon Sep 17 00:00:00 2001
From: c6b2qb5g <160118416+c6b2qb5g@users.noreply.github.com>
Date: Sat, 30 Mar 2024 01:58:50 +0700
Subject: [PATCH 304/369] Update servers_v7.json (#9683)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 1b49614a5f..49168d7da9 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -295,7 +295,7 @@
   },
   {
     "name": "NPTS",
-    "address": ["81.94.159.242"]
+    "address": ["77.87.215.102:26863"]
   },
   {
     "name": "Skywar.VN",

From 64d1a1f8cebda2e0afe37b76e5e20e35f3314ce4 Mon Sep 17 00:00:00 2001
From: GaviTSRA <61122293+GaviTSRA@users.noreply.github.com>
Date: Fri, 29 Mar 2024 19:58:57 +0100
Subject: [PATCH 305/369] Update servers_v7.json -  Add TSR Survival and TSR
 Attack (#9685)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 49168d7da9..8553f2187f 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -1,7 +1,7 @@
 [
   {
     "name": "TSR Network",
-    "address": ["de-prem-01.hosts.optikservers.com:35526"]
+    "address": ["de-prem-01.hosts.optikservers.com:35526", "de-prem-01.hosts.optikservers.com:35915", "de-prem-01.hosts.optikservers.com:35250"]
   },
   {
     "name": "Toast Mindustry",

From ee412c61fc120c9241a0ecd74dce72e0234eb3fd Mon Sep 17 00:00:00 2001
From: "nuri (smol)" <75618732+SMOLKEYS@users.noreply.github.com>
Date: Sat, 30 Mar 2024 03:01:59 +0800
Subject: [PATCH 306/369] pierceFragCap (#9684)

Co-authored-by: SMOLKEYS <SMOLKEYS@users.noreply.github.com>
---
 core/src/mindustry/entities/bullet/BulletType.java | 5 ++++-
 core/src/mindustry/entities/comp/BulletComp.java   | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index 64737495e7..85bd903395 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -176,6 +176,8 @@ public class BulletType extends Content implements Cloneable{
     public float fragLifeMin = 1f, fragLifeMax = 1f;
     /** Random offset of frag bullets from the parent bullet. */
     public float fragOffsetMin = 1f, fragOffsetMax = 7f;
+    /** How many times this bullet can release frag bullets, if pierce = true. */
+    public int pierceFragCap = -1;
 
     /** Bullet that is created at a fixed interval. */
     public @Nullable BulletType intervalBullet;
@@ -509,12 +511,13 @@ public class BulletType extends Content implements Cloneable{
     }
 
     public void createFrags(Bullet b, float x, float y){
-        if(fragBullet != null && (fragOnAbsorb || !b.absorbed)){
+        if(fragBullet != null && (fragOnAbsorb || !b.absorbed) && !(b.frags >= pierceFragCap && pierceFragCap > 0)){
             for(int i = 0; i < fragBullets; i++){
                 float len = Mathf.random(fragOffsetMin, fragOffsetMax);
                 float a = b.rotation() + Mathf.range(fragRandomSpread / 2) + fragAngle + ((i - fragBullets/2) * fragSpread);
                 fragBullet.create(b, x + Angles.trnsx(a, len), y + Angles.trnsy(a, len), a, Mathf.random(fragVelocityMin, fragVelocityMax), Mathf.random(fragLifeMin, fragLifeMax));
             }
+            b.frags++;
         }
     }
 
diff --git a/core/src/mindustry/entities/comp/BulletComp.java b/core/src/mindustry/entities/comp/BulletComp.java
index 7483d66496..d9c3aef000 100644
--- a/core/src/mindustry/entities/comp/BulletComp.java
+++ b/core/src/mindustry/entities/comp/BulletComp.java
@@ -45,6 +45,7 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
     transient @Nullable Mover mover;
     transient boolean absorbed, hit;
     transient @Nullable Trail trail;
+    transient int frags;
 
     @Override
     public void getCollisions(Cons<QuadTree> consumer){

From 5d180e9dd8e83e0a7390a790a15e43c141a958b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@mailbox.org>
Date: Fri, 29 Mar 2024 20:02:34 +0100
Subject: [PATCH 307/369] Update Hungarian translation (#9675)

* Update Hungarian translation

* Update bundle_hu.properties

Changed triple dots to three dots

* Further fixes

* Done requested fixes

* Arkycite terminology changed
---
 core/assets/bundles/bundle_hu.properties | 2298 +++++++++++-----------
 1 file changed, 1149 insertions(+), 1149 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 21f84cf25c..3a372d6433 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1,6 +1,6 @@
-credits.text = Készítette: [royal]Anuken[] - [sky]anukendev@gmail.com[]
+credits.text = Készítette: [royal]Anuken[] – [sky]anukendev@gmail.com[]
 credits = Készítők
-contributors = Közreműködők És Fordítók
+contributors = Közreműködők és fordítók
 discord = Csatlakozz a Mindustry Discord szerverhez!
 link.discord.description = Az eredeti Mindustry Discord csevegőszoba
 link.reddit.description = A Mindustry subreddit
@@ -8,14 +8,14 @@ link.github.description = A játék forráskódja
 link.changelog.description = Frissítési változások listája
 link.dev-builds.description = Instabil fejlesztői összeállítások
 link.trello.description = Hivatalos Trello tábla a tervezett funkcióknak
-link.itch.io.description = itch.io oldal PC letöltésekkel
-link.google-play.description = Google Play áruház listázás
-link.f-droid.description = F-Droid katalógus listázás
+link.itch.io.description = itch.io oldal PC-s letöltésekkel
+link.google-play.description = Listázás a Google Play áruházban
+link.f-droid.description = Listázás az F-Droidon
 link.wiki.description = Hivatalos Mindustry wiki
 link.suggestions.description = Új funkciók ajánlása
-link.bug.description = Találtál egy szoftver hibát? Itt jelentheted
-linkopen = Ez a kiszolgáló egy linket küldött neked. Biztos vagy benne, hogy megnyitod?\n\n[sky]{0}
-linkfail = Nem sikerült megnyitni a linket!\nAz URL a vágólapra lett másolva.
+link.bug.description = Találtál egy szoftverhibát? Itt jelentheted
+linkopen = Ez a kiszolgáló egy hivatkozást küldött. Biztos vagy benne, hogy megnyitod?\n\n[sky]{0}
+linkfail = Nem sikerült megnyitni a hivatkozást!\nA webcím a vágólapra lett másolva.
 screenshot = Képernyőkép mentve ide: {0}
 screenshot.invalid = Túl nagy a pálya, nincs elég memória a képernyőképhez.
 gameover = A játéknak vége
@@ -41,12 +41,12 @@ be.ignore = Most nem
 be.noupdates = Nem található frissítés.
 be.check = Frissítések keresése
 
-mods.browser = Mod választó
+mods.browser = Modböngésző
 mods.browser.selected = Mod kiválasztása
 mods.browser.add = Letöltés
 mods.browser.reinstall = Újratelepítés
 mods.browser.view-releases = Kiadások megtekintése
-mods.browser.noreleases = [scarlet]Nem találhatóak a kiadások\n[accent]Nem lehet kiadásokat találni ehhez a Modhoz. Nézd meg a tárolóját, hogy vannak-e kiadásai.
+mods.browser.noreleases = [scarlet]Nem találhatóak a kiadások\n[accent]Nem találhatók kiadások ehhez a modhoz. Nézd meg a tárolóját, hogy vannak-e kiadásai.
 mods.browser.latest = [lightgray][Legújabb]
 mods.browser.releases = Kiadások
 mods.github.open = Tároló
@@ -64,15 +64,15 @@ schematic.import = Vázlat importálása...
 schematic.exportfile = Exportálás fájlba
 schematic.importfile = Importálás fájlból
 schematic.browseworkshop = Steam Műhely megtekintése
-schematic.copy = Másolás a vágólapra
-schematic.copy.import = Importálás a vágólapról
+schematic.copy = Végólapra másolás
+schematic.copy.import = Importálás vágólapról
 schematic.shareworkshop = Megosztás a Steam Műhelyben
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Vázlat tükrözése
 schematic.saved = Vázlat elmentve.
 schematic.delete.confirm = Ez a vázlat törölve lesz.
 schematic.edit = Vázlat szerkesztése
 schematic.info = {0}x{1}, {2} blokk
-schematic.disabled = [scarlet]Vázlatok letiltva[]\nNem használhatsz vázlatokat ezen a [accent]pályán[], vagy [accent]kiszolgálón.
+schematic.disabled = [scarlet]Vázlatok letiltva[]\nNem használhatsz vázlatokat ezen a [accent]pályán[] vagy [accent]kiszolgálón.
 schematic.tags = Címkék:
 schematic.edittags = Címkék szerkesztése
 schematic.addtag = Címke hozzáadása
@@ -93,18 +93,18 @@ stats.deconstructed = Építmények lebontva
 stats.playtime = Játékban töltött idő
 
 globalitems = [accent]A bolygó nyersanyagai
-map.delete = Biztosan törölni akarod a(z) "[accent]{0}[]" pályát?
+map.delete = Biztosan törölni akarod a(z) „[accent]{0}[]” pályát?
 level.highscore = Legmagasabb pontszám: [accent]{0}
 level.select = Szint kiválasztása
 level.mode = Játékmód:
-coreattack = < A Támaszpont támadás alatt van! >
+coreattack = < A támaszpont támadás alatt van! >
 nearpoint = [[ [scarlet]AZONNAL HAGYD EL A LEDOBÁSI PONTOT![] ]\nA megsemmisülés fenyeget!
-database = Támaszpont adatbázis
+database = Támaszpont adatbázisa
 database.button = Adatbázis
 savegame = Játék mentése
 loadgame = Játék betöltése
 joingame = Kapcsolódás egy játékhoz
-customgame = Egyedi játék
+customgame = Egyéni játék
 newgame = Új játék
 none = <semmi>
 none.found = [lightgray]<nincs találat>
@@ -129,15 +129,15 @@ committingchanges = Változások rögzítése
 done = Kész
 feature.unsupported = Ez az eszköz nem támogatja ezt a funkciót.
 
-mods.initfailed = [red]⚠[] Az előző Mindustry munkamenet nem tudott inicializálódni. Ez valószínű egy rosszúl működő Mod miatt történt.\n\nAz "összeomlások" elkerülése érdekében, [red]minden Mod le lett tiltva.[]
+mods.initfailed = [red]⚠[] Az előző Mindustry példány előkészítése nem sikerült. Ezt valószínűleg egy rosszul működő mod okozta.\n\nAz ismételt összeomlások elkerülése érdekében [red]minden mod le lett tiltva.[]
 mods = Modok
-mods.none = [lightgray]Nem találhatóak Modok!
-mods.guide = Mod készítési útmutató
+mods.none = [lightgray]Nem találhatóak modok!
+mods.guide = Modkészítési útmutató
 mods.report = Hiba jelentése
 mods.openfolder = Mappa megnyitása
 mods.viewcontent = Tartalom megtekintése
 mods.reload = Újratöltés
-mods.reloadexit = A játék újraindul, hogy betöltődjenek a Modok.
+mods.reloadexit = A játék most kilép, hogy újratöltse a modokat.
 mod.installed = [[Telepítve]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Aktív
@@ -145,7 +145,7 @@ mod.disabled = [red]Inaktív
 mod.multiplayer.compatible = [gray]Többjátékos kompatibilis
 mod.disable = Letiltás
 mod.content = Tartalom:
-mod.delete.error = Nem lehet törölni a Modot. Lehet, hogy egy másik folyamat használja.
+mod.delete.error = Nem lehet törölni a modot. Lehet, hogy egy másik folyamat használja.
 
 mod.incompatiblegame = [red]Elavult játék
 mod.incompatiblemod = [red]Inkompatibilis
@@ -155,48 +155,48 @@ mod.erroredcontent = [red]Hibás tartalom
 mod.circulardependencies = [red]Körkörös függőségek
 mod.incompletedependencies = [red]Hiányos függőségek
 
-mod.requiresversion.details = Szükséges játékverzió: [accent]{0}[]\nA játék ezen verziója elavult! Ez a Mod egy újabb verziót kíván (valószínűleg egy Béta, vagy egy Alfa kiadást) a működéshez.
-mod.outdatedv7.details = Ez a Mod nem kompatibilis a játék legújabb verziójával! A Mod készítőjének frissítenie kell azt és hozzá kell adnia a [accent]minGameVersion: 136[]-t a [accent]mod.json[] fájlhoz.
-mod.blacklisted.details = Ez a Mod manuálisan a feketelistára került, mert a játék összeomlott tőle, vagy más probléma miatt. Ne használd!
-mod.missingdependencies.details = Ez a Mod függőségeket hiányol: {0}
-mod.erroredcontent.details = Ez a Mod hibákat okozott a betöltésnél. Kérd meg a Mod készítőjét, hogy javítsa ki a hibákat.
-mod.circulardependencies.details = Ennek a Modnak egymástól függő függőségei vannak.
-mod.incompletedependencies.details = Ez a Mod nem tudott betölteni a hiányzó, vagy a rossz függőségek miatt: {0}.
+mod.requiresversion.details = Szükséges játékverzió: [accent]{0}[]\nA játék ezen verziója elavult! A mod működéséhez újabb verzió szükséges (valószínűleg egy béta vagy alfa kiadás).
+mod.outdatedv7.details = Ez a mod nem kompatibilis a játék legújabb verziójával! A mod készítőjének frissítenie kell azt és hozzá kell adnia ezt a [accent]mod.json[] fájlhoz: [accent]minGameVersion: 136[].
+mod.blacklisted.details = Ez a mod kézileg feketelistára került, mert a játék összeomlott tőle, vagy más problémát okozott. Ne használd!
+mod.missingdependencies.details = Ez a mod függőségeket hiányol: {0}
+mod.erroredcontent.details = Ez a mod hibákat okozott a betöltésnél. Kérd meg a mod készítőjét, hogy javítsa őket.
+mod.circulardependencies.details = Ennek a modnak egymástól függő függőségei vannak.
+mod.incompletedependencies.details = Ez a mod nem tölthető be az érvénytelen vagy hiányzó függőségek miatt: {0}.
 
 mod.requiresversion = Szükséges játékverzió: [red]{0}[]
 
 mod.errors = Hiba történt a tartalom betöltése közben.
-mod.noerrorplay = [red]Vannak hibás Modok.[] Kapcsold ki, vagy javítsd ki őket a játék előtt.
-mod.nowdisabled = [red]A '{0}' Modnak nincs megfelelő függősége:[accent] {1}\n[lightgray]Ezeket előbb le kell tölteni.\nEz a Mod automatikusan törölve lesz.
+mod.noerrorplay = [red]Hibákkal rendelkező modjaid vannak.[] Kapcsold ki, vagy javítsd ki őket a játék előtt.
+mod.nowdisabled = [red]A(z) „{0}” modnak nincs megfelelő függősége:[accent] {1}\n[lightgray]Ezeket előbb le kell tölteni.\nEz a mod automatikusan ki lesz kapcsolva.
 mod.enable = Engedélyezés
 mod.requiresrestart = A játék kilép a módosítások alkalmazásához.
-mod.reloadrequired = [red]Újratöltés szükséges
+mod.reloadrequired = [red]Újraindítás szükséges
 mod.import = Mod importálása
 mod.import.file = Fájl importálása
-mod.import.github = Importálás GitHub-ról
-mod.jarwarn = [scarlet]A JAR Modok eredendően nem biztonságosak.[]\nGyőződj meg arról, hogy ezt a Modot megbízható forrásból importálod!
-mod.item.remove = Ez az elem része a(z)[accent] '{0}'[] Modnak. A törléséhez távolítsd el a Modot.
-mod.remove.confirm = Ez a Mod törölve lesz.
+mod.import.github = Importálás GitHubról
+mod.jarwarn = [scarlet]A JAR modok eredendően nem biztonságosak.[]\nGyőződj meg arról, hogy ezt a modot megbízható forrásból importálod!
+mod.item.remove = Ez az elem a(z)[accent] „{0}”[] mod része. A törléséhez távolítsd el a modot.
+mod.remove.confirm = Ez a mod törölve lesz.
 mod.author = [lightgray]Készítő:[] {0}
-mod.missing = Ez a mentés nemrég törölt, vagy frissített Modokat tartalmaz. Elképzelhető, hogy nem fog működni. Biztosan betöltöd?\n[lightgray]Modok:\n{0}
-mod.preview.missing = Mielőtt publikálod ezt a Modot a Steam Műhelyben, adj hozzá egy borítóképet.\nKészíts egy[accent] preview.png[] nevű képet a Mod mappájába, majd próbáld újra.
-mod.folder.missing = Csak mappa formában lehet feltölteni a Steam Műhelybe.\nHogy átalakítsd, csomagold ki a ZIP fájlt egy mappába és töröld le a régit, majd indítsd újra a játékot, vagy töltsd újra a Modot.
-mod.scripts.disable = Ez az eszköz nem támogatja a szkriptekkel rendelkező Modokat.\nA játékhoz tiltsd le ezeket a Modokat.
+mod.missing = Ez a mentés nemrég törölt vagy frissített modokat tartalmaz. Elképzelhető, hogy nem fog működni. Biztosan betöltöd?\n[lightgray]Modok:\n{0}
+mod.preview.missing = Mielőtt közzéteszed ezt a modot a Steam Műhelyben, adj hozzá egy borítóképet.\nKészíts egy[accent] preview.png[] nevű képet a Mod mappájába, majd próbáld újra.
+mod.folder.missing = Csak mappa formában lehet feltölteni a Steam Műhelybe.\nHogy átalakítsd, bontsd ki a ZIP-fájlt egy mappába és töröld le a régit, majd indítsd újra a játékot, vagy töltsd újra a modokat.
+mod.scripts.disable = Ez az eszköz nem támogatja a szkriptekkel rendelkező modokat.\nA játékhoz tiltsd le ezeket a modokat.
 
-about.button = Rólunk
+about.button = Névjegy
 name = Név:
 noname = Előbb válassz egy[accent] nevet[].
 search = Keresés:
-planetmap = Bolygó térkép
+planetmap = Bolygótérkép
 launchcore = Támaszpont indítása
-filename = Fájl név:
-unlocked = Új tartalom kinyitva!
-available = Új fejlesztés áll rendelkezésre!
+filename = Fájlnév:
+unlocked = Új tartalom feloldva!
+available = Új fejlesztés érhető el!
 unlock.incampaign = < Oldd fel a hadjáratban a részletekért >
 campaign.select = Válassz kezdő hadjáratot
 campaign.none = [lightgray]Válassz egy bolygót a kezdéshez.\nEzt bármikor megváltoztathatod.
-campaign.erekir = Újabb, csiszoltabb tartalom. Általában lineáris játékmenet.\n\nSokkal bonyolultabb. Magasabb minőségű pályák és élmények.
-campaign.serpulo = Régebbi tartalom. A klasszikus élmények. Nyíltabb végű.\n\nPotenciálisan kiegyensúlyozatlan pályák és hadjárat. Kevésbé csiszolt.
+campaign.erekir = Újabb, csiszoltabb tartalom. Többnyire lineáris játékmenet.\n\nSokkal nehezebb. Magasabb minőségű pályák és élmények.
+campaign.serpulo = Régebbi tartalom. A klasszikus élmény. Nyíltabb végű, több tartalommal.\n\nPotenciálisan kiegyensúlyozatlan pályák és hadjárat. Kevésbé csiszolt.
 completed = [accent]Kész
 techtree = Fejlesztési fa
 techtree.select = Fejlesztési fa kiválasztása
@@ -230,8 +230,8 @@ server.kicked.customClient = Ez a kiszolgáló nem támogatja a saját készít
 server.kicked.gameover = Vége a játéknak!
 server.kicked.serverRestarting = Ez a kiszolgáló újraindul.
 server.versions = A te játékverziód:[accent] {0}[]\nA kiszolgáló verziója:[accent] {1}[]
-host.info = A [accent]Kiszolgáló indítása[] gomb egy kiszolgálót indít a [scarlet]6567[] porton.\nEzen a [lightgray] Wi-Fi-n, vagy a helyi hálózaton [] bárki láthatja a kiszolgálót a kiszolgálólistán.\n\nHa azt szeretnéd, hogy az emberek bárhonnan, IP-címmel kapcsolódhassanak, akkor [accent]porttovábbítás[] szükséges.\n\n[lightgray]Megjegyzés: ha valakinek problémái vannak a LAN-játékhoz való kapcsolódással, győződj meg arról, hogy a tűzfal beállításaiban engedélyezted-e a Mindustry hozzáférését a helyi hálózathoz. Ne feledd, hogy a nyilvános hálózatok néha nem teszik lehetővé a kiszolgálók felderítését.
-join.info = Itt megadhatsz egy [accent]kiszolgáló IP[]-címet a kapcsolódáshoz, vagy felfedezhetsz [accent]helyi hálózati[], vagy [accent]globális[] kiszolgálókat a kapcsolódáshoz.\nA LAN és WAN többjátékos mód is támogatott.\n\n[lightgray]Ha valakihez IP alapján szeretnél kapcsolódni, akkor meg kell tudnod a partnered IP címét. Az IP-címeteket az interneten a "mi az IP-címem?" szövegre való kereséssel is megtalálhatjátok.
+host.info = A [accent]kiszolgáló indítása[] gomb egy kiszolgálót indít a [scarlet]6567-es[] porton.\nEzen a [lightgray]Wi-Fi-n vagy a helyi hálózaton[] bárki láthatja a kiszolgálót a kiszolgálólistán.\n\nHa azt szeretnéd, hogy bárhonnan, IP-címmel kapcsolódhassanak, akkor [accent]porttovábbítás[] szükséges.\n\n[lightgray]Megjegyzés: ha valakinek problémái vannak a LAN-játékhoz való kapcsolódással, győződj meg arról, hogy a tűzfal beállításaiban engedélyezted-e a Mindustry hozzáférését a helyi hálózathoz. Ne feledd, hogy a nyilvános hálózatok néha nem teszik lehetővé a kiszolgálók felderítését.
+join.info = Itt megadhatod egy [accent]kiszolgáló IP-címét[] a kapcsolódáshoz, vagy felfedezhetsz [accent]helyi[] vagy [accent]globális[] kiszolgálókat.\nA LAN és WAN többjátékos mód is támogatott.\n\n[lightgray]Ha valakihez IP-cím alapján szeretnél kapcsolódni, akkor meg kell tudnod az IP-címét, amelyet például a „my ip” webes kereséssel találhat meg.
 hostserver = Többjátékos játék
 invitefriends = Barátok meghívása
 hostserver.mobile = Többjátékos játék
@@ -257,22 +257,22 @@ server.hidden = Rejtett
 viewplayer = Játékos figyelése: [accent]{0}
 trace = Játékos követése
 trace.playername = Játékos neve: [accent]{0}
-trace.ip = IP: [accent]{0}
+trace.ip = IP-cím: [accent]{0}
 trace.id = Azonosító: [accent]{0}
 trace.language = Nyelv: [accent]{0}
 trace.mobile = Mobil kliens: [accent]{0}
 trace.modclient = Nem hivatalos kliens: [accent]{0}
 trace.times.joined = Kapcsolódások száma: [accent]{0}
 trace.times.kicked = Kirúgások száma: [accent]{0}
-trace.ips = IP-k:
+trace.ips = IP-címek:
 trace.names = Nevek:
-invalidid = Érvénytelen kliens azonosító (ID)! Küldj hibajelentést.
+invalidid = Érvénytelen kliensazonosító (ID)! Küldj hibajelentést.
 
 player.ban = Kitiltás
 player.kick = Kirúgás
 player.trace = Követés
-player.admin = Admin választás
-player.team = Csapat váltás
+player.admin = Admin be/ki
+player.team = Csapatváltás
 
 server.bans = Tiltások
 server.bans.none = Nincsenek tiltott játékosok!
@@ -285,31 +285,31 @@ server.outdated = [scarlet]Elavult kiszolgáló![]
 server.outdated.client = [scarlet]Elavult kliens![]
 server.version = [gray]v{0} {1}
 server.custombuild = [accent]Saját összeállítás
-confirmban = Biztosan tiltod "{0}[white]" játékost?
-confirmkick = Biztosan kirúgod "{0}[white]" játékost?
+confirmban = Biztosan tiltod „{0}[white]” játékost?
+confirmkick = Biztosan kirúgod „{0}[white]” játékost?
 confirmunban = Biztosan újra engedélyezed ezt a játékost?
-confirmadmin = Biztosan előlépteted "{0}[white]" játékost adminná?
-confirmunadmin = Biztosan meg akarod szüntetni "{0}[white]" játékosnak az adminisztrátori státuszát?
+confirmadmin = Biztosan előlépteted „{0}[white]” játékost adminná?
+confirmunadmin = Biztosan meg akarod szüntetni „{0}[white]” játékos adminisztrátori státuszát?
 votekick.reason = Kiszavazás oka
-votekick.reason.message = Valóban kiakarod szavazni "{0}[white]"-t?\nHa igen, írd le miért:
+votekick.reason.message = Valóban ki akarod szavazni „{0}[white]” játékost?\nHa igen, írd be az okát:
 joingame.title = Kapcsolódás a játékhoz
 joingame.ip = Cím:
-disconnect = Lekapcsolódva.
+disconnect = Kapcsolat bontva.
 disconnect.error = Kapcsolódási hiba.
-disconnect.closed = Kapcsolat bontva.
+disconnect.closed = Kapcsolat lezárva.
 disconnect.timeout = Időtúllépés.
-disconnect.data = Nem sikerült betölteni a világ adatot!
+disconnect.data = Nem sikerült betölteni a világ adatait!
 cantconnect = Nem sikerült kapcsolódni a(z) ([accent]{0}[]) játékhoz.
 connecting = [accent]Kapcsolódás...
 reconnecting = [accent]Újrakapcsolódás...
-connecting.data = [accent]Világ adat betöltése...
+connecting.data = [accent]Világadatok betöltése...
 server.port = Port:
 server.addressinuse = A cím már használatban van!
 server.invalidport = Érvénytelen port!
-server.error = [scarlet]Kiszolgáló hiba.
+server.error = [scarlet]Kiszolgálási hiba.
 save.new = Új mentés
 save.overwrite = Biztosan felülírod\nezt a mentést?
-save.nocampaign = A hadjáratból származó egyes mentési fájlok nem importálhatóak.
+save.nocampaign = A hadjáratból származó egyes mentési fájlok nem importálhatók.
 overwrite = Felülírás
 save.none = Nem található mentés!
 savefail = Nem sikerült elmenteni a játékot!
@@ -324,7 +324,7 @@ save.newslot = Mentés neve:
 save.rename = Átnevezés
 save.rename.text = Új név:
 selectslot = Válassz ki egy mentést.
-slot = [accent]Rekesz {0}
+slot = [accent]{0}. hely
 editmessage = Üzenet szerkesztése
 save.corrupted = A mentési fájl sérült vagy érvénytelen!
 empty = <üres>
@@ -335,19 +335,19 @@ save.autosave = Automatikus mentés: {0}
 save.map = Térkép: {0}
 save.wave = Hullám: {0}
 save.mode = Játékmód: {0}
-save.date = Utolsó Mentés: {0}
+save.date = Utolsó mentés: {0}
 save.playtime = Játékidő: {0}
 warning = Figyelmeztetés.
 confirm = Megerősítés
 delete = Törlés
 view.workshop = Megtekintés a Steam Műhelyben
-workshop.listing = Steam Műhely listázás szerkesztése
+workshop.listing = Steam Műhely listázásának szerkesztése
 ok = OK
 open = Megnyitás
 customize = Szabályok módosítása
-cancel = Mégsem
+cancel = Mégse
 command = Parancs
-command.queue = Sorba állít
+command.queue = Sorba állítás
 command.mine = Bányászás
 command.repair = Javítás
 command.rebuild = Újraépítés
@@ -363,9 +363,9 @@ stance.shoot = Viselkedés: lövés
 stance.holdfire = Viselkedés: tüzet szüntess
 stance.pursuetarget = Viselkedés: célpont követése
 stance.patrol = Viselkedés: járőrözési útvonal
-stance.ram = Viselkedés: ütközés\n[lightgray]Egyenes vonalú mozgás, nincs útkeresés
-openlink = Link megnyitása
-copylink = Link másolása
+stance.ram = Viselkedés: ütközés\n[lightgray]Egyenes vonalú mozgás, útkeresés nélkül
+openlink = Hivatkozás megnyitása
+copylink = Hivatkozás másolása
 back = Vissza
 max = Max
 objective = A pálya célja
@@ -376,18 +376,18 @@ data.export = Adatok exportálása
 data.import = Adatok importálása
 data.openfolder = Adatok mappájának megnyitása
 data.exported = Adatok exportálva.
-data.invalid = Ez nem egy érvényes játékadat.
+data.invalid = Ezek nem érvényes játékadatok.
 data.import.confirm = A külső adatok importálása felülírja[scarlet] minden[] jelenlegi játékadatodat.\n[accent]Nem vonható vissza![]\n\nAmint kész az importálás, a játék azonnal kilép.
 quit.confirm = Biztosan kilépsz?
 loading = [accent]Betöltés...
 downloading = [accent]Letöltés...
 saving = [accent]Mentés...
-respawn = Nyomd meg a(z) [accent][[{0}][] gombot, hogy drónként újraéledj.
-cancelbuilding = Használd a(z) [accent][[{0}][] gombot, hogy töröld a tervrajzot.
-selectschematic = Használd a(z) [accent][[{0}][] gombot, hogy kijelölj és másolj.
-pausebuilding = Használd a(z) [accent][[{0}][] gombot, hogy megállítsd az építkezést.
-resumebuilding = Használd a(z) [scarlet][[{0}][] gombot, hogy folytasd az építkezést.
-enablebuilding = Használd a(z) [scarlet][[{0}][] gombot, hogy jóváhagyd az építkezést.
+respawn = [accent][[{0}][] az újraéledéshez
+cancelbuilding = [accent][[{0}][] a tervrajz törléséhez
+selectschematic = [accent][[{0}][] a kijelöléshez és másoláshoz
+pausebuilding = [accent][[{0}][] az építkezés megállításához
+resumebuilding = [scarlet][[{0}][] az építkezés folytatásához
+enablebuilding = [scarlet][[{0}][] az építkezés jóváhagyásához
 showui = A kezelőfelület elrejtve.\nNyomd meg a(z) [accent][[{0}][] gombot a kezelőfelület megjelenítéséhez.
 commandmode.name = [accent]Parancs mód
 commandmode.nounits = [nincs egység]
@@ -397,52 +397,52 @@ wave.waiting = [lightgray]A következő hullám elkezdődik: {0} mp múlva
 wave.waveInProgress = [lightgray]Hullám folyamatban
 waiting = [lightgray]Várakozás...
 waiting.players = Várakozás a játékosokra...
-wave.enemies = [lightgray]{0}db ellenség maradt
-wave.enemycores = [accent]{0}db[lightgray] ellenséges Támaszpont
-wave.enemycore = [accent]{0}db[lightgray] ellenséges Támaszpont
-wave.enemy = [lightgray]{0}db ellenség maradt
+wave.enemies = [lightgray]{0} ellenség maradt
+wave.enemycores = [accent]{0}[lightgray] ellenséges támaszpont
+wave.enemycore = [accent]{0}[lightgray] ellenséges támaszpont
+wave.enemy = [lightgray]{0} ellenség maradt
 wave.guardianwarn = Egy Őrző érkezik [accent]{0}[] hullám múlva.
 wave.guardianwarn.one = Egy Őrző érkezik [accent]{0}[] hullám múlva.
 loadimage = Kép betöltése
 saveimage = Kép mentése
 unknown = Ismeretlen
-custom = Egyedi
+custom = Egyéni
 builtin = Beépített
 map.delete.confirm = Biztosan törlöd ezt a pályát? Ez a művelet nem vonható vissza!
 map.random = [accent]Véletlenszerű pálya
-map.nospawn = Ez a pálya nem rendelkezik Támaszponttal, amellyel a játékos kezdhet! Adj hozzá egy {0} Támaszpontot ehhez a pályához a szerkesztőben!
-map.nospawn.pvp = Ezen a pályán nincs ellenséges Támaszpont, amellyel a másik csapat kezdhet! Adj hozzá egy [scarlet]nem narancssárga[] Támaszpontot ehhez a pályához a szerkesztőben!
-map.nospawn.attack = Ezen a pályán nincs ellenséges Támaszpont! Adj hozzá egy {0} Támaszpontot ehhez a pályához a szerkesztőben!
+map.nospawn = Ez a pálya nem rendelkezik támaszponttal, amellyel a játékos kezdhetne. Adj hozzá egy {0} támaszpontot a pályához a szerkesztőben.
+map.nospawn.pvp = Ezen a pályán nincs ellenséges támaszpont, amellyel egy játékos kezdhet. Adj hozzá egy [scarlet]nem narancssárga[] támaszpontot a pályához a szerkesztőben.
+map.nospawn.attack = Ezen a pályán nincs ellenséges támaszpont. Adj hozzá {0} támaszpontot ehhez a pályához a szerkesztőben.
 map.invalid = Hiba történt a pálya betöltésekor: sérült vagy érvénytelen fájl.
 workshop.update = Elem frissítése
 workshop.error = Hiba történt a Steam Műhely részleteinek lekérdezésekor: {0}
-map.publish.confirm = Biztos, hogy közzéteszed ezt a pályát?\n\n[lightgray]Győződj meg róla, hogy elfogadtad a Steam Műhely EULA-t, különben a pályáid nem jelennek meg!
+map.publish.confirm = Biztos, hogy közzéteszed ezt a pályát?\n\n[lightgray]Győződj meg róla, hogy elfogadtad a Steam Műhely EULA-t, különben a pályáid nem jelennek meg.
 workshop.menu = Válaszd ki, hogy mit szeretnél csinálni ezzel az elemmel.
-workshop.info = Elem infó
-changelog = Változásnapló (opcionális):
+workshop.info = Eleminformációk
+changelog = Változásnapló (nem kötelező):
 updatedesc = Cím és leírás felülírása
 eula = Steam EULA
-missing = Ezt az elemet törölték vagy áthelyezték.\n[lightgray]A Steam Műhely adatait automatikusan leválasztották.
-publishing = [accent]Publikálás...
+missing = Ezt az elemet törölték vagy áthelyezték.\n[lightgray]A Steam Műhely adatai automatikusan le lettek választva.
+publishing = [accent]Közzététel...
 publish.confirm = Biztosan közzéteszed?\n\n[lightgray]Győződj meg róla, hogy elfogadtad a Steam Műhely EULA-t, különben az elemeid nem jelennek meg!
-publish.error = Hiba az elem publikálásakor: {0}
-steam.error = Nem sikerült inicializálni a Steam szolgáltatásokat.\nHiba: {0}
+publish.error = Hiba az elem közzétételekor: {0}
+steam.error = Nem sikerült előkészíteni a Steam szolgáltatásokat.\nHiba: {0}
 
 editor.planet = Bolygó:
 editor.sector = Szektor:
-editor.seed = Seed:
+editor.seed = Kiindulóérték:
 editor.cliffs = Falak sziklákká
 editor.brush = Méret
 editor.openin = Megnyitás a szerkesztőben
-editor.oregen = Érc generálás
-editor.oregen.info = Érc generálás:
-editor.mapinfo = Általános
-editor.author = Készítő:
+editor.oregen = Ércelőállítás
+editor.oregen.info = Ércelőállítás:
+editor.mapinfo = Pályainformációk
+editor.author = Szerző:
 editor.description = Leírás:
-editor.nodescription = A pályának rendelkeznie kell egy legalább 4 karakter hosszú leírással, mielőtt megosztod.
-editor.waves = Hullámok:
-editor.rules = Szabályok:
-editor.generation = Generálás:
+editor.nodescription = A megosztás előtt a pályának rendelkeznie kell egy legalább 4 karakteres leírással.
+editor.waves = Hullámok
+editor.rules = Szabályok
+editor.generation = Előállítás
 editor.objectives = Célok
 editor.locales = Helyi csomagok
 editor.ingame = Szerkesztés a játékban
@@ -453,9 +453,9 @@ editor.center = Ugrás középre
 editor.search = Pályák keresése...
 editor.filters = Pályák szűrése
 editor.filters.mode = Játékmódok:
-editor.filters.type = Pálya típus:
+editor.filters.type = Pályatípus:
 editor.filters.search = Keresés ebben:
-editor.filters.author = Készítő
+editor.filters.author = Szerző
 editor.filters.description = Leírás
 editor.shiftx = X eltolás
 editor.shifty = Y eltolás
@@ -468,29 +468,29 @@ waves.health = élet: {0}%
 waves.perspawn = kezdőpontonként
 waves.shields = pajzs/hullám
 waves.to = -
-waves.spawn = Kezdőpont:
+waves.spawn = kezdőpont:
 waves.spawn.all = <mind>
 waves.spawn.select = Kezdőpont kiválasztása
 waves.spawn.none = [scarlet]nem találhatóak kezdőpontok a pályán
-waves.max = max egységek
+waves.max = egységkorlát
 waves.guardian = Őrző
 waves.preview = Előnézet
 waves.edit = Szerkesztés...
-waves.random = Véletlen
+waves.random = Véletlenszerű
 waves.copy = Másolás a vágólapra
-waves.load = Másolás a vágólapról
-waves.invalid = Nem lehet beilleszteni a vágólapról.
+waves.load = Betöltés a vágólapról
+waves.invalid = Érvénytelen hullámok a vágólapon.
 waves.copied = Hullámok másolva.
-waves.none = Nincs ellenség megadva.\nVedd figyelembe, hogy az üresen hagyott hullám elrendezések automatikusan lecserélődnek az alapértelmezett elrendezésre.
+waves.none = Nincs ellenség megadva.\nVedd figyelembe, hogy az üresen hagyott hullám-elrendezések automatikusan le lesznek cserélve az alapértelmezett elrendezésre.
 waves.sort = Rendezési szempont
 waves.sort.reverse = Rendezés visszafelé
-waves.sort.begin = Indul
+waves.sort.begin = Kezdés
 waves.sort.health = Élet
 waves.sort.type = Típus
 waves.search = Hullám keresése...
-waves.filter = Egység szűrő
-waves.units.hide = Mindent elrejt
-waves.units.show = Mindent megjelenít
+waves.filter = Egységszűrő
+waves.units.hide = Összes elrejtése
+waves.units.show = Összes megjelenítése
 
 #these are intentionally in lower case
 wavemode.counts = típusokra bontva
@@ -499,56 +499,56 @@ wavemode.health = életpontok
 
 editor.default = [lightgray]<Alapbeállítás>
 details = Részletek...
-edit = Szerkesztés...
+edit = Szerkesztés
 variables = Változók
 logic.globals = Beépített változók
 editor.name = Név:
-editor.spawn = Egység megidézése
+editor.spawn = Egység létrehozása
 editor.removeunit = Egység eltávolítása
 editor.teams = Csapatok
 editor.errorload = Hiba a fájl betöltése közben.
 editor.errorsave = Hiba a fájl mentése közben.
 editor.errorimage = Ez egy kép, nem pedig egy pálya.
 editor.errorlegacy = Ez a pálya túl régi és olyan régi pálya formátumot használ, amely már nem támogatott.
-editor.errornot = Ez nem egy pálya-fájl.
-editor.errorheader = Ez a pálya-fájl vagy érvénytelen, vagy sérült.
+editor.errornot = Ez nem egy pályafájl.
+editor.errorheader = Ez a pályafájl érvénytelen vagy sérült.
 editor.errorname = A pályának nincs neve. Mentést próbálsz betölteni?
-editor.errorlocales = Hiba az érvénytelen Helyi Csomagok beolvasásakor.
+editor.errorlocales = Hiba az érvénytelen helyi csomagok beolvasásakor.
 editor.update = Frissítés
 editor.randomize = Véletlenszerű
 editor.moveup = Mozgás felfelé
 editor.movedown = Mozgás lefelé
 editor.copy = Másolás
-editor.apply = Alkalmazás
-editor.generate = Generálás
-editor.sectorgenerate = Szektor generálása
+editor.apply = Alkalmaz
+editor.generate = Előállítás
+editor.sectorgenerate = Szektor előállítása
 editor.resize = Átméretezés
 editor.loadmap = Pálya betöltése
 editor.savemap = Pálya mentése
 editor.savechanges = [scarlet]Nem mentett módosításaid vannak!\n\n[]Szeretnéd elmenteni őket?
 editor.saved = Mentve!
-editor.save.noname = A pályádnak nincs neve! Állíts be egyet a 'pálya infó' menüben.
-editor.save.overwrite = A pályád felülír egy beépített pályát! Válassz egy másik nevet az 'pálya infó' menüben!
-editor.import.exists = [scarlet]Nem lehet importálni:[] Már létezik a(z) "{0}" nevű beépített pálya!
+editor.save.noname = A pályádnak nincs neve! Állíts be egyet a „pályainformációk” menüben.
+editor.save.overwrite = A pályád felülír egy beépített pályát! Válassz egy másik nevet a „pályainformációk” menüben.
+editor.import.exists = [scarlet]Nem lehet importálni:[] Már létezik „{0}” nevű beépített pálya!
 editor.import = Importálás...
 editor.importmap = Pálya importálása
 editor.importmap.description = Létező pálya importálása
 editor.importfile = Fájl importálása
-editor.importfile.description = Egy külső pálya fájl importálása
+editor.importfile.description = Egy külső pályafájl importálása
 editor.importimage = Képfájl importálása
-editor.importimage.description = Egy külső pálya képfájl importálása
+editor.importimage.description = Egy külső pályaképfájl importálása
 editor.export = Exportálás...
 editor.exportfile = Fájl exportálása
-editor.exportfile.description = Exportálás egy pálya fájlba
-editor.exportimage = Domborzat kép exportálása
+editor.exportfile.description = Exportálás egy pályafájlba
+editor.exportimage = Domborzati kép exportálása
 editor.exportimage.description = Csak alapvető domborzatot tartalmazó képfájl exportálása
 editor.loadimage = Domborzat importálása
 editor.saveimage = Domborzat exportálása
-editor.unsaved = Biztos ki akarsz lépni?\n[scarlet]A nem mentett módosításaid elvesznek!
+editor.unsaved = Biztos, hogy ki akarsz lépni?\n[scarlet]A nem mentett módosításaid elvesznek.
 editor.resizemap = Pálya átméretezése
 editor.mapname = Pálya neve:
 editor.overwrite = [accent]Vigyázz!\nEzzel felülírsz egy már létező pályát.
-editor.overwrite.confirm = [scarlet]Vigyázz![] Ilyen nevű pálya már létezik:\n"[accent]{0}[]"\nBiztosan felülírod?
+editor.overwrite.confirm = [scarlet]Vigyázz![] Ilyen nevű pálya már létezik. Biztosan felülírod?\n„[accent]{0}[]”
 editor.exists = Ilyen nevű pálya már létezik.
 editor.selectmap = Válassz ki egy pályát a betöltéshez:
 
@@ -559,20 +559,20 @@ toolmode.replaceall.description = Az összes blokkot lecseréli a pályán.
 toolmode.orthogonal = Merőleges
 toolmode.orthogonal.description = Csak merőleges vonalakat rajzol.
 toolmode.square = Négyzet
-toolmode.square.description = Négyzet ecset
+toolmode.square.description = Négyzetes ecset.
 toolmode.eraseores = Ércradír
 toolmode.eraseores.description = Csak az érceket törli.
-toolmode.fillteams = Csoportok Kitöltése
-toolmode.fillteams.description = Töltse ki a csoportokat a blokkok helyett.
-toolmode.fillerase = Kitöltés Törlése
-toolmode.fillerase.description = Törölje az azonos típusú blokkokat.
-toolmode.drawteams = Csoportok Rajzolása
-toolmode.drawteams.description = Csoportok rajzolása blokkok helyett.
+toolmode.fillteams = Csapatok kitöltése
+toolmode.fillteams.description = Csapatok kitöltése a blokkok helyett.
+toolmode.fillerase = Kitöltés törlése
+toolmode.fillerase.description = Az azonos típusú blokkok törlése.
+toolmode.drawteams = Csapatok rajzolása
+toolmode.drawteams.description = Csapatok rajzolása blokkok helyett.
 #unused
 toolmode.underliquid = Folyadékok alá
-toolmode.underliquid.description = Padlók rajzolása a folyadék blokkok alá.
+toolmode.underliquid.description = Padlók rajzolása a folyadékblokkok alá.
 
-filters.empty = [lightgray]Még nincs szűrő! Adj hozzá egyet a lenti gombra kattintva!
+filters.empty = [lightgray]Még nincs szűrő! Adj hozzá egyet a lenti gombra kattintva.
 
 filter.distort = Torzítás
 filter.noise = Zaj
@@ -584,14 +584,14 @@ filter.oremedian = Érc medián
 filter.blend = Vegyes
 filter.defaultores = Alapértelmezett ércek
 filter.ore = Érc
-filter.rivernoise = Vízfolyás zaj
+filter.rivernoise = Vízfolyás zaja
 filter.mirror = Tükrözés
-filter.clear = Blokkok törlése
-filter.option.ignore = Elutasít
-filter.scatter = Szórás
+filter.clear = Törlés
+filter.option.ignore = Elutasítás
+filter.scatter = Szétszórás
 filter.terrain = Domborzat
 
-filter.option.scale = Méret
+filter.option.scale = Méretezés
 filter.option.chance = Gyakoriság
 filter.option.mag = Magnitúdó
 filter.option.threshold = Küszöbérték
@@ -604,7 +604,7 @@ filter.option.rotate = Forgatás
 filter.option.amount = Mennyiség
 filter.option.block = Blokk
 filter.option.floor = Talaj
-filter.option.flooronto = Cél talaj
+filter.option.flooronto = Céltalaj
 filter.option.target = Cél
 filter.option.replacement = Csere
 filter.option.wall = Fal
@@ -612,24 +612,24 @@ filter.option.ore = Érc
 filter.option.floor2 = Másodlagos talaj
 filter.option.threshold2 = Másodlagos küszöbérték
 filter.option.radius = Sugár
-filter.option.percentile = Arány
+filter.option.percentile = Százalék
 
-locales.info = Itt adhatsz hozzá különböző Helyi Csomagokat a pályádhoz. A Helyi Csomagok minden tulajdonságának van egy neve és egy értéke. Ezeket a tulajdonságokat a Világ Processzorok és a Célkitűzések azok neveivel használhatják. Támogatják a szövegformázást (a helyőrzőket az aktuális értékükkel helyettesítik).\n\n[cyan]Példa tulajdonság:\n[]name: [accent]időzítő[]\nvalue: [accent]Példa időzítő, hátralévő idő: {0}[]\n\n[cyan]Használat:\n[]Beállítás Célkitűzés szövegeként: [accent]@időzítő\n\n[]Írja be egy Világ Processzorba:\n[accent]localeprint "időzítő"\nformat time\n[gray](ahol az idő egy külön kiszámított változó)
-locales.deletelocale = Biztos, hogy törölni akarod ezt a Helyi Csomagot?
-locales.applytoall = Változások alkalmazása az összes Helyi Csomagra
-locales.addtoother = Hozzáadás más Helyi Csomaghoz
+locales.info = Itt adhatsz hozzá különböző nyelvi csomagokat a pályádhoz. A nyelvi csomagokban minden tulajdonságnak van egy neve és egy értéke. Ezeket a tulajdonságokat a világfeldolgozók és a célkitűzések is használhatják a saját neveikkel. Támogatják a szövegformázást (a helyőrzőket a tényleges értékükkel helyettesítik).\n\n[cyan]Példa tulajdonság:\n[]name: [accent]időzítő[]\nvalue: [accent]Példa időzítő, hátralévő idő: {0}[]\n\n[cyan]Használat:\n[]Beállítás célkitűzés szövegeként: [accent]@időzítő\n\n[]Írd be egy világfeldolgozóba:\n[accent]localeprint "időzítő"\nformat time\n[gray](ahol az idő egy külön számított változó)
+locales.deletelocale = Biztos, hogy törölni akarod ezt a nyelvi csomagot?
+locales.applytoall = Változások alkalmazása az összes nyelvi csomagra
+locales.addtoother = Hozzáadás más nyelvi csomagokhoz
 locales.rollback = Visszaállítás az utoljára elfogadottra
-locales.filter = Tulajdonság szűrő
-locales.searchname = Név keresés...
-locales.searchvalue = Érték keresés...
-locales.searchlocale = Helyi csomag keresés...
+locales.filter = Tulajdonságszűrő
+locales.searchname = Név keresése...
+locales.searchvalue = Érték keresése...
+locales.searchlocale = Nyelvi csomag keresése...
 locales.byname = Név szerint
 locales.byvalue = Érték szerint
-locales.showcorrect = Azon tulajdonságok megjelenítése, amelyek mindenhol egyedi értékekkel rendelkeznek és jelen vannak minden Helyi Csomagban.
-locales.showmissing = Azon tulajdonságok megjelenítése, amelyek hiányoznak Bizonyos Helyi Csomagokból
-locales.showsame = Azon tulajdonságok megjelenítése, amelyek azonos értékekkel rendelkeznek bizonyos Helyi Csomagokban
-locales.viewproperty = Megtekintés minden Helyi Csomagban
-locales.viewing = "{0}" tulajdonság megtekintése
+locales.showcorrect = Azon tulajdonságok megjelenítése, amelyek mindenhol egyedi értékekkel rendelkeznek és jelen vannak minden nyelvi csomagban.
+locales.showmissing = Azon tulajdonságok megjelenítése, amelyek hiányoznak egyes nyelvi csomagokból
+locales.showsame = Azon tulajdonságok megjelenítése, amelyek azonos értékekkel rendelkeznek különböző nyelvi csomagokban
+locales.viewproperty = Megtekintés minden nyelvi csomagban
+locales.viewing = A(z) „{0}” tulajdonság megtekintése
 locales.addicon = Ikon hozzáadása
 
 width = Szélesség:
@@ -640,27 +640,27 @@ campaign = Hadjárat
 load = Betöltés
 save = Mentés
 fps = FPS: {0}
-ping = Ping: {0}ms
+ping = Ping: {0} ms
 tps = TPS: {0}
-memory = Mem: {0}MB
-memory2 = Mem:\n {0}MB +\n {1}MB
-language.restart = Indítsd újra a játékot, hogy betöltődjenek a nyelvi beállítások!
+memory = Mem: {0} MB
+memory2 = Mem:\n {0} MB +\n {1} MB
+language.restart = Indítsd újra a játékot, hogy a nyelvi beállítások érvénybe lépjenek.
 settings = Beállítások
 tutorial = Oktatóanyag
 tutorial.retake = Oktatóanyag újrajátszása
 editor = Szerkesztő
-mapeditor = Pálya szerkesztő
+mapeditor = Pályaszerkesztő
 
 abandon = Feladás
 abandon.text = Ez a szektor és minden nyersanyaga az ellenség kezére kerül.
 locked = Lezárva
 complete = [lightgray]Feltételek:
-requirement.wave = Juss el a {0}. hullámig a(z) {1} szektorban
-requirement.core = Pusztítsd el az ellenséges Támaszpontot a(z) {0} szektorban
+requirement.wave = Juss el a(z) {0}. hullámig a(z) {1} szektorban
+requirement.core = Pusztítsd el az ellenséges támaszpontot a(z) {0} szektorban
 requirement.research = Fejleszd ki: {0}
 requirement.produce = Gyártsd le: {0}
 requirement.capture = Foglald el a(z) {0} szektort
-requirement.onplanet = Szektor elfoglalása a(z) {0}-n
+requirement.onplanet = Szektor elfoglalása a(z) {0} bolygón
 requirement.onsector = Landolj a(z) {0} szektorban
 launch.text = Indítás
 research.multiplayer = Csak a kiszolgáló fedezhet fel nyersanyagokat.
@@ -671,10 +671,10 @@ configure = Rakomány szerkesztése
 objective.research.name = Fejlesztés
 objective.produce.name = Megszerzés
 objective.item.name = Nyersanyag megszerzése
-objective.coreitem.name = Támaszpont nyersanyag
-objective.buildcount.name = Építés számláló
-objective.unitcount.name = Egység számláló
-objective.destroyunits.name = Egység megsemmisítése
+objective.coreitem.name = Támaszpont nyersanyaga
+objective.buildcount.name = Építésszámláló
+objective.unitcount.name = Egységszámláló
+objective.destroyunits.name = Egységek megsemmisítése
 objective.timer.name = Időzítő
 objective.destroyblock.name = Blokk megsemmisítése
 objective.destroyblocks.name = Blokkok megsemmisítése
@@ -697,18 +697,18 @@ objective.produce = [accent]Termelj:\n[]{0}[lightgray]{1}
 objective.destroyblock = [accent]Semmisítsd meg:\n[]{0}[lightgray]{1}
 objective.destroyblocks = [accent]Semmisítsd meg: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
 objective.item = [accent]Termelj: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
-objective.coreitem = [accent]Szállítás a Támaszpontba:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
-objective.build = [accent]Építs: [][lightgray]{0}[]db\n{1}[lightgray]{2}
-objective.buildunit = [accent]Gyárts egységeket: [][lightgray]{0}[]db\n{1}[lightgray]{2}
-objective.destroyunits = [accent]Semmisíts meg: [][lightgray]{0}[]db Egységet
+objective.coreitem = [accent]Szállítás a támaszpontba:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.build = [accent]Építs: [][lightgray]{0}[]\n{1}[lightgray]{2}
+objective.buildunit = [accent]Gyárts egységeket: [][lightgray]{0}[]\n{1}[lightgray]{2}
+objective.destroyunits = [accent]Semmisíts meg: [][lightgray]{0}[] egységet
 objective.enemiesapproaching = [accent]Ellenség érkezik: [lightgray]{0}[] mp múlva
 objective.enemyescelating = [accent]Az ellenséges gyártás fokozódik: [lightgray]{0}[] mp múlva
 objective.enemyairunits = [accent]Az ellenséges légi egységek gyártása elkezdődik: [lightgray]{0}[] mp múlva
-objective.destroycore = [accent]Semmisítsd meg az ellenséges Támaszpontot
+objective.destroycore = [accent]Semmisítsd meg az ellenséges támaszpontot
 objective.command = [accent]Irányítsd az egységeket
 objective.nuclearlaunch = [accent]⚠ Nukleáris kilövés észlelve: [lightgray]{0}
 
-announce.nuclearstrike = [red]⚠ BEÉRKEZŐ NUKLEÁRIS CSAPÁS ⚠\n[lightgray]Azonnal építs tartalék Támaszpontokat!
+announce.nuclearstrike = [red]⚠ BEÉRKEZŐ NUKLEÁRIS CSAPÁS ⚠\n[lightgray]Azonnal építs tartalék támaszpontokat!
 
 loadout = Rakomány
 resources = Nyersanyagok
@@ -717,10 +717,10 @@ bannedblocks = Tiltott épületek
 objectives = Feladatok
 bannedunits = Tiltott egységek
 bannedunits.whitelist = Tiltott egységek fehérlistára
-bannedblocks.whitelist = Tiltott épületek fehérlistára
+bannedblocks.whitelist = Tiltott blokkok fehérlistára
 addall = Összes hozzáadása
 launch.from = Indítás a(z) [accent]{0} szektorból
-launch.capacity = Nyersanyag kapacitás az indításhoz: [accent]{0}
+launch.capacity = Nyersanyag-kapacitás az indításkor: [accent]{0}
 launch.destination = Úticél: {0}
 configure.invalid = A mennyiségnek 0 és {0} között kell lennie.
 add = Hozzáadás...
@@ -729,13 +729,13 @@ guardian = Őrző
 connectfail = [scarlet]Kapcsolódási hiba:\n\n[accent]{0}
 error.unreachable = A kiszolgálót nem lehet elérni.\nBiztosan jól írtad be a címet?
 error.invalidaddress = Érvénytelen cím.
-error.timedout = Időtúllépés!\nGyőződj meg róla, hogy a "porttovábbítás" be van kapcsolva a kiszolgáló gépen és a cím helyes!
-error.mismatch = Csomaghiba:\nLehetséges kliens/kiszolgáló verzió eltérés.\nGyőződj meg róla, hogy te és a kiszolgáló is a Mindustry legfrissebb verzióját használjátok!
+error.timedout = Időtúllépés!\nGyőződj meg róla, hogy a porttovábbítás be van kapcsolva a kiszolgálógépen, és a cím helyes!
+error.mismatch = Csomaghiba:\nLehetséges kliens- vagy kiszolgálóverzió-eltérés.\nGyőződj meg róla, hogy te és a kiszolgáló is a Mindustry legfrissebb verzióját használjátok!
 error.alreadyconnected = Már kapcsolódva vagy.
-error.mapnotfound = A pálya fájl nem található!
+error.mapnotfound = A pályafájl nem található!
 error.io = Internet I/O hiba.
-error.any = Ismeretlen internet hiba.
-error.bloom = Nem sikerült inicializálni a bloom-ot.\nElőfordulhat, hogy a készülék nem támogatja.
+error.any = Ismeretlen hálózati hiba.
+error.bloom = A bloom hatás előkészítése nem sikerült.\nElőfordulhat, hogy az eszköz nem támogatja.
 
 weather.rain.name = Eső
 weather.snow.name = Hóesés
@@ -743,8 +743,8 @@ weather.sandstorm.name = Homokvihar
 weather.sporestorm.name = Spóravihar
 weather.fog.name = Köd
 
-campaign.playtime = \uf129 [lightgray]Szektor Játékidő: {0}
-campaign.complete = [accent]Gratuláció.\n\nAz ellenség a(z) {0}-n legyőzve.\n[lightgray]Az utolsó szektor meghódítása megtörtént.
+campaign.playtime =  [lightgray]Játékidő a szektorban: {0}
+campaign.complete = [accent]Gratulálunk.\n\nAz ellenség legyőzve a(z) {0} bolygón.\n[lightgray]Az utolsó szektor meghódítása megtörtént.
 
 sectorlist = Szektorok
 sectorlist.attacked = {0} támadás alatt
@@ -753,10 +753,10 @@ sectors.resources = Nyersanyagok:
 sectors.production = Termelés:
 sectors.export = Export:
 sectors.import = Import:
-sectors.time = A szektorban eltöltött idő:
+sectors.time = Idő:
 sectors.threat = Fenyegetés:
 sectors.wave = Hullám:
-sectors.stored = Eltárolt nyersanyagok:
+sectors.stored = Tárolt nyersanyagok:
 sectors.resume = Folytatás
 sectors.launch = Indítás
 sectors.select = Kiválasztás
@@ -764,12 +764,12 @@ sectors.nonelaunch = [lightgray]semmi (nap)
 sectors.rename = Szektor átnevezése
 sectors.enemybase = [scarlet]Ellenséges bázis
 sectors.vulnerable = [scarlet]Sebezhető
-sectors.underattack = [scarlet]Támadás alatt! [accent]{0}% sérült
+sectors.underattack = [scarlet]Támadás alatt! [accent]{0}%-ban sérült
 sectors.underattack.nodamage = [scarlet]Nincs meghódítva
 sectors.survives = [accent]Túlél {0} hullámot
 sectors.go = Utazás
-sector.abandon = Elhagy
-sector.abandon.confirm = Ennek a szektornak a Támaszpontja(i) önmegsemmisítésre kerülnek.\nFolytatod?
+sector.abandon = Elhagyás
+sector.abandon.confirm = Ennek a szektornak a támaszpontjai önmegsemmisítésre kerülnek.\nFolytatod?
 sector.curcapture = A szektor elfoglalva
 sector.curlost = A szektor elveszett
 sector.missingresources = [scarlet]Nincs elég nyersanyag
@@ -779,7 +779,7 @@ sector.capture = A(z) [accent]{0}[white] szektor elfoglalva!
 sector.capture.current = A szektor elfoglalva!
 sector.changeicon = Ikon módosítása
 sector.noswitch.title = A szektorváltás nem lehetséges
-sector.noswitch = Nem válthatsz szektort, amíg egy meglévő szektor támadás alatt áll.\n\nSzektor: [accent]{0}[] a(z) [accent]{1}[]-n
+sector.noswitch = Nem válthatsz szektort, amíg egy meglévő szektor támadás alatt áll.\n\nSzektor: [accent]{0}[] a(z) [accent]{1}[] bolygón
 sector.view = A szektor megtekintése
 
 threat.low = Alacsony
@@ -794,43 +794,43 @@ planet.serpulo.name = Serpulo
 planet.erekir.name = Erekir
 planet.sun.name = Nap
 
-sector.impact0078.name = Ütközet 0078
-sector.groundZero.name = Becsapódási Pont
-sector.craters.name = A Kráterek
-sector.frozenForest.name = Fagyott Erdő
-sector.ruinousShores.name = Romos Partok
-sector.stainedMountains.name = Foltos Hegyek
-sector.desolateRift.name = Kietlen Hasadék
-sector.nuclearComplex.name = Nukleáris Termelési Komplexum
-sector.overgrowth.name = Túlburjánzott
+sector.impact0078.name = 0078-as becsapódás
+sector.groundZero.name = Becsapódási pont
+sector.craters.name = A kráterek
+sector.frozenForest.name = Fagyott erdő
+sector.ruinousShores.name = Romos partok
+sector.stainedMountains.name = Foltos hegyek
+sector.desolateRift.name = Kietlen hasadék
+sector.nuclearComplex.name = Nukleáris termelési komplexum
+sector.overgrowth.name = Túlburjánzás
 sector.tarFields.name = Kátránymezők
-sector.saltFlats.name = Sós Síkságok
+sector.saltFlats.name = Sós síkságok
 sector.fungalPass.name = Gombahágó
-sector.biomassFacility.name = Biomassza Szintézis Létesítmény
-sector.windsweptIslands.name = Szélfútta Szigetek
-sector.extractionOutpost.name = Kivonási Pont
-sector.planetaryTerminal.name = Bolygó Körüli Indító Terminál
+sector.biomassFacility.name = Biomassza szintetizáló létesítmény
+sector.windsweptIslands.name = Szélfútta szigetek
+sector.extractionOutpost.name = Kivonási helyőrség
+sector.planetaryTerminal.name = Bolygó körüli indítóterminál
 sector.coastline.name = Partvonal
-sector.navalFortress.name = Tengerészeti Erőd
+sector.navalFortress.name = Tengerészeti erőd
 
-sector.groundZero.description = Az ideális helyszín, hogy ismét belekezdjünk. Alacsony ellenséges fenyegetés. Némi nyersanyag.\nGyűjts annyi Rezet és Ólmot, amennyit csak tudsz.\nHaladj tovább.
-sector.frozenForest.description = Még itt, a hegyekhez közel is elterjedtek a spórák. A fagypont alatti hőmérséklet nem tudja örökké fogva tartani őket.\n\nFedezd fel az elektromosság erejét! Építs Belső Égetésű Erőművet! Használj Foltozót!
-sector.saltFlats.description = A sivatag peremén terül el a Sós Síkságok néven ismert síkság. Kevés nyersanyag található errefelé.\n\nAz ellenség egy raktárkomplexumot létesített itt. Pusztítsd el a Támaszpontot! Kő kövön ne maradjon!
-sector.craters.description = Régen háborúk folytak ezen a helyen és csak egy kráter maradt utánuk. Szerencsédre a kráter évezredek alatt feltöltődött Vízzel így letudod hűteni vele a Fúróidat és Lövegeidet. Persze előtte használd a Homokot, hogy legyen üveged!
-sector.ruinousShores.description = A romokon túl fekszik a vízpart. Egykor itt állt egy parti védelmi vonal. Mára nem sok maradt belőle. Csak a legegyszerűbb védelmi épületek maradtak sértetlenek, minden más csak törmelékként van jelen.\nFolytasd a terjeszkedést! Fedezd fel a régi technológiákat!
-sector.stainedMountains.description = Mélyebben benn a szárazföldön fekszenek a hegyek, a spóráktól még érintetlenül.\nTermeld ki a bőséges Titán készleteket a körzetben. Tanuld meg felhasználni!.\n\nAz ellenség itt nagyobb létszámban van jelen. Ne hagyj nekik időt, hogy a legerősebb egységeiket hadba állíthassák!
+sector.groundZero.description = Az ideális helyszín, hogy ismét belekezdjünk. Alacsony ellenséges fenyegetés. Kevés nyersanyag.\nGyűjts annyi rezet és ólmot, amennyit csak tudsz.\nHaladj tovább.
+sector.frozenForest.description = Még itt, a hegyekhez közel is elterjedtek a spórák. A fagypont alatti hőmérséklet nem tudja örökké fogva tartani őket.\n\nFedezd fel az elektromosság erejét! Építs égetőerőműveket! Tanuld meg a foltozók használatát!
+sector.saltFlats.description = A sivatag peremén terülnek el a Sós síkságok. Kevés nyersanyag található errefelé.\n\nAz ellenség egy raktárkomplexumot létesített itt. Pusztítsd el a támaszpontjukat! Kő kövön ne maradjon!
+sector.craters.description = Víz gyűjt össze ebben a kráterben, amely régi háborúk emlékét őrzi. Szerezd vissza a területet. Gyűjts homokot! Olvassz üveget! Pumpálj vizet, hogy lehűtsd a fúróidat és lövegtornyaidat.
+sector.ruinousShores.description = A pusztaság mögött a partvonal húzódik. Valaha ezen a helyen egy partvédelmi rendszer állt. Nem sok minden maradt belőle. Csak a legalapvetőbb védelmi szerkezetek maradtak érintetlenül, minden más csak törmelék lett.\nFolytasd a terjeszkedést! Fedezd fel újra a technológiát!
+sector.stainedMountains.description = Mélyebben a szárazföldön fekszenek a hegyek, a spóráktól még érintetlenül.\nTermeld ki a bőséges titán készleteket a körzetben. Tanuld meg felhasználni!.\n\nAz ellenség itt nagyobb létszámban van jelen. Ne hagyj nekik időt, hogy a legerősebb egységeiket hadba állíthassák!
 sector.overgrowth.description = Ez a terület közelebb esik a spórák forrásához, a spórák már kinőtték.\nAz ellenség egy helyőrséget létesített itt. Építs Mace egységeket! Pusztítsd el a bázist!
-sector.tarFields.description = Egy Olajtermelő övezet peremvidéke a hegyek és a sivatag között. Egy azon kevés szektorok közül, ahol még hasznosítható kátránykészletek találhatóak.\nBár a terület elhagyatott, veszélyes ellenséges erők fészkelnek a közelben. Ne becsüld alá őket!\n\n[lightgray]Fedezd fel az Olajfeldolgozási lehetőségeket, ha tudod!
-sector.desolateRift.description = Egy extrém veszélyes zóna. Nyersanyagokban gazdag, de szűkös a hely. Magas kockázat. Hagyd el, amint lehet! Ne tévesszen meg a hosszú szünet az ellenség támadásai között!
-sector.nuclearComplex.description = Egy néhai létesítmény a Tórium kitermelésére és feldolgozására, romokban.\n[lightgray]Fedezd fel a Tóriumot és sokrétű felhasználását!\n\nAz ellenség nagy létszámban van jelen, és folyamatosan megfigyelés alatt tartják a környéket.
-sector.fungalPass.description = Átmenet a magas hegyek és a mélyebben fekvő, spórák uralta lapály között. Egy kisebb ellenséges megfigyelő állomás található itt.\nSemmisítsd meg!\nHasználj Dagger és Crawler egységeket! Pusztítsd el a két Támaszpontot!
-sector.biomassFacility.description = A Spórák származási helye. Ebben a létesítményben fejlesztették ki őket és eredetileg itt került sor a gyártásukra.\nFedezd fel az itt található technológiákat! Használd a Spóra Kapszulákat üzemanyag- és Műanyagok gyártására!\n\n[lightgray]A létesítmény pusztulása nyomán a spórák elszabadultak és szétszóródtak a légkörben. A helyi ökoszisztémában semmi sem tudta felvenni a versenyt egy ennyire invazív életformával.
-sector.windsweptIslands.description = Távolabb a partvonalon túl fekszik ez az elszigetelt szigetcsoport. A feljegyzések szerint egykor [accent]Műanyag[] gyártása zajlott itt.\n\nVerd vissza az ellenség vízi egységeit! Állíts fel egy bázist a szigeteken! Fedezd fel az itt talált gyárakat!
-sector.extractionOutpost.description = Egy távoli ellenséges támaszpont, amelyet az ellenség azért épített, hogy nyersanyagokat juttasson el más szektorokba.\n\nA szektorok közötti szállítási technológia elengedhetetlen a további hódításhoz. Pusztítsd el a bázist. Fejleszd ki a Kilövő Állást.
-sector.impact0078.description = Itt fekszenek a roncsai az első csillagközi űrhajónak, amely ebbe a csillagrendszerbe érkezett.\n\nMents ki a romok alól mindent amit csak tudsz! Fedezd fel az épen maradt technológiákat.
-sector.planetaryTerminal.description = A végső célpont.\n\nEzen a vízparti bázison található egy olyan építmény, amely képes Támaszpontokat kilőni a közeli bolygókra. Folyamatosan őrzik.\n\nKészíts vízi egységeket! Ártalmatlanítsd az ellenséget amilyen gyorsan csak tudod! Találd meg a kilövőszerkezetet!
+sector.tarFields.description = Egy olajtermelő övezet peremvidéke a hegyek és a sivatag között. Egy azon kevés szektorok közül, ahol még hasznosítható kátránykészletek találhatók.\nBár a terület elhagyatott, veszélyes ellenséges erők fészkelnek a közelben. Ne becsüld alá őket!\n\n[lightgray]Fedezd fel az olajfeldolgozási lehetőségeket, ha tudod!
+sector.desolateRift.description = Egy extrém veszélyes zóna. Nyersanyagokban gazdag, de szűkös a hely. Magas a kockázat. Építsd szárazföldi és légvédelmet, amint csak tudsz. Ne tévesszen meg a hosszú szünet az ellenség támadásai között.
+sector.nuclearComplex.description = Egy néhai tóriumkitermelő és feldolgozó létesítmény, romokban.\n[lightgray]Fedezd fel a tóriumot és a sokrétű felhasználását!\n\nAz ellenség nagy létszámban van jelen, és folyamatosan megfigyelés alatt tartják a környéket.
+sector.fungalPass.description = Átmeneti terület a magas hegyek és a mélyebben fekvő, spórák uralta lapály között. Egy kisebb ellenséges megfigyelő állomás található itt.\nSemmisítsd meg!\nHasználj Dagger és Crawler egységeket! Pusztítsd el a két támaszpontot!
+sector.biomassFacility.description = A spórák származási helye. Ebben a létesítményben fejlesztették ki őket, és eredetileg itt is gyártották őket.\nFedezd fel az itt található technológiákat. Tenyészd ki a spórákat üzemanyag és műanyagok gyártásához.\n\n[lightgray]A létesítmény pusztulása nyomán a spórák elszabadultak és szétszóródtak a légkörben. A helyi ökoszisztémában semmi sem tudta felvenni a versenyt egy ennyire invazív életformával.
+sector.windsweptIslands.description = Távolabb, a partvonalon túl fekszik ez az elszigetelt szigetcsoport. A feljegyzések szerint egykor [accent]műanyagot[] gyártottak itt.\n\nVerd vissza az ellenség vízi egységeit! Állíts fel egy bázist a szigeteken! Fedezd fel az itt talált gyárakat!
+sector.extractionOutpost.description = Egy távoli ellenséges támaszpont, amelyet az ellenség azért épített, hogy nyersanyagokat juttasson el más szektorokba.\n\nA szektorok közötti szállítási technológia elengedhetetlen a további hódításhoz. Pusztítsd el a bázist. Fejleszd ki a kilövőállást.
+sector.impact0078.description = Itt nyugszanak az ebbe a csillagrendszerbe érkező első csillagközi űrhajó maradványai.\n\nMents ki a romok alól mindent amit csak tudsz. Fedezd fel az épen maradt technológiákat.
+sector.planetaryTerminal.description = A végső célpont.\n\nEzen a vízparti bázison egy olyan építmény található, amely képes támaszpontokat kilőni a közeli bolygókra. Rendkívül jól őrzik.\n\nKészíts vízi egységeket! Ártalmatlanítsd az ellenséget, amilyen gyorsan csak tudod! Találd meg a kilövőszerkezetet!
 sector.coastline.description = Ezen a helyen egy haditengerészeti egység technológiájának maradványait azonosították. Verd vissza az ellenséges támadásokat, foglald el ezt a szektort, és szerezd meg a technológiát.
-sector.navalFortress.description = Az ellenség bázist létesített egy távoli, természetesen-megerősített szigeten. Pusztítsd el ezt az előőrsöt. Szerezd meg a fejlett hadihajó-technológiájukat, és fejleszd ki te is.
+sector.navalFortress.description = Az ellenség bázist létesített egy távoli, természetes erődítményes szigeten. Pusztítsd el ezt az előőrsöt. Szerezd meg a fejlett hadihajó-technológiájukat, és fejleszd ki te is.
 
 sector.onset.name = A Kezdet
 sector.aegis.name = Égisz
@@ -851,31 +851,31 @@ sector.karst.name = Karszt
 sector.origin.name = Eredet
 
 sector.onset.description = Kezdd meg az Erekir meghódítását. Gyűjts nyersanyagokat, állíts elő egységeket, és kezdd el a technológiai fejlesztéseket.
-sector.aegis.description = Ez a szektor Volfrám lelőhelyeket tartalmaz.\nFejleszd ki az [accent]Ütvefúró[]t, hogy ki tudd bányászni ezt a nyersanyagot és elpusztítani az ellenséges bázist a szektorban.
-sector.lake.description = Az Ebben a szektorban lévő Salakos tó nagymértékben korlátozza az ütőképes egységek használatát. A lebegőegységek használata az egyetlen lehetőség.\nFejleszd ki a [accent]Repülőgép Gyár[]at és állíts elő egy [accent]Elude[] egységet, amilyen hamar csak lehet.
+sector.aegis.description = Ez a szektor volfrám-lelőhelyeket tartalmaz.\nFejleszd ki az [accent]Ütvefúrót[], hogy ki tudd bányászni ezt a nyersanyagot, és pusztítsd el az ellenséges bázist a szektorban.
+sector.lake.description = Az ebben a szektorban lévő salakos tó nagymértékben korlátozza a használható egységeket. A lebegőegységek használata az egyetlen lehetőség.\nFejleszd ki a [accent]Repülőgépgyárat[], és állíts elő egy [accent]Elude[] egységet, amilyen hamar csak lehet.
 sector.intersect.description = A letapogatások arra utalnak, hogy ezt a szektort a leszállás után hamarosan több oldalról is megtámadják.\nÁllítsd fel gyorsan a védelmedet, és terjeszkedj minél hamarabb.\n[accent]Mech[] egységekre lesz szükség a terület zord terepviszonyai miatt.
-sector.atlas.description = Ez a szektor változatos terepet tartalmaz, és az ütőképes támadáshoz többféle egységre lesz szükség.\nAz itt felfedezett ellenséges bázisok némelyikén való átjutáshoz is szükség lehet továbbfejlesztett egységekre.\nFejleszd ki az [accent]Elektrolizátor[]t és a [accent]Tank Újratervező[]t.
+sector.atlas.description = Ez a szektor változatos terepet tartalmaz, és az ütőképes támadáshoz többféle egységre lesz szükség.\nAz itt felfedezett ellenséges bázisok némelyikén való átjutáshoz is továbbfejlesztett egységekre lehet szükség.\nFejleszd ki az [accent]Elektrolizátort[] és a [accent]Tank újratervezőt[].
 sector.split.description = A minimális ellenséges jelenlét miatt ez a szektor tökéletes az új nyersanyagszállító technológiák tesztelésére.
-sector.basin.description = Jelentős ellenséges jelenlét lett érzékelve ebben a szektorban.\nÉpíts gyorsan egységeket, és foglalj el ellenséges Támaszpontokat, hogy megvethesd a lábad.
-sector.marsh.description = Ebben a szektorban rengeteg Arkycit található, de kevés a Víznyelő.\nÉpíts [accent]Kémiai Égető Kamrá[]t az áramfejlesztéshez.
+sector.basin.description = Jelentős ellenséges jelenlét lett érzékelve ebben a szektorban.\nÉpíts gyorsan egységeket, és foglald el az ellenséges támaszpontokat, hogy megvethesd a lábad.
+sector.marsh.description = Ebben a szektorban rengeteg arkicit található, de kevés a kürtő.\nÉpíts [accent]Kémiai égetőkamrát[] az áramfejlesztéshez.
 sector.peaks.description = A hegyvidéki terep ebben a szektorban a legtöbb egységet használhatatlanná teszi. Repülő egységekre lesz szükség.\nVigyázz az ellenséges légvédelmi létesítményekkel. Lehetséges, hogy az ilyen létesítményeket hatástalanítani lehet a támogató épületeik célba vételével.
-sector.ravine.description = A szektorban nincs észlelve ellenséges Támaszpont, bár ez egy fontos szállítási útvonal az ellenség számára. Várhatóan változatos ellenséges erőkkel kell számolni. Gyárts [accent]Elektrometál[]t. Építs [accent]Afflict[] lövegtornyokat.
+sector.ravine.description = A szektorban nem észlelhető ellenséges támaszpont, de ez egy fontos szállítási útvonal az ellenség számára, így változatos ellenséges erőkkel kell számolni.\nTermelj [accent]elektrometált[]. Építs [accent]Afflict[] lövegtornyokat.
 sector.caldera-erekir.description = Ebben a szektorban a feltárható nyersanyagok több szigeten szétszóródva találhatóak.\nFejleszd ki és helyezd üzembe a drónalapú szállítmányozást.
-sector.stronghold.description = A nagy ellenséges tábor ebben a szektorban jelentős [accent]Tórium[] készleteket őriz.\nHasználd magasabb szintű egységek és lövegtornyok fejlesztésére.
-sector.crevice.description = Ebben a szektorban az ellenség kegyetlen támadóerőket fog mozgósítani, hogy kiiktassa a bázisodat.\nGyűjts [accent]Karbid[]ot, majd fejleszd ki és építs [accent]Pirolízis Erőmű[]vet, mert lehet, hogy nélkülözhetetlenek lesznek a túléléshez.
-sector.siege.description = Ebben a szektorban két párhuzamos kanyon található, amelyek két irányból érkező támadásokat tesznek lehetővé.\nFejleszd ki a [accent]Cianogén[]t, hogy még erősebb tankegységeket hozhass létre.\nVigyázat: Ellenséges, nagy hatótávolságú rakéták észlelve. A rakéták a becsapódásuk előtt megsemmisíthetők.
-sector.crossroads.description = Az ellenséges támaszpontok ebben a szektorban változó terepviszonyok között alakultak ki. Ahhoz, hogy alkalmazkodni tudj kutass különböző egységek után.\nEzenkívül egyes bázisokat pajzsok védenek. Találd ki, hogyan táplálják őket.
-sector.karst.description = Ez a szektor gazdag a nyersanyagokban, de amint egy új Támaszpont leszáll, az ellenség megtámadja azt.\nHasználd ki a nyersanyagokat és fedezd fel a [accent]Tóritkvarc[]ot.
-sector.origin.description = Az utolsó szektor, jelentős ellenséges jelenléttel.\nNem valószínű, hogy maradt további fejlesztési lehetőség - koncentrálj az ellenséges Támaszpontok elpusztítására.
+sector.stronghold.description = A nagy ellenséges tábor ebben a szektorban jelentős mennyiségű [accent]tóriumot[] őriz.\nHasználd magasabb szintű egységek és lövegtornyok fejlesztésére.
+sector.crevice.description = Ebben a szektorban az ellenség kegyetlen támadóerőket fog mozgósítani, hogy kiiktassa a bázisodat.\nA [accent]karbid[] és a [accent]Pirolízis erőmű[] kifejlesztése nélkülözhetetlen lehet a túléléshez.
+sector.siege.description = Ebben a szektorban két párhuzamos kanyon található, amelyek két irányból érkező támadásokat tesznek lehetővé.\nFejleszd ki a [accent]diciánt[], hogy még erősebb tankegységeket hozhass létre.\nVigyázat: ellenséges, nagy hatótávolságú rakéták észlelve. A rakéták a becsapódásuk előtt megsemmisíthetők.
+sector.crossroads.description = Az ellenséges támaszpontok ebben a szektorban változó terepviszonyok között alakultak ki. Ahhoz, hogy alkalmazkodni tudj, fejlessz ki különböző egységeket.\nEzenkívül egyes bázisokat pajzsok védenek. Találd ki, hogyan táplálják őket.
+sector.karst.description = Ez a szektor gazdag a nyersanyagokban, de amint egy új támaszpont leszáll, az ellenség megtámadja azt.\nHasználd ki a nyersanyagokat és fedezd fel a [accent]tóritkvarcot[].
+sector.origin.description = Az utolsó szektor, jelentős ellenséges jelenléttel.\nNem valószínű, hogy további fejlesztési lehetőségek maradtak – koncentrálj az ellenséges támaszpontok elpusztítására.
 
 status.burning.name = Égő
-status.freezing.name = Fagyasztó
+status.freezing.name = Fagyos
 status.wet.name = Nedves
 status.muddy.name = Sáros
 status.melting.name = Olvadó
 status.sapped.name = Kiszáradt
 status.electrified.name = Elektromos
-status.spore-slowed.name = Spóra lassított
+status.spore-slowed.name = Spórával lassított
 status.tarred.name = Kátrányozott
 status.overdrive.name = Túlhajtás
 status.overclock.name = Túlhúzás
@@ -887,28 +887,28 @@ status.boss.name = Őrző
 settings.language = Nyelvek
 settings.data = Játékadatok
 settings.reset = Alapértelmezett
-settings.rebind = Újrakötés
-settings.resetKey = Visszaállítás
+settings.rebind = Átállítás
+settings.resetKey = Vissza-\nállítás
 settings.controls = Irányítás
 settings.game = Játék
 settings.sound = Hangok
 settings.graphics = Grafika
 settings.cleardata = Játékadatok törlése...
 settings.clear.confirm = Biztosan törlöd ezeket az adatokat?\nA műveletet nem lehet visszavonni!
-settings.clearall.confirm = [scarlet] FIGYELEM! []\nEz törli az összes adatot, beleértve a mentéseket, pályákat, felfedezéseket és a billentyű beállításokat.\nAz 'OK' gomb megnyomásával a játék minden adatot töröl és automatikusan kilép.
+settings.clearall.confirm = [scarlet]FIGYELEM![]\nEz törli az összes adatot, beleértve a mentéseket, pályákat, felfedezéseket és a billentyűbeállításokat.\nAz „OK” gomb megnyomásával a játék minden adatot töröl, és automatikusan kilép.
 settings.clearsaves.confirm = Biztosan törlöd az összes mentést?
 settings.clearsaves = Mentések törlése
 settings.clearresearch = Fejlesztések törlése
 settings.clearresearch.confirm = Biztosan törlöd az összes fejlesztést?
-settings.clearcampaignsaves = Hadjárat mentések törlése
-settings.clearcampaignsaves.confirm = Biztosan törlöd az összes hadjárat mentést?
-paused = [accent]< Megállítva >
+settings.clearcampaignsaves = Hadjáratmentések törlése
+settings.clearcampaignsaves.confirm = Biztosan törlöd az összes hadjáratmentést?
+paused = [accent]< Szünet >
 clear = Törlés
 banned = [scarlet]Kitiltva
 unsupported.environment = [scarlet]Nem támogatott környezet
 yes = Igen
 no = Nem
-info.title = Infó
+info.title = Információ
 error.title = [scarlet]Hiba történt
 error.crashtitle = Hiba történt
 unit.nobuild = [scarlet]Az egység nem tud építeni
@@ -924,9 +924,9 @@ stat.maxefficiency = Maximális hatékonyság
 stat.booster = Erősítő
 stat.tiles = Szükséges talaj
 stat.affinities = Módosító körülmények
-stat.opposites = Eltérések
+stat.opposites = Ellentettek
 stat.powercapacity = Maximális tárolási kapacitás
-stat.powershot = Áram/Lövés
+stat.powershot = Áram/lövés
 stat.damage = Sebzés
 stat.targetsair = Repülő célpontok
 stat.targetsground = Földi célpontok
@@ -935,39 +935,39 @@ stat.launchtime = Kilövések közti idő
 stat.shootrange = Hatótáv
 stat.size = Méret
 stat.displaysize = Felbontás
-stat.liquidcapacity = Folyadék kapacitás
-stat.powerrange = Áram hatótáv
-stat.linkrange = Kapcsolat hatótáv
-stat.instructions = Instrukciók
-stat.powerconnections = Maximális kapcsolat
+stat.liquidcapacity = Folyadékkapacitás
+stat.powerrange = Áram hatótávja
+stat.linkrange = Kapcsolat hatótávja
+stat.instructions = Utasítások
+stat.powerconnections = Max. kapcsolatok
 stat.poweruse = Áramhasználat
-stat.powerdamage = Áram/Sebzés
-stat.itemcapacity = Nyersanyag kapacitás
-stat.memorycapacity = Memória méret
+stat.powerdamage = Áram/sebzés
+stat.itemcapacity = Nyersanyag-kapacitás
+stat.memorycapacity = Memóriakapacitás
 stat.basepowergeneration = Alap áramtermelés
 stat.productiontime = Gyártási idő
 stat.repairtime = Teljes javítási idő
 stat.repairspeed = Javítási sebesség
 stat.weapons = Fegyverek
-stat.bullet = Töltény
+stat.bullet = Lövedék
 stat.moduletier = Modul szintje
-stat.unittype = Egység típus
+stat.unittype = Egység típusa
 stat.speedincrease = Gyorsítás
 stat.range = Hatótáv
-stat.drilltier = Kitermelhető
+stat.drilltier = Kitermelhetők
 stat.drillspeed = Alap termelési sebesség
 stat.boosteffect = Erősítés hatása
-stat.maxunits = Maximális aktív egység
+stat.maxunits = Max. aktív egységek
 stat.health = Életpontok
 stat.armor = Páncél
 stat.buildtime = Építési időtartam
-stat.maxconsecutive = Maximum egymást követő
+stat.maxconsecutive = Max. egymást követő
 stat.buildcost = Építési költség
 stat.inaccuracy = Pontatlanság
 stat.shots = Lövések
 stat.reload = Tüzelési sebesség
 stat.ammo = Lőszer
-stat.shieldhealth = Pajzs élete
+stat.shieldhealth = Pajzs életereje
 stat.cooldowntime = Újratöltés időtartama
 stat.explosiveness = Robbanékonyság
 stat.basedeflectchance = Alap hárítási esély
@@ -983,35 +983,35 @@ stat.speed = Sebesség
 stat.buildspeed = Építési sebesség
 stat.minespeed = Termelési sebesség
 stat.minetier = Termelési szint
-stat.payloadcapacity = Rakomány kapacitás
+stat.payloadcapacity = Rakománykapacitás
 stat.abilities = Képességek
 stat.canboost = Erősíthető
 stat.flying = Repül
-stat.ammouse = Lőszer használat
-stat.damagemultiplier = Sebzés szorzó
-stat.healthmultiplier = Életerő szorzó
-stat.speedmultiplier = Sebesség szorzó
-stat.reloadmultiplier = Újratöltés szorzó
-stat.buildspeedmultiplier = Építési sebesség szorzó
+stat.ammouse = Lőszerhasználat
+stat.damagemultiplier = Sebzésszorzó
+stat.healthmultiplier = Életerőszorzó
+stat.speedmultiplier = Sebességszorzó
+stat.reloadmultiplier = Újratöltési szorzó
+stat.buildspeedmultiplier = Építési sebességszorzó
 stat.reactive = Reakciók
 stat.immunities = Immunitások
 stat.healing = Gyógyulás
 
 ability.forcefield = Erőtér
 ability.repairfield = Javító mező
-ability.statusfield = Állapot mező
+ability.statusfield = Állapotmező
 ability.unitspawn = Gyár
-ability.shieldregenfield = Pajzs regeneráló mező
+ability.shieldregenfield = Pajzsregeneráló mező
 ability.movelightning = Villámcsapás
 ability.shieldarc = Pajzs ív
-ability.suppressionfield = Javítás elnyomás
-ability.energyfield = Energia mező
+ability.suppressionfield = Javítás elnyomása
+ability.energyfield = Energiamező
 ability.energyfield.sametypehealmultiplier = [lightgray]Azonos típusú gyógyítás: [white]{0}%
 ability.energyfield.maxtargets = [lightgray]Célpontok maximális száma: [white]{0}
 ability.regen = Regeneráció
 
-bar.onlycoredeposit = Csak a Támaszpont elhelyezése megengedett
-bar.drilltierreq = Erősebb Fúró/Vágó szükséges
+bar.onlycoredeposit = Csak a támaszpont elhelyezése megengedett
+bar.drilltierreq = Erősebb fúró szükséges
 bar.noresources = Hiányzó nyersanyagok
 bar.corereq = Támaszpont szükséges
 bar.corefloor = Támaszpont zónacsempe szükséges
@@ -1036,42 +1036,42 @@ bar.heatpercent = Hő: {0} ({1}%)
 bar.power = Áram
 bar.progress = Építés állapota
 bar.loadprogress = Állapot
-bar.launchcooldown = Lehűlés indítása
+bar.launchcooldown = Kilövés visszaszámlálása
 bar.input = Bemenet
 bar.output = Kimenet
 bar.strength = [stat]{0}[lightgray]x erő
 
-units.processorcontrol = [lightgray]Processzor vezérelt
+units.processorcontrol = [lightgray]Processzorvezérelt
 
 bullet.damage = [stat]{0}[lightgray] sebzés
 bullet.splashdamage = [stat]{0}[lightgray] területi sebzés ~[stat] {1}[lightgray] csempe
 bullet.incendiary = [stat]gyújtó
 bullet.homing = [stat]nyomkövető
 bullet.armorpierce = [stat]páncéltörő
-bullet.maxdamagefraction = [stat]{0}%[lightgray] sebzés határérték
-bullet.suppression = [stat]{0} mp[lightgray] javítás elnyomás ~ [stat]{1}[lightgray] csempe
-bullet.interval = [stat]{0}/mp[lightgray] időszakos töltény(ek):
-bullet.frags = [stat]{0}[lightgray]x repesz lövedék(ek):
-bullet.lightning = [stat]{0}[lightgray]x villámcsapás ~ [stat]{1}[lightgray] sebzés
-bullet.buildingdamage = [stat]{0}%[lightgray] épület sebzés
+bullet.maxdamagefraction = [stat]{0}%[lightgray] sebzési határérték
+bullet.suppression = [stat]{0} mp[lightgray] javításelnyomás ~[stat]{1}[lightgray] csempe
+bullet.interval = [stat]{0}/mp[lightgray] lövedékek időköze:
+bullet.frags = [stat]{0}[lightgray]x repeszlövedék:
+bullet.lightning = [stat]{0}[lightgray]x villámcsapás ~[stat]{1}[lightgray] sebzés
+bullet.buildingdamage = [stat]{0}%[lightgray] épületsebzés
 bullet.knockback = [stat]{0}[lightgray] hátralökés
 bullet.pierce = [stat]{0}[lightgray]x átütő erő
 bullet.infinitepierce = [stat]átütő erő
-bullet.healpercent = [stat]{0}[lightgray]% gyógyító
-bullet.healamount = [stat]{0}[lightgray] közvetlen javító
-bullet.multiplier = [stat]{0}[lightgray]x lövedék szorzó
-bullet.reload = [stat]{0}[lightgray]x tüzelési sebesség
-bullet.range = [stat]{0}[lightgray] csempe tartomány
+bullet.healpercent = [stat]{0}%[lightgray] javítás
+bullet.healamount = [stat]{0}[lightgray] közvetlen javítás
+bullet.multiplier = [stat]{0}[lightgray]x lőszerszorzó
+bullet.reload = [stat]{0}%[lightgray] tüzelési sebesség
+bullet.range = [stat]{0}[lightgray] csempés hatótáv
 
-unit.blocks = csempe
+unit.blocks = blokk
 unit.blockssquared = blokk²
-unit.powersecond = áram egység/mp
+unit.powersecond = áramegység/mp
 unit.tilessecond = csempe/mp
-unit.liquidsecond = folyadék egység/mp
+unit.liquidsecond = folyadékegység/mp
 unit.itemssecond = nyersanyag/mp
-unit.liquidunits = folyadék egység
-unit.powerunits = áram egység
-unit.heatunits = hő egység
+unit.liquidunits = folyadékegység
+unit.powerunits = áramegység
+unit.heatunits = hőegység
 unit.degrees = fok
 unit.seconds = másodperc
 unit.minutes = perc
@@ -1079,10 +1079,10 @@ unit.persecond = /mp
 unit.perminute = /perc
 unit.timesspeed = x sebesség
 unit.percent = %
-unit.shieldhealth = pajzs állapot
+unit.shieldhealth = pajzs életereje
 unit.items = nyersanyag
 unit.thousands = k
-unit.millions = Mil
+unit.millions = mil
 unit.billions = Mrd
 unit.pershot = /lövés
 category.purpose = Cél
@@ -1090,33 +1090,33 @@ category.general = Általános
 category.power = Áram
 category.liquids = Folyadékok
 category.items = Nyersanyagok
-category.crafting = Bemenet/Kimenet
+category.crafting = Bemenet/kimenet
 category.function = Funkció
-category.optional = Lehetséges erősítés
-setting.skipcoreanimation.name = Támaszpont indítás/leszállás animáció kihagyása
+category.optional = Lehetséges fejlesztések
+setting.skipcoreanimation.name = Támaszpont indítási/leszállási animáció kihagyása
 setting.landscape.name = Fekvő mód zárolása
 setting.shadows.name = Árnyékok
-setting.blockreplace.name = Automatikus blokk javaslatok
+setting.blockreplace.name = Automatikus blokkjavaslatok
 setting.linear.name = Lineáris szűrés
 setting.hints.name = Tanácsok
 setting.logichints.name = Logikai tanácsok
 setting.backgroundpause.name = Szüneteltetés a háttérben
 setting.buildautopause.name = Automatikus szünet építéskor
 setting.doubletapmine.name = Bányászás dupla kattintással/koppintással
-setting.commandmodehold.name = Tartsd lenyomva a parancs módhoz
-setting.distinctcontrolgroups.name = Egységenként legfeljebb egy ellenőrző csoport
-setting.modcrashdisable.name = Modok letiltása indítási összeomláskor
+setting.commandmodehold.name = Lenyomva tartás a parancs módhoz
+setting.distinctcontrolgroups.name = Egységenként legfeljebb egy vezérlőcsoport
+setting.modcrashdisable.name = Modok letiltása indításkori összeomláskor
 setting.animatedwater.name = Animált felületek
 setting.animatedshields.name = Animált pajzsok
-setting.playerindicators.name = Játékos mutató
-setting.indicators.name = Ellenség mutató
+setting.playerindicators.name = Játékosjelzők
+setting.indicators.name = Ellenségjelzők
 setting.autotarget.name = Automatikus célzás
 setting.keyboard.name = Irányítás egérrel és billentyűzettel
 setting.touchscreen.name = Irányítás érintőképernyővel
-setting.fpscap.name = Max FPS
+setting.fpscap.name = FPS-korlát
 setting.fpscap.none = Nincs
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI méretezése
+setting.uiscale.name = Felület méretezése
 setting.uiscale.description = A módosítások alkalmazásához újraindítás szükséges.
 setting.swapdiagonal.name = Mindig átlós elhelyezés
 setting.difficulty.training = Kiképzés
@@ -1126,78 +1126,78 @@ setting.difficulty.hard = Nehéz
 setting.difficulty.insane = Őrült
 setting.difficulty.name = Nehézség:
 setting.screenshake.name = Képernyő rázkódása
-setting.bloomintensity.name = Bloom intenzitás
-setting.bloomblur.name = Bloom Blur
+setting.bloomintensity.name = Bloom intenzitása
+setting.bloomblur.name = Bloom elmosása
 setting.effects.name = Hatások megjelenítése
-setting.destroyedblocks.name = Elpusztított épületek megjelenítése
-setting.blockstatus.name = Épületek állapotának megjelenítése
-setting.conveyorpathfinding.name = Szállítószalag útvonalkeresés építéskor
-setting.sensitivity.name = Kontroller érzékenység
+setting.destroyedblocks.name = Elpusztított blokkok megjelenítése
+setting.blockstatus.name = Blokkok állapotának megjelenítése
+setting.conveyorpathfinding.name = Szállítószalag útvonalkeresése építéskor
+setting.sensitivity.name = Kontroller érzékenysége
 setting.saveinterval.name = Mentési időköz
 setting.seconds = {0} másodperc
 setting.milliseconds = {0} ezredmásodperc
 setting.fullscreen.name = Teljes képernyő
 setting.borderlesswindow.name = Keret nélküli ablak
 setting.borderlesswindow.name.windows = Keret nélküli teljes képernyő
-setting.borderlesswindow.description = A változások alkalmazásához újraindításra lehet szükség.
-setting.fps.name = FPS, memória használat és ping megjelenítése
+setting.borderlesswindow.description = A változtatások érvénybe lépéséhez újraindításra lehet szükség.
+setting.fps.name = FPS, memóriahasználat és ping megjelenítése
 setting.console.name = Konzol engedélyezése
 setting.smoothcamera.name = Egyenletes kamera
 setting.vsync.name = VSync
-setting.pixelate.name = Pixeles
+setting.pixelate.name = Pixelesítés
 setting.minimap.name = Minitérkép megjelenítése
-setting.coreitems.name = A Támaszpontban lévő nyersanyagok megjelenítése
-setting.position.name = A játékos pozíciójának megjelenítése
+setting.coreitems.name = Támaszpontban lévő nyersanyagok megjelenítése
+setting.position.name = Játékos pozíciójának megjelenítése
 setting.mouseposition.name = Egér pozíciójának megjelenítése
-setting.musicvol.name = Zene hangerő
-setting.atmosphere.name = Bolygó atmoszféra megjelenítése
+setting.musicvol.name = Zene hangereje
+setting.atmosphere.name = Bolygóatmoszféra megjelenítése
 setting.drawlight.name = Sötét/világos fényhatások
 setting.ambientvol.name = Környezeti hangerő
 setting.mutemusic.name = Zene némítása
-setting.sfxvol.name = SFX hangerő
+setting.sfxvol.name = Hanghatások hangereje
 setting.mutesound.name = Hang némítása
 setting.crashreport.name = Névtelen összeomlási jelentések
 setting.savecreate.name = Automatikus mentés
 setting.steampublichost.name = Nyilvános játék láthatósága
-setting.playerlimit.name = Játékos limit
+setting.playerlimit.name = Játékoskorlát
 setting.chatopacity.name = Csevegő átlátszatlansága
 setting.lasersopacity.name = Villanyvezeték átlátszatlansága
 setting.bridgeopacity.name = Híd átlátszatlansága
-setting.playerchat.name = Játékos szóbuborékok megjelenítése
-setting.showweather.name = Időjárás grafika megjelenítése
+setting.playerchat.name = Játékosok csevegőbuborékainak megjelenítése
+setting.showweather.name = Időjárásgrafika megjelenítése
 setting.hidedisplays.name = Logikai kijelzők elrejtése
-setting.macnotch.name = A felület igazítása a bevágás megjelenítéséhez
-setting.macnotch.description = A változtatások alkalmazásához újra kell indítani
+setting.macnotch.name = A felület igazítása a kijelző bevágásához
+setting.macnotch.description = A változtatások érvénybe lépéséhez újraindítás szükséges
 steam.friendsonly = Csak barátok
-steam.friendsonly.tooltip = Csak a Steam-barátok tudnak kapcsolódni a játékodhoz.\nHa nem jelölöd be ezt a négyzetet, a játékod nyilvános lesz - bárki kapcsolódhat hozzá.
+steam.friendsonly.tooltip = Csak a Steam-barátok tudnak kapcsolódni a játékodhoz.\nHa nem jelölöd be ezt a négyzetet, a játékod nyilvános lesz – bárki kapcsolódhat hozzá.
 public.beta = Ne feledd, hogy a játék béta verziójában nem tudsz nyilvános szobát nyitni.
-uiscale.reset = Az UI mérete megváltozott.\nAz "OK" gombbal megerősítheted ezt a méretet.\n[scarlet]Visszavonás és kilépés [accent] {0}[] másodperc múlva...
-uiscale.cancel = Mégsem és kilépés
+uiscale.reset = A felület mérete megváltozott.\nAz „OK” gombbal megerősítheted ezt a méretet.\n[scarlet]Visszavonás és kilépés [accent] {0}[] másodperc múlva...
+uiscale.cancel = Mégse és kilépés
 setting.bloom.name = Bloom
-keybind.title = Gyorsbillentyűk
+keybind.title = Billentyűk átállítása
 keybinds.mobile = [scarlet]A legtöbb billentyűfunkció mobilon nem működik. Csak a mozgás támogatott.
 category.general.name = Általános
 category.view.name = Nézet
-category.command.name = Egység parancs
+category.command.name = Egységparancs
 category.multiplayer.name = Többjátékos
-category.blocks.name = Blokk választás
+category.blocks.name = Blokkválasztás
 placement.blockselectkeys = \n[lightgray]Kulcs: [{0},
 keybind.respawn.name = Újraéledés
 keybind.control.name = Egység irányítása
 keybind.clear_building.name = Épület törlése
 keybind.press = Nyomj meg egy gombot...
-keybind.press.axis = Nyomj meg egy kart, vagy gombot...
-keybind.screenshot.name = Pálya képernyőkép
+keybind.press.axis = Nyomj meg egy kart vagy gombot...
+keybind.screenshot.name = Pálya képernyőképe
 keybind.toggle_power_lines.name = Villanyvezetékek be/ki
-keybind.toggle_block_status.name = Épület állapot be/ki
+keybind.toggle_block_status.name = Blokkállapotok be/ki
 keybind.move_x.name = Mozgás vízszintesen
 keybind.move_y.name = Mozgás függőlegesen
 keybind.mouse_move.name = Egér követése
 keybind.pan.name = Felderítés
 keybind.boost.name = Erősítés
 keybind.command_mode.name = Parancs mód
-keybind.command_queue.name = Egység parancsok sorba állítása
-keybind.create_control_group.name = Vezérlő csoport készítése
+keybind.command_queue.name = Egységparancsok sorba állítása
+keybind.create_control_group.name = Vezérlőcsoport készítése
 keybind.cancel_orders.name = Parancsok visszavonása
 
 keybind.unit_stance_shoot.name = Egység viselkedése: lövés
@@ -1206,15 +1206,15 @@ keybind.unit_stance_pursue_target.name = Egység viselkedése: célpont követé
 keybind.unit_stance_patrol.name = Egység viselkedése: járőrözés
 keybind.unit_stance_ram.name = Egység viselkedése: ütközés
 
-keybind.unit_command_move = Egység parancs: mozgás
-keybind.unit_command_repair = Egység parancs: javítás
-keybind.unit_command_rebuild = Egység parancs: újraépítés
-keybind.unit_command_assist = Egység parancs: támogatás
-keybind.unit_command_mine = Egység parancs: bányászás
-keybind.unit_command_boost = Egység parancs: erősítés
-keybind.unit_command_load_units = Egység parancs: egységek berakodása a rakományszállítóba
-keybind.unit_command_load_blocks = Egység parancs: blokkok berakodása a rakományszállítóba
-keybind.unit_command_unload_payload = Egység parancs: kirakodás a rakományszállítóból
+keybind.unit_command_move = Egységparancs: mozgás
+keybind.unit_command_repair = Egységparancs: javítás
+keybind.unit_command_rebuild = Egységparancs: újjáépítés
+keybind.unit_command_assist = Egységparancs: támogatás
+keybind.unit_command_mine = Egységparancs: bányászás
+keybind.unit_command_boost = Egységparancs: erősítés
+keybind.unit_command_load_units = Egységparancs: egységek berakodása
+keybind.unit_command_load_blocks = Egységparancs: blokkok berakodása
+keybind.unit_command_unload_payload = Egységparancs: kirakodás
 
 keybind.rebuild_select.name = Régió újjáépítése
 keybind.schematic_select.name = Terület kijelölése
@@ -1227,24 +1227,24 @@ keybind.block_select_left.name = Blokk váltás balra
 keybind.block_select_right.name = Blokk váltás jobbra
 keybind.block_select_up.name = Blokk váltás fel
 keybind.block_select_down.name = Blokk váltás le
-keybind.block_select_01.name = Kategória/blokk választás 1
-keybind.block_select_02.name = Kategória/blokk választás 2
-keybind.block_select_03.name = Kategória/blokk választás 3
-keybind.block_select_04.name = Kategória/blokk választás 4
-keybind.block_select_05.name = Kategória/blokk választás 5
-keybind.block_select_06.name = Kategória/blokk választás 6
-keybind.block_select_07.name = Kategória/blokk választás 7
-keybind.block_select_08.name = Kategória/blokk választás 8
-keybind.block_select_09.name = Kategória/blokk választás 9
-keybind.block_select_10.name = Kategória/blokk választás 10
+keybind.block_select_01.name = 1. kategória/blokk választása
+keybind.block_select_02.name = 2. kategória/blokk választása
+keybind.block_select_03.name = 3. kategória/blokk választása
+keybind.block_select_04.name = 4. kategória/blokk választása
+keybind.block_select_05.name = 5. kategória/blokk választása
+keybind.block_select_06.name = 6. kategória/blokk választása
+keybind.block_select_07.name = 7. kategória/blokk választása
+keybind.block_select_08.name = 8. kategória/blokk választása
+keybind.block_select_09.name = 9. kategória/blokk választása
+keybind.block_select_10.name = 10. kategória/blokk választása
 keybind.fullscreen.name = Teljes képernyő be/ki
-keybind.select.name = Kiválasztás/Lövés
+keybind.select.name = Kiválasztás/lövés
 keybind.diagonal_placement.name = Átlós elhelyezés
-keybind.pick.name = Blokk másolása
+keybind.pick.name = Blokk kiválasztása
 keybind.break_block.name = Blokk törlése
-keybind.select_all_units.name = Minden egység kijelölése
-keybind.select_all_unit_factories.name = Minden egység gyár kijelölése
-keybind.deselect.name = Blokk választás törlése
+keybind.select_all_units.name = Összes egység kijelölése
+keybind.select_all_unit_factories.name = Összes egységgyár kijelölése
+keybind.deselect.name = Blokkkijelölés törlése
 keybind.pickupCargo.name = Rakomány felvétele
 keybind.dropCargo.name = Rakomány lerakása
 keybind.shoot.name = Lövés
@@ -1253,79 +1253,79 @@ keybind.menu.name = Menü
 keybind.pause.name = Szünet
 keybind.pause_building.name = Építés szüneteltetése/folytatása
 keybind.minimap.name = Minitérkép
-keybind.planet_map.name = Bolygó térkép
+keybind.planet_map.name = Bolygótérkép
 keybind.research.name = Fejlesztés
 keybind.block_info.name = Blokk infó
 keybind.chat.name = Csevegés
 keybind.player_list.name = Játékosok listája
 keybind.console.name = Konzol
 keybind.rotate.name = Forgatás
-keybind.rotateplaced.name = Meglévő forgatása (tartsd nyomva)
-keybind.toggle_menus.name = Menük váltása
+keybind.rotateplaced.name = Meglévő forgatása (nyomva tartva)
+keybind.toggle_menus.name = Menük be/ki
 keybind.chat_history_prev.name = Csevegés görgetése felfelé
 keybind.chat_history_next.name = Csevegés görgetése lefelé
 keybind.chat_scroll.name = Csevegés görgetése
-keybind.chat_mode.name = Csevegés mód megváltoztatása
+keybind.chat_mode.name = Csevegési mód megváltoztatása
 keybind.drop_unit.name = Egység eldobása
-keybind.zoom_minimap.name = Zoom a minitérképen
+keybind.zoom_minimap.name = Nagyítás a minitérképen
 mode.help.title = Játékmódok leírása
-mode.survival.name = Túlélő
-mode.survival.description = A normál mód. Korlátozott nyersanyag és automatikusan érkező hullámok.\n[gray]Szükséges hozzá egy ellenséges kezdőpont a pályán.
+mode.survival.name = Túlélés
+mode.survival.description = A normál mód. Korlátozott nyersanyagok, és automatikusan érkező hullámok.\n[gray]Ellenséges kezdőpont szükséges hozzá a pályán.
 mode.sandbox.name = Homokozó
 mode.sandbox.description = Végtelen nyersanyagforrás, nincs időzítés a hullámokhoz.
 mode.editor.name = Szerkesztő
 mode.pvp.name = PvP
-mode.pvp.description = Harcolj más játékosok ellen.\n[gray]Szükséges hozzá legalább két különböző színű Támaszpont a pályán.
+mode.pvp.description = Harcolj más játékosok ellen.\n[gray]Legalább két különböző színű támaszpont szükséges hozzá a pályán.
 mode.attack.name = Támadás
-mode.attack.description = Pusztítsd el az ellenség bázisát. \n[gray]Szükséges hozzá egy piros Támaszpont a pályán.
+mode.attack.description = Pusztítsd el az ellenség bázisát. \n[gray]Piros támaszpont szükséges hozzá a pályán.
 mode.custom = Egyéni szabályok
 
 rules.invaliddata = Érvénytelen adatok vannak a vágólapon.
-rules.hidebannedblocks = Tiltott épületek elrejtése
+rules.hidebannedblocks = Tiltott blokkok elrejtése
 rules.infiniteresources = Végtelen nyersanyagforrás
-rules.onlydepositcore = Csak Támaszpontok elhelyezése engedélyezett
+rules.onlydepositcore = Csak a támaszpontok elhelyezése engedélyezett
 rules.derelictrepair = Az elhagyatott épületek javításának engedélyezése
-rules.reactorexplosions = Reaktor robbanás
-rules.coreincinerates = Többlet nyersanyagok megsemmisítése a Támaszpontban
-rules.disableworldprocessors = Világprocesszorok letiltása
+rules.reactorexplosions = Reaktorrobbanások
+rules.coreincinerates = Többletnyersanyagok megsemmisítése a támaszpontban
+rules.disableworldprocessors = Világfeldolgozók letiltása
 rules.schematic = Vázlatok engedélyezése
-rules.wavetimer = Hullám időzítő
-rules.wavesending = Hullám küldése
+rules.wavetimer = Hullámok időzítése
+rules.wavesending = Hullámok küldése
 rules.waves = Hullámok
-rules.attack = Támadás mód
-rules.buildai = Épületalkotó AI
-rules.buildaitier = Épületalkotó AI szintje
-rules.rtsai = RTS AI [red](WIP)
-rules.rtsminsquadsize = Minimális osztag méret
-rules.rtsmaxsquadsize = Maximális osztag méret
-rules.rtsminattackweight = Minimális támadási "lépéselőny"
-rules.cleanupdeadteams = A legyőzött csapatépületek törlése (PvP)
+rules.attack = Támadási mód
+rules.buildai = Bázisépítő MI
+rules.buildaitier = Építő MI szintje
+rules.rtsai = RTS MI [red](WIP)
+rules.rtsminsquadsize = Minimális osztagméret
+rules.rtsmaxsquadsize = Maximális osztagméret
+rules.rtsminattackweight = Minimális támadási súly
+rules.cleanupdeadteams = Legyőzött csapatok épületeinek törlése (PvP)
 rules.corecapture = Támaszpont elfoglalása megsemmisítéskor
-rules.polygoncoreprotection = Poligonális Támaszpont védelem
+rules.polygoncoreprotection = Poligonális támaszpontvédelem
 rules.placerangecheck = Elhelyezési tartomány ellenőrzése
-rules.enemyCheat = Végtelen ellenséges csapat erőforrások
-rules.blockhealthmultiplier = Épület életpont szorzó
-rules.blockdamagemultiplier = Épület sebzés szorzó
-rules.unitbuildspeedmultiplier = Egység gyártási sebesség szorzó
-rules.unitcostmultiplier = Egységköltség szorzó
-rules.unithealthmultiplier = Egység életpont szorzó
-rules.unitdamagemultiplier = Egység sebzés szorzó
-rules.unitcrashdamagemultiplier = Egység ütközési sebzés szorzó
-rules.solarmultiplier = Napenergia szorzó
-rules.unitcapvariable = A Támaszpontok befolyásolják a legyártható egységek darabszámát
-rules.unitcap = Alap egység-darabszám
-rules.limitarea = Játékterület korlátozása a pályán
-rules.enemycorebuildradius = Ellenséges Támaszpont körüli tiltott zóna sugara:[lightgray] (csempe)
+rules.enemyCheat = Végtelen ellenséges csapaterőforrások
+rules.blockhealthmultiplier = Épület életpontszorzója
+rules.blockdamagemultiplier = Épület sebzésszorzója
+rules.unitbuildspeedmultiplier = Egységgyártás sebességének szorzója
+rules.unitcostmultiplier = Egység költségszorzója
+rules.unithealthmultiplier = Egység életpontszorzója
+rules.unitdamagemultiplier = Egység sebzésszorzója
+rules.unitcrashdamagemultiplier = Egység ütközési sebzésszorzója
+rules.solarmultiplier = Napenergia szorzója
+rules.unitcapvariable = A támaszpontok befolyásolják a gyártható egységek darabszámát
+rules.unitcap = Alap egységdarabszám
+rules.limitarea = Játékterület korlátozása
+rules.enemycorebuildradius = Ellenséges támaszpont körüli tiltott zóna sugara:[lightgray] (csempe)
 rules.wavespacing = A hullámok közötti szünetek ideje:[lightgray] (mp)
 rules.initialwavespacing = Az első hullám előtti szünet ideje:[lightgray] (mp)
-rules.buildcostmultiplier = Építési költség szorzó
-rules.buildspeedmultiplier = Építési sebesség szorzó
-rules.deconstructrefundmultiplier = Bontási visszatérítés szorzó
+rules.buildcostmultiplier = Építési költség szorzója
+rules.buildspeedmultiplier = Építési sebesség szorzója
+rules.deconstructrefundmultiplier = Bontási visszatérítés szorzója
 rules.waitForWaveToEnd = Az ellenség kivárja a korábbi hullám végét
-rules.wavelimit = Az utolsó hullám után legyen vége a játéknak
+rules.wavelimit = A pálya az utolsó hullám után ér véget
 rules.dropzoneradius = A ledobási zóna sugara:[lightgray] (csempe)
 rules.unitammo = Az egységeknek lőszer kell [red](törölhető)
-rules.enemyteam = Elenséges csapat
+rules.enemyteam = Ellenséges csapat
 rules.playerteam = Saját csapat
 rules.title.waves = Hullámok
 rules.title.resourcesbuilding = Nyersanyagforrások és épületek
@@ -1339,7 +1339,7 @@ rules.lighting = Világítás
 rules.fog = Köd
 rules.fire = Tűz
 rules.anyenv = <Bármelyik>
-rules.explosions = Épület/egység robbanás sebzés
+rules.explosions = Épület/egység robbanási sebzése
 rules.ambientlight = Háttérvilágítás
 rules.weather = Időjárás
 rules.weather.frequency = Gyakoriság:
@@ -1351,7 +1351,7 @@ content.liquid.name = Folyadékok
 content.unit.name = Egységek
 content.block.name = Blokkok
 content.status.name = Állapothatások
-content.sector.name = Szektor
+content.sector.name = Szektorok
 content.team.name = Csapatok
 
 wallore = (Fal)
@@ -1366,7 +1366,7 @@ item.silicon.name = Szilícium
 item.plastanium.name = Műanyag
 item.phase-fabric.name = Tóritkvarc
 item.surge-alloy.name = Elektrometál
-item.spore-pod.name = Spóra Kapszula
+item.spore-pod.name = Spórakapszula
 item.sand.name = Homok
 item.blast-compound.name = Robbanóelegy
 item.pyratite.name = Piratit
@@ -1377,19 +1377,19 @@ item.beryllium.name = Berillium
 item.tungsten.name = Volfrám
 item.oxide.name = Oxid
 item.carbide.name = Karbid
-item.dormant-cyst.name = Nyugvó-Ciszta
+item.dormant-cyst.name = Nyugvó ciszta
 
 liquid.water.name = Víz
 liquid.slag.name = Salak
 liquid.oil.name = Olaj
 liquid.cryofluid.name = Hűtőfolyadék
 liquid.neoplasm.name = Neoplazma
-liquid.arkycite.name = Arkycit
+liquid.arkycite.name = Arkicit
 liquid.gallium.name = Gallium
 liquid.ozone.name = Ózon
 liquid.hydrogen.name = Hidrogén
 liquid.nitrogen.name = Nitrogén
-liquid.cyanogen.name = Cianogén
+liquid.cyanogen.name = Dicián
 
 unit.dagger.name = Dagger
 unit.mace.name = Mace
@@ -1449,159 +1449,159 @@ unit.evoke.name = Evoke
 unit.incite.name = Incite
 unit.emanate.name = Emanate
 unit.manifold.name = Manifold
-unit.assembly-drone.name = Assembly Drone
+unit.assembly-drone.name = Összeszerelő drón
 unit.latum.name = Latum
 unit.renale.name = Renale
 
 block.parallax.name = Parallax
 block.cliff.name = Szirt
-block.sand-boulder.name = Homok Szikla
-block.basalt-boulder.name = Bazalt Szikla
+block.sand-boulder.name = Homokszikla
+block.basalt-boulder.name = Bazaltszikla
 block.grass.name = Fű
 block.molten-slag.name = Salak
-block.pooled-cryofluid.name = Hűtőfolyadék Medence
+block.pooled-cryofluid.name = Hűtőfolyadék
 block.space.name = Űr
 block.salt.name = Só
-block.salt-wall.name = Só Fal
+block.salt-wall.name = Sófal
 block.pebbles.name = Kavicsok
 block.tendrils.name = Indák
-block.sand-wall.name = Homok Fal
-block.spore-pine.name = Spóra Fenyő
-block.spore-wall.name = Spóra Fal
+block.sand-wall.name = Homokfal
+block.spore-pine.name = Spórafenyő
+block.spore-wall.name = Spórafal
 block.boulder.name = Szikla
-block.snow-boulder.name = Hó Szikla
-block.snow-pine.name = Havas Fenyő
+block.snow-boulder.name = Havas szikla
+block.snow-pine.name = Havas fenyő
 block.shale.name = Pala
-block.shale-boulder.name = Pala Szikla
+block.shale-boulder.name = Palaszikla
 block.moss.name = Moha
 block.shrubs.name = Cserjék
-block.spore-moss.name = Spóra Moha
-block.shale-wall.name = Pala Fal
-block.scrap-wall.name = Törmelék Fal
-block.scrap-wall-large.name = Nagy Törmelék Fal
-block.scrap-wall-huge.name = Hatalmas Törmelék Fal
-block.scrap-wall-gigantic.name = Gigantikus Törmelék Fal
+block.spore-moss.name = Spóramoha
+block.shale-wall.name = Palafal
+block.scrap-wall.name = Törmelékfal
+block.scrap-wall-large.name = Nagy törmelékfal
+block.scrap-wall-huge.name = Hatalmas törmelékfal
+block.scrap-wall-gigantic.name = Gigantikus törmelékfal
 block.thruster.name = Hajtómű
 block.kiln.name = Kemence
-block.graphite-press.name = Grafit Préselő
-block.multi-press.name = Grafit Sajtoló
-block.constructing = {0} [lightgray](Építés)
+block.graphite-press.name = Grafitprés
+block.multi-press.name = Grafitsajtoló
+block.constructing = {0} [lightgray](építés alatt)
 block.spawn.name = Ellenséges kezdőpont
-block.core-shard.name = Szilánk
-block.core-foundation.name = Alapítvány
-block.core-nucleus.name = Magnum
-block.deep-water.name = Mély Víz
+block.core-shard.name = Támaszpont: Szilánk
+block.core-foundation.name = Támaszpont: Alapítvány
+block.core-nucleus.name = Támaszpont: Atommag
+block.deep-water.name = Mély víz
 block.shallow-water.name = Víz
-block.tainted-water.name = Szennyezett Víz
-block.deep-tainted-water.name = Mély Szennyezett Víz
-block.darksand-tainted-water.name = Sötét Homokkal Szennyezett Víz
+block.tainted-water.name = Szennyezett víz
+block.deep-tainted-water.name = Mély szennyezett víz
+block.darksand-tainted-water.name = Sötét homokkal szennyezett víz
 block.tar.name = Kátrány
 block.stone.name = Kő
 block.sand-floor.name = Homok
-block.darksand.name = Sötét Homok
+block.darksand.name = Sötét homok
 block.ice.name = Jég
 block.snow.name = Hó
 block.crater-stone.name = Kráterek
 block.sand-water.name = Homokvíz
-block.darksand-water.name = Sötét Homokvíz
+block.darksand-water.name = Sötét homokvíz
 block.char.name = Faszén
 block.dacite.name = Dácit
 block.rhyolite.name = Riolit
-block.dacite-wall.name = Dácit Fal
-block.dacite-boulder.name = Dácit Szikla
+block.dacite-wall.name = Dácitfal
+block.dacite-boulder.name = Dácitszikla
 block.ice-snow.name = Jéghó
-block.stone-wall.name = Kő Fal
-block.ice-wall.name = Jég Fal
-block.snow-wall.name = Hó Fal
-block.dune-wall.name = Dűne Fal
+block.stone-wall.name = Kőfal
+block.ice-wall.name = Jégfal
+block.snow-wall.name = Hófal
+block.dune-wall.name = Dűnefal
 block.pine.name = Fenyő
 block.dirt.name = Sár
-block.dirt-wall.name = Sár Fal
+block.dirt-wall.name = Sárfal
 block.mud.name = Iszap
-block.white-tree-dead.name = Kiszáradt Fehér Fa
-block.white-tree.name = Fehér Fa
-block.spore-cluster.name = Spóra Fürt
-block.metal-floor.name = Fém Padló 1
-block.metal-floor-2.name = Fém Padló 2
-block.metal-floor-3.name = Fém Padló 3
-block.metal-floor-4.name = Fém Padló 4
-block.metal-floor-5.name = Fém Padló 5
-block.metal-floor-damaged.name = Sérült Fém Padló
-block.dark-panel-1.name = Sötét Panel 1
-block.dark-panel-2.name = Sötét Panel 2
-block.dark-panel-3.name = Sötét Panel 3
-block.dark-panel-4.name = Sötét Panel 4
-block.dark-panel-5.name = Sötét Panel 5
-block.dark-panel-6.name = Sötét Panel 6
-block.dark-metal.name = Sötét Fém
+block.white-tree-dead.name = Kiszáradt fehér fa
+block.white-tree.name = Fehér fa
+block.spore-cluster.name = Spórafürt
+block.metal-floor.name = 1. fémpadló
+block.metal-floor-2.name = 2. fémpadló
+block.metal-floor-3.name = 3. fémpadló
+block.metal-floor-4.name = 4. fémpadló
+block.metal-floor-5.name = 5. fémpadló
+block.metal-floor-damaged.name = Sérült fémpadló
+block.dark-panel-1.name = 1. sötét panel
+block.dark-panel-2.name = 2. sötét panel
+block.dark-panel-3.name = 3. sötét panel
+block.dark-panel-4.name = 4. sötét panel
+block.dark-panel-5.name = 5. sötét panel
+block.dark-panel-6.name = 6. sötét panel
+block.dark-metal.name = Sötét fém
 block.basalt.name = Bazalt
-block.hotrock.name = Forró Kőzet
-block.magmarock.name = Magmás Kőzet
-block.copper-wall.name = Réz Fal
-block.copper-wall-large.name = Nagy Réz Fal
-block.titanium-wall.name = Titán Fal
-block.titanium-wall-large.name = Nagy Titán Fal
-block.plastanium-wall.name = Műanyag Fal
-block.plastanium-wall-large.name = Nagy Műanyag Fal
-block.phase-wall.name = Tóritkvarc Fal
-block.phase-wall-large.name = Nagy Tóritkvarc Fal
-block.thorium-wall.name = Tórium Fal
-block.thorium-wall-large.name = Nagy Tórium Fal
+block.hotrock.name = Forró kőzet
+block.magmarock.name = Magmás kőzet
+block.copper-wall.name = Rézfal
+block.copper-wall-large.name = Nagy rézfal
+block.titanium-wall.name = Titánfal
+block.titanium-wall-large.name = Nagy titánfal
+block.plastanium-wall.name = Műanyagfal
+block.plastanium-wall-large.name = Nagy műanyagfal
+block.phase-wall.name = Tóritkvarcfal
+block.phase-wall-large.name = Nagy tóritkvarcfal
+block.thorium-wall.name = Tóriumfal
+block.thorium-wall-large.name = Nagy tóriumfal
 block.door.name = Ajtó
-block.door-large.name = Nagy Ajtó
+block.door-large.name = Nagy ajtó
 block.duo.name = Duo
 block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Szállítószalag
-block.titanium-conveyor.name = Titán Szállítószalag
-block.plastanium-conveyor.name = Műanyag Szállítószalag
-block.armored-conveyor.name = Páncélozott Szállítószalag
-block.junction.name = Elágazás
+block.titanium-conveyor.name = Titán szállítószalag
+block.plastanium-conveyor.name = Műanyag szállítószalag
+block.armored-conveyor.name = Páncélozott szállítószalag
+block.junction.name = Átkötés
 block.router.name = Elosztó
-block.distributor.name = Terjesztő
+block.distributor.name = Szétosztó
 block.sorter.name = Válogató
-block.inverted-sorter.name = Inverz Válogató
+block.inverted-sorter.name = Fordított válogató
 block.message.name = Üzenet
-block.reinforced-message.name = Megerősített Üzenet
-block.world-message.name = Világ Üzenet
-block.world-switch.name = Világ Kapcsoló
+block.reinforced-message.name = Megerősített üzenet
+block.world-message.name = Világüzenet
+block.world-switch.name = Világkapcsoló
 block.illuminator.name = Világítótest
-block.overflow-gate.name = Alul-folyó Kapu
-block.underflow-gate.name = Túlfolyó Kapu
-block.silicon-smelter.name = Szilícium Kohó
+block.overflow-gate.name = Túlcsorduló kapu
+block.underflow-gate.name = Alulcsorduló kapu
+block.silicon-smelter.name = Szilícium kohó
 block.phase-weaver.name = Tóritkvarcképző
 block.pulverizer.name = Porlasztó
-block.cryofluid-mixer.name = Hűtőfolyadék Keverő
+block.cryofluid-mixer.name = Hűtőfolyadék-keverő
 block.melter.name = Olvasztó
 block.incinerator.name = Törmelékégető
-block.spore-press.name = Spóra Sajtoló
+block.spore-press.name = Spóraprés
 block.separator.name = Leválasztó
-block.coal-centrifuge.name = Szén Centrifuga
+block.coal-centrifuge.name = Széncentrifuga
 block.power-node.name = Villanyoszlop
-block.power-node-large.name = Nagy Villanyoszlop
+block.power-node-large.name = Nagy villanyoszlop
 block.surge-tower.name = Villanytorony
-block.diode.name = Akkumulátor Dióda
+block.diode.name = Akkumulátordióda
 block.battery.name = Akkumulátor
-block.battery-large.name = Nagy Akkumulátor
-block.combustion-generator.name = Belső-égetésű Erőmű
+block.battery-large.name = Nagy akkumulátor
+block.combustion-generator.name = Égetőerőmű
 block.steam-generator.name = Gőzerőmű
-block.differential-generator.name = Differenciál Erőmű
-block.impact-reactor.name = Ütközéses Erőmű
-block.mechanical-drill.name = Mechanikus Fúró
-block.pneumatic-drill.name = Pneumatikus Fúró
-block.laser-drill.name = Lézer Vágó
-block.water-extractor.name = Vízkiválasztó
+block.differential-generator.name = Differenciál-erőmű
+block.impact-reactor.name = Ütközéses erőmű
+block.mechanical-drill.name = Mechanikus fúró
+block.pneumatic-drill.name = Pneumatikus fúró
+block.laser-drill.name = Lézerfúró
+block.water-extractor.name = Vízkinyerő
 block.cultivator.name = Betakarító
 block.conduit.name = Csővezeték
-block.mechanical-pump.name = Mechanikus Szivattyú
-block.item-source.name = Nyersanyag Forrás
-block.item-void.name = Nyersanyag Hiány
-block.liquid-source.name = Folyadék Forrás
-block.liquid-void.name = Folyadék Hiány
-block.power-void.name = Áram Hiány
-block.power-source.name = Áram Forrás
+block.mechanical-pump.name = Mechanikus szivattyú
+block.item-source.name = Nyersanyagforrás
+block.item-void.name = Nyersanyagnyelő
+block.liquid-source.name = Folyadékforrás
+block.liquid-void.name = Folyadéknyelő
+block.power-void.name = Áramnyelő
+block.power-source.name = Áramforrás
 block.unloader.name = Kirakodó
 block.vault.name = Raktár
 block.wave.name = Wave
@@ -1609,199 +1609,199 @@ block.tsunami.name = Tsunami
 block.swarmer.name = Swarmer
 block.salvo.name = Salvo
 block.ripple.name = Ripple
-block.phase-conveyor.name = Tóritkvarc Szállítószalag Híd
-block.bridge-conveyor.name = Szállítószalag Híd
-block.plastanium-compressor.name = Műanyag Sűrítő
-block.pyratite-mixer.name = Piratit Keverő
-block.blast-mixer.name = Robbanóelegy Keverő
+block.phase-conveyor.name = Tóritkvarc szállítószalag
+block.bridge-conveyor.name = Szállítószalag-híd
+block.plastanium-compressor.name = Műanyagsűrítő
+block.pyratite-mixer.name = Piratitkeverő
+block.blast-mixer.name = Robbanóelegy-keverő
 block.solar-panel.name = Napelem
-block.solar-panel-large.name = Nagy Napelem
+block.solar-panel-large.name = Nagy napelem
 block.oil-extractor.name = Olajleválasztó
-block.repair-point.name = Javítási Pont
-block.repair-turret.name = Javító Löveg
-block.pulse-conduit.name = Impulzus Csővezeték
-block.plated-conduit.name = Lemezelt Csővezeték
-block.phase-conduit.name = Tóritkvarc Csővezeték Híd
-block.liquid-router.name = Folyadék Elosztó
-block.liquid-tank.name = Folyadék Tartály
-block.liquid-container.name = Folyadék Tároló
-block.liquid-junction.name = Csővezeték Átkötés
-block.bridge-conduit.name = Csővezeték Híd
-block.rotary-pump.name = Fogaskerék Szivattyú
-block.thorium-reactor.name = Tórium Erőmű
+block.repair-point.name = Javítási pont
+block.repair-turret.name = Javítótorony
+block.pulse-conduit.name = Impulzus-csővezeték
+block.plated-conduit.name = Lemezelt csővezeték
+block.phase-conduit.name = Tóritkvarc-csővezeték
+block.liquid-router.name = Folyadékelosztó
+block.liquid-tank.name = Folyadéktartály
+block.liquid-container.name = Folyadéktároló
+block.liquid-junction.name = Csővezeték-átkötés
+block.bridge-conduit.name = Csővezetékhíd
+block.rotary-pump.name = Fogaskerekes szivattyú
+block.thorium-reactor.name = Tóriumerőmű
 block.mass-driver.name = Tömegmozgató
-block.blast-drill.name = Légrobbanásos Fúró
-block.impulse-pump.name = Impulzus Szivattyú
+block.blast-drill.name = Légrobbanásos fúró
+block.impulse-pump.name = Impulzusszivattyú
 block.thermal-generator.name = Hőerőmű
-block.surge-smelter.name = Elektrometál Olvasztó
+block.surge-smelter.name = Elektrometál-olvasztó
 block.mender.name = Foltozó
-block.mend-projector.name = Foltozó Projektor
-block.surge-wall.name = Elektrometál Fal
-block.surge-wall-large.name = Nagy Elektrometál Fal
+block.mend-projector.name = Foltozó projektor
+block.surge-wall.name = Elektrometálfal
+block.surge-wall-large.name = Nagy elektrometálfal
 block.cyclone.name = Cyclone
 block.fuse.name = Fuse
-block.shock-mine.name = Sokkoló Taposóakna
-block.overdrive-projector.name = Túlhajtó Projektor
-block.force-projector.name = Erő Projektor
+block.shock-mine.name = Sokkoló taposóakna
+block.overdrive-projector.name = Túlhajtó kivetítő
+block.force-projector.name = Erőkivetítő
 block.arc.name = Arc
-block.rtg-generator.name = RTG Erőmű
+block.rtg-generator.name = RTG erőmű
 block.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
 block.container.name = Konténer
-block.launch-pad.name = Kilövő Állás
+block.launch-pad.name = Kilövőállás
 block.segment.name = Segment
-block.ground-factory.name = Földi Egység Gyár
-block.air-factory.name = Repülőgép Gyár
-block.naval-factory.name = Hadihajó Gyár
-block.additive-reconstructor.name = Additív Újratervező
-block.multiplicative-reconstructor.name = Multiplikatív Újratervező
-block.exponential-reconstructor.name = Exponenciális Újratervező
-block.tetrative-reconstructor.name = Tetratív Újratervező
-block.payload-conveyor.name = Rakomány Szállítószalag
-block.payload-router.name = Rakomány Elosztó
+block.ground-factory.name = Földiegységgyár
+block.air-factory.name = Repülőgépgyár
+block.naval-factory.name = Hadihajógyár
+block.additive-reconstructor.name = Additív újratervező
+block.multiplicative-reconstructor.name = Multiplikatív újratervező
+block.exponential-reconstructor.name = Exponenciális újratervező
+block.tetrative-reconstructor.name = Tetratív újratervező
+block.payload-conveyor.name = Rakományszállító-szalag
+block.payload-router.name = Rakomány-elosztó
 block.duct.name = Szállítószalag
-block.duct-router.name = Szállítószalag Elosztó
-block.duct-bridge.name = Szállítószalag Híd
-block.large-payload-mass-driver.name = Nagy Rakomány Tömegmozgató
-block.payload-void.name = Rakomány Megsemmisítő
-block.payload-source.name = Rakomány Készítő
-block.disassembler.name = Szétválasztó
-block.silicon-crucible.name = Szilícium Olvasztó
-block.overdrive-dome.name = Túlhajtó Búra
-block.interplanetary-accelerator.name = Bolygóközi Gyorsító
+block.duct-router.name = Szállítószalag-elosztó
+block.duct-bridge.name = Szállítószalaghíd
+block.large-payload-mass-driver.name = Nagy rakomány-tömegmozgató
+block.payload-void.name = Rakománynyelő
+block.payload-source.name = Rakományforrás
+block.disassembler.name = Szétszerelő
+block.silicon-crucible.name = Szilíciumolvasztó
+block.overdrive-dome.name = Túlhajtó búra
+block.interplanetary-accelerator.name = Bolygóközi gyorsító
 block.constructor.name = Építő
-block.constructor.description = Akár 2x2 csempe méretű szerkezeteket is gyárt.
-block.large-constructor.name = Nagy Építő
-block.large-constructor.description = Akár 4x4 csempe méretű szerkezeteket is gyárt.
+block.constructor.description = Legfeljebb 2×2-es csempeméretű épületeket gyárt.
+block.large-constructor.name = Nagy építő
+block.large-constructor.description = Akár 4×4-es csempeméretű épületeket is gyárt.
 block.deconstructor.name = Lebontó
-block.deconstructor.description = Lebontja a szerkezeteket és az egységeket. Visszaadja az építési költség 100%-át.
-block.payload-loader.name = Rakomány Csomagoló
-block.payload-loader.description = A folyadékokat és a nyersanyagokat csomagolja nagyobb blokkokba.
-block.payload-unloader.name = Rakomány Kicsomagoló
-block.payload-unloader.description = A folyadékokból és nyersanyagokból álló blokkokat csomagolja ki.
-block.heat-source.name = Hő Forrás
-block.heat-source.description = Egy 1x1-es blokk, amely gyakorlatilag végtelen Hőt ad.
+block.deconstructor.description = Lebontja az épületeket és az egységeket. Visszaadja az építési költség 100%-át.
+block.payload-loader.name = Rakománycsomagoló
+block.payload-loader.description = A folyadékokat és a nyersanyagokat blokkokba csomagolja.
+block.payload-unloader.name = Rakománykibontó
+block.payload-unloader.description = Kibontja a folyadékokból és nyersanyagokból álló blokkokat.
+block.heat-source.name = Hőforrás
+block.heat-source.description = Nagy hőmennyiséget bocsát ki. Csak homokozó módban.
 
 #Erekir
 block.empty.name = Üres
-block.rhyolite-crater.name = Riolit Kráter
-block.rough-rhyolite.name = Durva Riolit
+block.rhyolite-crater.name = Riolit kráter
+block.rough-rhyolite.name = Durva riolit
 block.regolith.name = Regolit
-block.yellow-stone.name = Sárga Kő
-block.carbon-stone.name = Szén Kő
-block.ferric-stone.name = Vasas Kő
-block.ferric-craters.name = Vasas Kráterek
-block.beryllic-stone.name = Berilliumos Kő
-block.crystalline-stone.name = Kristályos Kő
-block.crystal-floor.name = Kristály Talaj
-block.yellow-stone-plates.name = Sárga Kőlemezek
-block.red-stone.name = Vörös Kő
-block.dense-red-stone.name = Sűrű Vörös Kő
-block.red-ice.name = Vörös Jég
-block.arkycite-floor.name = Arkycit
-block.arkyic-stone.name = Arkycites Kő
-block.rhyolite-vent.name = Riolit Kürtő
-block.carbon-vent.name = Szén Kürtő
-block.arkyic-vent.name = Arkycites Kürtő
-block.yellow-stone-vent.name = Sárga Kő Kürtő
-block.red-stone-vent.name = Vörös Kő Kürtő
-block.crystalline-vent.name = Kristályos Kürtő
-block.redmat.name = Vörös Padló
-block.bluemat.name = Kék Padló
-block.core-zone.name = Támaszpont Zóna
-block.regolith-wall.name = Regolit Fal
-block.yellow-stone-wall.name = Sárga Kő Fal
-block.rhyolite-wall.name = Riolit Fal
-block.carbon-wall.name = Szén Fal
-block.ferric-stone-wall.name = Vasas-Kő Fal
-block.beryllic-stone-wall.name = Berilliumos-Kő Fal
-block.arkyic-wall.name = Arkycit Fal
-block.crystalline-stone-wall.name = Kristályos-Kő Fal
-block.red-ice-wall.name = Vörös-Jég Fal
-block.red-stone-wall.name = Vörös-Kő Fal
-block.red-diamond-wall.name = Vörös Gyémánt Fal
-block.redweed.name = Vörös Fű
-block.pur-bush.name = Lila Bokor
-block.yellowcoral.name = Sárga Korall
-block.carbon-boulder.name = Szén Szikla
-block.ferric-boulder.name = Vasas Szikla
-block.beryllic-boulder.name = Berilliumos Szikla
-block.yellow-stone-boulder.name = Sárga Kő Szikla
-block.arkyic-boulder.name = Arkycites Szikla
-block.crystal-cluster.name = Kristály Fürt
-block.vibrant-crystal-cluster.name = Vibráló Kristály Fürt
-block.crystal-blocks.name = Kristály Blokkok
-block.crystal-orbs.name = Kristály Gömbök
-block.crystalline-boulder.name = Kristályos Szikla
-block.red-ice-boulder.name = Vörös Jég Szikla
-block.rhyolite-boulder.name = Riolit Szikla
-block.red-stone-boulder.name = Vörös Kő Szikla
-block.graphitic-wall.name = Grafit Fal
-block.silicon-arc-furnace.name = Szilícium Ívkemence
+block.yellow-stone.name = Sárga kő
+block.carbon-stone.name = Szénkő
+block.ferric-stone.name = Vasas kő
+block.ferric-craters.name = Vasas kráterek
+block.beryllic-stone.name = Berilliumos kő
+block.crystalline-stone.name = Kristályos kő
+block.crystal-floor.name = Kristálytalaj
+block.yellow-stone-plates.name = Sárga kőlemezek
+block.red-stone.name = Vörös kő
+block.dense-red-stone.name = Sűrű vörös kő
+block.red-ice.name = Vörös jég
+block.arkycite-floor.name = Arkicit
+block.arkyic-stone.name = Arkicites kő
+block.rhyolite-vent.name = Riolitkürtő
+block.carbon-vent.name = Szénkürtő
+block.arkyic-vent.name = Arkicites kürtő
+block.yellow-stone-vent.name = Sárgakő-kürtő
+block.red-stone-vent.name = Vöröskő-kürtő
+block.crystalline-vent.name = Kristályos kürtő
+block.redmat.name = Vörös padló
+block.bluemat.name = Kék padló
+block.core-zone.name = Támaszpontzóna
+block.regolith-wall.name = Regolitfal
+block.yellow-stone-wall.name = Sárgakő-fal
+block.rhyolite-wall.name = Riolit fal
+block.carbon-wall.name = Szénfal
+block.ferric-stone-wall.name = Vasaskő-fal
+block.beryllic-stone-wall.name = Berilliumoskő-fal
+block.arkyic-wall.name = Arkicites fal
+block.crystalline-stone-wall.name = Kristályos kőFal
+block.red-ice-wall.name = Vörösjég-fal
+block.red-stone-wall.name = Vöröskő-fal
+block.red-diamond-wall.name = Vörösgyémánt-fal
+block.redweed.name = Vörös fű
+block.pur-bush.name = Lila bokor
+block.yellowcoral.name = Sárga korall
+block.carbon-boulder.name = Szén szikla
+block.ferric-boulder.name = Vasas szikla
+block.beryllic-boulder.name = Berilliumos szikla
+block.yellow-stone-boulder.name = Sárgakő-szikla
+block.arkyic-boulder.name = Arkicites szikla
+block.crystal-cluster.name = Kristályfürt
+block.vibrant-crystal-cluster.name = Vibráló kristályfürt
+block.crystal-blocks.name = Kristályblokkok
+block.crystal-orbs.name = Kristálygömbök
+block.crystalline-boulder.name = Kristályos szikla
+block.red-ice-boulder.name = Vörösjég-szikla
+block.rhyolite-boulder.name = Riolit szikla
+block.red-stone-boulder.name = Vöröskő-szikla
+block.graphitic-wall.name = Grafit fal
+block.silicon-arc-furnace.name = Szilícium ívkemence
 block.electrolyzer.name = Elektrolizátor
-block.atmospheric-concentrator.name = Atmoszferikus Sűrítő
-block.oxidation-chamber.name = Oxidációs Kamra
-block.electric-heater.name = Elektromos Fűtőtest
-block.slag-heater.name = Salakos Fűtőtest
-block.phase-heater.name = Tóritkvarcos Fűtőtest
-block.heat-redirector.name = Hő Elvezető
-block.heat-router.name = Hő Elosztó
-block.slag-incinerator.name = Salakégető Kemence
-block.carbide-crucible.name = Karbid Olvasztó
-block.slag-centrifuge.name = Salak Centrifuga
-block.surge-crucible.name = Elektrometál Olvasztó
-block.cyanogen-synthesizer.name = Cianogén Szintetizáló
-block.phase-synthesizer.name = Tóritkvarc Szintetizáló
+block.atmospheric-concentrator.name = Atmoszferikus sűrítő
+block.oxidation-chamber.name = Oxidációs kamra
+block.electric-heater.name = Elektromos fűtőtest
+block.slag-heater.name = Salakos fűtőtest
+block.phase-heater.name = Tóritkvarcos fűtőtest
+block.heat-redirector.name = Hőelvezető
+block.heat-router.name = Hőelosztó
+block.slag-incinerator.name = Salakégető kemence
+block.carbide-crucible.name = Karbidolvasztó
+block.slag-centrifuge.name = Salakcentrifuga
+block.surge-crucible.name = Elektrometál-olvasztó
+block.cyanogen-synthesizer.name = Diciánszintetizáló
+block.phase-synthesizer.name = Tóritkvarc-szintetizáló
 block.heat-reactor.name = Hőerőmű
-block.beryllium-wall.name = Berillium Fal
-block.beryllium-wall-large.name = Nagy Berillium Fal
-block.tungsten-wall.name = Volfrám Fal
-block.tungsten-wall-large.name = Nagy Volfrám Fal
-block.blast-door.name = Robbanásbiztos Ajtó
-block.carbide-wall.name = Karbid Fal
-block.carbide-wall-large.name = Nagy Karbid Fal
-block.reinforced-surge-wall.name = Megerősített Elektrometál Fal
-block.reinforced-surge-wall-large.name = Nagy Megerősített Elektrometál Fal
-block.shielded-wall.name = Álcázott Fal
+block.beryllium-wall.name = Berilliumfal
+block.beryllium-wall-large.name = Nagy berilliumfal
+block.tungsten-wall.name = Volfrámfal
+block.tungsten-wall-large.name = Nagy volfrámfal
+block.blast-door.name = Robbanásbiztos ajtó
+block.carbide-wall.name = Karbidfal
+block.carbide-wall-large.name = Nagy karbidfal
+block.reinforced-surge-wall.name = Megerősített elektrometálfal
+block.reinforced-surge-wall-large.name = Nagy megerősített elektrometálfal
+block.shielded-wall.name = Pajzzsal védett fal
 block.radar.name = Radar
-block.build-tower.name = Építő Torony
-block.regen-projector.name = Épület Regenerátor
-block.shockwave-tower.name = Sokkhullám Torony
-block.shield-projector.name = Pajzs Generátor
-block.large-shield-projector.name = Nagy Pajzs Generátor
-block.armored-duct.name = Páncélozott Szállítószalag
-block.overflow-duct.name = Túlfolyó Szállítószalag
-block.underflow-duct.name = Alul-folyó Szállítószalag
-block.duct-unloader.name = Kirakodó Szállítószalag
-block.surge-conveyor.name = Elektrometál Szállítószalag
-block.surge-router.name = Elektrometál Elosztó
-block.unit-cargo-loader.name = Egység Rakomány Berakodó
-block.unit-cargo-unload-point.name = Egység Rakomány Kirakodó Pont
-block.reinforced-pump.name = Megerősített Szivattyú
-block.reinforced-conduit.name = Megerősített Csővezeték
-block.reinforced-liquid-junction.name = Megerősített Folyadék Átkötés
-block.reinforced-bridge-conduit.name = Megerősített Csővezeték Híd
-block.reinforced-liquid-router.name = Megerősített Folyadék Elosztó
-block.reinforced-liquid-container.name = Megerősített Folyadék Konténer
-block.reinforced-liquid-tank.name = Megerősített Folyadék Tartály
-block.beam-node.name = Sugár Csomópont
-block.beam-tower.name = Sugár Torony
-block.beam-link.name = Sugár Hálózat
-block.turbine-condenser.name = Kondenzációs Turbina
-block.chemical-combustion-chamber.name = Kémiai Égető Kamra
-block.pyrolysis-generator.name = Pirolízis Erőmű
+block.build-tower.name = Építőtorony
+block.regen-projector.name = Regeneráló kivetítő
+block.shockwave-tower.name = Sokkhullámtorony
+block.shield-projector.name = Pajzskivetítő
+block.large-shield-projector.name = Nagy pajzskivetítő
+block.armored-duct.name = Páncélozott szállítószalag
+block.overflow-duct.name = Túlcsorduló szállítószalag
+block.underflow-duct.name = Alulcsorduló szállítószalag
+block.duct-unloader.name = Szállítószalag-kirakodó
+block.surge-conveyor.name = Elektrometál-szállítószalag
+block.surge-router.name = Elektrometál-elosztó
+block.unit-cargo-loader.name = Egységrakomány-berakodó
+block.unit-cargo-unload-point.name = Egységrakomány-kirakodó pont
+block.reinforced-pump.name = Megerősített szivattyú
+block.reinforced-conduit.name = Megerősített csővezeték
+block.reinforced-liquid-junction.name = Megerősített folyadékátkötés
+block.reinforced-bridge-conduit.name = Megerősített csővezetékhíd
+block.reinforced-liquid-router.name = Megerősített folyadékelosztó
+block.reinforced-liquid-container.name = Megerősített folyadékkonténer
+block.reinforced-liquid-tank.name = Megerősített folyadéktartály
+block.beam-node.name = Sugárcsomópont
+block.beam-tower.name = Sugártorony
+block.beam-link.name = Sugárhálózat
+block.turbine-condenser.name = Kondenzációs turbina
+block.chemical-combustion-chamber.name = Kémiai égetőkamra
+block.pyrolysis-generator.name = Pirolíziserőmű
 block.vent-condenser.name = Vízleválasztó
 block.cliff-crusher.name = Sziklazúzó
-block.plasma-bore.name = Plazma Vágó
-block.large-plasma-bore.name = Nagy Plazma Vágó
+block.plasma-bore.name = Plazmafúró
+block.large-plasma-bore.name = Nagy plazmafúró
 block.impact-drill.name = Ütvefúró
-block.eruption-drill.name = Erupciós Fúró
+block.eruption-drill.name = Kitörési fúró
 block.core-bastion.name = Bástya
 block.core-citadel.name = Citadella
 block.core-acropolis.name = Akropolisz
-block.reinforced-container.name = Megerősített Konténer
-block.reinforced-vault.name = Megerősített Tároló
+block.reinforced-container.name = Megerősített konténer
+block.reinforced-vault.name = Megerősített tároló
 block.breach.name = Breach
 block.sublimate.name = Sublimate
 block.titan.name = Titan
@@ -1809,39 +1809,39 @@ block.disperse.name = Disperse
 block.afflict.name = Afflict
 block.lustre.name = Lustre
 block.scathe.name = Scathe
-block.tank-refabricator.name = Tank Újratervező
-block.mech-refabricator.name = Mech Újratervező
-block.ship-refabricator.name = Repülőgép Újratervező
-block.tank-assembler.name = Tank Összeszerelő
-block.ship-assembler.name = Repülőgép Összeszerelő
-block.mech-assembler.name = Mech Összeszerelő
-block.reinforced-payload-conveyor.name = Megerősített Rakomány Szállítószalag
-block.reinforced-payload-router.name = Megerősített Rakomány Elosztó
-block.payload-mass-driver.name = Rakomány Tömegmozgató
-block.small-deconstructor.name = Kis Lebontó
-block.canvas.name = Vászon Kijelző
-block.world-processor.name = Világ Processzor
-block.world-cell.name = Világ Cella
-block.tank-fabricator.name = Tank Gyár
-block.mech-fabricator.name = Mech Gyár
-block.ship-fabricator.name = Repülőgép Gyár
-block.prime-refabricator.name = Elsődleges Újratervező
-block.unit-repair-tower.name = Egység Javító Torony
+block.tank-refabricator.name = Tankújratervező
+block.mech-refabricator.name = Mechújratervező
+block.ship-refabricator.name = Repülőgép-újratervező
+block.tank-assembler.name = Tankösszeszerelő
+block.ship-assembler.name = Hajó-összeszerelő
+block.mech-assembler.name = Mechösszeszerelő
+block.reinforced-payload-conveyor.name = Megerősített rakományszállító-szalag
+block.reinforced-payload-router.name = Megerősített rakományelosztó
+block.payload-mass-driver.name = Rakomány-tömegmozgató
+block.small-deconstructor.name = Lebontó
+block.canvas.name = Vászon
+block.world-processor.name = Világprocesszor
+block.world-cell.name = Világcella
+block.tank-fabricator.name = Tankgyártó
+block.mech-fabricator.name = Mechgyártó
+block.ship-fabricator.name = Repülőgépgyártó
+block.prime-refabricator.name = Elsődleges újratervező
+block.unit-repair-tower.name = Egységjavító torony
 block.diffuse.name = Diffuse
-block.basic-assembler-module.name = Alap Összeszerelő Modul
+block.basic-assembler-module.name = Alapvető összeszerelő modul
 block.smite.name = Smite
 block.malign.name = Malign
-block.flux-reactor.name = Fluxus Reaktor
-block.neoplasia-reactor.name = Neoplázia Reaktor
+block.flux-reactor.name = Fluxusreaktor
+block.neoplasia-reactor.name = Neopláziareaktor
 
 block.switch.name = Kapcsoló
 block.micro-processor.name = Mikroprocesszor
-block.logic-processor.name = Logikai Processzor
-block.hyper-processor.name = Hiper Processzor
-block.logic-display.name = Logikai Kijelző
-block.large-logic-display.name = Nagy Logikai Kijelző
-block.memory-cell.name = Memória Cella
-block.memory-bank.name = Memória Bank
+block.logic-processor.name = Logikai processzor
+block.hyper-processor.name = Hiperprocesszor
+block.logic-display.name = Logikai kijelző
+block.large-logic-display.name = Nagy logikai kijelző
+block.memory-cell.name = Memóriacella
+block.memory-bank.name = Memóriabank
 
 team.malis.name = Lila
 team.crux.name = Piros
@@ -1852,169 +1852,169 @@ team.blue.name = Kék
 
 hint.skip = Kihagyás
 hint.desktopMove = Használd a [accent][[WASD][] gombokat a mozgáshoz.
-hint.zoom = Használd az egér [accent]Görgőjét[] a zoomhoz..
-hint.desktopShoot = Használd a [accent]Bal-Egérgomb[]ot a lövéshez.
-hint.depositItems = A nyersanyagokat áthelyezheted húzással a drónból a Támaszpontba.
+hint.zoom = [accent]Görgess[] a nagyításhoz és kicsinyítéshez.
+hint.desktopShoot = Használd a [accent]bal egérgombot[] a lövéshez.
+hint.depositItems = A nyersanyagokat húzással helyezheted át a drónból a támaszpontba.
 hint.respawn = Ahhoz, hogy drónként újraéledj, nyomd meg a [accent][[V][] gombot.
-hint.respawn.mobile = Átvetted az irányítást egy egység, vagy lövegtorony felett. Ahhoz, hogy drónként újraéledj, [accent]érintsd meg az avatárt a bal felső sarokban.[]
-hint.desktopPause = Nyomd meg a [accent][[Szóköz][]t, hogy szüneteltesd, vagy folytasd a játékot.
-hint.breaking = A [accent]Jobb-Egérgomb[]ot nyomva kijelölheted az útban lévő épületeket a lebontásukhoz.
-hint.breaking.mobile = Használd a \ue817 [accent]Kalapács[] gombot jobb lent és töröld vele az útban lévő épületeket.\n\nTartsd lenyomva az ujjad és húzd, hogy nagyobb területet tudj kijelölni.
-hint.blockInfo = Egy épület információinak megtekintéséhez válaszd ki az épületet az [accent]Építés menüben[], majd válaszd a [accent][[?][] gombot a jobb oldalon.
-hint.derelict = Az [accent]Elhagyatott[] szerkezetek régi bázisok maradványai, amelyek már nem működnek.\n\nEzeket a maradványokat le lehet [accent]bontani[] nyersanyagokért, vagy megjavítani őket.
-hint.research = Használd a \ue875 [accent]Fejlesztési Fa[] gombot, hogy felfedezz új technológiákat.
-hint.research.mobile = Használd a \ue875 [accent]Fejlesztési Fa[] gombot a \ue88c [accent]Menü[]ben, hogy felfedezz új technológiákat.
-hint.unitControl = Nyomd le a [accent][[Bal-CTRL][] gombot és kattints a [accent]Jobb-Egérgomb[]al az irányítani kívánt szövetséges egységre, vagy -lövegtoronyra, hogy átvedd fölötte az irányítást.
-hint.unitControl.mobile = [accent][[Dupla koppintás][]sal átveheted az irányítást szövetséges egységek, vagy -lövegtornyok felett.
-hint.unitSelectControl = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd hosszan a [accent]Bal-SHIFT[] gombot.\nParancs Módban az egységek kijelöléséhez kattints és húzd az egeret. A [accent]Jobb-Egérgomb[]-al kattints az egységek mozgatásához egy helyszínre, vagy az ellenséges célpontra.
-hint.unitSelectControl.mobile = Az egységek irányításához lépj be a [accent]Parancs Mód[]ba, úgy, hogy nyomd meg a [accent]Parancs Mód[] gombot a bal alsó sarokban.\nParancs módban az egységek kiválasztásához érintsd meg a kijelzőt és húzással jelöld ki az egységeket. Koppints az egységek mozgatásához egy helyszínre, vagy ellenséges az célpontra.
-hint.launch = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Támaszpontot a következő szektorba, úgy, hogy megnyitod a \ue827 [accent]Bolygó térkép[]et a jobb alsó sarokban, és átpásztázol az új helyszínre.
-hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]Indítsd[] el a Támaszpontot egy közeli szektorba, úgy, hogy kiválasztasz egy szektort a \ue88c [accent]Menü[]ben a \ue827 [accent]Bolygó térkép[]ről.
-hint.schematicSelect = Az [accent][[F][] nyomva tartásával egyszerre több épületet is kijelölhetsz és másolhatsz.\n\nAz egér [accent][[Görgővel][] viszont, csak egy épületet tudsz kijelölni és lemásolni.
-hint.rebuildSelect = Tartsd nyomva a [accent][[B][] és húzással jelöld ki a megsemmisített épületterveket.\nEz automatikusan újraépíti őket.
-hint.rebuildSelect.mobile = Válaszd a \ue874 másolás gombot, majd koppints \ue80f újjáépítés gombra, és húzd a megsemmisült épülettervek kijelöléséhez.\nEz automatikusan újraépíti őket.
-hint.conveyorPathfind = Tartsd nyomva a [accent][[Bal-CTRL][] gombot a szállítószalagok lerakása közben, hogy a játék útvonalat generáljon.
-hint.conveyorPathfind.mobile = Engedélyezd az \ue844 [accent]Átlós Mód[]ot és tegyél le egyszerre több szállítószalagot, hogy a játék útvonalat generáljon.
-hint.boost = Tartsd nyomva a [accent][[Bal-SHIFT][] gombot, hogy átrepülj az akadályok felett.\n\nErre nem minden földi egység képes.
-hint.payloadPickup = A [accent][[[] gombbal kis épületeket, vagy egységeket emelhetsz fel.
-hint.payloadPickup.mobile = [accent]Tartsd nyomva az ujjad[] egy kis épületen, vagy egységen, hogy felemeld.
-hint.payloadDrop = A [accent]][] megnyomásával lerakhatod a rakományodat.
-hint.payloadDrop.mobile = [accent]Tartsd hosszan az ujjad[] egy üres területen, hogy letedd a rakományodat.
-hint.waveFire = A [accent]Wave[] lövegtornyok, ha Víz van bennük, automatikusan eloltják a közeli tüzeket.
-hint.generator = A \uf879 [accent]Belső-égetésű Erőmű[] Szenet éget, és átadja az Áramot a vele érintkező épületeknek.\n\nÁramot nagyobb távolságra is szállíthatsz \uf87f [accent]Villanyoszlop[]ok segítségével.
-hint.guardian = Az [accent]Őrző[]knek páncélja van. A gyenge lövedékeknek, mint a [accent]Réz[], vagy az [accent]Ólom[] [scarlet]nincs hatásuk[] az Őrző páncéljára.\n\nHasználj magasabb szintű lövegtornyokat, vagy \uf835 [accent]Grafit[] lövedéket a \uf861Duo/\uf859Salvo lövegtornyokban, hogy leszedd az Őrzőket.
-hint.coreUpgrade = A Támaszpontot fejlesztheted, ha [accent]magasabb szintű Támaszpontot teszel rá[].\n\nHelyezz egy [accent]Alapítvány[] Támaszpontot a [accent]Szilánk[] Támaszpontra. Figyelj rá, hogy ne legyenek az új Támaszpont területén épületek.
-hint.presetLaunch = A szürke [accent]hadjárat szektorok[]ba, amilyen például a [accent]Fagyott Erdő[], bárhonnan kilőhetsz. Nem kell szomszédos területtel rendelkezned.\n\nA [accent]számozott szektorok[], mint ez is, [accent]opcionálisak[].
+hint.respawn.mobile = Átvetted az irányítást egy egység vagy épület felett. Ahhoz, hogy drónként újraéledj, [accent]koppints a profilképre a bal felső sarokban.[]
+hint.desktopPause = Nyomd meg a [accent][[Szóközt][] a játék szüneteltetéséhez vagy folytatásához.
+hint.breaking = [accent]Jobb egérgombbal[] és húzással lebonthatod a blokkokat.
+hint.breaking.mobile = Használd a jobb alsó sarokban lévő  [accent]kalapács[] gombot a blokkok törléséhez.\n\nTartsd lenyomva az ujjad és húzd, hogy nagyobb területet tudj kijelölni.
+hint.blockInfo = Egy blokk információinak megtekintéséhez válaszd ki az épületet az [accent]építési menüben[], majd válaszd a [accent][[?][] gomb jobb oldalt.
+hint.derelict = Az [accent]elhagyatott[] szerkezetek régi bázisok maradványai, amelyek már nem működnek.\n\nEzeket az épületeket le lehet [accent]bontani[] nyersanyagokért, vagy meg is lehet javítani őket.
+hint.research = Használd a  [accent]Fejlesztési fa[] gombot, hogy új technológiákat fedezz fel.
+hint.research.mobile = Használd a  [accent]Fejlesztési fa[] gombot a  [accent]menüben[], hogy új technológiákat fedezz fel.
+hint.unitControl = Nyomd le a [accent][[bal Ctrl][] gombot, és kattints [accent]jobb egérgombbal[] a baráti egység vagy lövegtorony irányításához.
+hint.unitControl.mobile = [accent][[Dupla koppintással][] irányíthatók kézileg a szövetséges egységek vagy lövegtornyok.
+hint.unitSelectControl = Az egységek irányításához lépj be [accent]parancs módba[] a [accent]bal Shift[] lenyomva tartásával.\nParancs módban az egységek kijelöléséhez kattints, és húzd az egeret. A [accent]jobb egérgombbal[] küldd az egységeket a helyszínre vagy a célponthoz.
+hint.unitSelectControl.mobile = Az egységek irányításához lépj be [accent]parancs módba[] a bal alsó sarokban lévő [accent]parancs[] gombbal.\nParancs módban az egységek kiválasztásához érintsd meg a kijelzőt és húzással jelöld ki az egységeket. Koppintással küldd az egységeket a helyszínre vagy a célponthoz.
+hint.launch = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]lődd ki[] a támaszpontot a következő szektorba, úgy, hogy megnyitod a  [accent]Bolygótérképet[] a jobb alsó sarokban, és átforgatod az új helyszínre.
+hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]lődd ki[] el a támaszpontot egy közeli szektorba, úgy, hogy kiválasztasz egy szektort a  [accent]Menüben[] a  [accent]Bolygótérképről[].
+hint.schematicSelect = Tartsd nyomja az [accent][[F][] gombot több épület kijelöléséhez és másolásához.\n\n[accent][[Középső kattintással][] egy adott blokktípus másolható.
+hint.rebuildSelect = Tartsd nyomva a [accent][[B][] gombot és húzással jelöld ki a megsemmisített blokkterveket.\nEz automatikusan újraépíti őket.
+hint.rebuildSelect.mobile = Válaszd a  másolás gombot, majd koppints az  újjáépítés gombra, és húzd a megsemmisült blokktervek kijelöléséhez.\nEz automatikusan újraépíti őket.
+hint.conveyorPathfind = Tartsd nyomva a [accent][[bal Ctrl][] gombot a szállítószalagok lerakása közben, hogy a játék útvonalat állítson elő.
+hint.conveyorPathfind.mobile = Engedélyezd az  [accent]átlós módot[], és tegyél le egyszerre több szállítószalagot, hogy a játék útvonalat állítson elő.
+hint.boost = Tartsd nyomva a [accent][[bal Shift][] gombot, hogy átrepülj az akadályok felett.\n\nErre csak néhány földi egység képes.
+hint.payloadPickup = Nyomd meg a [accent][[[] gombot a kis blokkok vagy egységek felemeléséhez.
+hint.payloadPickup.mobile = [accent]Koppints és tartsd lenyomva az ujjad[] egy kis blokk vagy egység felemeléséhez.
+hint.payloadDrop = Nyomd le a [accent]][] gombot a rakomány lerakásához.
+hint.payloadDrop.mobile = [accent]Koppints és tartsd lenyomva az ujjad[] egy üres területen a rakomány lerakásához.
+hint.waveFire = A vizet lőszerként használó [accent]Wave[] lövegtornyok automatikusan eloltják a közeli tüzeket.
+hint.generator = Az  [accent]égetőerőmű[] szenet éget, és áramot ad át a vele érintkező épületeknek.\n\nAz áramszállítás távolsága [accent]villanyoszlopokkal[] növelhető.
+hint.guardian = Az [accent]Őrzők[] páncélozottak. A gyenge lövedékek, mint a [accent]réz[] vagy az [accent]ólom[] [scarlet]nem hatásosak[] az Őrző páncéljával szemben.\n\nHasználj magasabb szintű lövegtornyokat, vagy  [accent]grafitot[]  a Duo/Salvo lövegtornyokban, hogy leszedd az Őrzőket.
+hint.coreUpgrade = A támaszpont úgy fejleszthető, hogy [accent]magasabb szintű támaszpontot teszel rá[].\n\nHelyezz egy  [accent]Alapítvány[] támaszpontot a  [accent]Szilánk[] támaszpontra. Figyelj rá, hogy ne legyenek az új támaszpont területén épületek.
+hint.presetLaunch = A szürke [accent]landolási zónát tartalmazó szektorokba[], amilyen például a [accent]Fagyott erdő[], bárhonnan kilőhetsz. Nem szükséges hozzá szomszédos területet elfoglalnod.\n\nA [accent]számozott szektorok[], mint ez is, [accent]nem kötelezők[].
 hint.presetDifficulty = Ebben a szektorban [scarlet]magas az ellenséges fenyegetettségi szint[].\nAz ilyen szektorokba való indulás [accent]nem ajánlott[] megfelelő technológia és felkészülés nélkül.
-hint.coreIncinerate = Ha a Támaszpontodban egy nyersanyag elérte a maximumot, a beérkező ilyen nyersanyagaid azonnal [accent]megsemmisítésre kerülnek[].
-hint.factoryControl = Egy egységgyár [accent]kimeneti célpontjának[] beállításához Parancs Módban kattints egy gyárépületre, majd kattints a Jobb-Egérgombbal egy helyre.\nAz előállított egységek automatikusan odamennek.
-hint.factoryControl.mobile = Egy egységgyár [accent]kimeneti célpontjának[] beállításához Parancs Módban koppints egy gyárépületre, majd koppints egy helyre.\nAz előállított egységek automatikusan odamennek.
+hint.coreIncinerate = Ha a támaszpont egy nyersanyagból elérte a maximumot, a beérkező további nyersanyagok azonnal [accent]megsemmisítésre kerülnek[].
+hint.factoryControl = Egy egységgyár [accent]kimeneti célpontjának[] beállításához kattints parancs módban egy gyárépületre, majd kattints jobb egérgombbal egy helyre.\nAz előállított egységek automatikusan odamennek.
+hint.factoryControl.mobile = Egy egységgyár [accent]kimeneti célpontjának[] beállításához koppints parancs módban egy gyárépületre, majd koppints egy helyre.\nAz előállított egységek automatikusan odamennek.
 
-gz.mine = Menj a földön lévő \uf8c4 [accent]Rézérc[] közelébe, és kattints a bányászat megkezdéséhez.
-gz.mine.mobile = Menj a földön lévő \uf8c4 [accent]Rézérc[] közelébe, és koppints a bányászat megkezdéséhez.
-gz.research = Nyisd meg a \ue875 Fejlesztési fát.\nFejleszd ki a \uf870 [accent]Mechanikus Fúró[]t, majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy Rézfoltra, hogy elhelyezd.
-gz.research.mobile = Nyisd meg a \ue875 Fejlesztési fát.\nFejleszd ki a \uf870 [accent]Mechanikus Fúró[]t, majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy Rézfoltra, hogy elhelyezd.\n\nNyomd meg a \ue800 [accent]Pipa[]t a jobb alsó sarokban a megerősítéshez.
-gz.conveyors = Fejleszd ki és építs \uf896 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Támaszpontba.\n\nKattints és húzd az egeret bármely irányba, hogy hosszabb Szállítószalagot készíthess.\n[accent]Görgővel[] a szállítás irányát tudod megváltoztatni.
-gz.conveyors.mobile = Fejleszd ki és építs \uf896 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Támaszpontba.\n\nTartsd rajta az ujjad egy másodpercig, és húzd bármely irányba, hogy hosszabb Szállítószalagot készíthess.
-gz.drills = Bővítsd a bányászati kapacitást.\nÉpíts több Mechanikus Fúrót.\nBányássz 100 Rezet.
-gz.lead = Az \uf837 [accent]Ólom[] egy másik gyakran használt nyersanyag.\nÉpíts fúrókat az Ólom kitermelésére.
-gz.moveup = \ue804 Menj tovább a többi feladatért.
-gz.turrets = Fejleszd ki és építs 2 darab \uf861 [accent]Duo[] lövegtornyot, hogy védd a Támaszpontot.\nA Duo lövegtornyoknak szükségük van \uf838 [accent]lőszer[]re, amelyeket Szállítószalaggal juttathatsz el hozzájuk.
-gz.duoammo = Lásd el a Duo lövegtornyokat [accent]Rézzel[]. Használj Szállítószalagot.
-gz.walls = A [accent]Falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts \uf8ae [accent]Réz Fal[]akat a lövegtornyok körül.
+gz.mine = Menj a földön lévő  [accent]rézérc[] közelébe, és kattints a bányászat megkezdéséhez.
+gz.mine.mobile = Menj a földön lévő  [accent]rézérc[] közelébe, és koppints a bányászat megkezdéséhez.
+gz.research = Nyisd meg a  Fejlesztési fát.\nFejleszd ki a  [accent]Mechanikus fúrót[], majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy rézfoltra az elhelyezéséhez.
+gz.research.mobile = Nyisd meg a  Fejlesztési fát.\nFejleszd ki a  [accent]Mechanikus fúrót[], majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy rézfoltra az elhelyezéséhez.\n\nA megerősítéshez nyomd meg a jobb alsó sarokban lévő  [accent]pipát[].
+gz.conveyors = Fejleszd ki, és építs  [accent]szállítószalagokat[], hogy a kitermelt\nnyersanyagokat eljuttasd a fúróktól a támaszpontba.\n\nKattints és húzd az egeret, hogy több szállítószalagot helyezz el.\nHasználd a [accent]görgőt[] a forgatáshoz.
+gz.conveyors.mobile = Fejleszd ki, és építs  [accent]szállítószalagokat[], hogy a kitermelt\nnyersanyagokat eljuttasd a fúróktól a támaszpontba.\n\nTartsd lenyomva az ujjad és húzd el, hogy több szállítószalagot helyezz el.
+gz.drills = Bővítsd a bányászati kapacitást.\nÉpíts több mechanikus fúrót.\nBányássz 100 rezet.
+gz.lead = Az  [accent]ólom[] egy másik gyakran használt nyersanyag.\nÉpíts fúrókat az ólom kitermelésére.
+gz.moveup =  Menj tovább a további utasításokért.
+gz.turrets = Fejleszd ki, és építs 2  [accent]Duo[] lövegtornyot, hogy megvédd a támaszpontot.\nA Duo lövegtornyoknak  [accent]lőszerre[] van szükségük, mely szállítószalaggal juttatható el hozzájuk.
+gz.duoammo = Szállítószalagok segítségével lásd el [accent]rézzel[] a Duo lövegtornyokat.
+gz.walls = A [accent]falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts  [accent]rézfalakat[] a lövegtornyok köré.
 gz.defend = Az ellenség közeledik, készülj fel a védekezésre.
-gz.aa = A repülő egységeket nem lehet könnyen elintézni a hagyományos lövegtornyokkal.\nA \uf860 [accent]Scatter[] lövegtornyok kiváló légelhárítást biztosítanak, de szükségük van \uf837 [accent]Ólom[] lőszerre.
-gz.scatterammo = Lásd el a Scatter lövegtornyokat [accent]Ólom[] lőszerrel. Használj Szállítószalagot.
-gz.supplyturret = [accent]Lövegtorony ellátmány
+gz.aa = A repülő egységeket nem lehet könnyen elintézni a hagyományos lövegtornyokkal.\nA  [accent]Scatter[] lövegtornyok kiváló légelhárítást biztosítanak, de lőszerként  [accent]ólomra[] van szükségük.
+gz.scatterammo = Szállítószalagok segítségével lásd el  [accent]ólommal[] a Scatter lövegtornyokat.
+gz.supplyturret = [accent]Lövegtorony ellátása
 gz.zone1 = Ez az ellenség leszállóhelye.
 gz.zone2 = Bármi, ami a hatósugarában épült, elpusztul, amikor egy hullám elindul.
 gz.zone3 = Egy hullám most kezdődik.\nKészülj fel.
-gz.finish = Építs több lövegtornyot, bányássz több nyersanyagot\nés védekezz az ellenséges hullámok ellen, hogy [accent]elfoglald a szektort[].
+gz.finish = Építs több lövegtornyot, bányássz több nyersanyagot,\nés védekezz az ellenséges hullámok ellen, hogy [accent]elfoglald a szektort[].
 
-onset.mine = Kattints a Bal-Egérgommbal a \uf748 [accent]Berillium[]ra, hogy kibányászd a falakból.\n\nHasználd a [accent][[WASD] gombokat a mozgáshoz.
-onset.mine.mobile = Koppints a \uf748 [accent]Berillium[]ra, hogy kibányászd a falakból.
-onset.research = Nyisd meg a \ue875 Fejlesztési fát.\nFejleszd ki és építs egy \uf73e [accent]Kondenzációs Turbina[]t a kürtőn.\nEz [accent]Áram[]ot fog generálni.
-onset.bore = Fejleszd ki és építs \uf741 [accent]Plazma Vágó[]t.\nEz automatikusan bányássza ki a nyersanyagokat a falakból.
-onset.power = Ahhoz, hogy [accent]Áram[]mal lásd el a Plazma Fúrót, Fejleszd ki és építs \uf73d [accent]Sugár Csomópont[]okat.\nSegítségükkel összekötheted a Kondenzációs Turbinát a Plazma Vágóval.
-onset.ducts = Fejleszd ki és építs \uf799 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat eljuttasd a fúróktól/vágóktól a Támaszpontba\nKattints és húzd az egeret bármely irányba, hogy hosszabb Szállítószalagot készíthess.\n[accent]Görgővel[] a szállítás irányát tudod megváltoztatni.
-onset.ducts.mobile = Fejleszd ki és építs \uf799 [accent]Szállítószalag[]ot, hogy a kitermelt nyersanyagokat\neljuttasd a fúróktól/vágóktól a Támaszpontba.\n\nTartsd rajta az ujjad egy másodpercig, és húzd bármely irányba, hogy hosszabb Szállítószalagot készíthess.
-onset.moremine = Bővítsd a bányászati kapacitást.\nÉpíts több Plazma Vágót, használj Sugár Csomópontokat és Szállítószalagokat.\nBányássz 200 Berilliumot.
-onset.graphite = Az összetettebb épületekhez szükség van \uf835 [accent]Grafit[]ra.\nÉpíts Plazma Vágókat, a Grafit kibányászásához.
-onset.research2 = Kezdd el a [accent]Gyárak[] fejlesztését.\nFejleszd ki a \uf74d [accent]Sziklazúzó[]t és a \uf779 [accent]Szilícium Ívkemence[]t.
-onset.arcfurnace = A Szilícium Ívkemencének szüksége lesz \uf834 [accent]Homok[]ra és \uf835 [accent]Grafit[]ra, hogy \uf82f [accent]Szilícium[]ot gyártson.\nTovábbá [accent]Áram[] is szükséges a működéséhez.
-onset.crusher = Használj \uf74d [accent]Sziklazúzó[]t, hogy Homokot bányászhass.
-onset.fabricator = Használd az [accent]egységeket[], hogy felfedezd a pályát, megvédd az épületeket, és megtámadhasd velük az ellenséget. Fejleszd ki és építs \uf6a2 [accent]Tank Gyár[]at.
-onset.makeunit = Állíts elő egy egységet.\nHasználd a "?" gombot, hogy megnézd a gyártási követelményeit.
-onset.turrets = Az egységek hatékonyak, de a [accent]lövegtornyok[] jobb védelmi képességeket biztosítanak, ha hatékonyan alkalmazod őket.\nÉpíts egy \uf6eb [accent]Breach[] lövegtornyot.\nA lövegtornyoknak szüksége van \uf748 [accent]lőszer[]re.
-onset.turretammo = Lásd el a lövegtornyokat [accent]Berillium[] lőszerrel.
-onset.walls = A [accent]Falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts \uf6ee [accent]Berillium Fal[]akat a lövegtornyok körül.
+onset.mine = Kattints bal egérgombbal a  [accent]berillium[] kibányászáshoz a falakból.\n\nA mozgáshoz használd a [accent][[WASD] gombokat.
+onset.mine.mobile = Koppints a  [accent]berillium[] kibányászáshoz a falakból.
+onset.research = Nyisd meg a  fejlesztési fát.\nFejleszd ki, és építs egy  [accent]kondenzációs turbinát[] a kürtőn.\nEz [accent]áramot[] fog termelni.
+onset.bore = Fejleszd ki, és építs egy  [accent]plazmafúrót[].\nEz automatikusan bányássza ki a nyersanyagokat a falakból.
+onset.power = Ahhoz, hogy [accent]árammal[] lásd el a plazmafúrót, fejleszd ki, és helyezz el egy  [accent]sugárcsomópontot[].\nSegítségükkel összekötheted a kondenzációs turbinát a plazmafúróval.
+onset.ducts = Fejleszd ki, és építs  [accent]szállítószalagot[], hogy a kitermelt nyersanyagokat eljuttasd a plazmafúrótól a támaszpontba.\nKattints, és húzd az egeret több szállítószalag elhelyezéséhez.\nHasználd a [accent]görgőt[] a forgatáshoz.
+onset.ducts.mobile = Fejleszd ki, és építs  [accent]szállítószalagot[], hogy a kitermelt nyersanyagokat eljuttasd a plazmafúrótól a támaszpontba.\n\nTartsd lenyomva az ujjad és húzd el, hogy több szállítószalagot helyezz el.
+onset.moremine = Bővítsd a bányászati kapacitást.\nHelyezz el több plazmavágót, és a támogatásukhoz használj sugárcsomópontokat és szállítószalagokat.\nBányássz 200 berilliumot.
+onset.graphite = Az összetettebb épületekhez  [accent]grafit[] szükséges.\nÉpíts plazmavágókat a grafit kibányászásához.
+onset.research2 = Kezdd el a [accent]gyárak[] fejlesztését.\nFejleszd ki a  [accent]sziklazúzót[] és a  [accent]szilícium ívkemencét[].
+onset.arcfurnace = A Szilícium ívkemencének  [accent]homokra[] és  [accent]grafitra[] van szüksége, hogy  [accent]szilíciumot[] gyártson.\nTovábbá [accent]áram[] is szükséges a működéséhez.
+onset.crusher = Használj  [accent]sziklazúzókat[], hogy homokot bányász.
+onset.fabricator = Használd az [accent]egységeket[], hogy felfedezd a pályát, megvédd az épületeket, és megtámadhasd velük az ellenséget. Fejleszd ki, és helyezz el egy  [accent]tankgyárat[].
+onset.makeunit = Állíts elő egy egységet.\nHasználd a „?” gombot, hogy megnézd a kiválasztott gyár követelményeit.
+onset.turrets = Az egységek hatékonyak, de hatásosan alkalmazva a [accent]lövegtornyok[] jobb védelmi képességeket biztosítanak.\nHelyezz el egy  [accent]Breach[] lövegtornyot.\nA lövegtornyoknak  [accent]lőszerre[] van szüksége.
+onset.turretammo = Szállítótalagok használatával lásd el a lövegtornyokat [accent]berillium[] lőszerrel.
+onset.walls = A [accent]falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts  [accent]Berillium falakat[] a lövegtornyok körül.
 onset.enemies = Az ellenség közeledik, készülj fel a védekezésre.
 onset.defenses = [accent]Állíts fel védelmet:[lightgray] {0}
-onset.attack = Az ellenség most sebezhető. Ellentámadásra fel.
-onset.cores = Új Támaszpont csak a [accent]Támaszpont Csempé[]re építhető.\nAz új Támaszpontok előretolt bázisként működnek, és megosztják a nyersanyagkészletüket más Támaszpontokkal.\nÉpíts egy új \uf725 Támaszpontot.
-onset.detect = Az ellenség 2 percen belül észrevesz téged.\nÁllíts fel védelmet, bányássz és termelj.
-onset.commandmode = Tartsd nyomva a [accent]shift[] gombot, hogy belépj a [accent]Parancs Mód[]ba.\n[accent]Bal egérgomb lenyomásával és húzással[] tudod kijelölni az egységeket.\nKattints [accent]Jobb egérgomb[]al egy pontra, vagy ellenségre, hogy a kiválasztott egységeket mozgásra, vagy támadásra utasítsd.
-onset.commandmode.mobile = Nyomd meg a [accent]Parancs[] gombot, hogy belépj a [accent]Parancs Mód[]ba.\nTartsd a kijelzőn az ujjad, majd [accent]húzd[] azt az egységek kiválasztásához.\n[accent]Koppints[] egy pontra, vagy ellenségre, hogy a kiválasztott egységeket mozgásra, vagy támadásra utasítsd.
-aegis.tungsten = Volfrámot [accent]Ütvefúró[]val tudsz bányászni.\nEnnek az épületnek szüksége van [accent]Víz[]re és [accent]Áram[]ra.
+onset.attack = Az ellenség most sebezhető. Indítsd ellentámadást.
+onset.cores = Új támaszpont csak a [accent]támaszpontcsempére[] helyezhető.\nAz új támaszpontok előretolt bázisként működnek, és megosztják a nyersanyagkészletüket más támaszpontokkal.\nHelyezz el egy  támaszpontot.
+onset.detect = Az ellenség 2 percen belül észrevesz téged.\nÁllíts fel védelmet, bányászatot és termelést.
+onset.commandmode = Tartsd nyomva a [accent]Shift[] gombot, hogy [accent]parancs módba[] lépj.\n[accent]Bal egérgombbal és húzással[] lehet egységeket kijelölni.\n[accent]Jobb egérgombbal[] utasíthatók az egységek mozgásra vagy támadásra.
+onset.commandmode.mobile = Nyomd meg a [accent]parancs gombot[], hogy [accent]parancs módba[] lépj.\nTartsd nyomva az ujjad, majd [accent]húzd[] az egységek kiválasztásához.\n[accent]Koppintással[] utasíthatók az egységek mozgásra vagy támadásra.
+aegis.tungsten = Volfrámot [accent]ütvefúróval[] lehet bányászni.\nEnnek az épületnek [accent]vízre[] és [accent]áramra[] van szüksége.
 
-split.pickup = Egyes blokkok a Támaszpont drónjával felvehetőek.\nVegyél fel egy [accent]Konténer[]t és helyezd bele egy [accent]Rakomány Csomagoló[]ba.\n(Az alapértelmezett gombok [ és ] a felvételhez és a lerakáshoz.)
-split.pickup.mobile = Egyes blokkok a Támaszpont drónjával felvehetőek.\nVegyél fel egy [accent]Konténer[]t és helyezd bele egy [accent]Rakomány Csomagoló[]ba.\nAhhoz felvegyél, vagy lerakj valamit koppints rá hosszan)
-split.acquire = Az egységek építéséhez Volfrámot kell szerezned.
-split.build = Az egységeket a fal másik oldalára kell eljuttatni.\nÉpíts 2 [accent]Rakomány Tömegmozgató[]t egyet-egyet a fal mindkét oldalán\nÁllítsd be a szállítási kapcsolatukat úgy, hogy kiválasztod az egyiket, majd kiválasztod a másikat.
-split.container = Hasonlít a Konténerre, csak egységek szállítására is alkalmas a [accent]Rakomány Tömegmozgató[]val.\nÉpíts egy egységgyárat egy tömegmozgató mellé, hogy feltöltsd őket, majd küldd át őket a falon, hogy megtámadják az ellenséges bázist.
+split.pickup = Egyes blokkok a támaszpont drónjával is felvehetők.\nVedd fel ezt a [accent]konténert[] és helyezd egy [accent]rakománycsomagolóba[].\n(A felvétel és lerakás alapértelmezett gombjai: [[ és ].)
+split.pickup.mobile = Egyes blokkok a támaszpont drónjával is felvehetők.\nVedd fel ezt a [accent]konténert[] és helyezd egy [accent]rakománycsomagolóba[].\n(A felvételhez és lerakáshoz nyomd meg hosszan.)
+split.acquire = Az egységek építéséhez volfrámot kell szerezned.
+split.build = Az egységeket a fal másik oldalára kell eljuttatni.\nÉpíts két [accent]rakomány-tömegmozgatót[], egyet-egyet a fal mindkét oldalán.\nÁllítsd be a szállítási kapcsolatukat úgy, hogy kiválasztod az egyiket, majd kiválasztod a másikat.
+split.container = A konténerekhez hasonlóan, az egységek is szállíthatók a [accent]rakomány-tömegmozgatóval[].\nÉpíts egy egységgyárat egy tömegmozgató mellé, hogy feltöltsd őket, majd küldd át őket a falon, hogy megtámadják az ellenséges bázist.
 
-item.copper.description = Széleskörűen felhasználható építkezésre és lövedékként.
-item.copper.details = Szokatlanul elterjedt fém a Serpulo-n. Gyenge szerkezetű, de megerősíthető.
-item.lead.description = Folyadékszállító csővezetékek építésére használatos, de elektromos eszközökben is alkalmazható.
-item.lead.details = Sűrű. Közömbös. Széles körben használatos elemekben.\nMegjegyzés: Valószínűleg mérgező a biológiai életformákra. Nem mintha sok maradt volna errefelé.
-item.metaglass.description = Folyadékok szállítására és tárolására alkalmas csővezetékek és épületek építésére, továbbá lövedékként is használható.
-item.graphite.description = Elektromos alkatrészek alapanyagaként és lövedékként is használható.
-item.sand.description = Egyéb finom nyersanyagok gyártási alapanyaga.
-item.coal.description = Tüzelőanyag és gyártási alapanyag.
-item.coal.details = Fosszilizálódott növényi anyagnak tűnik, jóval a "spóra incidens" előttről.
-item.titanium.description = Folyadékok szállítására, fúrókban és légi járművekben használható.
-item.thorium.description = Strapabíró szerkezetekben használható nukleáris tüzelőanyagként.
-item.scrap.description = Olvasztással és porítással finom nyersanyagok nyerhetők ki belőle.
+item.copper.description = Széleskörűen használatos építkezésnél és lőszerként.
+item.copper.details = Réz. Szokatlanul bőséges fém a Serpulón. Megerősítés nélkül strukturálisan gyenge.
+item.lead.description = Folyadékszállításnál és elektromos eszközökben használatos.
+item.lead.details = Sűrű. Közömbös. Széles körben használatos az akkumulátorokban.\nMegjegyzés: Valószínűleg mérgező a biológiai életformákra. Nem mintha sok maradt volna errefelé.
+item.metaglass.description = Folyadékszállító és -tárolóépületeknél használatos.
+item.graphite.description = Elektromos alkatrészekben és lőszerként használatos.
+item.sand.description = Egyéb finomított nyersanyagok gyártása során használatos.
+item.coal.description = Tüzelőanyagként és finomított nyersanyagok gyártásához használatos.
+item.coal.details = Fosszilizálódott növényi anyagnak tűnik, jóval a „spóra incidens” előttről.
+item.titanium.description = Folyadékszállító épületekben, fúrókban és gyárakban használatos.
+item.thorium.description = Strapabíró szerkezetekben használatos nukleáris fűtőanyag.
+item.scrap.description = Olvasztókban és porítókban használatos már nyersanyagok finomításához.
 item.scrap.details = Ősi építmények és egységek hátrahagyott maradványai.
-item.silicon.description = Napelemek, összetett áramkörök és nyomkövető lövedékek fontos alapanyaga. Sosincs belőle elég.
-item.plastanium.description = Fejlett egységek alapanyagaként, hőszigetelésre és repeszes lövedékekhez is használható.
-item.phase-fabric.description = Fejlett elektromos eszközökben és önjavító szerkezetekben is használható.
-item.surge-alloy.description = Magas szintű fegyverzetekben és aktív védelemhez is használható.
-item.spore-pod.description = Átalakítható Olajjá, vagy robbanószerekké, de használható tüzelőanyagként is.
-item.spore-pod.details = Spórák. Egy valószínűleg mesterséges életforma. Más életformák számára halálos gázt bocsátanak ki. Szélsőségesen invazív. Megfelelő körülmények között erősen gyúlékony.
-item.blast-compound.description = A bombák és a robbanó lövedékek egyik fő összetevője.
-item.pyratite.description = Gyújtó lövedékekben és tüzelőanyag-alapú generátorokban is használható.
+item.silicon.description = Napelemekben, összetett áramkörökben és nyomkövető lőszerekben használatos.
+item.plastanium.description = Fejlett egységek alapanyagaként, hőszigetelésben és repeszlövedékekben használatos.
+item.phase-fabric.description = Fejlett elektromos eszközökben és önjavító épületekben használatos.
+item.surge-alloy.description = Fejlett fegyverzetekhez és aktív védelmi épületekhez használatos.
+item.spore-pod.description = Olajjá, robbanószerré és tüzelőanyaggá alakításhoz használatos.
+item.spore-pod.details = Spórák. Valószínűleg egy mesterséges életforma. Más életformák számára halálos gázt bocsátanak ki. Szélsőségesen invazív. Megfelelő körülmények között erősen gyúlékony.
+item.blast-compound.description = Bombákhoz és robbanólövedékekhez használatos.
+item.pyratite.description = Gyújtólövedékekben és tüzelőanyag-alapú generátorokban használatos.
 
 #Erekir
-item.beryllium.description = Sokféle épület- és lőszertípushoz használatos az Erekir-en.
-item.tungsten.description = Fúrókban/vágókban, páncélokban használatos, de lőszerként is alkalmazható. A fejlettebb szerkezetek építéséhez szükséges.
-item.oxide.description = Hővezetőként és Áramszigetelőként is használatos.
-item.carbide.description = Korszerű szerkezetekben, nehezebb egységekben használatos, de lőszerként is alkalmazható.
+item.beryllium.description = Sokféle épület- és lőszertípushoz használatos az Erekiren.
+item.tungsten.description = Fúrókban, páncélokban és lőszerben használatos. A fejlettebb épületek építéséhez szükséges.
+item.oxide.description = Hővezetőként és szigetelőként is használatos az áramtermelésben.
+item.carbide.description = Fejlett szerkezetekben, nehezebb egységekhez és lőszerként használatos.
 
-liquid.water.description = Gépek hűtésére és Törmelékfeldolgozásra is használható.
-liquid.slag.description = Leválasztóban finomítva értékes fémek forrása, az ellenségre fröcskölve gyilkos fegyver.
-liquid.oil.description = Magas szintű nyersanyagok gyártására, vagy gyújtólövedékként is használható.
-liquid.cryofluid.description = Hűtőfolyadék az erőművek, reaktorok, lövegtornyok és gyárak számára.
+liquid.water.description = Gépek hűtéséhez és törmelékfeldolgozáshoz használatos.
+liquid.slag.description = Leválasztóban alkotófémekre finomítható. Folyadékot használó tornyokban lőszerként használható.
+liquid.oil.description = Fejlett nyersanyagok gyártásához és gyújtólövedékhez használatos.
+liquid.cryofluid.description = Reaktorokban, lövegtornyokban és gyárakban használatos hűtőfolyadékként.
 
 #Erekir
 liquid.arkycite.description = Kémiai reakciókban használatos energiatermelésre és anyagszintézisre.
-liquid.ozone.description = Oxidálószerként használatos az anyaggyártásban és üzemanyagként. Mérsékelten robbanékony.
-liquid.hydrogen.description = A nyersanyagok kitermelésében, egységgyártásban és szerkezetjavításban is használatos. Gyúlékony.
-liquid.cyanogen.description = Lőszerként, vagy fejlett egységek építéséhez és különböző reakciókhoz használatos a fejlett épületekben. Erősen gyúlékony.
-liquid.nitrogen.description = A nyersanyagok kitermelésében, gáztermelésnél és egységgyártásnál is használatos. Semleges gáz.
-liquid.neoplasm.description = A Neoplázia Reaktor veszélyes biológiai mellékterméke. Gyorsan átterjed minden szomszédos víztartalmú épületre, amelyhez hozzáér és közben károsítja azokat. Sűrű folyadék.
-liquid.neoplasm.details = Neoplazma. Egy kontrollálhatatlan, gyorsan osztódó, iszap állagú, szintetikus sejtmassza. Hőálló. Rendkívül veszélyes minden Vízzel kapcsolatos szerkezetre.\n\nTúl összetett és instabil a szabványos elemzésekhez. Potenciális alkalmazási területe ismeretlen. Ajánlott a Salak medencékben való elégetése.
+liquid.ozone.description = Az anyaggyártásban oxidálószerként, illetve üzemanyagként használatos. Mérsékelten robbanékony.
+liquid.hydrogen.description = A nyersanyagok kitermelésében, egységgyártásban és szerkezetjavításban használatos. Gyúlékony.
+liquid.cyanogen.description = Lőszerként, fejlett egységek építéséhez és különböző reakciókhoz használatos a fejlett blokkokban. Erősen gyúlékony.
+liquid.nitrogen.description = A nyersanyagok kitermelésénél, gáztermelésnél és egységgyártásnál is használatos. Semleges gáz.
+liquid.neoplasm.description = A neoplázia reaktor veszélyes biológiai mellékterméke. Gyorsan átterjed minden szomszédos víztartalmú blokkra, amelyhez hozzáér, és közben károsítja azokat. Sűrű folyadék.
+liquid.neoplasm.details = Neoplazma. Egy kontrollálhatatlan, gyorsan osztódó, iszap állagú, szintetikus sejtmassza. Hőálló. Rendkívül veszélyes minden vízzel kapcsolatos szerkezetre.\n\nTúl összetett és instabil a szabványos elemzésekhez. Potenciális alkalmazási területe ismeretlen. A salakmedencékben való elégetés ajánlott.
 
-block.derelict = \uf77e [lightgray]Elhagyatott
-block.armored-conveyor.description = Nyersanyagokat szállít. Nem fogad el nyersanyagot oldalról.
+block.derelict =  [lightgray]Elhagyatott
+block.armored-conveyor.description = Nyersanyagokat szállít. Nem fogad el oldalról nem szállítószalagról érkező nyersanyagot.
 block.illuminator.description = Világít.
-block.message.description = Üzenetet tárol szövetségesek kommunikációjához.
+block.message.description = Üzenetet tárol a szövetségesek kommunikációjához.
 block.reinforced-message.description = Üzenetet tárol a szövetségesek közötti kommunikációhoz.
 block.world-message.description = A pályakészítésben használható üzenetblokk. Nem lehet megsemmisíteni.
-block.graphite-press.description = Szenet présel Grafittá.
-block.multi-press.description = Szenet sajtol Grafittá. Hatékonyan dolgozik, de Vizet igényel hűtéshez.
-block.silicon-smelter.description = Szilíciumot nyer ki Homok és Szén keverékéből.
-block.kiln.description = Ólomból és Homokból olvaszt Ólomüveget.
-block.plastanium-compressor.description = Műanyagot gyárt Olaj és Titán felhasználásával.
-block.phase-weaver.description = Tóritkvarcot képez Tórium és Homok keverékéből.
-block.surge-smelter.description = Titán, Ólom, Szilícium és Réz olvadékából állít elő Elektrometált.
-block.cryofluid-mixer.description = Finom Titánport kever Vízhez a Hűtőfolyadék előállításához.
-block.blast-mixer.description = Piratitból és Spóra Kapszulákból készít Robbanóelegyet.
-block.pyratite-mixer.description = Szenet, Homokot és Ólmot vegyít Piratittá.
-block.melter.description = Törmeléket olvaszt Salakká.
-block.separator.description = Szétbontja a Salakot ásványi összetevőire.
-block.spore-press.description = Nagy nyomáson Olajat sajtol a Spóra Kapszulából.
-block.pulverizer.description = Finom Homokká őrli a Törmeléket.
-block.coal-centrifuge.description = Szenet nyer ki Olajból.
+block.graphite-press.description = Grafittá préseli a szenet.
+block.multi-press.description = Grafittá préseli a szenet. Hűtése vizet igényel.
+block.silicon-smelter.description = A homokot és szenet szilíciummá finomítja.
+block.kiln.description = Ólomüveget olvaszt az ólomból és a homokból.
+block.plastanium-compressor.description = Olaj és titán felhasználásával műanyagot gyárt.
+block.phase-weaver.description = Tórium és homok keverékéből tóritkvarcot állít elő.
+block.surge-smelter.description = Titán, ólom, szilícium és réz ötvözésével elektrometált állít elő.
+block.cryofluid-mixer.description = Finom titánpor vízhez keverésével hűtőfolyadékot állít elő.
+block.blast-mixer.description = Robbanóelegyet készít a piratitból és a spórakapszulákból.
+block.pyratite-mixer.description = Piratittá vegyíti a szenet, homokot és ólmot.
+block.melter.description = Salakká olvasztja a törmeléket.
+block.separator.description = Ásványi összetevőire bontja a salakot.
+block.spore-press.description = Olajat sajtol a spórakapszulából.
+block.pulverizer.description = Finom homokká őrli a törmeléket.
+block.coal-centrifuge.description = Szénné alakítja az olajat.
 block.incinerator.description = Megsemmisít minden nyersanyagot és folyadékot.
-block.power-void.description = Elnyel minden Áramot. (Csak homokozóban.)
-block.power-source.description = Végtelen Áramot termel. (Csak homokozóban.)
-block.item-source.description = Végtelen nyersanyagot bocsát ki. (Csak homokozóban.)
-block.item-void.description = Megsemmisít minden nyersanyagot. (Csak homokozóban.)
-block.liquid-source.description = Végtelen folyadékot bocsát ki. (Csak homokozóban.)
-block.liquid-void.description = Megsemmisít minden folyadékot. (Csak homokozóban.)
-block.payload-source.description = Végtelenül sok rakomány. (Csak homokozóban.)
-block.payload-void.description = Minden rakomány megsemmisítése. (Csak homokozóban.)
+block.power-void.description = Elnyel minden áramot. Csak homokozó módban.
+block.power-source.description = Végtelen áramot termel. Csak homokozó módban.
+block.item-source.description = Végtelen nyersanyagot termel. Csak homokozó módban.
+block.item-void.description = Megsemmisít minden nyersanyagot. Csak homokozó módban.
+block.liquid-source.description = Végtelen folyadékot termel. Csak homokozó módban.
+block.liquid-void.description = Megsemmisít minden folyadékot. Csak homokozó módban.
+block.payload-source.description = Végtelen rakományt termel. Csak homokozó módban.
+block.payload-void.description = Megsemmisít minden rakományt. Csak homokozó módban.
 block.copper-wall.description = Megvédi az épületeket az ellenséges lövedékektől.
 block.copper-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől.
 block.titanium-wall.description = Megvédi az épületeket az ellenséges lövedékektől.
@@ -2027,155 +2027,155 @@ block.phase-wall.description = Megvédi az épületeket az ellenséges lövedék
 block.phase-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől, a legtöbb lövedék visszapattan róla.
 block.surge-wall.description = Megvédi az épületeket az ellenséges lövedékektől, periodikusan elektromos kisüléseket generál, ha hozzáérnek.
 block.surge-wall-large.description = Megvédi az épületeket az ellenséges lövedékektől, periodikusan elektromos kisüléseket generál, ha hozzáérnek.
-block.door.description = Fal, amit nyitni és zárni lehet.
-block.door-large.description = Fal, amit nyitni és zárni lehet. De ez nagyobb.
-block.mender.description = Javítja az épületeket a hatókörén belül.\nSzilíciummal növelhető a hatósugara és hatékonysága.
-block.mend-projector.description = Javítja az épületeket a hatókörén belül.\nTóritkvarccal növelhető a hatósugara és hatékonysága.
+block.door.description = Nyitható és zárható fal.
+block.door-large.description = Nyitható és zárható fal.
+block.mender.description = Időnként javítja a közeli épületeket.\nSzilíciummal növelhető a hatósugara és hatékonysága.
+block.mend-projector.description = Javítja a közeli épületeket.\nTóritkvarccal növelhető a hatósugara és hatékonysága.
 block.overdrive-projector.description = Növeli a közeli épületek termelési sebességét.\nTóritkvarccal növelhető a hatósugara és hatékonysága.
-block.force-projector.description = Hatszögletű erőteret hoz létre maga körül, amely megvédi az épületeket és a benne lévő egységeket a sérüléstől.\nTúlmelegszik, ha túl sok sérülést szenved. Opcionálisan Hűtőfolyadékot használ a túlmelegedés megakadályozására. A Tóritkvarc növeli a pajzs méretét.
+block.force-projector.description = Hatszögletű erőteret hoz létre maga körül, amely megvédi az épületeket és a benne lévő egységeket a sérüléstől.\nTúlmelegszik, ha túl sok sérülést szenved. Hűtőfolyadékot használva megakadályozható a túlmelegedés. A tóritkvarc növeli a pajzs méretét.
 block.shock-mine.description = Elektromos kisülést hoz létre, ha ellenséggel érintkezik.
-block.conveyor.description = Szállítószalag. Nyersanyagokat szállít.
-block.titanium-conveyor.description = Nyersanyagokat szállít. Gyorsabb a sima Szállítószalagnál.
-block.plastanium-conveyor.description = Nyersanyagokat szállít tömbösítve. Hátulról fogadja a nyersanyagokat, elöl három irányba szétosztja őket. Több kezdő- és végponttal növelhető az áteresztőképessége.
-block.junction.description = Hídként működik két egymást keresztező Szállítószalag között.
+block.conveyor.description = Nyersanyagokat szállít.
+block.titanium-conveyor.description = Nyersanyagokat szállít. Gyorsabb a sima szállítószalagnál.
+block.plastanium-conveyor.description =  Nyersanyagokat szállít tömbösítve. Hátulról fogadja a nyersanyagokat, elöl három irányba osztja szét őket. Több kezdő- és végponttal növelhető az áteresztőképessége.
+block.junction.description = Hídként működik két egymást keresztező szállítószalag között.
 block.bridge-conveyor.description = Nyersanyagokat szállít épületek és terepakadályok fölött.
-block.phase-conveyor.description = Nyersanyagokat szállít épületek és terepakadályok fölött. Nagyobb távolságra ér, mint a sima Szállítószalag Híd, de Áramot használ.
+block.phase-conveyor.description = Nyersanyagokat szállít épületek és terepakadályok fölött. Nagyobb távolságra ér, mint a sima szállítószalaghíd, de áramot igényel.
 block.sorter.description = Csak a kiválasztott nyersanyagot engedi tovább egyenesen, minden mást oldalra ad ki.
-block.inverted-sorter.description = A kiválasztott nyersanyagot oldalra adja ki, minden mást egyenesen enged tovább.
-block.router.description = Háromfelé osztja szét a beérkező nyersanyagokat.
-block.router.details = Pokoli masina. Ne tedd közvetlenül gyárak mellé, mert az épületek nyersanyagai eltömítik.
-block.distributor.description = Hétfelé osztja szét a beérkező nyersanyagokat.
-block.overflow-gate.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud. Nem használható közvetlenül Túlfolyó Kapu, vagy Alul-folyó Kapu mellett.
-block.underflow-gate.description = Csak akkor enged tovább nyersanyagokat előre, ha oldalra már nem tudja kiadni őket. Nem használható közvetlenül Túlfolyó Kapu, vagy Alul-folyó Kapu mellett.
-block.mass-driver.description = Nagy hatótávolságú nyersanyagszállító eszköz. Rakományokban lő át nyersanyagokat egy másik, hozzákapcsolt Tömegmozgatónak.
-block.mechanical-pump.description = Folyadékot szivattyúz. Nem igényel Áramot.
-block.rotary-pump.description = Folyadékot szivattyúz. Árammal működik.
-block.impulse-pump.description = Folyadékot szivattyúz. Sokat termel, de sok Áramot fogyaszt.
-block.conduit.description = Folyadékot szállít.
-block.pulse-conduit.description = Folyadékot szállít. Gyorsabb és nagyobb tárolókapacitású, mint a sima Csővezeték.
-block.plated-conduit.description = Folyadékot szállít. Nem fogad el folyadékot oldalról. Nem önti ki a folyadékot, ha nincs a végén semmi.
-block.liquid-router.description = Háromfelé osztja szét a beérkező folyadékot. Bizonyos mennyiség tárolására is képes.
-block.liquid-container.description = Jelentős mennyiségű folyadékot tárol. Minden oldalon kijuttatja a folyadékot, hasonlóan a Folyadék Elosztóhoz.
-block.liquid-tank.description = Nagy mennyiségű folyadékot tárol és minden oldalán képes azt kijuttatni.
+block.inverted-sorter.description = Hasonló a szokásos válogatóhoz, de a kiválasztott nyersanyagot oldalra adja ki.
+block.router.description = Egyenletesen háromfelé osztja szét a beérkező nyersanyagokat.
+block.router.details = Egy szükséges rossz. Nem ajánlott termelőegységek mellett használni, mert a kimenet eltömíti.
+block.distributor.description = Egyenletesen hétfelé osztja szét a beérkező nyersanyagokat.
+block.overflow-gate.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud.
+block.underflow-gate.description = A túlcsorduló kapu ellentettje. Csak akkor ad ki nyersanyagot előrefelé, ha oldalra már nem tud.
+block.mass-driver.description = Nagy hatótávolságú nyersanyagszállító eszköz. Rakományokat gyűjt össze, és átlövi egy másik, hozzákapcsolt tömegmozgatónak.
+block.mechanical-pump.description = Folyadékot szivattyúz és ad ki. Nem igényel áramot.
+block.rotary-pump.description = Folyadékot szivattyúz és ad ki. Áramot igényel.
+block.impulse-pump.description = Folyadékot szivattyúz és ad ki.
+block.conduit.description = Folyadékot szállít. Pumpákkal és egyéb csővezetékekkel együtt használatos.
+block.pulse-conduit.description = Folyadékot szállít. Gyorsabban szállít, és nagyobb tárolókapacitású, mint a szokásos csővezeték.
+block.plated-conduit.description = Folyadékot szállít. Nem fogad el folyadékot oldalról. Nem szivárog, ha nincs a végén semmi.
+block.liquid-router.description = Egyenletesen háromfelé osztja szét a beérkező folyadékot. Bizonyos mennyiség tárolására is képes.
+block.liquid-container.description = Jelentős mennyiségű folyadékot tárol. Minden oldalon kiadja, hasonlóan a folyadékelosztóhoz.
+block.liquid-tank.description = Nagy mennyiségű folyadékot tárol. Minden oldalon kiadja, hasonlóan a folyadékelosztóhoz.
 block.liquid-junction.description = Hídként működik két egymást keresztező csővezeték között.
 block.bridge-conduit.description = Folyadékot szállít épületek és terepakadályok fölött.
-block.phase-conduit.description = Folyadékot szállít épületek és terepakadályok fölött. Nagyobb távolságra ér, mint a sima Csővezeték Híd, de Áramot használ.
-block.power-node.description = Áramot vezet az összekapcsolt épületekhez. Az érintkező épületekkel automatikusan kapcsolatban van.
-block.power-node-large.description = Nagyobb Villanyoszlop nagyobb hatótávolsággal.
-block.surge-tower.description = Hosszútávú Villanyoszlop, csak kevés kapcsolatra képes.
-block.diode.description = Az eltárolt Áramot irányítja át egy megadott irányba, de csak akkor, ha a fogadó oldalon van kevesebb tárolva.
-block.battery.description = Áramot tárol el, ha túltermelés van. Leadja az Áramot, ha hiány van.
-block.battery-large.description = Áramot tárol el, ha túltermelés van. Leadja az Áramot, ha hiány van. Nagyobb kapacitású a sima Akkumulátornál.
-block.combustion-generator.description = Áramot termel éghető anyagok elégetésével.
-block.thermal-generator.description = Forró környezetben Áramot termel.
-block.steam-generator.description = Áramot termel éghető anyagok elégetésével és Víz gőzzé alakításával.
-block.differential-generator.description = Egy lórúgásnyi Áramot termel. Hasznosítja a Hűtőfolyadék és az égő Piratit hőmérséklet különbségét.
-block.rtg-generator.description = A radioaktív bomlás energiáját hasznosítja, hogy lassan de biztosan Áramot termeljen.
-block.solar-panel.description = Napfényből állít elő kevés Áramot.
-block.solar-panel-large.description = Napfényből állít elő kevés Áramot. Hatékonyabb a sima Napelemnél.
-block.thorium-reactor.description = Jelentős Áramot állít elő Tóriumból. Állandó hűtést igényel. Ha túlmelegszik, akkor felrobban.
-block.impact-reactor.description = Csúcsra járatva rengeteg Áramot termel. Jelentős Árambefektetést igényel a reakció beindítása.
-block.mechanical-drill.description = Ércre helyezve kis tempóban termeli ki az adott nyersanyagot. Csak alapvető nyersanyagok kitermelésére képes.
-block.pneumatic-drill.description = Egy fejlettebb fúró, képes Titán kitermelésére. Gyorsabban dolgozik a Mechanikus Fúrónál.
-block.laser-drill.description = Lézerek használatával még gyorsabban tud dolgozni, de Áramot használ. Képes Tóriumot kitermelni.
-block.blast-drill.description = A technológia csúcsa. Rengeteg Áramot használ.
-block.water-extractor.description = Képes a talajvíz kiszivattyúzására. Akkor használd, ha nincs elérhető Víz a felszínen.
+block.phase-conduit.description = Folyadékot szállít épületek és terepakadályok fölött. Nagyobb távolságra ér, mint a sima csővezetékhíd, de áramot igényel.
+block.power-node.description = Áramot vezet az összekapcsolt csomópontokhoz. A szomszédos blokkokkal automatikusan kapcsolatban van.
+block.power-node-large.description = Nagyobb villanyoszlop, nagyobb hatótávolsággal.
+block.surge-tower.description = Hosszútávú villanyoszlop, kevesebb elérhető kapcsolattal.
+block.diode.description = Az eltárolt áramot irányítja egy irányba továbbítja, de csak akkor, ha a fogadó oldalon kevesebb van tárolva.
+block.battery.description = Áramot tárol el, ha túltermelés van. Leadja az áramot, ha hiány van.
+block.battery-large.description =  Áramot tárol el, ha túltermelés van. Leadja az áramot, ha hiány van. Nagyobb kapacitású a szokásos akkumulátornál.
+block.combustion-generator.description = Áramot termel éghető anyagok, például szén, elégetésével.
+block.thermal-generator.description = Forró környezetben áramot termel.
+block.steam-generator.description = Éghető anyagok elégetésével és víz gőzzé alakításával áramot termel.
+block.differential-generator.description = Nagy mennyiségű áramot termel. A hűtőfolyadék és az égő piratit hőmérséklet-különbségét használja ki.
+block.rtg-generator.description = A radioaktív bomlás energiáját hasznosítja, hogy lassan, de biztosan áramot termeljen.
+block.solar-panel.description = Napfényből állít elő kevés áramot.
+block.solar-panel-large.description = Napfényből állít elő kevés áramot. Hatékonyabb a szokásos napelemnél.
+block.thorium-reactor.description = Jelentős mennyiségű áramot állít elő tóriumból. Állandó hűtést igényel. Ha nincs megfelelően hűtőfolyadékkal ellátva, akkor felrobban.
+block.impact-reactor.description = Csúcsra járatva rengeteg áramot termel. A reakció beindítása jelentős árambefektetést igényel.
+block.mechanical-drill.description = Ércre helyezve lassú tempóban termeli ki az adott nyersanyagot. Csak alapvető nyersanyagok kitermelésére képes.
+block.pneumatic-drill.description = Egy fejlettebb fúró, mely titán kitermelésére is képes. Gyorsabban dolgozik a mechanikus fúrónál.
+block.laser-drill.description = Lézerek használatával még gyorsabban tud dolgozni, de áramot igényel. Képes tóriumot kitermelni.
+block.blast-drill.description = A technológia csúcsa. Nagy mennyiségű áramot igényel.
+block.water-extractor.description = Kiszivattyúzza a talajvizet. Olyan helyeken használatos, ahol nem érhető el felszíni vízforrás.
 block.cultivator.description = A légkörben szálló spórákat kapszulákba sűríti.
-block.cultivator.details = Visszaszerzett technológia. Hatalmas tömegű biomassza gyártására alkalmas a lehető leghatékonyabban. Valószínűleg a Serpulo-t ma borító spórák kezdeti inkubátora.
-block.oil-extractor.description = Nagy mennyiségben használ Vizet, Homokot és Áramot, hogy Olajat nyerjen ki a földből.
+block.cultivator.details = Visszaszerzett technológia. Hatalmas tömegű biomassza gyártására alkalmas a lehető leghatékonyabban. Valószínűleg a Serpulo felszínét ma borító spórák kezdeti inkubátora.
+block.oil-extractor.description = Nagy mennyiségű áramot, homokot és vizet használ, hogy olajat fúrjon.
 block.core-shard.description = Támaszpont. Ha elpusztul, a szektor elveszett.
-block.core-shard.details = Az első modell. Kompakt. Önsokszorosító. Egyszer használatos gyorsítófúvókákkal van felszerelve, nem bolygóközi utazásra tervezték.
-block.core-foundation.description = Támaszpont. Páncélozott. Több nyersanyagot tárol, mint a Szilánk.
+block.core-shard.details = Az első modell. Kompakt. Önsokszorosító. Egyszer használatos indítórakétákkal van felszerelve, nem bolygóközi utazásra tervezték.
+block.core-foundation.description = Támaszpont. Jól páncélozott. Több nyersanyagot tárol, mint a Szilánk.
 block.core-foundation.details = A második modell.
-block.core-nucleus.description = Támaszpont. Megerősített páncélzattal. Hatalmas mennyiségű nyersanyag tárolására képes.
+block.core-nucleus.description = Támaszpont. Rendkívül jól páncélozott. Hatalmas mennyiségű nyersanyag tárolására képes.
 block.core-nucleus.details = A harmadik, végső modell.
-block.vault.description = Nagy mennyiséget tárol minden nyersanyagtípusból. A tartalma kirakodó segítségével nyerhető ki.
-block.container.description = Kis mennyiséget tárol minden nyersanyagtípusból. A tartalma kirakodó segítségével nyerhető ki.
+block.vault.description = Nagy mennyiséget tárol minden nyersanyagtípusból. Bővíti a raktárat, ha egy támaszpont mellé van helyezve. A tartalma kirakodó segítségével nyerhető ki.
+block.container.description = Kis mennyiséget tárol minden nyersanyagtípusból. Bővíti a raktárat, ha egy támaszpont mellé van helyezve. A tartalma kirakodó segítségével nyerhető ki.
 block.unloader.description = Kirakodja a szomszédos épületekből a kiválasztott nyersanyagot.
 block.launch-pad.description = Nyersanyagokat juttat el más szektorokba.
-block.launch-pad.details = Szub-orbitális rendszer a nyersanyagok szektorok között történő szállítására. A teherkapszulák törékenyek, ezért nem képesek túlélni a visszatérést.
+block.launch-pad.details = Szuborbitális rendszer a nyersanyagok szektorok között történő szállítására. A teherkapszulák törékenyek, ezért nem képesek túlélni a légkörbe való visszatérést.
 block.duo.description = Változatos lövedékekkel lő az ellenségre.
-block.scatter.description = Ólom-, Ólomüveg-, vagy Törmelékdarabokkal tüzel az ellenséges légierőre.
+block.scatter.description = Ólom-, törmelék- vagy ólomüvegdarabokat lő az ellenséges légijárművekre.
 block.scorch.description = Megégeti az ellenség közeli földi egységeit. Kis távolságra nagyon hatékony.
-block.hail.description = Kis lövedékeket lő ki a nagy távolságokra lévő földi célpontokra.
-block.wave.description = Folyadékot önt az ellenségre. Eloltja a tüzet, ha Vízzel van feltöltve.
+block.hail.description = Kis lövedékeket lő ki nagy távolságokra lévő földi célpontokra.
+block.wave.description = Folyadékot önt az ellenségre. Eloltja a tüzeket, ha vízzel van ellátva.
 block.lancer.description = Erős energiasugarakat lő közeli földi célpontokra.
 block.arc.description = Elektromos szikrákat kelt földi célpontok között.
 block.swarmer.description = Nyomkövető rakétákat lő az ellenségre.
-block.salvo.description = Kis sorozatokat lő az ellenségre.
-block.fuse.description = Három kis hatótávú átütő erejű töltényt lő egyszerre.
-block.ripple.description = Lövedékek csoportjával tüzel földi célpontokra nagy távolságra.
+block.salvo.description = Gyors sorozatokat lő az ellenségre.
+block.fuse.description = Három kis hatótávú, átütő erejű lövedéket lő a közeli ellenségre.
+block.ripple.description = Lövedékek csoportjával tüzel nagy távolságra lévő földi célpontokra.
 block.cyclone.description = Robbanó lövedékeket lő közeli ellenségekre.
-block.spectre.description = Nagy, a páncélon is áthatoló lövedékekkel tüzel légi és földi célpontokra is.
-block.meltdown.description = Feltöltődés után folyamatos lézersugarat lő a közeli ellenségekre. Hűtést igényel.
-block.foreshadow.description = Nagy méretű villámot lő ki nagy távolságokra, de egyszerre csak egyetlen célpontra.
-block.repair-point.description = Folyamatosan gyógyítja a legközelebbi sérült egységet a közelében.
+block.spectre.description = Nagy lövedékekkel tüzel légi és földi célpontokra.
+block.meltdown.description = Feltöltődés után folyamatos lézersugarat lő a közeli ellenségekre. A működéséhez hűtőfolyadékot igényel.
+block.foreshadow.description = Egy nagy villámot lő ki egy nagy távolságra lévő célpontra. A magasabb maximális életerővel rendelkező ellenségeket részesíti előnyben.
+block.repair-point.description = Folyamatosan javítja a legközelebbi sérült egységet a közelében.
 block.segment.description = Megsemmisíti a beérkező lövedékeket. A lézerrel szemben hatástalan.
-block.parallax.description = Vonónyalábot bocsát ki, amivel magához vonzza és sebzi a repülő egységeket.
-block.tsunami.description = Erős folyadékhullámokat lő az ellenségre. Eloltja a tüzet, ha Vízzel van feltöltve.
-block.silicon-crucible.description = Szilíciumot finomít Homokból és Szénből. Piratitot használ kiegészítő hőforrásként. Forró környezetben hatékonyabb.
-block.disassembler.description = Ritka ásványi elemeket választ ki Salakból. Képes Tóriumot kiválasztani.
-block.overdrive-dome.description = Megnöveli a környező gyárak termelési sebességét. Tóritkvarcot és Szilíciumot igényel.
-block.payload-conveyor.description = Képes egységeket szállítani.
-block.payload-router.description = Háromfelé osztja szét a beérkező egységeket.
-block.ground-factory.description = Földi egységeket gyárt. A kész egységek azonnal hadra-foghatóak, vagy Újratervezőkben tovább fejleszthetőek.
-block.air-factory.description = Légi egységeket gyárt. A kész egységek azonnal hadra-foghatóak, vagy Újratervezőkben tovább fejleszthetőek.
-block.naval-factory.description = Vízi egységeket gyárt. A kész egységek azonnal hadra-foghatóak, vagy Újratervezőkben tovább fejleszthetőek.
+block.parallax.description = Vonónyalábot bocsát ki, amivel magához vonzza, és közben sebzi a légi egységeket.
+block.tsunami.description = Erős folyadékhullámot lő az ellenségre. Eloltja a tüzeket, ha vízzel van ellátva.
+block.silicon-crucible.description = Szilíciumot finomít homokból és szénből, piratitot használ kiegészítő hőforrásként. Forró környezetben még hatékonyabb.
+block.disassembler.description = Ritka ásványi összetevőket válogat ki a salakból, alacsony hatékonysággal. Képes tóriumot kiválogatni.
+block.overdrive-dome.description =  Megnöveli a környező épületek termelési sebességét. A működtetése tóritkvarcot és szilíciumot igényel.
+block.payload-conveyor.description = Nagy mennyiségű terhet mozgatni, például gyárakból érkező nyersanyagokat. Mágneses. Használható súlytalanságban.
+block.payload-router.description = Háromfelé osztja szét a beérkező terhet. Rendezőként is szolgál, ha van megadva szűrő. Mágneses. Használható súlytalanságban.
+block.ground-factory.description = Földi egységeket gyárt. A kész egységek azonnal hadra foghatók, vagy újratervezőkben továbbfejleszthetők.
+block.air-factory.description = Légi egységeket gyárt. A kész egységek azonnal hadra foghatók, vagy újratervezőkben továbbfejleszthetők.
+block.naval-factory.description = Vízi egységeket gyárt. A kész egységek azonnal hadra foghatók, vagy újratervezőkben továbbfejleszthetők.
 block.additive-reconstructor.description = Kettes szintre fejleszti a beérkező egységeket.
 block.multiplicative-reconstructor.description = Hármas szintre fejleszti a beérkező egységeket.
 block.exponential-reconstructor.description = Négyes szintre fejleszti a beérkező egységeket.
-block.tetrative-reconstructor.description = Ötös szintre fejleszti a beérkező egységeket.
-block.switch.description = Kétállású kapcsoló. Az állapota leolvasható és módosítható processzorokkal.
-block.micro-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek, vagy épületek irányítására is.
-block.logic-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek, vagy épületek irányítására is. Gyorsabb mint a Mikroprocesszor.
-block.hyper-processor.description = Logikai műveletek sorozatát hajtja végre végtelenítve. Használható egységek, vagy épületek irányítására is. Gyorsabb mint a Logikai Processzor.
-block.memory-cell.description = Információt tárol processzorok számára.
-block.memory-bank.description = Információt tárol processzorok számára. Nagyobb kapacitású.
-block.logic-display.description = Ábrák rajzolhatók rá processzorral.
-block.large-logic-display.description = Ábrák rajzolhatók rá processzorral.
-block.interplanetary-accelerator.description = Hatalmas elektromágneses gyorsítótorony. Képes Támaszpontokat szökési sebességre gyorsítani bolygóközi bevetéshez.
-block.repair-turret.description = Folyamatosan javítja a közelében lévő legközelebbi sérült egységet. Opcionálisan elfogadja a Hűtőfolyadékot.
+block.tetrative-reconstructor.description = Ötös szintre (a végsőre) fejleszti a beérkező egységeket.
+block.switch.description = Kétállású kapcsoló. Az állapota logikai processzorokkal olvasható és vezérelhető.
+block.micro-processor.description = Logikai műveletek sorozatát hajtja végre egy ciklusban. Egységek vagy épületek irányítására használható.
+block.logic-processor.description = Logikai műveletek sorozatát hajtja végre egy ciklusban. Egységek vagy épületek irányítására használható. Gyorsabb mint a mikroprocesszor.
+block.hyper-processor.description = Logikai műveletek sorozatát hajtja végre egy ciklusban. Egységek vagy épületek irányítására használható. Gyorsabb mint a logikai processzor.
+block.memory-cell.description = Információt tárol egy logikai processzor számára.
+block.memory-bank.description = Információt tárol egy logikai processzor számára. Nagy kapacitású.
+block.logic-display.description = Tetszőleges ábrákat jelenít meg egy logikai processzor alapján.
+block.large-logic-display.description = Tetszőleges ábrákat jelenít meg egy logikai processzor alapján.
+block.interplanetary-accelerator.description = Hatalmas elektromágneses sínágyútorony. Képes a támaszpontokat szökési sebességre gyorsítani a bolygóközi bevetéshez.
+block.repair-turret.description = Folyamatosan javítja a közelében lévő legközelebbi sérült egységet. Opcionálisan elfogad hűtőfolyadékot.
 
 #Erekir
 block.core-bastion.description = Támaszpont. Páncélozott. Ha elpusztul, a szektor elveszett.
 block.core-citadel.description = Támaszpont. Nagyon jól páncélozott. Több nyersanyagot tárol, mint a Bástya.
 block.core-acropolis.description = Támaszpont. Kivételesen jól páncélozott. Több nyersanyagot tárol, mint a Citadella.
-block.breach.description = Átütő erejű Berillium-, vagy Volfrámlövedékeket lő ki az ellenséges célpontokra.
-block.diffuse.description = Széles kúpban lövi ki a lövedékeket. Visszalöki az ellenséges célpontokat.
-block.sublimate.description = Folyamatos lángcsóvát lő ki az ellenséges célpontokra. Átüti a páncélt.
-block.titan.description = Hatalmas robbanó ágyúlövedéket lő ki földi célpontokra. Hidrogént igényel.
-block.afflict.description = Hatalmas töltésű repeszlövedék gömböket lő ki. Fűtést igényel.
-block.disperse.description = Égő repeszlövedékeket lő ki légi célpontokra.
-block.lustre.description = Lassan mozgó, egyszerre egy célpontra ható lézert lő ki az ellenséges célpontokra.
+block.breach.description = Átütő erejű berillium- vagy volfrámlövedéket lő az ellenséges célpontokra.
+block.diffuse.description = Széles kúpban lő ki lövedékeket. Visszalöki az ellenséges célpontokat.
+block.sublimate.description = Folyamatos lángcsóvát lő az ellenséges célpontokra. Átüti a páncélt.
+block.titan.description = Hatalmas robbanóanyagú tüzérségi lövedéket lő földi célpontokra. Hidrogént igényel.
+block.afflict.description = Hatalmas töltésű repeszlövedék-gömböket lő ki. Hőt igényel.
+block.disperse.description = Égő repeszlövedékeket lő légi célpontokra.
+block.lustre.description = Lassan mozgó, egyszerre egy célpontra ható lézert lő az ellenséges célpontokra.
 block.scathe.description = Nagy erejű rakétát indít jelentős távolságokra lévő földi célpontok ellen.
 block.smite.description = Átütő erejű, villámló lövedékeket lő ki.
-block.malign.description = Lézer töltetekből álló célzott sortüzet zúdít az ellenséges célpontokra. Nagy mennyiségű Hőt igényel.
-block.silicon-arc-furnace.description = Szilíciumot finomít Homokból és Grafitból.
-block.oxidation-chamber.description = A Berilliumot és az Ózont Oxiddá alakítja. Melléktermékként Hőt bocsát ki.
-block.electric-heater.description = Fűti a vele szemben álló épületeket. Nagy mennyiségű Áramot igényel.
+block.malign.description = Lézertöltetekből álló célzott sortüzet zúdít az ellenséges célpontokra. Jelentős fűtést igényel.
+block.silicon-arc-furnace.description = A homokot és grafitot szilíciummá finomítja.
+block.oxidation-chamber.description = A berilliumot és az ózont oxiddá alakítja. Melléktermékként hőt bocsát ki.
+block.electric-heater.description = Fűti a vele szemben álló épületeket. Nagy mennyiségű áramot igényel.
 block.slag-heater.description = Fűti a vele szemben álló épületeket. Salakot igényel.
 block.phase-heater.description = Fűti a vele szemben álló épületeket. Tóritkvarcot igényel.
-block.heat-redirector.description = Átirányítja a felgyülemlett Hőt más épületekbe.
-block.heat-router.description = A felgyülemlett Hőt három kimeneti irányba terjeszti.
-block.electrolyzer.description = A Vizet Hidrogén- és Ózongázzá alakítja.
-block.atmospheric-concentrator.description = Kondenzálja a Nitrogént a légkörből. Hőt igényel.
-block.surge-crucible.description = A Salakból és a Szilíciumból Elektrometált olvaszt. Hőt igényel.
-block.phase-synthesizer.description = Tóriumból, Homokból és Ózonból Tóritkvarcot szintetizál. Hőt igényel.
-block.carbide-crucible.description = A Grafitot és a Volfrámot Karbiddá olvasztja. Hőt igényel.
-block.cyanogen-synthesizer.description = Cianogént szintetizál Arkycitből és Grafitból. Hőt igényel.
-block.slag-incinerator.description = Elégeti a nem illékony tárgyakat, vagy folyadékokat. Salakot igényel.
-block.vent-condenser.description = A kürtőkből kiáramló gázokat Vízzé kondenzálja. Áramot igényel.
-block.plasma-bore.description = Ércfallal szemben elhelyezve, korlátlanul termeli ki a nyersanyagokat. Kis mennyiségű Áramot igényel.
-block.large-plasma-bore.description = Egy nagyobb Plazma Vágó. Képes a Volfrám és a Tórium bányászatára. Hidrogént és Áramot igényel.
-block.cliff-crusher.description = Felőrli a Homokfalakat és korlátlan ideig Homokot termel. Áramot igényel. A hatékonysága a fal típusától függően változik.
-block.impact-drill.description = Ha ércre helyezik, korlátlan ideig, sorozatokban termeli ki a nyersanyagokat. Áramot és Vizet igényel.
-block.eruption-drill.description = Továbbfejlesztett Ütvefúró. Képes Tóriumot bányászni. Hidrogént igényel.
-block.reinforced-conduit.description = Előre szállítja a folyadékokat. Nem fogadja el a nem csővezetékes bemeneteket oldalról.
+block.heat-redirector.description = Más blokkokba irányítja a felgyülemlett hőt.
+block.heat-router.description = A felgyülemlett hőt három kimeneti irányba osztja.
+block.electrolyzer.description = A vizet hidrogénné és ózonná alakítja. A keletkező gázokat két ellentétes irányba adja ki, melyeket a megfelelő színek jelölik.
+block.atmospheric-concentrator.description = Koncentrálja a légkörben lévő nitrogént. Hőt igényel.
+block.surge-crucible.description = Salakból és szilíciumból elektrometált olvaszt. Hőt igényel.
+block.phase-synthesizer.description = Tóriumból, homokból és ózonból tóritkvarcot szintetizál. Hőt igényel.
+block.carbide-crucible.description = A grafitot és a volfrámot karbiddá olvasztja. Hőt igényel.
+block.cyanogen-synthesizer.description = Arkicitből és grafitból diciánt szintetizál. Hőt igényel.
+block.slag-incinerator.description = Elégeti a nem illékony nyersanyagokat vagy folyadékokat. Salakot igényel.
+block.vent-condenser.description = A kürtőkből kiáramló gázokat vízzé kondenzálja. Áramot igényel.
+block.plasma-bore.description = Ércfallal szemben elhelyezve, korlátlanul termel nyersanyagokat. Kis mennyiségű áramot igényel.\nHidrogén felhasználásával növelhető a hatékonysága.
+block.large-plasma-bore.description = Egy nagyobb plazmafúró. Képes a volfrám és a tórium bányászatára. Hidrogént és áramot igényel.\nNitrogén felhasználásával növelhető a hatékonysága.
+block.cliff-crusher.description = Felőrli a falakat, és korlátlan mennyiségű homokot termel. Áramot igényel. A hatékonysága a fal típusától függően változik.
+block.impact-drill.description = Ha ércre helyezik, korlátlan ideig, sorozatokban termeli ki a nyersanyagokat. Áramot és vizet igényel.
+block.eruption-drill.description = Továbbfejlesztett ütvefúró. Képes tóriumot bányászni. Hidrogént igényel.
+block.reinforced-conduit.description = Előre szállítja a folyadékokat. Nem fogad nem csővezetékes bemeneteket oldalról.
 block.reinforced-liquid-router.description = Egyenletesen osztja el a folyadékokat minden oldalra.
 block.reinforced-liquid-tank.description = Nagy mennyiségű folyadékot tárol.
 block.reinforced-liquid-container.description = Jelentős mennyiségű folyadékot tárol.
-block.reinforced-bridge-conduit.description = Folyadékok szállítására alkalmas épületek és terepakadályok fölött.
-block.reinforced-pump.description = Folyadékokat szivattyúz és ad ki. Hidrogént igényel.
+block.reinforced-bridge-conduit.description = Folyadékot szállít épületek és terepakadályok fölött.
+block.reinforced-pump.description = Folyadékot szivattyúz és ad ki. Hidrogént igényel.
 block.beryllium-wall.description = Megvédi az építményeket az ellenséges lövedékektől.
 block.beryllium-wall-large.description = Megvédi az építményeket az ellenséges lövedékektől.
 block.tungsten-wall.description = Megvédi az építményeket az ellenséges lövedékektől.
@@ -2184,212 +2184,212 @@ block.carbide-wall.description = Megvédi az építményeket az ellenséges löv
 block.carbide-wall-large.description = Megvédi az építményeket az ellenséges lövedékektől.
 block.reinforced-surge-wall.description = Megvédi az építményeket az ellenséges lövedékektől, a lövedékekkel való érintkezésekor időszakosan elektromos íveket bocsát ki.
 block.reinforced-surge-wall-large.description = Megvédi az építményeket az ellenséges lövedékektől, a lövedékekkel való érintkezésekor időszakosan elektromos íveket bocsát ki.
-block.shielded-wall.description = Megvédi az építményeket az ellenséges lövedékektől. Olyan pajzsot képez, amely a legtöbb lövedéket elnyeli, ha Áramot kap. Vezeti az Áramot.
-block.blast-door.description = Egy fal, amely kinyílik, ha a szövetséges földi egységek vannak a közelében. Kézzel nem irányítható.
+block.shielded-wall.description = Megvédi az építményeket az ellenséges lövedékektől. Olyan pajzsot képez, amely a legtöbb lövedéket elnyeli, ha az áramellátás biztosítva van. Vezeti az áramot.
+block.blast-door.description = Egy fal, amely kinyílik, ha szövetséges földi egységek vannak a közelében. Kézzel nem irányítható.
 block.duct.description = Előre mozgatja a nyersanyagokat. Csak egyetlen nyersanyag tárolására alkalmas.
 block.armored-duct.description = Előre mozgatja a nyersanyagokat. Csak szállítószalagos bemeneteket fogad el oldalról.
-block.duct-router.description = A nyersanyagokat egyenlően osztja el három irányba. Csak a hátsó oldalról fogadja be a tárgyakat. Nyersanyag Válogatóként is konfigurálható.
-block.overflow-duct.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud. Nem használható közvetlenül Túlfolyó Kapu, vagy Alul-folyó Kapu mellett.
-block.duct-bridge.description = Nyersanyagok szállítására alkalmas épületek és terepakadályok fölött.
-block.duct-unloader.description = A kiválasztott nyersanyagokat kirakodja a mögötte lévő épületekből. Támaszpontokból nem lehet kirakodni.
-block.underflow-duct.description = Csak akkor enged tovább nyersanyagokat előre, ha oldalra már nem tudja kiadni őket. Nem használható közvetlenül Túlfolyó Kapu, vagy Alul-folyó Kapu mellett.
-block.reinforced-liquid-junction.description = Két egymást keresztező csővezeték közötti csomópontként működik.
-block.surge-conveyor.description = A nyersanyagokat rakományokban mozgatja. Árammal felgyorsítható. Vezeti az Áramot.
-block.surge-router.description = Egyenletesen osztja el a nyersanyagokat három irányba a Szállítószalagról. Árammal felgyorsítható. Vezeti az Áramot.
+block.duct-router.description = A nyersanyagokat egyenlően osztja el három irányba. Csak hátulról fogad el nyersanyagokat. Nyersanyagválogatóként is beállítható.
+block.overflow-duct.description = Csak akkor ad ki nyersanyagot oldalra, ha előrefelé már nem tud.
+block.duct-bridge.description = Nyersanyagokat szállít épületek és terepakadályok fölött.
+block.duct-unloader.description = A kiválasztott nyersanyagokat kirakodja a mögötte lévő épületekből. Támaszpontokból nem tud kirakodni.
+block.underflow-duct.description = A túlcsorduló szállítószalag ellentettje. Csak akkor ad ki nyersanyagot előrefelé, ha oldalra már nem tud.
+block.reinforced-liquid-junction.description = Csomópontként működik két egymást keresztező csővezeték között.
+block.surge-conveyor.description = A nyersanyagokat rakományokban mozgatja. Árammal felgyorsítható. Vezeti az áramot.
+block.surge-router.description = Egyenletesen osztja el a nyersanyagokat három irányba az elektrometál-szállítószalagról. Árammal felgyorsítható. Vezeti az Áramot.
 block.unit-cargo-loader.description = Teherszállító drónokat épít. A drónok automatikusan szétosztják a nyersanyagokat a megfelelő szűrővel rendelkező kirakodási pontokra.
 block.unit-cargo-unload-point.description = A teherszállító drónok kirakodási pontjaként működik. Csak a kiválasztott szűrőnek megfelelő nyersanyagokat fogadja be.
-block.beam-node.description = Az Áramot merőlegesen vezeti a többi épülethez. Kis mennyiségű energiát tárol.
-block.beam-tower.description = Az Áramot merőlegesen vezeti a többi épülethez. Nagy mennyiségű energiát tárol. Nagy hatótávolságú.
-block.turbine-condenser.description = A kürtőkből kiáramló gázokból Áramot termel. Kis mennyiségű Vizet termel.
-block.chemical-combustion-chamber.description = Arkycitből és Ózonból termel Áramot.
-block.pyrolysis-generator.description = Nagy mennyiségű Áramot termel Arkycitből és Salakból. Melléktermékként Vizet termel.
-block.flux-reactor.description = Nagy mennyiségű Áramot termel Hő hatására. Stabilizátorként Cianogént igényel. Az Áramtermelés és a Cianogén igény arányos a Hőbevitellel.\nFelrobban, ha nem áll rendelkezésre elegendő Cianogén.
-block.neoplasia-reactor.description = Arkycit, Víz és Tóritkvarc felhasználásával nagy mennyiségű Áramot termel. Melléktermékként Hőt és veszélyes Neoplazmát termel.\nHevesen robban, ha a Neoplazmát nem távolítják el a reaktorból a csővezetékeken keresztül.
+block.beam-node.description = Merőlegesen áramot vezet a többi blokkhoz. Kis mennyiségű áramot tárol.
+block.beam-tower.description = Merőlegesen áramot vezet a többi blokkhoz. Nagy mennyiségű áramot tárol. Nagy hatótávolságú.
+block.turbine-condenser.description = Kürtőkre helyezve áramot termel. Kis mennyiségű vizet termel.
+block.chemical-combustion-chamber.description = Áramot termel arkicitből és ózonból.
+block.pyrolysis-generator.description = Nagy mennyiségű áramot termel arkicitből és salakból. Melléktermékként vizet termel.
+block.flux-reactor.description = Fűtés hatására nagy mennyiségű áramot termel. Stabilizátorként diciánt igényel. Az áramtermelés és a diciánigény arányos a hőbevitellel.\nFelrobban, ha nem áll rendelkezésre elegendő dicián.
+block.neoplasia-reactor.description = Arkicit, víz és tóritkvarc felhasználásával nagy mennyiségű áramot termel. Melléktermékként hőt és veszélyes neoplazmát termel.\nFelrobban, ha a neoplazmát nem távolítják el a reaktorból csővezetékeken keresztül.
 block.build-tower.description = Automatikusan újjáépíti a hatósugarában lévő építményeket, és segíti a többi egységet az építkezésben.
-block.regen-projector.description = Lassan javítja a szövetséges építményeket egy négyzet alakú kerületben. Hidrogént igényel.
-block.reinforced-container.description = Kis mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a Támaszpont tárolókapacitását.
-block.reinforced-vault.description = Nagy mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a Támaszpont tárolókapacitását.
-block.tank-fabricator.description = Stell egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Tank Újratervezőbe fejlesztésre.
-block.ship-fabricator.description = Elude egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Repülőgép Újratervezőbe fejlesztésre.
-block.mech-fabricator.description = Merui egységeket épít. A kimeneti egységek közvetlenül felhasználhatóak, vagy átvihetőek Mech Újratervezőbe fejlesztésre.
-block.tank-assembler.description = Nagy méretű tankokat állít össze a beadott blokkokból és egységekből. A kimeneti szint Összeszerelő Modulok hozzáadásával növelhető.
-block.ship-assembler.description = Nagy méretű hajókat állít össze a beadott blokkokból és egységekből. A kimeneti szint Összeszerelő Modulok hozzáadásával növelhető.
-block.mech-assembler.description = Nagy méretű Mech-eket állít össze a beadott blokkokból és egységekből. A kimeneti szint Összeszerelő Modulok hozzáadásával növelhető.
-block.tank-refabricator.description = Felfejleszti a bejuttatott tank típusú egységeket a második szintre.
-block.ship-refabricator.description = Felfejleszti a bejuttatott repülőgép típusú egységeket a második szintre.
-block.mech-refabricator.description = Felfejleszti a bejuttatott mech típusú egységeket a második szintre.
-block.prime-refabricator.description = A bejuttatott tank-/repülőgép-/mech típusú egységeket a harmadik szintre fejleszti.
-block.basic-assembler-module.description = Növeli a Tank-/Repülgép-/Mech Összeszerelő szintjét, ha annak az építési határvonala mellé helyezik. Áramot igényel. Használható nyersanyag-rakomány bemenetként.
-block.small-deconstructor.description = Lebontja a bevitt építményeket és egységeket. Visszaadja az építési költség 100%-át.
+block.regen-projector.description = Lassan javítja a szövetséges építményeket egy négyzet alakú területen. Hidrogént igényel.\nTóritkvarc felhasználásával növelhető a hatékonysága.
+block.reinforced-container.description = Kis mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a támaszpont tárolókapacitását.
+block.reinforced-vault.description = Nagy mennyiségű nyersanyagot tud tárolni. A tartalma kirakodók segítségével nyerhető ki. Nem növeli a támaszpont tárolókapacitását.
+block.tank-fabricator.description = Stell egységeket épít. A kimeneti egységek közvetlenül használhatók, vagy fejlesztésre újratervezőkbe küldhetők.
+block.ship-fabricator.description = Elude egységeket épít. A kimeneti egységek közvetlenül használhatók, vagy fejlesztésre újratervezőkbe küldhetők.
+block.mech-fabricator.description = Merui egységeket épít. A kimeneti egységek közvetlenül használhatók, vagy fejlesztésre újratervezőkbe küldhetők.
+block.tank-assembler.description = Nagy méretű tankokat állít össze a beadott blokkokból és egységekből. A kimeneti szint modulok hozzáadásával növelhető.
+block.ship-assembler.description = Nagy méretű hajókat állít össze a beadott blokkokból és egységekből. A kimeneti szint modulok hozzáadásával növelhető.
+block.mech-assembler.description = Nagy méretű mecheket állít össze a beadott blokkokból és egységekből. A kimeneti szint modulok hozzáadásával növelhető.
+block.tank-refabricator.description = Kettes szintre fejleszti a beérkező tank típusú egységeket.
+block.ship-refabricator.description = Kettes szintre fejleszti a beérkező hajó típusú egységeket.
+block.mech-refabricator.description = Kettes szintre fejleszti a beérkező mech típusú egységeket.
+block.prime-refabricator.description = Hármas szintre fejleszti a beérkező tank típusú egységeket.
+block.basic-assembler-module.description = Növeli az összeszerelő szintjét, ha annak az építési határvonala mellé helyezik. Áramot igényel. Használható nyersanyagrakomány-bemenetként.
+block.small-deconstructor.description = Lebontja a beadott építményeket és egységeket. Visszaadja az építési költség 100%-át.
 block.reinforced-payload-conveyor.description = Előre mozgatja a rakományokat.
-block.reinforced-payload-router.description = A rakományokat szomszédos a blokkokba osztja szét. Szűrő beállítása esetén válogatóként is funkcionál.
-block.payload-mass-driver.description = Nagy hatótávolságú nyersanyagszállító eszköz. Rakományokban lő át nyersanyagokat egy másik, hozzákapcsolt Tömegmozgatónak.
-block.large-payload-mass-driver.description = Nagy hatótávolságú rakományszállító szerkezet. A fogadott rakományokat a hozzákapcsolt másik Tömegmozgatóra lövi.
+block.reinforced-payload-router.description = A rakományokat szomszédos a blokkokba osztja szét. Szűrő beállítása esetén válogatóként működik.
+block.payload-mass-driver.description = Nagy hatótávolságú rakományszállító épület. A kapott rakományokat egy másik, hozzákapcsolt rakomány-tömegmozgatónak lövi át.
+block.large-payload-mass-driver.description = Nagy hatótávolságú rakományszállító épület. A kapott rakományokat egy másik, hozzákapcsolt rakomány-tömegmozgatónak lövi át.
 block.unit-repair-tower.description = Javítja a közelében lévő összes egységet. Ózont igényel.
 block.radar.description = Fokozatosan feltárja a terepet és az ellenséges egységeket egy nagy sugarú körben. Áramot igényel.
-block.shockwave-tower.description = Sérülést okoz és megsemmisíti az ellenséges lövedékeket egy egységsugarú körön belül. Cianogént igényel.
+block.shockwave-tower.description = Sérülést okoz és megsemmisíti az ellenséges lövedékeket egy körön belül. Diciánt igényel.
 block.canvas.description = Egy egyszerű képet jelenít meg egy előre meghatározott palettával. Szerkeszthető.
 
-unit.dagger.description = Egyszerű töltényeket lő közeli ellenségekre
+unit.dagger.description = Szokásos lövedékeket lő a közeli ellenségekre.
 unit.mace.description = Lángnyelveket küld a közeli ellenségek felé.
 unit.fortress.description = Nagy hatótávú rakétákat lő földi célpontokra.
 unit.scepter.description = Töltött lövedékek záporát lövi közeli ellenségekre.
 unit.reign.description = Méretes átütő erejű lövedékeket zúdít minden közeli ellenségre.
-unit.nova.description = Lézereket lő, amelyek az ellenséget sebzik, de gyógyítják a szövetségeseket. Repülésre alkalmas.
-unit.pulsar.description = Elektromos szikrákat szór, amelyek az ellenséget sebzik, de gyógyítják a szövetségeseket. Repülésre alkalmas.
-unit.quasar.description = Átütő erejű lézersugarakat lő, amelyek az ellenséget sebzik, de gyógyítják a szövetségeseket. Repülésre alkalmas. Pajzsa van.
-unit.vela.description = Folyamatos lézernyalábot bocsát ki, ami sebzi az ellenséget, felgyújtja az épületeiket, de gyógyítja a szövetségeseket. Repülésre alkalmas.
-unit.corvus.description = Hatalmas lézersugarat lő, amelyek sebzik az ellenséget, de gyógyítják a szövetségeseket. A legtöbb terepakadályt átlépi.
-unit.crawler.description = Az ellenséghez rohan és egy nagy robbanásban megsemmisíti önmagát, így sebezve az ellenséget.
-unit.atrax.description = Gyengítő Salakgolyókat lő a földi célpontokra. A legtöbb terepakadályt átlépi.
-unit.spiroct.description = Elszívja az ellenség életerejét, önmagát gyógyítva közben. A legtöbb terepakadályt átlépi.
-unit.arkyid.description = Nagy lézernyalábokkal elszívja az ellenség életerejét, önmagát gyógyítva közben. A legtöbb terepakadályt átlépi.
-unit.toxopid.description = Nagy elektromos bombákat és átütő erejű lézert lő az ellenségre. A legtöbb terepakadályt átlépi.
-unit.flare.description = Egyszerű töltényeket lő közeli földi célpontokra.
-unit.horizon.description = Bombákat szór földi célpontokra.
+unit.nova.description = Lézerlövedékeket lő ki, amelyek sebzik az ellenséges célpontokat, és megjavítják a szövetséges épületeket. Repülésre alkalmas.
+unit.pulsar.description = Elektromos szikrákat szór, amelyek sebzik az ellenséges célpontokat, és megjavítják a szövetséges épületeket. Repülésre alkalmas.
+unit.quasar.description = Átütő erejű lézersugarakat lő, amelyek sebzik az ellenséges célpontokat, és megjavítják a szövetséges épületeket. Repülésre alkalmas. Pajzsa van.
+unit.vela.description = Folyamatos lézernyalábot bocsát ki, amelyek sebzik az ellenséges célpontokat, tüzet okoznak, és megjavítják a szövetséges épületeket. Repülésre alkalmas.
+unit.corvus.description = Hatalmas lézersugarat lő, amelyek sebzik az ellenséges célpontokat, és megjavítják a szövetséges épületeket. Átlépi a legtöbb terepakadályt.
+unit.crawler.description = Az ellenséghez rohan és megsemmisíti önmagát, nagy robbanást okozva.
+unit.atrax.description = Bénító salakgolyókat lő a földi célpontokra. A legtöbb terepakadályt átlépi.
+unit.spiroct.description = Lézersugarakkal elszívja az ellenséges célpontok életerejét, miközben javítja önmagát. A legtöbb terepakadályt átlépi.
+unit.arkyid.description = Nagy lézersugarakkal elszívja az ellenséges célpontok életerejét, miközben javítja önmagát. A legtöbb terepakadályt átlépi.
+unit.toxopid.description = Kazettás elektromos bombákat és átütő erejű lézert lő az ellenségre. A legtöbb terepakadályt átlépi.
+unit.flare.description = Szokásos lövedékeket lő közeli földi célpontokra.
+unit.horizon.description = Kazettás bombákat szór földi célpontokra.
 unit.zenith.description = Rakétasorozatokat lő közeli ellenségekre.
 unit.antumbra.description = Lövedékek záporát zúdítja minden közeli ellenségre.
 unit.eclipse.description = Két átütő erejű lézersugarat és rengeteg lövedéket zúdít minden közeli ellenségre.
-unit.mono.description = Automatikusan bányászik Rezet és Ólmot a Támaszpontba juttatva őket.
-unit.poly.description = Automatikusan újjáépíti az elpusztult épületeket és segít más egységeknek építkezni.
-unit.mega.description = Automatikusan javítja a sérült épületeket. Képes kis épületek és földi egységek szállítására.
-unit.quad.description = Nagy bombákat szór földi célpontokra, amelyek sebzik az ellenséget, de javítják a szövetséges épületeket. Képes közepes méretű földi egységek szállítására.
-unit.oct.description = Megvédi a közeli szövetségeseket regeneráló pajzsával. Képes szállítani a legtöbb földi egységet.
+unit.mono.description = Automatikusan rezet és ólmot bányászik, a támaszpontba juttatva őket.
+unit.poly.description = Automatikusan újjáépíti az elpusztult épületeket és segít más egységeknek az építkezésben.
+unit.mega.description = Automatikusan javítja a sérült épületeket. Kis blokkok és földi egységek szállítására képes.
+unit.quad.description = Plazmabombákat szór földi célpontokra, amelyek sebzik az ellenséget, de javítják a szövetséges épületeket. Közepes méretű földi egységek szállítására képes.
+unit.oct.description = Megvédi a közeli szövetségeseket egy regeneráló pajzssal. A legtöbb földi egység szállítására képes.
 unit.risso.description = Rakéták és lövedékek záporát zúdítja minden közeli ellenségre.
-unit.minke.description = Tüzérségi lövedékeket és egyszerű töltényeket lő közeli földi célpontokra.
-unit.bryde.description = Nagy távolságú tüzérségi rakétákat lő az ellenségre.
+unit.minke.description = Tüzérségi és szokásos lövedékeket lő közeli földi célpontokra.
+unit.bryde.description = Nagy távolságú tüzérségi lövedékeket és rakétákat lő az ellenségre.
 unit.sei.description = Rakéták és páncéltörő lövedékek záporát zúdítja az ellenségre.
 unit.omura.description = Nagy hatótávolságú átütő erejű lövedékeket lő az ellenségre. Flare egységeket gyárt.
-unit.alpha.description = Megvédi a Bástyát az ellenségtől. Épít.
-unit.beta.description = Megvédi az Alapítványt az ellenségtől. Épít.
-unit.gamma.description = Megvédi a Magnumot az ellenségtől. Épít.
+unit.alpha.description = Megvédi a Szilánk támaszpontot az ellenségtől. Épületeket épít.
+unit.beta.description = Megvédi az Alapítvány támaszpontot az ellenségtől. Épületeket épít.
+unit.gamma.description = Megvédi at Atommag támaszpontot az ellenségtől. Épületeket épít.
 unit.retusa.description = Célkövető torpedókat lő ki minden közeli ellenségre. Javítja a szövetséges egységeket.
-unit.oxynoe.description = Plazma lángcsóvát lő az ellenséges célpontokra. Célba veszi az ellenséges lövedékeket egy pontvédelmi toronnyal.
-unit.cyerce.description = Célpont kereső kazettás rakétákat lő ki az ellenségre. Javítja a szövetséges egységeket.
+unit.oxynoe.description = Épületjavító lángcsóvát lő az ellenséges célpontokra. Célba veszi az ellenséges lövedékeket egy pontvédelmi toronnyal.
+unit.cyerce.description = Célkereső kazettás rakétákat lő ki az ellenségre. Javítja a szövetséges egységeket.
 unit.aegires.description = Elektromosan sokkolja az összes ellenséges egységet és építményt, amely az energiamezőjébe lép. Javítja az összes szövetségest.
-unit.navanax.description = Robbanékony EMP lövedékeket lő ki, jelentős károkat okozva az ellenséges energiahálózatokban és megjavítva a szövetségesek építményeit. Megolvasztja a közeli ellenséget 4 autonóm lézertoronnyal.
+unit.navanax.description = Robbanékony EMI-lövedékeket lő ki, jelentős károkat okozva az ellenséges energiahálózatokban, és megjavítva a szövetségesek építményeit. Szétolvasztja a közeli ellenséges célpontokat a 4 autonóm lézertornyával.
 
 #Erekir
-unit.stell.description = Normál lövedékeket lő ki az ellenséges célpontokra.
+unit.stell.description = Szokásos lövedékeket lő ki az ellenséges célpontokra.
 unit.locus.description = Változatos lövedékeket lő ki az ellenséges célpontokra.
 unit.precept.description = Átütő erejű kazettás lövedékeket lő ki az ellenséges célpontokra.
-unit.vanquish.description = Nagy átütési képességű, hasítólövedékeket lő ki az ellenséges célpontokra.
-unit.conquer.description = Nagy átütési képességű golyózáport lő ki az ellenséges célpontokra.
+unit.vanquish.description = Nagy, átütő erejű hasítólövedékeket lő ki az ellenséges célpontokra.
+unit.conquer.description = Nagy, átütő erejű golyózáport lő ki az ellenséges célpontokra.
 unit.merui.description = Nagy hatótávolságú ágyúkkal lövi az ellenséges szárazföldi célpontokat. A legtöbb terepakadályt átlépi.
 unit.cleroi.description = Kettős lövedékeket lő ki az ellenséges célpontokra. Célba veszi az ellenséges lövedékeket a pontvédelmi tornyokkal. A legtöbb terepakadályt átlépi.
 unit.anthicus.description = Nagy hatótávolságú célkövető rakétákat lő ki az ellenséges célpontokra. A legtöbb terepakadályt átlépi.
-unit.tecta.description = Célkövető plazma rakétákat lő ki az ellenséges célpontokra. Irányított pajzzsal védi magát. A legtöbb terepakadályt átlépi.
+unit.tecta.description = Célkövető plazmarakétákat lő ki az ellenséges célpontokra. Irányított pajzzsal védi magát. A legtöbb terepakadályt átlépi.
 unit.collaris.description = Nagy hatótávolságú repeszágyúval lövi az ellenséges célpontokat. A legtöbb terepakadályt átlépi.
-unit.elude.description = Célkövető golyópárokat lő ki az ellenséges célpontokra. Képes folyadéktestek felett lebegni.
+unit.elude.description = Célkövető golyópárokat lő ki az ellenséges célpontokra. Lebeg a folyadékfelületeket felett.
 unit.avert.description = Forgó lövedékpárokat lő ki az ellenséges célpontokra.
 unit.obviate.description = Forgó, páros villámgömböket lő ki az ellenséges célpontokra.
-unit.quell.description = Kettő darab, nagy hatótávolságú célkövető rakétát lő ki egyszerre az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító épületeket.
-unit.disrupt.description = Három darab, nagy hatótávolságú célkövető rakétát lő ki egyszerre az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító épületeket.
-unit.evoke.description = A Bástya védelmére szolgáló építményeket épít. Sugárral javítja az építményeket.
-unit.incite.description = A Citadella védelmére szolgáló építményeket épít. Sugárral javítja az építményeket.
-unit.emanate.description = Az Akropolisz védelmére szolgáló építményeket épít. Sugárral javítja az építményeket.
+unit.quell.description = Nagy hatótávolságú célkövető rakétát lő ki az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító épületeket. Csak földi célpontokat támad.
+unit.disrupt.description = Nagy hatótávolságú célkövető elnyomó rakétát lő ki az ellenséges célpontokra. Elnyomja az ellenséges szerkezetjavító épületeket. Csak földi célpontokat támad.
+unit.evoke.description = A Bástya védelmére szolgáló építményeket épít. Sugárral javítja az építményeket. 2×2-es épületek szállítására képes.
+unit.incite.description = A Citadella védelmére szolgáló építményeket épít. Sugárral javítja az építményeket. 2×2-es épületek szállítására képes.
+unit.emanate.description = Az Akropolisz védelmére szolgáló építményeket épít. Sugárral javítja az építményeket. 2×2-es épületek szállítására képes.
 
 lst.read = Szám kiolvasása egy összekapcsolt memóriacellából.
-lst.write = Írj egy számot egy összekapcsolt memóriacellába.
-lst.print = Szöveg hozzáadása a nyomtatási pufferhez.\nNem jelenít meg semmit, amíg a [accent]Kiírási Művelet[] használatban van.
-lst.format = A szövegpufferben lévő következő helyőrzőt egy értékkel helyettesíti.\nNem csinál semmit, ha a helyőrző minta érvénytelen.\nHelyőrző minta: "{[accent]number 0-9[]}"\nPélda:\n[accent]print "test {0}"\nformat "example"
-lst.draw = Művelet hozzáadása a rajzpufferhez.\nNem jelenít meg semmit, amíg a [accent]Rajzolási Művelet[] használatban van.
-lst.drawflush = Sorba állított [accent]rajz[] műveletek megjelenítése a kijelzőn.
-lst.printflush = Sorba állított [accent]kiírási[] műveletek kiírása egy üzenetblokkba.
-lst.getlink = A processzor linkjének lekérdezése index szerint. 0-nál kezdődik.
+lst.write = Szám beírása egy összekapcsolt memóriacellába.
+lst.print = Szöveg hozzáadása a nyomtatási pufferhez.\nA [accent]Print Flush[] használatáig nem jelenít meg semmit.
+lst.format =  A szövegpufferben lévő következő helyőrző cseréje egy értékre.\nNem csinál semmit, ha a helyőrzőminta érvénytelen.\nHelyőrzőminta: "{[accent]number 0-9[]}"\nPélda:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Művelet hozzáadása a rajzpufferhez.\nA [accent]Draw Flush[] használatáig nem jelenít meg semmit.
+lst.drawflush = Sorba állított [accent]Draw[] műveletek megjelenítése a kijelzőn.
+lst.printflush = Sorba állított [accent]Print[] műveletek kiírása egy üzenetblokkba.
+lst.getlink = A processzor hivatkozásának lekérése index alapján. 0-nál kezdődik.
 lst.control = Épület irányítása.
-lst.radar = Beméri az egységeket az épület körül egy bizonyos hatótávolságban.
+lst.radar = Egységek megkeresése az épület körül egy bizonyos hatótávolságban.
 lst.sensor = Adatok lekérése egy épületről vagy egységről.
 lst.set = Egy változó beállítása.
-lst.operation = Végezzen el egy műveletet 1-2 változóval.
+lst.operation = Egy művelet elvégzése 1-2 változóval.
 lst.end = Ugrás az utasítási verem tetejére.
-lst.wait = Várjon bizonyos számú másodpercet.
-lst.stop = A processzor program futtatásának leállítása.
-lst.lookup = Egy nyersanyag/folyadék/egység/épület típus keresése azonosító alapján.\nAz egyes típusok összesített száma a következőkkel érhető el:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.wait = Várakozás bizonyos számú másodpercig.
+lst.stop = A processzor futtatásának leállítása.
+lst.lookup = Egy nyersanyag/folyadék/egység/épület típusának keresése azonosító alapján.\nAz egyes típusok összesített száma a következőkkel érhető el:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\nA fordított művelethez használd az objektum [accent]@id[] értékét.
 lst.jump = Feltételes ugrás egy másik utasításra.
-lst.unitbind = Összekapcsolás a következő egységtípussal és tárolja a következőben: [accent]@unit[].
-lst.unitcontrol = Az aktuálisan összekapcsolt egység vezérlése.
-lst.unitradar = Egységek keresése az aktuálisan összekapcsolt egység körül.
+lst.unitbind = Összekapcsolás a következő egységtípussal, és tárolás a következőben: [accent]@unit[].
+lst.unitcontrol = A jelenleg összekapcsolt egység vezérlése.
+lst.unitradar = Egységek keresése a jelenleg összekapcsolt egység körül.
 lst.unitlocate = Egy adott típusú pozíció/épület keresése bárhol a pályán.\nÖsszekapcsolt egységet igényel.
 lst.getblock = Csempeadatok lekérdezése tetszőleges helyen.
 lst.setblock = Csempeadatok beállítása tetszőleges helyen.
-lst.spawnunit = Egység lerakása egy helyen.
-lst.applystatus = Állapothatás alkalmazása, vagy törlése egy egységről.
-lst.weathersensor = Check if a type of weather is active.
-lst.weatherset = Set the current state of a type of weather.
-lst.spawnwave = Egy tetszőleges helyen keletkező hullám szimulálása.\nNem növeli a hullámszámlálót.
-lst.explosion = Robbanás létrehozása egy helyen.
-lst.setrate = A processzor végrehajtási sebességének beállítása utasítás/ütemben.
-lst.fetch = Egységek, Támaszpontok, játékosok, vagy épületek keresése index szerint.\nAz indexek 0-nál kezdődnek és a visszaadott számuknál végződnek.
-lst.packcolor = Tömöríti [0, 1] az RGBA komponenseket egyetlen számba a rajzoláshoz, vagy szabálymeghatározáshoz.
-lst.setrule = Állíts be egy játékszabályt.
+lst.spawnunit = Egység lerakása az adott helyen.
+lst.applystatus = Állapothatás alkalmazása vagy törlése egy egységről.
+lst.weathersensor = Ellenőrzés, hogy egy adott időjárástípus aktív-e.
+lst.weatherset = Az időjárástípus jelenlegi állapotának megadása.
+lst.spawnwave = Egy hullám indítása.
+lst.explosion = Robbanás létrehozása az adott helyen.
+lst.setrate = A processzor végrehajtási sebességének beállítása utasítás/órajelciklusban.
+lst.fetch = Egységek, támaszpontok, játékosok, vagy épületek keresése index szerint.\nAz indexek 0-tól indulnak és a visszaadott számuknál végződnek.
+lst.packcolor = Egyetlen számba tömöríti a [0, 1] RGBA komponenseket a rajzoláshoz vagy szabálymeghatározáshoz.
+lst.setrule = Játékszabály beállítása.
 lst.flushmessage = Üzenet megjelenítése a képernyőn a szövegpufferből.\nMegvárja, amíg az előző üzenet befejeződik.
-lst.cutscene = Manipulálja a játékos kameráját.
+lst.cutscene = A játékos kamerájának mozgatása.
 lst.setflag = Egy globális jelölő beállítása, amely minden processzor által olvasható.
-lst.getflag = Ellenőrzi, hogy egy globális jelölő be van-e állítva.
-lst.setprop = Egy egység vagy épület tulajdonságát állítja be.
-lst.effect = Létrehoz egy részecske hatást.
-lst.sync = Egy változó szinkronizálása a hálózaton keresztül.\nMásodpercenként legfeljebb 10 alkalommal hívható meg.
-lst.makemarker = Új logikai jelölő létrehozása a világban.\nEgy azonosítót kell megadni a jelölő azonosításához.\nA jelölők száma jelenleg világonként 20 000-re van korlátozva.
-lst.setmarker = Egy jelölő tulajdonságának beállítása.\nA használt azonosítónak meg kell egyeznie a Make Marker utasításban megadottal.\n[accent]null []értékek figyelmen kívül lesznek hagyva.
-lst.localeprint = Hozzáadja a pálya Helyi Csomagjainak tulajdonság értékét a szövegpufferhez.\nA pálya Helyi Csomagjainak beállításait a térképszerkesztőben ellenőrizheted [accent]Pálya Infó > Helyi Csomagok[].\nHa a kliens egy mobileszköz, akkor először próbáld kiíratni a ".mobile" végződésű tulajdonságot.
+lst.getflag = Ellenőrzés, hogy egy globális jelölő be van-e állítva.
+lst.setprop = Beállítja egy egység vagy épület tulajdonságát.
+lst.effect = Részecskehatás létrehozása.
+lst.sync = Egy változó szinkronizálása a hálózaton keresztül.\nMásodpercenként legfeljebb 20-szor hívható meg.
+lst.makemarker = Új logikai jelölő létrehozása a világban.\nMeg kell adni egy azonosítót a jelölő azonosításához.\nA jelölők száma jelenleg világonként 20 000-re van korlátozva.
+lst.setmarker = Egy jelölő tulajdonságának beállítása.\nA használt azonosítónak meg kell egyeznie a Make Marker utasításban megadottal.\nA [accent]null []értékek figyelmen kívül lesznek hagyva.
+lst.localeprint = Hozzáadja a pálya nyelvi csomagjainak tulajdonságértékét a szövegpufferhez.\nA pálya nyelvi csomagjainak beállításait a térképszerkesztőben ellenőrizheted: [accent]Pályainformációk > Nyelvi csomagok[].\nHa a kliens egy mobileszköz, akkor először próbáld kiíratni a „.mobile” végződésű tulajdonságot.
 
 lglobal.false = 0
 lglobal.true = 1
-lglobal.null = nulla
-lglobal.@pi = A pi matematikai állandó (3.141...)
+lglobal.null = null
+lglobal.@pi = A pí matematikai állandó (3.141...)
 lglobal.@e = Az e matematikai állandó (2.718...)
-lglobal.@degToRad = Szorozza meg ezt a számot a fokok radiánra való konvertálásához
-lglobal.@radToDeg = Szorozza meg ezt a számot a radiánok fokokká konvertálásához
+lglobal.@degToRad = Ezzel a számmal szoroz a fok radiánra való átalakításához
+lglobal.@radToDeg = Ezzel a számmal szoroz a radián fokra való átalakításához
 
-lglobal.@time = Az aktuális mentés játékideje, milliszekundumban
-lglobal.@tick = Az aktuális mentés játékideje, tick-ben (1 másodperc = 60 tick)
-lglobal.@second = Az aktuális mentés játékideje, másodpercben
-lglobal.@minute = Az aktuális mentés játékideje, percben
-lglobal.@waveNumber = Az aktuális hullám száma, ha a hullámok engedélyezve vannak
+lglobal.@time = A jelenelgi mentés játékideje ezredmásodpercben
+lglobal.@tick = Az aktuális mentés játékideje, órajelciklusban (1 másodperc = 60 órajelciklus)
+lglobal.@second = A jelenelgi mentés játékideje másodpercben
+lglobal.@minute = A jelenelgi mentés játékideje percben
+lglobal.@waveNumber = A jelenlegi hullám száma, ha a hullámok engedélyezve vannak
 lglobal.@waveTime = Visszaszámláló a hullámokhoz, másodpercben
 lglobal.@mapw = A pálya szélessége csempékben
 lglobal.@maph = A pálya magassága csempékben
 
 lglobal.sectionMap = Pálya
 lglobal.sectionGeneral = Általános
-lglobal.sectionNetwork = Hálózati/kliensoldali [Csak Világprocesszor]
+lglobal.sectionNetwork = Hálózati/kliensoldali [Csak világprocesszor]
 lglobal.sectionProcessor = Processzor
-lglobal.sectionLookup = Keres
+lglobal.sectionLookup = Keresés
 
 lglobal.@this = A kódot végrehajtó logikai blokk
 lglobal.@thisx = A kódot végrehajtó blokk X koordinátája
 lglobal.@thisy = A kódot végrehajtó blokk Y koordinátája
-lglobal.@links = Az ehhez a processzorhoz kapcsolt épületek összesített száma
-lglobal.@ipt = A processzor utasítás végrehajtási sebessége tick-ben (60 tick = 1 másodperc)
+lglobal.@links = Az ehhez a processzorhoz kapcsolt épületek száma összesen
+lglobal.@ipt = A processzor végrehajtási sebessége órajelciklusban (60 órajelciklus = 1 másodperc)
 
-lglobal.@unitCount = A játékban található egységek típusainak összesített száma; a Keres utasítással együtt használjuk
-lglobal.@blockCount = A játékban található blokkok típusainak összesített száma; a Keres utasítással együtt használjuk
-lglobal.@itemCount = A játékban található nyersanyagok típusainak összesített száma; a Keres utasítással együtt használjuk
-lglobal.@liquidCount = A játékban található folyadékok típusainak összesített száma; a Keres utasítással együtt használjuk
+lglobal.@unitCount = A játékban található egységtípusok száma összesen; a keresés utasítással együtt használatos
+lglobal.@blockCount = A játékban található blokktípusok száma összesen; a keresés utasítással együtt használatos
+lglobal.@itemCount = A játékban található nyersanyagtípusok száma összesen; a keres utasítással együtt használatos
+lglobal.@liquidCount = A játékban található folyadéktípusok száma összesen; a keresés utasítással együtt használatos
 
 lglobal.@server = Igaz, ha a kód egy kiszolgálón, vagy egyjátékos módban fut, egyébként hamis
 lglobal.@client = Igaz, ha a kód egy kiszolgálóhoz kapcsolódott kliensen fut
 
-lglobal.@clientLocale = A kódot futtató kliens nyelvi beállítása. Például: hu_HU
+lglobal.@clientLocale = A kódot futtató kliens területi beállítása. Például: hu_HU
 lglobal.@clientUnit = A kódot futtató kliens egysége
-lglobal.@clientName = A kódot futtató kliens játékos neve
-lglobal.@clientTeam = A kódot futtató kliens csapat azonosítója
+lglobal.@clientName = A kódot futtató kliens játékosneve
+lglobal.@clientTeam = A kódot futtató kliens csapatazonosítója
 lglobal.@clientMobile = Igaz, ha a kódot futtató kliens egy mobil eszköz, egyébként hamis
 
 logic.nounitbuild = [red]Az egységépítési logika itt nem megengedett.
 
-lenum.type = Az épület/egység típusa.\nPéldául bármilyen elosztó esetében ez a [accent]@router[] értéket adja vissza.\nNem karakterlánc.
-lenum.shoot = Lőj egy pontra.
-lenum.shootp = Lőj egy egységre/épületre sebesség előrejelzéssel.
-lenum.config = Épületkonfiguráció, például nyersanyag Válogató.
-lenum.enabled = Attól függ, hogy a blokk engedélyezve van-e.
+lenum.type = Az épület/egység típusa.\nPéldául bármilyen elosztó esetén a [accent]@router[] értéket adja vissza.\nNem karakterlánc.
+lenum.shoot = Lövés egy adott pontra.
+lenum.shootp = Lövés egy egységre/épületre sebesség-előrejelzéssel.
+lenum.config = Épületkonfiguráció, például nyersanyag-válogató.
+lenum.enabled = Engedélyezve van-e a blokk.
 
 laccess.color = Megvilágítás színe.
-laccess.controller = Egységvezérlő. Ha a processzor vezérli, akkor a processzort adja vissza.\nHa formációban van, akkor a vezérlőjét adja vissza.\nMáskülönben magát az egységet adja vissza.
-laccess.dead = Attól függ, hogy egy egység/épület halott-e, vagy már nem érvényes.
-laccess.controlled = Visszatér:\n[accent]@ctrlProcessor[]l, ha az egységvezérlő egy processzor\n[accent]@ctrlPlayer[]l, ha az egység/épület vezérlője a játékos\n[accent]@ctrlFormation[]l, ha az egység formációban van\nMáskülönben 0.
-laccess.progress = Akció előrehaladása, 0 és 1. között.\nVisszatér a termeléssel, a lövegtorony újratöltésével, vagy az építés előrehaladásával.
+laccess.controller = Egységvezérlő. Ha processzor vezérli, akkor a processzort adja vissza.\nKülönben magát az egységet adja vissza.
+laccess.dead = Egy épület/egység halott-e, vagy már nem érvényes-e.
+laccess.controlled = Ezt adja vissza:\n[accent]@ctrlProcessor[], ha az egységvezérlő egy processzor\n[accent]@ctrlPlayer[], ha az egység/épület vezérlője a játékos\n[accent]@ctrlFormation[], ha az egység formációban van\nKülönben 0.
+laccess.progress = Művelet előrehaladása, 0 és 1 között.\nA termelés, a lövegtorony-újratöltés vagy az építés előrehaladását adja vissza.
 laccess.speed = Az egység legnagyobb sebessége, csempe/mp-ben.
 laccess.id = Egy egység/blokk/nyersanyag/folyadék azonosítója.\nEz a keresési művelet fordítottja.
 
@@ -2397,47 +2397,47 @@ lcategory.unknown = Ismeretlen
 lcategory.unknown.description = Nem kategorizált utasítások.
 lcategory.io = Bemenet és kimenet
 lcategory.io.description = A memóriablokkok és processzorpufferek tartalmának módosítása.
-lcategory.block = Blokk vezérlés
+lcategory.block = Blokkvezérlés
 lcategory.block.description = Interakció a blokkokkal.
 lcategory.operation = Műveletek
 lcategory.operation.description = Logikai műveletek.
-lcategory.control = Áramlásszabályozás
+lcategory.control = Folyamatvezérlés
 lcategory.control.description = A végrehajtási sorrend kezelése.
 lcategory.unit = Egységvezérlés
-lcategory.unit.description = Adj parancsokat az egységeknek.
+lcategory.unit.description = Parancsok adása az egységeknek.
 lcategory.world = Világ
 lcategory.world.description = A világ viselkedésének szabályozása.
 
 graphicstype.clear = A kijelző kitöltése egy színnel.
 graphicstype.color = Szín kiválasztása a következő rajzolási műveletekhez.
-graphicstype.col = A színnel egyenértékű, de csomagolva.\nA csomagolt színeket HEX kódként írja ki egy [accent]%[] előtaggal.\nPéldául: [accent]%ff0000[] piros lenne.
-graphicstype.stroke = Vonalszélesség beállítása.
-graphicstype.line = Rajzolj vonalszakaszt.
+graphicstype.col = A színnel egyenértékű, de csomagolva van.\nA csomagolt színeket hexa kódként írja ki egy [accent]%[] előtaggal.\nPéldául: a [accent]%ff0000[] piros lenne.
+graphicstype.stroke = Vonalvastagság beállítása.
+graphicstype.line = Vonalszakasz rajzolása.
 graphicstype.rect = Téglalap kitöltése.
-graphicstype.linerect = Rajzolj egy téglalap alakú körvonalat.
+graphicstype.linerect = Téglalap körvonalának rajzolása.
 graphicstype.poly = Egy szabályos sokszög kitöltése.
-graphicstype.linepoly = Rajzolj egy szabályos sokszög körvonalat.
-graphicstype.triangle = Töltsön ki egy háromszöget.
-graphicstype.image = Rajzolj egy képet valamilyen tartalomról.\nPédául: [accent]@router[], vagy [accent]@dagger[].
-graphicstype.print = Szöveget rajzol a kiírási pufferből.\nTörli a kiírás puffert.
+graphicstype.linepoly = Szabályos sokszög körvonalának rajzolása.
+graphicstype.triangle = Egy háromszög kitöltése.
+graphicstype.image = Kép rajzolása valamilyen tartalomról.\nPéldául: [accent]@router[] vagy [accent]@dagger[].
+graphicstype.print = Szöveget rajzol a kiírási pufferből.\nCsak ASCII karakterek használhatók.\nTörli a kiírás puffert.
 
 lenum.always = Mindig igaz.
-lenum.idiv = Egész számok osztása.
-lenum.div = Osztás.\nVisszatér [accent]null[]-val a nullával való osztásnál.
-lenum.mod = Moduló.
-lenum.equal = Egyenlő. Kényszeríti a típusokat.\nA nem nulla értékű objektumok értéke 1 lesz, egyébként 0.
+lenum.idiv = Egész osztás.
+lenum.div = Osztás.\nNullával való osztáskor a visszatérési érték [accent]null[].
+lenum.mod = Modulo.
+lenum.equal = Egyenlő. Kényszeríti a típusokat.\nA nem null értékű objektumok értéke 1 lesz, egyébként 0.
 lenum.notequal = Nem egyenlő. Kényszeríti a típusokat.
-lenum.strictequal = Szigorúan egyenlő. Nem kényszeríti a típusokat.\nA(z) [accent]null[] ellenőrzésére használható.
+lenum.strictequal = Szigorúan egyenlőség. Nem kényszeríti a típusokat.\nA [accent]null[] ellenőrzésére is használható.
 lenum.shl = Biteltolás balra.
 lenum.shr = Biteltolás jobbra.
 lenum.or = Bitenkénti VAGY.
 lenum.land = Logikai ÉS.
 lenum.and = Bitenkénti ÉS.
 lenum.not = Bitenkénti átfordítás.
-lenum.xor = Bitenkénti KIZÁRÓ-VAGY.
+lenum.xor = Bitenkénti KIZÁRÓ VAGY.
 
-lenum.min = Legalább két szám.
-lenum.max = Legfeljebb két szám.
+lenum.min = Két szám minimuma.
+lenum.max = Két szám maximuma.
 lenum.angle = A vektor szöge fokban.
 lenum.anglediff = Két szög abszolút távolsága fokban.
 lenum.len = A vektor hossza.
@@ -2446,15 +2446,15 @@ lenum.sin = Szinusz, fokban.
 lenum.cos = Koszinusz, fokban.
 lenum.tan = Tangens, fokban.
 
-lenum.asin = ARC-szinusz, fokban.
-lenum.acos = ARC-koszinusz, fokban.
-lenum.atan = ARC-tangens, fokban.
+lenum.asin = Arkusz szinusz, fokban.
+lenum.acos = Arkusz koszinusz, fokban.
+lenum.atan = Arkusz tangens, fokban.
 
 #not a typo, look up 'range notation'
-lenum.rand = Véletlen decimális szám a [0, érték] tartományban.
+lenum.rand = Véletlenszerű decimális szám a [0, érték) tartományban.
 lenum.log = Természetes logaritmus (ln).
 lenum.log10 = 10-es alapú logaritmus.
-lenum.noise = 2D szimplex zaj.
+lenum.noise = 2D-s szimplex zaj.
 lenum.abs = Abszolút érték.
 lenum.sqrt = Négyzetgyök.
 
@@ -2469,70 +2469,70 @@ lenum.player = Egy játékos által irányított egység.
 
 lenum.ore = Érclelőhely.
 lenum.damaged = Sérült szövetséges épület.
-lenum.spawn = Ellenséges kezdőpont.\nLehet egy Támaszpont vagy egy pozíció.
+lenum.spawn = Ellenséges kezdőpont.\nLehet támaszpont vagy pozíció.
 lenum.building = Épület egy adott csoportban.
 
-lenum.core = Bármilyen Támaszpont.
-lenum.storage = Raktárépület, pl. Vault.
+lenum.core = Bármilyen támaszpont.
+lenum.storage = Raktárépület, például tároló.
 lenum.generator = Energiát termelő épületek.
 lenum.factory = Nyersanyagokat feldolgozó épületek.
 lenum.repair = Javítási pontok.
 lenum.battery = Bármilyen akkumulátor.
-lenum.resupply = Utánpótlási pontok.\nCsak akkor van jelentősége, ha az [accent]"Egység Lőszer"[] engedélyezve van.
-lenum.reactor = Ütközéses/Tórium Erőmű.
+lenum.resupply = Utánpótlási pontok.\nCsak akkor van jelentősége, ha az [accent]„egység lőszere”[] engedélyezve van.
+lenum.reactor = Ütközéses- vagy tóriumerőmű.
 lenum.turret = Bármilyen lövegtorony.
 
-sensor.in = Az épület/egység, amelyet érzékelni kell.
+sensor.in = Az érzékelendő épület/egység.
 
-radar.from = Épület, ahonnan érzékelni kell.\nAz érzékelő hatótávolságát az épület hatótávolsága korlátozza.
-radar.target = Szűrő az érzékelhető egységekhez.
+radar.from = Az épület, ahonnan érzékelni kell.\nAz érzékelő hatótávolságát az épület hatótávolsága korlátozza.
+radar.target = Szűrő az érzékelendő egységekhez.
 radar.and = További szűrők.
 radar.order = Rendezési sorrend. 0-tól visszafelé.
 radar.sort = Az eredmények rendezésének metrikája.
 radar.output = Változó, amelybe a kimeneti egységet írja.
-unitradar.target = Szűrő az érzékelhető egységekhez.
 
+unitradar.target = Érzékelendő egységek szűrése.
 unitradar.and = További szűrők.
 unitradar.order = Rendezési sorrend. 0-tól visszafelé.
 unitradar.sort = Az eredmények rendezésének metrikája.
 unitradar.output = Változó, amelybe a kimeneti egységet írja.
 
-control.of = Épület az irányításhoz.
+control.of = Irányítandó épület.
 control.unit = Megcélozandó egység/épület.
-control.shoot = Akár lőni is lehet.
+control.shoot = Lőjön-e.
 
-unitlocate.enemy = Akár az ellenséges épületek felderítése.
-unitlocate.found = Függetlenül attól, hogy a tárgy meglett-e találva.
+unitlocate.enemy = Felderítse-e az ellenséges épületeket.
+unitlocate.found = Megtalálta-e az objektumot.
 unitlocate.building = Kimeneti változó a megtalált épülethez.
-unitlocate.outx = Kimeneti X koordináta.
-unitlocate.outy = Kimeneti Y koordináta.
+unitlocate.outx = Kimenet X koordinátája.
+unitlocate.outy = Kimenet Y koordinátája.
 unitlocate.group = Keresendő épületcsoport.
 
 lenum.idle = Ne mozdulj, de folytasd az építkezést/bányászatot.\nAz alapértelmezett állapot.
-lenum.stop = Mozgás/bányászás/építés leállítása.
-lenum.unbind = A logikai vezérlés teljes kikapcsolása.\nSzokásos mesterséges intelligencia visszaállítása.
+lenum.stop = Mozgás/bányászat/építés leállítása.
+lenum.unbind = A logikai vezérlés teljes kikapcsolása.\nSzokásos mesterséges intelligencia folytatása.
 lenum.move = Mozgás a pontos pozícióba.
-lenum.approach = Közelítsen meg egy pozíciót egy sugárral.
-lenum.pathfind = Útkeresés az ellenséges kezdőponthoz.
-lenum.autopathfind = Automatikus útkeresés a legközelebbi ellenséges Támaszponthoz, vagy ledobási ponthoz.\nEz ugyanaz, mint a normál hullámos ellenséges útkeresés.
-lenum.target = Lőj egy helyet.
-lenum.targetp = Lőj egy célpontra sebesség-előrejelzéssel.
-lenum.itemdrop = Dobj le egy nyersanyagot.
-lenum.itemtake = Vegyél fel egy nyersanyagot egy épületből.
-lenum.paydrop = Dobd le az aktuális rakományt.
-lenum.paytake = A rakomány felvétele az aktuális helyen.
-lenum.payenter = Lépj be/szállj le arra a rakomány blokkra, amelyen az egység van.
+lenum.approach = Egy pozíció megközelítése egy sugárral.
+lenum.pathfind = Útkeresés a megadott pozícióhoz.
+lenum.autopathfind = Automatikus útkeresés a legközelebbi ellenséges támaszponthoz vagy ledobási ponthoz.\nEz ugyanaz, mint a normál hullámos ellenséges útkeresés.
+lenum.target = Lövés egy pozícióra.
+lenum.targetp = Lövés egy célpontra sebesség-előrejelzéssel.
+lenum.itemdrop = Egy nyersanyag ledobása.
+lenum.itemtake = Egy nyersanyag felvétele egy épületből.
+lenum.paydrop = A jelenlegi rakomány ledobása.
+lenum.paytake = Rakomány felvétele a jelenlegi helyen.
+lenum.payenter = Belépés/leszállás a rakományblokkra, amelyen az egység van.
 lenum.flag = Számjegyes egységjelölő.
-lenum.mine = Bánya egy helyen.
-lenum.build = Építs egy szerkezetet.
-lenum.getblock = Egy épület és a koordinátái típusának lekérdezése. \nAz egységnek a pozíciótartományon belül kell lennie.\nA nem szilárd épületek [accent]@solid[] típusúak lesznek.
-lenum.within = Ellenőrizze, hogy az egység egy pozíció közelében van-e.
-lenum.boost = Erősítés indítás/leállítás.
+lenum.mine = Bányászat egy helyen.
+lenum.build = Egy épület építése.
+lenum.getblock = Az épület, talaj és típus lekérdezése a koordinátákon.\nAz egységnek a pozíciótartományon belül kell lennie.\nA szilárd dolgok, melyek nem épületek, [accent]@solid[] típusúak lesznek.
+lenum.within = Ellenőrzés, hogy az egység egy pozíció közelében van-e.
+lenum.boost = Erősítés indítása/leállítása.
 
-lenum.flushtext = A nyomtatási puffer tartalmának ürítése a jelölőre, ha alkalmazható.\nHa a fetch értéke igaz, megpróbálja lehívni a tulajdonságokat a pálya Helyi Csomagjából, vagy a játék csomagjából.
-lenum.texture = A textúra neve közvetlenül a játék textúra atlaszából (kebab-case elnevezési stílus használatával).\nHa a printFlush értéke igaz, akkor a szöveges puffer tartalmát használja szöveges argumentumként.
+lenum.flushtext = Az írási puffer tartalmának ürítése a jelölőre, ha alkalmazható.\nHa a „fetch” igaz, akkor megpróbálja lekérni a tulajdonságokat a pálya nyelvi csomagjából vagy a játék csomagjából.
+lenum.texture = A textúra neve közvetlenül a játék textúraatlaszából (ún. kebab-case elnevezési stílus használatával).\nHa a „printFlush” igaz, akkor a szöveges puffer tartalmát használja szöveges argumentumként.
 lenum.texturesize = A textúra mérete csempékben. A nulla érték a jelölő szélességét az eredeti textúra méretére skálázza.
-lenum.autoscale = A jelölő skálázása a játékos nagyítási szintjének megfelelően.
-lenum.posi = Indexelt pozíció, vonal- és négyszögjelzőkhöz használatos, ahol a nulla index az első pozíció.
-lenum.uvi = A textúra pozíciója nullától egyig, négyzet jelölőkhöz használatos.
-lenum.colori = Indexelt szín, vonal- és négyzet jelölőkhöz használatos, ahol a nulla index az első szín.
+lenum.autoscale = Skálázva legyen-e a jelölő a játékos nagyítási szintjének megfelelően.
+lenum.posi = Indexelt pozíció, vonal- és négyszögjelzőkhöz használatos, ahol a nulla az első pozíció.
+lenum.uvi = A textúra pozíciója nullától egyig, négyzetjelölőkhöz használatos.
+lenum.colori = Indexelt szín, vonal- és négyzetjelölőkhöz használatos, ahol a nulla az első szín.

From 08cb83b8e297181972590139d1d346ce36fe17e2 Mon Sep 17 00:00:00 2001
From: TheRadioactiveBanana
 <89061718+TheRadioactiveBanana@users.noreply.github.com>
Date: Sat, 30 Mar 2024 00:32:46 +0530
Subject: [PATCH 308/369] UK nodes switching internet for higher stability and
 lower ping (#9682)

Also probably moving TD, RA and some others to UK
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 8553f2187f..d62c916a04 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -146,7 +146,7 @@
   },
   {
     "name": "Eradication Mindustry",
-    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "130.61.22.183:7005", "130.61.220.99:7000", "130.61.220.99:7001", "130.61.220.99:7002", "130.61.220.99:7003", "130.61.220.99:7004", "130.61.220.99:7005", "77.100.100.249:7000", "77.100.100.249:7001"]
+    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "130.61.22.183:7005", "130.61.220.99:7000", "130.61.220.99:7001", "130.61.220.99:7002", "130.61.220.99:7003", "130.61.220.99:7004", "130.61.220.99:7005", "62.30.47.116:7000", "62.30.47.116:7001", "62.30.47.116:7002"]
   },
   {
     "name": "Conservatory",

From fe10d92e05fccb2a0337da64275f7fe9b4057f70 Mon Sep 17 00:00:00 2001
From: RedsonBr140 <redson@riseup.net>
Date: Fri, 29 Mar 2024 16:07:48 -0300
Subject: [PATCH 309/369] feat: update the pt_BR translation (#8219)

* feat: Translate mods and campaign.

* feat: translate global and world-specific hints.

---------

Co-authored-by: Anuken <arnukren@gmail.com>
---
 core/assets/bundles/bundle_pt_BR.properties | 123 ++++++++++----------
 1 file changed, 59 insertions(+), 64 deletions(-)

diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 8dcf3382bb..5d055120e0 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -41,16 +41,16 @@ be.ignore = Ignorar
 be.noupdates = Nenhuma atualização encontrada.
 be.check = Checar por atualizações
 
-mods.browser = Mod Browser
+mods.browser = Navegador de mods
 mods.browser.selected = Mod selecionado
 mods.browser.add = Instalar
 mods.browser.reinstall = Reinstalar
-mods.browser.view-releases = View Releases
-mods.browser.noreleases = [scarlet]Nenhum lançamento encontrado\n[accent]Não foi possível encontrar nenhum lançamento para este mod. Verifique se o repositório do mod tem algum lançamento publicado.
-mods.browser.latest = <Latest>
-mods.browser.releases = Releases
+mods.browser.view-releases = Ver versões
+mods.browser.noreleases = [scarlet]Nenhuma versão encontrada\n[accent]Não foi possível encontrar nenhuma versão do mod. Veja se o repositório do mod possui alguma versão publicada.
+mods.browser.latest = <Mais recente>
+mods.browser.releases = Versões
 mods.github.open = Repositório
-mods.github.open-release = Release Page
+mods.github.open-release = Página da versão
 mods.browser.sortdate = Ordenar por mais recente
 mods.browser.sortstars = Ordenar por estrelas
 
@@ -146,9 +146,9 @@ mod.multiplayer.compatible = [gray]Compatível com Multiplayer
 mod.disable = Desati-\nvar
 mod.content = Conteúdo:
 mod.delete.error = Incapaz de deletar o mod. O arquivo talvez esteja em uso.
-mod.incompatiblegame = [red]Outdated Game
-mod.incompatiblemod = [red]Incompatible
-mod.blacklisted = [red]Unsupported
+mod.incompatiblegame = [red]Jogo desatualizado
+mod.incompatiblemod = [red]Incompatível
+mod.blacklisted = [red]Não suportado
 mod.unmetdependencies = [red]Unmet Dependencies
 mod.erroredcontent = [scarlet]Erros no conteúdo
 mod.circulardependencies = [red]Circular Dependencies
@@ -190,9 +190,9 @@ unlocked = Novo bloco desbloqueado!
 available = Nova pesquisa disponível!
 unlock.incampaign = < Desbloqueie na campanha para mais detalhes >
 campaign.select = Selecione a campanha inicial
-campaign.none = [lightgray]Selecione um planeta para começar.\nEle pode ser alterado a qualquer momento.
-campaign.erekir = Conteúdo mais novo e mais polido. Progressão de campanha principalmente linear.\n\nMapas de maior qualidade e experiência geral.
-campaign.serpulo = Conteúdo mais antigo; a experiência clássica. Mais aberto.\n\nMapas e mecânicas de campanha potencialmente desbalanceados. Menos polido.
+campaign.none = [lightgray]Selecione um planeta para começar nele.\nVocê pode mudar de planeta a qualquer momento.
+campaign.erekir = Novo, conteúdo mais polido. Uma progressão mais linear na campanha.\n\nExperiência geral e mapas de maior qualidade.
+campaign.serpulo = Conteúdo antigo; a experiência clássica. Mais aberto.\n\nMapas e mecânicas de campanha potencialmente desbalanceados. Menos polido.
 completed = [accent]Completado
 techtree = Árvore Tecnológica
 techtree.select = Seleção de Árvore Tecnológica
@@ -383,8 +383,8 @@ pausebuilding = [accent][[{0}][] para parar a construção
 resumebuilding = [scarlet][[{0}][] para continuar a construção
 enablebuilding = [scarlet][[{0}][] para habilitar construção
 showui = Interface escondida.\nPressione [accent][[{0}][] para mostrar a interface.
-commandmode.name = [accent]Command Mode
-commandmode.nounits = [no units]
+commandmode.name = [accent]Modo de comando
+commandmode.nounits = [nenhuma unidade]
 wave = [accent]Horda {0}
 wave.cap = [accent]Horda {0}/{1}
 wave.waiting = Proxima horda em {0}
@@ -1851,13 +1851,12 @@ hint.research = Use o botão de \ue875 [accent]Pesquisa[] para pesquisar novas t
 hint.research.mobile = Use o botão de \ue875 [accent]Pesquisa[] no \ue88c [accent]Menu[] para pesquisar novas tecnologias.
 hint.unitControl = Segure [accent][[L-ctrl][] e [accent]click[] para controlar suas unidades ou torretas.
 hint.unitControl.mobile = [accent][[Toque duas vezes][] para controlar suas unidades ou torretas.
-hint.unitSelectControl = To control units, enter [accent]command mode[] by holding [accent]L-shift.[]\nWhile in command mode, click and drag to select units. [accent]Right-click[] a location or target to command units there.
-hint.unitSelectControl.mobile = To control units, enter [accent]command mode[] by pressing the [accent]command[] button in the bottom left.\nWhile in command mode, long-press and drag to select units. Tap a location or target to command units there.
+hint.unitSelectControl = Para controlar unidades, entre no [accent]modo de comando[] segurando [accent]Shift esquerdo.[]\nEnquanto no modo de comando, clique e segure pra selecionar unidades. Clique com o [accent]Botão direito[] em um lugar ou alvo para mandar as unidades para lá.
+hint.unitSelectControl.mobile = Para controlar unidades, entre no [accent]modo de comando[] segurando o botão de [accent]comando[] no canto inferior esquerdo.\nEnquanto no modo de comando, segure e arraste pra selecionar unidades. Toque em algum lugar ou alvo para mandar as unidades para lá.
 hint.launch = Quando recursos suficientes forem coletados, você pode [accent]Lançar[] selecionando setores próximos a partir do \ue827 [accent]Mapa[] no canto inferior direito.
 hint.launch.mobile = Quando recursos suficientes forem coletados, você pode [accent]Lançar[] selecionando setores próximos a partir do \ue827 [accent]Mapa[] no \ue88c [accent]Menu[].
 hint.schematicSelect = Segure [accent][[F][] e arraste para selecionar blocos para copiar e colar.\n\n[accent][[Middle Click][] para copiar um bloco só.
-hint.rebuildSelect = Hold [accent][[B][] and drag to select destroyed block plans.\nThis will rebuild them automatically.
-hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
+hint.rebuildSelect = Segure [accent][[B][] e arraste para selecionar blocos destruídos.\nIsso irá reconstruí-los automaticamente.
 hint.conveyorPathfind = Segure [accent][[L-Ctrl][] enquanto arrasta as esteiras para gerar automaticamente um caminho.
 hint.conveyorPathfind.mobile = Ative o \ue844 [accent]modo diagonal[] e arraste as esteiras para gerar automaticamente um caminho.
 hint.boost = Segure [accent][[L-Shift][] para voar sobre obstáculos com a sua unidade.\n\nApenas algumas unidades terrestres tem propulsores.
@@ -1874,53 +1873,49 @@ hint.presetDifficulty = Esse setor tem um [scarlet]alto nível de ameaça inimig
 hint.coreIncinerate = Depois que o núcleo ter recebido até a capacidade máxima de um item, qualquer item do mesmo tipo que ele receber será [accent]incinerado[].
 hint.factoryControl = Para definir a [accent]o local de saída[] de uma fábrica de unidades, clique em uma fábrica enquanto estiver no modo de comando, depois clique com o botão direito em um local.\nAs unidades produzidas por ela se moverão automaticamente para lá.
 hint.factoryControl.mobile = Para definir a [accent]o local de saída[] de uma fábrica de unidades, toque em uma fábrica enquanto estiver no modo de comando, depois toque em um local.\nAs unidades produzidas por ela se moverão automaticamente para lá.
-gz.mine = Move near the \uf8c4 [accent]copper ore[] on the ground and click to begin mining.
-gz.mine.mobile = Move near the \uf8c4 [accent]copper ore[] on the ground and tap it to begin mining.
-gz.research = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nClick on a copper patch to place it.
-gz.research.mobile = Open the \ue875 tech tree.\nResearch the \uf870 [accent]Mechanical Drill[], then select it from the menu in the bottom right.\nTap on a copper patch to place it.\n\nPress the \ue800 [accent]checkmark[] at the bottom right to confirm.
-gz.conveyors = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nClick and drag to place multiple conveyors.\n[accent]Scroll[] to rotate.
-gz.conveyors.mobile = Research and place \uf896 [accent]conveyors[] to move the mined resources\nfrom drills to the core.\n\nHold down your finger for a second and drag to place multiple conveyors.
-gz.drills = Expand the mining operation.\nPlace more Mechanical Drills.\nMine 100 copper.
-gz.lead = \uf837 [accent]Lead[] is another commonly used resource.\nSet up drills to mine lead.
-gz.moveup = \ue804 Move up for further objectives.
-gz.turrets = Research and place 2 \uf861 [accent]Duo[] turrets to defend the core.\nDuo turrets require \uf838 [accent]ammo[] from conveyors.
-gz.duoammo = Supply the Duo turrets with [accent]copper[], using conveyors.
-gz.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace \uf8ae [accent]copper walls[] around the turrets.
-gz.defend = Enemy incoming, prepare to defend.
-gz.aa = Flying units cannot easily be dispatched with standard turrets.\n\uf860 [accent]Scatter[] turrets provide excellent anti-air, but require \uf837 [accent]lead[] as ammo.
-gz.scatterammo = Supply the Scatter turret with [accent]lead[], using conveyors.
-gz.supplyturret = [accent]Supply Turret
-gz.zone1 = This is the enemy drop zone.
-gz.zone2 = Anything built in the radius is destroyed when a wave starts.
-gz.zone3 = A wave will begin now.\nGet ready.
-gz.finish = Build more turrets, mine more resources,\nand defend against all the waves to [accent]capture the sector[].
-onset.mine = Click to mine \uf748 [accent]beryllium[] from walls.\n\nUse [accent][[WASD] to move.
-onset.mine.mobile = Tap to mine \uf748 [accent]beryllium[] from walls.
-onset.research = Open the \ue875 tech tree.\nResearch, then place a \uf73e [accent]turbine condenser[] on the vent.\nThis will generate [accent]power[].
-onset.bore = Research and place a \uf741 [accent]plasma bore[].\nThis automatically mines resources from walls.
-onset.power = To [accent]power[] the plasma bore, research and place a \uf73d [accent]beam node[].\nConnect the turbine condenser to the plasma bore.
-onset.ducts = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\nClick and drag to place multiple ducts.\n[accent]Scroll[] to rotate.
-onset.ducts.mobile = Research and place \uf799 [accent]ducts[] to move the mined resources from the plasma bore to the core.\n\nHold down your finger for a second and drag to place multiple ducts.
-onset.moremine = Expand the mining operation.\nPlace more Plasma Bores and use beam nodes and ducts to support them.\nMine 200 beryllium.
-onset.graphite = More complex blocks require \uf835 [accent]graphite[].\nSet up plasma bores to mine graphite.
-onset.research2 = Begin researching [accent]factories[].\nResearch the \uf74d [accent]cliff crusher[] and \uf779 [accent]silicon arc furnace[].
-onset.arcfurnace = The arc furnace needs \uf834 [accent]sand[] and \uf835 [accent]graphite[] to create \uf82f [accent]silicon[].\n[accent]Power[] is also required.
-onset.crusher = Use \uf74d [accent]cliff crushers[] to mine sand.
-onset.fabricator = Use [accent]units[] to explore the map, defend buildings, and attack the enemy. Research and place a \uf6a2 [accent]tank fabricator[].
-onset.makeunit = Produce a unit.\nUse the "?" button to see selected factory requirements.
-onset.turrets = Units are effective, but [accent]turrets[] provide better defensive capabilities if used effectively.\nPlace a \uf6eb [accent]Breach[] turret.\nTurrets require \uf748 [accent]ammo[].
-onset.turretammo = Supply the turret with [accent]beryllium ammo.[]
-onset.walls = [accent]Walls[] can prevent oncoming damage from reaching buildings.\nPlace some \uf6ee [accent]beryllium walls[] around the turret.
-onset.enemies = Enemy incoming, prepare to defend.
-onset.defenses = [accent]Set up defenses:[lightgray] {0}
-onset.attack = The enemy is vulnerable. Counter-attack.
-onset.cores = New cores can be placed on [accent]core tiles[].\nNew cores function as forward bases and share a resource inventory with other cores.\nPlace a \uf725 core.
-onset.detect = The enemy will be able to detect you in 2 minutes.\nSet up defenses, mining, and production.
+gz.mine = Vá para perto do \uf8c4 [accent]minério de cobre[] no chão e clique para começar a minerar.
+gz.mine.mobile = Vá para perto do \uf8c4 [accent]minério de cobre[] no chão e toque nele para começar a minerar.
+gz.research = Abra a \ue875 árvore tecnológica.\nPesquise a \uf870 [accent]Broca mecânica[], Depois selecione-a pelo menu no canto inferior direito.\nClique no cobre para coloca-la.
+gz.research.mobile = Abra a \ue875 árvore tecnológica.\nPesquise a \uf870 [accent]Broca mecânica[], Depois selecione-a pelo menu no canto inferior direito.\nClique no cobre para colocá-la.\n\nPressione a \ue800 [accent]confirmação[] no canto inferior direito para confirmar.
+gz.conveyors = Pesquise e coloque \uf896 [accent]esteiras[] para mover os recursos minerados\ndas brocas para o núcleo.\n\nClique e arraste para pôr multiplas esteiras.\n[accent]Scroll[] para rotacionar.
+gz.conveyors.mobile = Pesquise e coloque \uf896 [accent]esteiras[] para mover os recursos minerados\ndas brocas para o núcleo.\n\nSegure por um segundo e arraste para colocar múltiplas esteiras.
+gz.drills = Expanda a mineração.\nColoque mais Brocas Mecânicas.\nMinere 100 cobres.
+gz.lead = \uf837 [accent]Chumbo[] é outro recurso comumente usado.\nColoque brocas para minerar chumbo.
+gz.moveup = \ue804 Vá para cima para outros objetivos.
+gz.turrets = Pesquise e coloque 2 torretas \uf861 [accent]Duo[] para defender o núcleo.\ntorretas Duo requerem \uf838 [accent]munição[] de esteiras.
+gz.duoammo = Abasteça as torretas Duo com [accent]cobre[], usando esteiras.
+gz.walls = [accent]Muros[] podem previnir danos recebidos de atingir as construções.\nColoque \uf8ae [accent]muros de cobre[] em volta das torretas.
+gz.defend = Inimigos vindo, prepare-se para defender.
+gz.aa = Unidades flutuantes não podem ser destruidas facilmente por torretas comuns.\nTorretas\uf860 [accent]Scatter[] Proveem ótima defesa aérea, mas requerem \uf837 [accent]chumbo[] como munição.
+gz.scatterammo = Abasteça a torreta Scatter com [accent]chumbo[], usando esteiras.
+gz.supplyturret = [accent]Abasteça a torreta
+gz.zone1 = Essa é a zona de spawn inimigo.
+gz.zone2 = Qualquer coisa construida nesta área será destruida quando uma horda começar.
+gz.zone3 = Uma horda vai começar agora\nSe prepare.
+gz.finish = Construa mais torretas, minere mais recursos,\ne se defenda de todas as hordas para [accent]capturar o setor[].
+onset.mine = Clique para minerar \uf748 [accent]berílio[] das paredes.\n\nUse [accent][[WASD] para se mover.
+onset.mine.mobile = Toque para minerar \uf748 [accent]berílio[] das paredes.
+onset.research = Abra a \ue875 árvore tecnológica.\nPesquise, e então coloque um \uf73e [accent]Condensador de Turbina[] na ventilação.\nIsso vai gerar [accent]energia[].
+onset.bore = Pesquise e coloque uma \uf741 [accent]Mineradora de Plasma[].\nEla minera recursos das paredes automaticamente.
+onset.power = Para[accent]alimentar[] a Mineradora de Plasma, pesquise e coloque uma \uf73d [accent]Célula de Feixe[].\nConecte o condensador de turbina ao minerador de plasma.
+onset.ducts = Pesquise e coloque \uf799 [accent]dutos[] para mover recursos minerados da mineradora de plasma para o núcleo.\nClique e segure para colocar múltiplos dutos.\n[accent]Scroll[] para rotacionar.
+onset.ducts.mobile = Pesquise e coloque \uf799 [accent]dutos[] para mover recursos minerados da mineradora de plasma para o núcleo.\n\nSegure por um segundo e arraste para colocar múltiplos dutos.
+onset.moremine = Expanda a mineração.\nColoque mais Mineradoras de Plasma, use as Células de Feixe e dutos para isso.\nMinere 200 berílios.
+onset.graphite = Blocos mais complexos requerem \uf835 [accent]grafite[].\nColoque Mineradoras de Plasma para minerar grafite.
+onset.research2 = Comece a pesquisar [accent]fábricas[].\nPesquise o \uf74d [accent]Esmagador de Penhasco[] e o \uf779 [accent]silicon arc furnace[].
+onset.arcfurnace = O arc furnace precisa de \uf834 [accent]areia[] e \uf835 [accent]grafite[] para criar \uf82f [accent]silício[].\n[accent]Energia[] também é necessária.
+onset.crusher = Use o \uf74d [accent]Esmagador de Areia[] para minerar areia.
+onset.fabricator = Use [accent]unidades[] para explorar o mapa, defender construções e atacar o inimigo. Pesquise e coloque um \uf6a2 [accent]Fabricador de Tanques[].
+onset.makeunit = Produza uma unidade.\nUse o botão "?" para ver os requisitos da fábrica selecionada.
+onset.turrets = Unidades são efetivas, mas [accent]torretas[] proveem melhores capacidades defensivas se usadas efetivamente.\nColoque uma torreta \uf6eb [accent]Breach[].\nTorretas requerem \uf748 [accent]munição[].
+onset.turretammo = Abasteça a torreta com [accent]munição de berílio.[]
+onset.walls = [accent]Muros[] podem previnir danos recebidos de atingir as construções.\nColoque \uf6ee [accent]muros de berílio[] em volta das torretas.
+
+onset.enemies = Inimigo vindo, se prepare.
+onset.attack = O inimigo está vulnerável. Contra ataque.
+onset.cores = Novos núcleos podem ser colocados em [accent]ladrilhos de núcleo[].\nNovos núcleos funcionam como bases avançadas e compartilham seus recursos com outros núcleos.\nColoque um \uf725 núcleo.
+onset.detect = O inimigo poderá te detectar em 2 minutos.\nConstrua defesas, mineração e produção.
 
-#Don't translate these yet!
-onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
-onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
-aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
 split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
 split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)
 split.acquire = You must acquire some tungsten to build units.

From 520c423a597328f0151ccc1b2ec3790d36341c54 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az566-840.ut545be5203uvep113pmbghppc.ex.internal.cloudapp.net>
Date: Fri, 29 Mar 2024 19:08:39 +0000
Subject: [PATCH 310/369] Automatic bundle update

---
 core/assets/bundles/bundle_hu.properties    | 86 ++++++++++-----------
 core/assets/bundles/bundle_pt_BR.properties |  5 ++
 2 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 3a372d6433..88ac610b4f 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -743,7 +743,7 @@ weather.sandstorm.name = Homokvihar
 weather.sporestorm.name = Spóravihar
 weather.fog.name = Köd
 
-campaign.playtime =  [lightgray]Játékidő a szektorban: {0}
+campaign.playtime = \uf129 [lightgray]Játékidő a szektorban: {0}
 campaign.complete = [accent]Gratulálunk.\n\nAz ellenség legyőzve a(z) {0} bolygón.\n[lightgray]Az utolsó szektor meghódítása megtörtént.
 
 sectorlist = Szektorok
@@ -1859,79 +1859,79 @@ hint.respawn = Ahhoz, hogy drónként újraéledj, nyomd meg a [accent][[V][] go
 hint.respawn.mobile = Átvetted az irányítást egy egység vagy épület felett. Ahhoz, hogy drónként újraéledj, [accent]koppints a profilképre a bal felső sarokban.[]
 hint.desktopPause = Nyomd meg a [accent][[Szóközt][] a játék szüneteltetéséhez vagy folytatásához.
 hint.breaking = [accent]Jobb egérgombbal[] és húzással lebonthatod a blokkokat.
-hint.breaking.mobile = Használd a jobb alsó sarokban lévő  [accent]kalapács[] gombot a blokkok törléséhez.\n\nTartsd lenyomva az ujjad és húzd, hogy nagyobb területet tudj kijelölni.
+hint.breaking.mobile = Használd a jobb alsó sarokban lévő \ue817 [accent]kalapács[] gombot a blokkok törléséhez.\n\nTartsd lenyomva az ujjad és húzd, hogy nagyobb területet tudj kijelölni.
 hint.blockInfo = Egy blokk információinak megtekintéséhez válaszd ki az épületet az [accent]építési menüben[], majd válaszd a [accent][[?][] gomb jobb oldalt.
 hint.derelict = Az [accent]elhagyatott[] szerkezetek régi bázisok maradványai, amelyek már nem működnek.\n\nEzeket az épületeket le lehet [accent]bontani[] nyersanyagokért, vagy meg is lehet javítani őket.
-hint.research = Használd a  [accent]Fejlesztési fa[] gombot, hogy új technológiákat fedezz fel.
-hint.research.mobile = Használd a  [accent]Fejlesztési fa[] gombot a  [accent]menüben[], hogy új technológiákat fedezz fel.
+hint.research = Használd a \ue875 [accent]Fejlesztési fa[] gombot, hogy új technológiákat fedezz fel.
+hint.research.mobile = Használd a \ue875 [accent]Fejlesztési fa[] gombot a \ue88c [accent]menüben[], hogy új technológiákat fedezz fel.
 hint.unitControl = Nyomd le a [accent][[bal Ctrl][] gombot, és kattints [accent]jobb egérgombbal[] a baráti egység vagy lövegtorony irányításához.
 hint.unitControl.mobile = [accent][[Dupla koppintással][] irányíthatók kézileg a szövetséges egységek vagy lövegtornyok.
 hint.unitSelectControl = Az egységek irányításához lépj be [accent]parancs módba[] a [accent]bal Shift[] lenyomva tartásával.\nParancs módban az egységek kijelöléséhez kattints, és húzd az egeret. A [accent]jobb egérgombbal[] küldd az egységeket a helyszínre vagy a célponthoz.
 hint.unitSelectControl.mobile = Az egységek irányításához lépj be [accent]parancs módba[] a bal alsó sarokban lévő [accent]parancs[] gombbal.\nParancs módban az egységek kiválasztásához érintsd meg a kijelzőt és húzással jelöld ki az egységeket. Koppintással küldd az egységeket a helyszínre vagy a célponthoz.
-hint.launch = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]lődd ki[] a támaszpontot a következő szektorba, úgy, hogy megnyitod a  [accent]Bolygótérképet[] a jobb alsó sarokban, és átforgatod az új helyszínre.
-hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]lődd ki[] el a támaszpontot egy közeli szektorba, úgy, hogy kiválasztasz egy szektort a  [accent]Menüben[] a  [accent]Bolygótérképről[].
+hint.launch = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]lődd ki[] a támaszpontot a következő szektorba, úgy, hogy megnyitod a \ue827 [accent]Bolygótérképet[] a jobb alsó sarokban, és átforgatod az új helyszínre.
+hint.launch.mobile = Ha elegendő nyersanyagot gyűjtöttél össze, akkor [accent]lődd ki[] el a támaszpontot egy közeli szektorba, úgy, hogy kiválasztasz egy szektort a \ue88c [accent]Menüben[] a \ue827 [accent]Bolygótérképről[].
 hint.schematicSelect = Tartsd nyomja az [accent][[F][] gombot több épület kijelöléséhez és másolásához.\n\n[accent][[Középső kattintással][] egy adott blokktípus másolható.
 hint.rebuildSelect = Tartsd nyomva a [accent][[B][] gombot és húzással jelöld ki a megsemmisített blokkterveket.\nEz automatikusan újraépíti őket.
-hint.rebuildSelect.mobile = Válaszd a  másolás gombot, majd koppints az  újjáépítés gombra, és húzd a megsemmisült blokktervek kijelöléséhez.\nEz automatikusan újraépíti őket.
+hint.rebuildSelect.mobile = Válaszd a \ue874 másolás gombot, majd koppints az \ue80f újjáépítés gombra, és húzd a megsemmisült blokktervek kijelöléséhez.\nEz automatikusan újraépíti őket.
 hint.conveyorPathfind = Tartsd nyomva a [accent][[bal Ctrl][] gombot a szállítószalagok lerakása közben, hogy a játék útvonalat állítson elő.
-hint.conveyorPathfind.mobile = Engedélyezd az  [accent]átlós módot[], és tegyél le egyszerre több szállítószalagot, hogy a játék útvonalat állítson elő.
+hint.conveyorPathfind.mobile = Engedélyezd az \ue844 [accent]átlós módot[], és tegyél le egyszerre több szállítószalagot, hogy a játék útvonalat állítson elő.
 hint.boost = Tartsd nyomva a [accent][[bal Shift][] gombot, hogy átrepülj az akadályok felett.\n\nErre csak néhány földi egység képes.
 hint.payloadPickup = Nyomd meg a [accent][[[] gombot a kis blokkok vagy egységek felemeléséhez.
 hint.payloadPickup.mobile = [accent]Koppints és tartsd lenyomva az ujjad[] egy kis blokk vagy egység felemeléséhez.
 hint.payloadDrop = Nyomd le a [accent]][] gombot a rakomány lerakásához.
 hint.payloadDrop.mobile = [accent]Koppints és tartsd lenyomva az ujjad[] egy üres területen a rakomány lerakásához.
 hint.waveFire = A vizet lőszerként használó [accent]Wave[] lövegtornyok automatikusan eloltják a közeli tüzeket.
-hint.generator = Az  [accent]égetőerőmű[] szenet éget, és áramot ad át a vele érintkező épületeknek.\n\nAz áramszállítás távolsága [accent]villanyoszlopokkal[] növelhető.
-hint.guardian = Az [accent]Őrzők[] páncélozottak. A gyenge lövedékek, mint a [accent]réz[] vagy az [accent]ólom[] [scarlet]nem hatásosak[] az Őrző páncéljával szemben.\n\nHasználj magasabb szintű lövegtornyokat, vagy  [accent]grafitot[]  a Duo/Salvo lövegtornyokban, hogy leszedd az Őrzőket.
-hint.coreUpgrade = A támaszpont úgy fejleszthető, hogy [accent]magasabb szintű támaszpontot teszel rá[].\n\nHelyezz egy  [accent]Alapítvány[] támaszpontot a  [accent]Szilánk[] támaszpontra. Figyelj rá, hogy ne legyenek az új támaszpont területén épületek.
+hint.generator = Az \uf879 [accent]égetőerőmű[] szenet éget, és áramot ad át a vele érintkező épületeknek.\n\nAz áramszállítás távolsága [accent]villanyoszlopokkal[] növelhető.
+hint.guardian = Az [accent]Őrzők[] páncélozottak. A gyenge lövedékek, mint a [accent]réz[] vagy az [accent]ólom[] [scarlet]nem hatásosak[] az Őrző páncéljával szemben.\n\nHasználj magasabb szintű lövegtornyokat, vagy \uf835 [accent]grafitot[]  a Duo/\uf859Salvo lövegtornyokban, hogy leszedd az Őrzőket.
+hint.coreUpgrade = A támaszpont úgy fejleszthető, hogy [accent]magasabb szintű támaszpontot teszel rá[].\n\nHelyezz egy \uf868 [accent]Alapítvány[] támaszpontot a \uf869 [accent]Szilánk[] támaszpontra. Figyelj rá, hogy ne legyenek az új támaszpont területén épületek.
 hint.presetLaunch = A szürke [accent]landolási zónát tartalmazó szektorokba[], amilyen például a [accent]Fagyott erdő[], bárhonnan kilőhetsz. Nem szükséges hozzá szomszédos területet elfoglalnod.\n\nA [accent]számozott szektorok[], mint ez is, [accent]nem kötelezők[].
 hint.presetDifficulty = Ebben a szektorban [scarlet]magas az ellenséges fenyegetettségi szint[].\nAz ilyen szektorokba való indulás [accent]nem ajánlott[] megfelelő technológia és felkészülés nélkül.
 hint.coreIncinerate = Ha a támaszpont egy nyersanyagból elérte a maximumot, a beérkező további nyersanyagok azonnal [accent]megsemmisítésre kerülnek[].
 hint.factoryControl = Egy egységgyár [accent]kimeneti célpontjának[] beállításához kattints parancs módban egy gyárépületre, majd kattints jobb egérgombbal egy helyre.\nAz előállított egységek automatikusan odamennek.
 hint.factoryControl.mobile = Egy egységgyár [accent]kimeneti célpontjának[] beállításához koppints parancs módban egy gyárépületre, majd koppints egy helyre.\nAz előállított egységek automatikusan odamennek.
 
-gz.mine = Menj a földön lévő  [accent]rézérc[] közelébe, és kattints a bányászat megkezdéséhez.
-gz.mine.mobile = Menj a földön lévő  [accent]rézérc[] közelébe, és koppints a bányászat megkezdéséhez.
-gz.research = Nyisd meg a  Fejlesztési fát.\nFejleszd ki a  [accent]Mechanikus fúrót[], majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy rézfoltra az elhelyezéséhez.
-gz.research.mobile = Nyisd meg a  Fejlesztési fát.\nFejleszd ki a  [accent]Mechanikus fúrót[], majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy rézfoltra az elhelyezéséhez.\n\nA megerősítéshez nyomd meg a jobb alsó sarokban lévő  [accent]pipát[].
-gz.conveyors = Fejleszd ki, és építs  [accent]szállítószalagokat[], hogy a kitermelt\nnyersanyagokat eljuttasd a fúróktól a támaszpontba.\n\nKattints és húzd az egeret, hogy több szállítószalagot helyezz el.\nHasználd a [accent]görgőt[] a forgatáshoz.
-gz.conveyors.mobile = Fejleszd ki, és építs  [accent]szállítószalagokat[], hogy a kitermelt\nnyersanyagokat eljuttasd a fúróktól a támaszpontba.\n\nTartsd lenyomva az ujjad és húzd el, hogy több szállítószalagot helyezz el.
+gz.mine = Menj a földön lévő \uf8c4 [accent]rézérc[] közelébe, és kattints a bányászat megkezdéséhez.
+gz.mine.mobile = Menj a földön lévő \uf8c4 [accent]rézérc[] közelébe, és koppints a bányászat megkezdéséhez.
+gz.research = Nyisd meg a \ue875 Fejlesztési fát.\nFejleszd ki a \uf870 [accent]Mechanikus fúrót[], majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy rézfoltra az elhelyezéséhez.
+gz.research.mobile = Nyisd meg a \ue875 Fejlesztési fát.\nFejleszd ki a \uf870 [accent]Mechanikus fúrót[], majd válaszd ki a jobb alsó sarokban lévő menüből.\nKattints egy rézfoltra az elhelyezéséhez.\n\nA megerősítéshez nyomd meg a jobb alsó sarokban lévő \ue800 [accent]pipát[].
+gz.conveyors = Fejleszd ki, és építs \uf896 [accent]szállítószalagokat[], hogy a kitermelt\nnyersanyagokat eljuttasd a fúróktól a támaszpontba.\n\nKattints és húzd az egeret, hogy több szállítószalagot helyezz el.\nHasználd a [accent]görgőt[] a forgatáshoz.
+gz.conveyors.mobile = Fejleszd ki, és építs \uf896 [accent]szállítószalagokat[], hogy a kitermelt\nnyersanyagokat eljuttasd a fúróktól a támaszpontba.\n\nTartsd lenyomva az ujjad és húzd el, hogy több szállítószalagot helyezz el.
 gz.drills = Bővítsd a bányászati kapacitást.\nÉpíts több mechanikus fúrót.\nBányássz 100 rezet.
-gz.lead = Az  [accent]ólom[] egy másik gyakran használt nyersanyag.\nÉpíts fúrókat az ólom kitermelésére.
-gz.moveup =  Menj tovább a további utasításokért.
-gz.turrets = Fejleszd ki, és építs 2  [accent]Duo[] lövegtornyot, hogy megvédd a támaszpontot.\nA Duo lövegtornyoknak  [accent]lőszerre[] van szükségük, mely szállítószalaggal juttatható el hozzájuk.
+gz.lead = Az \uf837 [accent]ólom[] egy másik gyakran használt nyersanyag.\nÉpíts fúrókat az ólom kitermelésére.
+gz.moveup = \ue804 Menj tovább a további utasításokért.
+gz.turrets = Fejleszd ki, és építs 2 \uf861 [accent]Duo[] lövegtornyot, hogy megvédd a támaszpontot.\nA Duo lövegtornyoknak \uf838 [accent]lőszerre[] van szükségük, mely szállítószalaggal juttatható el hozzájuk.
 gz.duoammo = Szállítószalagok segítségével lásd el [accent]rézzel[] a Duo lövegtornyokat.
-gz.walls = A [accent]falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts  [accent]rézfalakat[] a lövegtornyok köré.
+gz.walls = A [accent]falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts \uf8ae [accent]rézfalakat[] a lövegtornyok köré.
 gz.defend = Az ellenség közeledik, készülj fel a védekezésre.
-gz.aa = A repülő egységeket nem lehet könnyen elintézni a hagyományos lövegtornyokkal.\nA  [accent]Scatter[] lövegtornyok kiváló légelhárítást biztosítanak, de lőszerként  [accent]ólomra[] van szükségük.
-gz.scatterammo = Szállítószalagok segítségével lásd el  [accent]ólommal[] a Scatter lövegtornyokat.
+gz.aa = A repülő egységeket nem lehet könnyen elintézni a hagyományos lövegtornyokkal.\nA \uf860 [accent]Scatter[] lövegtornyok kiváló légelhárítást biztosítanak, de lőszerként \uf837 [accent]ólomra[] van szükségük.
+gz.scatterammo = Szállítószalagok segítségével lásd el \uf837 [accent]ólommal[] a Scatter lövegtornyokat.
 gz.supplyturret = [accent]Lövegtorony ellátása
 gz.zone1 = Ez az ellenség leszállóhelye.
 gz.zone2 = Bármi, ami a hatósugarában épült, elpusztul, amikor egy hullám elindul.
 gz.zone3 = Egy hullám most kezdődik.\nKészülj fel.
 gz.finish = Építs több lövegtornyot, bányássz több nyersanyagot,\nés védekezz az ellenséges hullámok ellen, hogy [accent]elfoglald a szektort[].
 
-onset.mine = Kattints bal egérgombbal a  [accent]berillium[] kibányászáshoz a falakból.\n\nA mozgáshoz használd a [accent][[WASD] gombokat.
-onset.mine.mobile = Koppints a  [accent]berillium[] kibányászáshoz a falakból.
-onset.research = Nyisd meg a  fejlesztési fát.\nFejleszd ki, és építs egy  [accent]kondenzációs turbinát[] a kürtőn.\nEz [accent]áramot[] fog termelni.
-onset.bore = Fejleszd ki, és építs egy  [accent]plazmafúrót[].\nEz automatikusan bányássza ki a nyersanyagokat a falakból.
-onset.power = Ahhoz, hogy [accent]árammal[] lásd el a plazmafúrót, fejleszd ki, és helyezz el egy  [accent]sugárcsomópontot[].\nSegítségükkel összekötheted a kondenzációs turbinát a plazmafúróval.
-onset.ducts = Fejleszd ki, és építs  [accent]szállítószalagot[], hogy a kitermelt nyersanyagokat eljuttasd a plazmafúrótól a támaszpontba.\nKattints, és húzd az egeret több szállítószalag elhelyezéséhez.\nHasználd a [accent]görgőt[] a forgatáshoz.
-onset.ducts.mobile = Fejleszd ki, és építs  [accent]szállítószalagot[], hogy a kitermelt nyersanyagokat eljuttasd a plazmafúrótól a támaszpontba.\n\nTartsd lenyomva az ujjad és húzd el, hogy több szállítószalagot helyezz el.
+onset.mine = Kattints bal egérgombbal a \uf748 [accent]berillium[] kibányászáshoz a falakból.\n\nA mozgáshoz használd a [accent][[WASD] gombokat.
+onset.mine.mobile = Koppints a \uf748 [accent]berillium[] kibányászáshoz a falakból.
+onset.research = Nyisd meg a \ue875 fejlesztési fát.\nFejleszd ki, és építs egy \uf73e [accent]kondenzációs turbinát[] a kürtőn.\nEz [accent]áramot[] fog termelni.
+onset.bore = Fejleszd ki, és építs egy \uf741 [accent]plazmafúrót[].\nEz automatikusan bányássza ki a nyersanyagokat a falakból.
+onset.power = Ahhoz, hogy [accent]árammal[] lásd el a plazmafúrót, fejleszd ki, és helyezz el egy \uf73d [accent]sugárcsomópontot[].\nSegítségükkel összekötheted a kondenzációs turbinát a plazmafúróval.
+onset.ducts = Fejleszd ki, és építs \uf799 [accent]szállítószalagot[], hogy a kitermelt nyersanyagokat eljuttasd a plazmafúrótól a támaszpontba.\nKattints, és húzd az egeret több szállítószalag elhelyezéséhez.\nHasználd a [accent]görgőt[] a forgatáshoz.
+onset.ducts.mobile = Fejleszd ki, és építs \uf799 [accent]szállítószalagot[], hogy a kitermelt nyersanyagokat eljuttasd a plazmafúrótól a támaszpontba.\n\nTartsd lenyomva az ujjad és húzd el, hogy több szállítószalagot helyezz el.
 onset.moremine = Bővítsd a bányászati kapacitást.\nHelyezz el több plazmavágót, és a támogatásukhoz használj sugárcsomópontokat és szállítószalagokat.\nBányássz 200 berilliumot.
-onset.graphite = Az összetettebb épületekhez  [accent]grafit[] szükséges.\nÉpíts plazmavágókat a grafit kibányászásához.
-onset.research2 = Kezdd el a [accent]gyárak[] fejlesztését.\nFejleszd ki a  [accent]sziklazúzót[] és a  [accent]szilícium ívkemencét[].
-onset.arcfurnace = A Szilícium ívkemencének  [accent]homokra[] és  [accent]grafitra[] van szüksége, hogy  [accent]szilíciumot[] gyártson.\nTovábbá [accent]áram[] is szükséges a működéséhez.
-onset.crusher = Használj  [accent]sziklazúzókat[], hogy homokot bányász.
-onset.fabricator = Használd az [accent]egységeket[], hogy felfedezd a pályát, megvédd az épületeket, és megtámadhasd velük az ellenséget. Fejleszd ki, és helyezz el egy  [accent]tankgyárat[].
+onset.graphite = Az összetettebb épületekhez \uf835 [accent]grafit[] szükséges.\nÉpíts plazmavágókat a grafit kibányászásához.
+onset.research2 = Kezdd el a [accent]gyárak[] fejlesztését.\nFejleszd ki a \uf74d [accent]sziklazúzót[] és a \uf779 [accent]szilícium ívkemencét[].
+onset.arcfurnace = A Szilícium ívkemencének \uf834 [accent]homokra[] és \uf835 [accent]grafitra[] van szüksége, hogy \uf82f [accent]szilíciumot[] gyártson.\nTovábbá [accent]áram[] is szükséges a működéséhez.
+onset.crusher = Használj \uf74d [accent]sziklazúzókat[], hogy homokot bányász.
+onset.fabricator = Használd az [accent]egységeket[], hogy felfedezd a pályát, megvédd az épületeket, és megtámadhasd velük az ellenséget. Fejleszd ki, és helyezz el egy \uf6a2 [accent]tankgyárat[].
 onset.makeunit = Állíts elő egy egységet.\nHasználd a „?” gombot, hogy megnézd a kiválasztott gyár követelményeit.
-onset.turrets = Az egységek hatékonyak, de hatásosan alkalmazva a [accent]lövegtornyok[] jobb védelmi képességeket biztosítanak.\nHelyezz el egy  [accent]Breach[] lövegtornyot.\nA lövegtornyoknak  [accent]lőszerre[] van szüksége.
+onset.turrets = Az egységek hatékonyak, de hatásosan alkalmazva a [accent]lövegtornyok[] jobb védelmi képességeket biztosítanak.\nHelyezz el egy \uf6eb [accent]Breach[] lövegtornyot.\nA lövegtornyoknak \uf748 [accent]lőszerre[] van szüksége.
 onset.turretammo = Szállítótalagok használatával lásd el a lövegtornyokat [accent]berillium[] lőszerrel.
-onset.walls = A [accent]falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts  [accent]Berillium falakat[] a lövegtornyok körül.
+onset.walls = A [accent]falak[] megakadályozhatják, hogy az épületekben károk keletkezzenek.\nÉpíts \uf6ee [accent]Berillium falakat[] a lövegtornyok körül.
 onset.enemies = Az ellenség közeledik, készülj fel a védekezésre.
 onset.defenses = [accent]Állíts fel védelmet:[lightgray] {0}
 onset.attack = Az ellenség most sebezhető. Indítsd ellentámadást.
-onset.cores = Új támaszpont csak a [accent]támaszpontcsempére[] helyezhető.\nAz új támaszpontok előretolt bázisként működnek, és megosztják a nyersanyagkészletüket más támaszpontokkal.\nHelyezz el egy  támaszpontot.
+onset.cores = Új támaszpont csak a [accent]támaszpontcsempére[] helyezhető.\nAz új támaszpontok előretolt bázisként működnek, és megosztják a nyersanyagkészletüket más támaszpontokkal.\nHelyezz el egy \uf725 támaszpontot.
 onset.detect = Az ellenség 2 percen belül észrevesz téged.\nÁllíts fel védelmet, bányászatot és termelést.
 onset.commandmode = Tartsd nyomva a [accent]Shift[] gombot, hogy [accent]parancs módba[] lépj.\n[accent]Bal egérgombbal és húzással[] lehet egységeket kijelölni.\n[accent]Jobb egérgombbal[] utasíthatók az egységek mozgásra vagy támadásra.
 onset.commandmode.mobile = Nyomd meg a [accent]parancs gombot[], hogy [accent]parancs módba[] lépj.\nTartsd nyomva az ujjad, majd [accent]húzd[] az egységek kiválasztásához.\n[accent]Koppintással[] utasíthatók az egységek mozgásra vagy támadásra.
@@ -1985,7 +1985,7 @@ liquid.nitrogen.description = A nyersanyagok kitermelésénél, gáztermelésné
 liquid.neoplasm.description = A neoplázia reaktor veszélyes biológiai mellékterméke. Gyorsan átterjed minden szomszédos víztartalmú blokkra, amelyhez hozzáér, és közben károsítja azokat. Sűrű folyadék.
 liquid.neoplasm.details = Neoplazma. Egy kontrollálhatatlan, gyorsan osztódó, iszap állagú, szintetikus sejtmassza. Hőálló. Rendkívül veszélyes minden vízzel kapcsolatos szerkezetre.\n\nTúl összetett és instabil a szabványos elemzésekhez. Potenciális alkalmazási területe ismeretlen. A salakmedencékben való elégetés ajánlott.
 
-block.derelict =  [lightgray]Elhagyatott
+block.derelict = \uf77e [lightgray]Elhagyatott
 block.armored-conveyor.description = Nyersanyagokat szállít. Nem fogad el oldalról nem szállítószalagról érkező nyersanyagot.
 block.illuminator.description = Világít.
 block.message.description = Üzenetet tárol a szövetségesek kommunikációjához.
@@ -2036,7 +2036,7 @@ block.force-projector.description = Hatszögletű erőteret hoz létre maga kör
 block.shock-mine.description = Elektromos kisülést hoz létre, ha ellenséggel érintkezik.
 block.conveyor.description = Nyersanyagokat szállít.
 block.titanium-conveyor.description = Nyersanyagokat szállít. Gyorsabb a sima szállítószalagnál.
-block.plastanium-conveyor.description =  Nyersanyagokat szállít tömbösítve. Hátulról fogadja a nyersanyagokat, elöl három irányba osztja szét őket. Több kezdő- és végponttal növelhető az áteresztőképessége.
+block.plastanium-conveyor.description = Nyersanyagokat szállít tömbösítve. Hátulról fogadja a nyersanyagokat, elöl három irányba osztja szét őket. Több kezdő- és végponttal növelhető az áteresztőképessége.
 block.junction.description = Hídként működik két egymást keresztező szállítószalag között.
 block.bridge-conveyor.description = Nyersanyagokat szállít épületek és terepakadályok fölött.
 block.phase-conveyor.description = Nyersanyagokat szállít épületek és terepakadályok fölött. Nagyobb távolságra ér, mint a sima szállítószalaghíd, de áramot igényel.
@@ -2065,7 +2065,7 @@ block.power-node-large.description = Nagyobb villanyoszlop, nagyobb hatótávols
 block.surge-tower.description = Hosszútávú villanyoszlop, kevesebb elérhető kapcsolattal.
 block.diode.description = Az eltárolt áramot irányítja egy irányba továbbítja, de csak akkor, ha a fogadó oldalon kevesebb van tárolva.
 block.battery.description = Áramot tárol el, ha túltermelés van. Leadja az áramot, ha hiány van.
-block.battery-large.description =  Áramot tárol el, ha túltermelés van. Leadja az áramot, ha hiány van. Nagyobb kapacitású a szokásos akkumulátornál.
+block.battery-large.description = Áramot tárol el, ha túltermelés van. Leadja az áramot, ha hiány van. Nagyobb kapacitású a szokásos akkumulátornál.
 block.combustion-generator.description = Áramot termel éghető anyagok, például szén, elégetésével.
 block.thermal-generator.description = Forró környezetben áramot termel.
 block.steam-generator.description = Éghető anyagok elégetésével és víz gőzzé alakításával áramot termel.
@@ -2115,7 +2115,7 @@ block.parallax.description = Vonónyalábot bocsát ki, amivel magához vonzza,
 block.tsunami.description = Erős folyadékhullámot lő az ellenségre. Eloltja a tüzeket, ha vízzel van ellátva.
 block.silicon-crucible.description = Szilíciumot finomít homokból és szénből, piratitot használ kiegészítő hőforrásként. Forró környezetben még hatékonyabb.
 block.disassembler.description = Ritka ásványi összetevőket válogat ki a salakból, alacsony hatékonysággal. Képes tóriumot kiválogatni.
-block.overdrive-dome.description =  Megnöveli a környező épületek termelési sebességét. A működtetése tóritkvarcot és szilíciumot igényel.
+block.overdrive-dome.description = Megnöveli a környező épületek termelési sebességét. A működtetése tóritkvarcot és szilíciumot igényel.
 block.payload-conveyor.description = Nagy mennyiségű terhet mozgatni, például gyárakból érkező nyersanyagokat. Mágneses. Használható súlytalanságban.
 block.payload-router.description = Háromfelé osztja szét a beérkező terhet. Rendezőként is szolgál, ha van megadva szűrő. Mágneses. Használható súlytalanságban.
 block.ground-factory.description = Földi egységeket gyárt. A kész egységek azonnal hadra foghatók, vagy újratervezőkben továbbfejleszthetők.
@@ -2292,7 +2292,7 @@ unit.emanate.description = Az Akropolisz védelmére szolgáló építményeket
 lst.read = Szám kiolvasása egy összekapcsolt memóriacellából.
 lst.write = Szám beírása egy összekapcsolt memóriacellába.
 lst.print = Szöveg hozzáadása a nyomtatási pufferhez.\nA [accent]Print Flush[] használatáig nem jelenít meg semmit.
-lst.format =  A szövegpufferben lévő következő helyőrző cseréje egy értékre.\nNem csinál semmit, ha a helyőrzőminta érvénytelen.\nHelyőrzőminta: "{[accent]number 0-9[]}"\nPélda:\n[accent]print "test {0}"\nformat "example"
+lst.format = A szövegpufferben lévő következő helyőrző cseréje egy értékre.\nNem csinál semmit, ha a helyőrzőminta érvénytelen.\nHelyőrzőminta: "{[accent]number 0-9[]}"\nPélda:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Művelet hozzáadása a rajzpufferhez.\nA [accent]Draw Flush[] használatáig nem jelenít meg semmit.
 lst.drawflush = Sorba állított [accent]Draw[] műveletek megjelenítése a kijelzőn.
 lst.printflush = Sorba állított [accent]Print[] műveletek kiírása egy üzenetblokkba.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 5d055120e0..8c757e81b6 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -1857,6 +1857,7 @@ hint.launch = Quando recursos suficientes forem coletados, você pode [accent]La
 hint.launch.mobile = Quando recursos suficientes forem coletados, você pode [accent]Lançar[] selecionando setores próximos a partir do \ue827 [accent]Mapa[] no \ue88c [accent]Menu[].
 hint.schematicSelect = Segure [accent][[F][] e arraste para selecionar blocos para copiar e colar.\n\n[accent][[Middle Click][] para copiar um bloco só.
 hint.rebuildSelect = Segure [accent][[B][] e arraste para selecionar blocos destruídos.\nIsso irá reconstruí-los automaticamente.
+hint.rebuildSelect.mobile = Select the \ue874 copy button, then tap the \ue80f rebuild button and drag to select destroyed block plans.\nThis will rebuild them automatically.
 hint.conveyorPathfind = Segure [accent][[L-Ctrl][] enquanto arrasta as esteiras para gerar automaticamente um caminho.
 hint.conveyorPathfind.mobile = Ative o \ue844 [accent]modo diagonal[] e arraste as esteiras para gerar automaticamente um caminho.
 hint.boost = Segure [accent][[L-Shift][] para voar sobre obstáculos com a sua unidade.\n\nApenas algumas unidades terrestres tem propulsores.
@@ -1912,9 +1913,13 @@ onset.turretammo = Abasteça a torreta com [accent]munição de berílio.[]
 onset.walls = [accent]Muros[] podem previnir danos recebidos de atingir as construções.\nColoque \uf6ee [accent]muros de berílio[] em volta das torretas.
 
 onset.enemies = Inimigo vindo, se prepare.
+onset.defenses = [accent]Set up defenses:[lightgray] {0}
 onset.attack = O inimigo está vulnerável. Contra ataque.
 onset.cores = Novos núcleos podem ser colocados em [accent]ladrilhos de núcleo[].\nNovos núcleos funcionam como bases avançadas e compartilham seus recursos com outros núcleos.\nColoque um \uf725 núcleo.
 onset.detect = O inimigo poderá te detectar em 2 minutos.\nConstrua defesas, mineração e produção.
+onset.commandmode = Hold [accent]shift[] to enter [accent]command mode[].\n[accent]Left-click and drag[] to select units.\n[accent]Right-click[] to order selected units to move or attack.
+onset.commandmode.mobile = Press the [accent]command button[] to enter [accent]command mode[].\nHold down a finger, then [accent]drag[] to select units.\n[accent]Tap[] to order selected units to move or attack.
+aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
 
 split.pickup = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(Default keys are [ and ] to pick up and drop)
 split.pickup.mobile = Some blocks can be picked up by the core unit.\nPick up this [accent]container[] and place it onto the [accent]payload loader[].\n(To pick up or drop something, long-press it.)

From d8c1ea17e13249ab20bee88fcc311e9e191806bd Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Fri, 29 Mar 2024 12:17:19 -0700
Subject: [PATCH 311/369] Make payload blocks run `onDestroyed()` of the block
 payload it carries when destroyed. (#8253)

* Payloads go boom.

* When a payload unit dies too

* Keep the functionality, but limit it to a rule
---
 core/assets/bundles/bundle.properties                       | 1 +
 core/src/mindustry/entities/comp/PayloadComp.java           | 5 +++++
 core/src/mindustry/game/Rules.java                          | 2 ++
 core/src/mindustry/ui/dialogs/CustomRulesDialog.java        | 1 +
 core/src/mindustry/world/blocks/payloads/BuildPayload.java  | 5 +++++
 core/src/mindustry/world/blocks/payloads/Payload.java       | 2 ++
 core/src/mindustry/world/blocks/payloads/PayloadBlock.java  | 6 ++++++
 .../mindustry/world/blocks/payloads/PayloadConveyor.java    | 6 ++++++
 8 files changed, 28 insertions(+)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 260c5af651..af18ff5f20 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1313,6 +1313,7 @@ rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
diff --git a/core/src/mindustry/entities/comp/PayloadComp.java b/core/src/mindustry/entities/comp/PayloadComp.java
index d1f7518e65..9b9d6e6405 100644
--- a/core/src/mindustry/entities/comp/PayloadComp.java
+++ b/core/src/mindustry/entities/comp/PayloadComp.java
@@ -60,6 +60,11 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
         }
     }
 
+    @Override
+    public void destroy(){
+        if(Vars.state.rules.unitPayloadsExplode) payloads.each(Payload::destroyed);
+    }
+
     float payloadUsed(){
         return payloads.sumf(p -> p.size() * p.size());
     }
diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index 951426907d..9da173c2df 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -59,6 +59,8 @@ public class Rules{
     public boolean unitAmmo = false;
     /** EXPERIMENTAL! If true, blocks will update in units and share power. */
     public boolean unitPayloadUpdate = false;
+    /** If true, units' payloads are destroy()ed when the unit is destroyed. */
+    public boolean unitPayloadsExplode = false;
     /** Whether cores add to unit limit */
     public boolean unitCapVariable = true;
     /** If true, unit spawn points are shown. */
diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index 4c54569b4d..1091c74c08 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -233,6 +233,7 @@ public class CustomRulesDialog extends BaseDialog{
 
         title("@rules.title.unit");
         check("@rules.unitcapvariable", b -> rules.unitCapVariable = b, () -> rules.unitCapVariable);
+        check("@rules.unitpayloadsexplode", b -> rules.unitPayloadsExplode = b, () -> rules.unitPayloadsExplode);
         numberi("@rules.unitcap", f -> rules.unitCap = f, () -> rules.unitCap, -999, 999);
         number("@rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier);
         number("@rules.unitcrashdamagemultiplier", f -> rules.unitCrashDamageMultiplier = f, () -> rules.unitCrashDamageMultiplier);
diff --git a/core/src/mindustry/world/blocks/payloads/BuildPayload.java b/core/src/mindustry/world/blocks/payloads/BuildPayload.java
index 42f79374ad..90e37e9e16 100644
--- a/core/src/mindustry/world/blocks/payloads/BuildPayload.java
+++ b/core/src/mindustry/world/blocks/payloads/BuildPayload.java
@@ -51,6 +51,11 @@ public class BuildPayload implements Payload{
         build.updatePayload(unitHolder, buildingHolder);
     }
 
+    @Override
+    public void destroyed(){
+        build.onDestroyed();
+    }
+
     @Override
     public ItemStack[] requirements(){
         return build.block.requirements;
diff --git a/core/src/mindustry/world/blocks/payloads/Payload.java b/core/src/mindustry/world/blocks/payloads/Payload.java
index 218fab7192..b1e6f90ff5 100644
--- a/core/src/mindustry/world/blocks/payloads/Payload.java
+++ b/core/src/mindustry/world/blocks/payloads/Payload.java
@@ -54,6 +54,8 @@ public interface Payload extends Position{
         return 0f;
     }
 
+    default void destroyed(){};
+
     /** writes the payload for saving. */
     void write(Writes write);
 
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadBlock.java b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
index 1ecd627dc3..b4b0de0f37 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
@@ -151,6 +151,12 @@ public class PayloadBlock extends Block{
             }
         }
 
+        @Override
+        public void onDestroyed(){
+            if(payload != null) payload.destroyed();
+            super.onDestroyed();
+        }
+
         public boolean blends(int direction){
             return PayloadBlock.blends(this, direction);
         }
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
index 6fedce44a3..e6c368d97e 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
@@ -190,6 +190,12 @@ public class PayloadConveyor extends Block{
             super.draw();
         }
 
+        @Override
+        public void onDestroyed(){
+            if(item != null) item.destroyed();
+            super.onDestroyed();
+        }
+
         @Override
         public void draw(){
             super.draw();

From 2fb5bc56c6c5cd9a65eb5064153a2a3e30cf4173 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Fri, 29 Mar 2024 21:11:39 -0700
Subject: [PATCH 312/369] Better Ability Stats (#9654)

* Fix armor plate multiplier + change Math.round to Strings.autoFixed

* Missing ability name bundles

* Center ability name

* SuppressionFieldAbility stats

* Is two per row is acceptable?

I can revert this commit if not.

* LiquidExplodeAbility stat display

* MoveLightningAbility stat display

* Better SpawnDeathAbility display

* Fix multiplier coloring inconsistencies

Some had [lightgray] before %/x, some had it after

* Consistent content name display

Match with bullet status effects

* Consistent stat formatting

Convert from some being "stat: #" and some being "# stat" to all being "# stat"

* Re-order stats

* Optimize Imports

* Add ability descriptions

* Apparently I forgot LiquidRegenAbility

* Mention healing allies if displayHeal = true
---
 core/assets/bundles/bundle.properties         | 46 +++++++++++++++----
 core/src/mindustry/content/UnitTypes.java     |  2 +-
 .../mindustry/entities/abilities/Ability.java | 18 +++++++-
 .../entities/abilities/ArmorPlateAbility.java |  6 +--
 .../abilities/EnergyFieldAbility.java         | 29 +++++++-----
 .../entities/abilities/ForceFieldAbility.java | 12 ++---
 .../abilities/LiquidExplodeAbility.java       |  7 +++
 .../abilities/LiquidRegenAbility.java         |  9 ++++
 .../abilities/MoveLightningAbility.java       | 13 +++++-
 .../entities/abilities/RegenAbility.java      | 17 +++----
 .../abilities/RepairFieldAbility.java         |  9 ++--
 .../entities/abilities/ShieldArcAbility.java  |  9 ++--
 .../abilities/ShieldRegenFieldAbility.java    | 13 +++---
 .../entities/abilities/SpawnDeathAbility.java |  3 +-
 .../abilities/StatusFieldAbility.java         | 13 +++---
 .../abilities/SuppressionFieldAbility.java    | 18 ++++++++
 .../entities/abilities/UnitSpawnAbility.java  |  6 +--
 core/src/mindustry/world/meta/StatValues.java | 32 +++++++------
 18 files changed, 182 insertions(+), 80 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index af18ff5f20..94d1e5d086 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -998,17 +998,47 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Repair Suppression
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
-ability.regen = Regeneration
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.regen = Self Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 bar.drilltierreq = Better Drill Required
@@ -1051,15 +1081,15 @@ bullet.armorpierce = [stat]armor piercing
 bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
 bullet.suppression = [stat]{0}[lightgray] seconds of repair suppression ~ [stat]{1}[lightgray] tiles
 bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
-bullet.frags = [stat]{0}[lightgray]x frag bullets:
-bullet.lightning = [stat]{0}[lightgray]x lightning ~ [stat]{1}[lightgray] damage
+bullet.frags = [stat]{0}x[lightgray] frag bullets:
+bullet.lightning = [stat]{0}x[lightgray] lightning ~ [stat]{1}[lightgray] damage
 bullet.buildingdamage = [stat]{0}%[lightgray] building damage
 bullet.knockback = [stat]{0}[lightgray] knockback
-bullet.pierce = [stat]{0}[lightgray]x pierce
+bullet.pierce = [stat]{0}x[lightgray] pierce
 bullet.infinitepierce = [stat]pierce
-bullet.healpercent = [stat]{0}[lightgray]% repair
+bullet.healpercent = [stat]{0}%[lightgray] repair
 bullet.healamount = [stat]{0}[lightgray] direct repair
-bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
+bullet.multiplier = [stat]{0}x[lightgray] ammo multiplier
 bullet.reload = [stat]{0}%[lightgray] fire rate
 bullet.range = [stat]{0}[lightgray] tiles range
 
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index c9200be5e1..015b069c9f 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -3895,7 +3895,7 @@ public class UnitTypes{
                     x = 43f * i / 4f;
                     particles = parts;
                     //visual only, the middle one does the actual suppressing
-                    display = active = false;
+                    active = false;
                 }});
             }
 
diff --git a/core/src/mindustry/entities/abilities/Ability.java b/core/src/mindustry/entities/abilities/Ability.java
index 5a6b025417..42a31d6312 100644
--- a/core/src/mindustry/entities/abilities/Ability.java
+++ b/core/src/mindustry/entities/abilities/Ability.java
@@ -6,6 +6,7 @@ import mindustry.gen.*;
 import mindustry.type.*;
 
 public abstract class Ability implements Cloneable{
+    protected static final float descriptionWidth = 350f;
     /** If false, this ability does not show in unit stats. */
     public boolean display = true;
     //the one and only data variable that is synced.
@@ -16,7 +17,16 @@ public abstract class Ability implements Cloneable{
     public void death(Unit unit){}
     public void init(UnitType type){}
     public void displayBars(Unit unit, Table bars){}
-    public void addStats(Table t){}
+    public void addStats(Table t){
+        if(Core.bundle.has(getBundle() + ".description")){
+            t.add(Core.bundle.get(getBundle() + ".description")).wrap().width(descriptionWidth);
+            t.row();
+        }
+    }
+
+    public String abilityStat(String stat, Object... values){
+        return Core.bundle.format("ability.stat." + stat, values);
+    }
 
     public Ability copy(){
         try{
@@ -29,7 +39,11 @@ public abstract class Ability implements Cloneable{
 
     /** @return localized ability name; mods should override this. */
     public String localized(){
+        return Core.bundle.get(getBundle());
+    }
+
+    public String getBundle(){
         var type = getClass();
-        return Core.bundle.get("ability." + (type.isAnonymousClass() ? type.getSuperclass() : type).getSimpleName().replace("Ability", "").toLowerCase());
+        return "ability." + (type.isAnonymousClass() ? type.getSuperclass() : type).getSimpleName().replace("Ability", "").toLowerCase();
     }
 }
diff --git a/core/src/mindustry/entities/abilities/ArmorPlateAbility.java b/core/src/mindustry/entities/abilities/ArmorPlateAbility.java
index 4c02028492..d417e01735 100644
--- a/core/src/mindustry/entities/abilities/ArmorPlateAbility.java
+++ b/core/src/mindustry/entities/abilities/ArmorPlateAbility.java
@@ -4,11 +4,10 @@ import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
-import arc.scene.ui.layout.Table;
+import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
-import mindustry.world.meta.*;
 
 public class ArmorPlateAbility extends Ability{
     public TextureRegion plateRegion;
@@ -39,7 +38,8 @@ public class ArmorPlateAbility extends Ability{
 
     @Override
     public void addStats(Table t){
-        t.add("[lightgray]" + Stat.healthMultiplier.localized() + ": [white]" + Math.round(healthMultiplier * 100f) + 100 + "%");
+        super.addStats(t);
+        t.add(abilityStat("damagereduction", Strings.autoFixed(-healthMultiplier * 100f, 1)));
     }
 
     @Override
diff --git a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java
index acd47475bc..8c041087c0 100644
--- a/core/src/mindustry/entities/abilities/EnergyFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/EnergyFieldAbility.java
@@ -14,7 +14,6 @@ import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
-import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
@@ -53,23 +52,29 @@ public class EnergyFieldAbility extends Ability{
 
     @Override
     public void addStats(Table t){
-        t.add(Core.bundle.format("bullet.damage", damage));
+        if(displayHeal){
+            t.add(Core.bundle.get(getBundle() + ".healdescription")).wrap().width(descriptionWidth);
+        }else{
+            t.add(Core.bundle.get(getBundle() + ".description")).wrap().width(descriptionWidth);
+        }
         t.row();
-        t.add("[lightgray]" + Stat.reload.localized() + ": [white]" + Strings.autoFixed(60f / reload, 2) + " " + StatUnit.perSecond.localized());
-        t.row();
-        t.add("[lightgray]" + Stat.shootRange.localized() + ": [white]" +  Strings.autoFixed(range / tilesize, 2) + " " + StatUnit.blocks.localized());
-        t.row();
-        t.add(Core.bundle.format("ability.energyfield.maxtargets", maxTargets));
 
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(range / tilesize, 2)));
+        t.row();
+        t.add(abilityStat("firingrate", Strings.autoFixed(60f / reload, 2)));
+        t.row();
+        t.add(abilityStat("maxtargets", maxTargets));
+        t.row();
+        t.add(Core.bundle.format("bullet.damage", damage));
+        if(status != StatusEffects.none){
+            t.row();
+            t.add((status.hasEmoji() ? status.emoji() : "") + "[stat]" + status.localizedName);
+        }
         if(displayHeal){
             t.row();
             t.add(Core.bundle.format("bullet.healpercent", Strings.autoFixed(healPercent, 2)));
             t.row();
-            t.add(Core.bundle.format("ability.energyfield.sametypehealmultiplier", Math.round(sameTypeHealMult * 100f)));
-        }
-        if(status != StatusEffects.none){
-            t.row();
-            t.add(status.emoji() + " " + status.localizedName);
+            t.add(abilityStat("sametypehealmultiplier", (sameTypeHealMult < 1f ? "[negstat]" : "") + Strings.autoFixed(sameTypeHealMult * 100f, 2)));
         }
     }
 
diff --git a/core/src/mindustry/entities/abilities/ForceFieldAbility.java b/core/src/mindustry/entities/abilities/ForceFieldAbility.java
index 81264ac05c..f391156adb 100644
--- a/core/src/mindustry/entities/abilities/ForceFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/ForceFieldAbility.java
@@ -1,5 +1,6 @@
 package mindustry.entities.abilities;
 
+import arc.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
@@ -12,7 +13,6 @@ import mindustry.content.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.ui.*;
-import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
@@ -73,14 +73,14 @@ public class ForceFieldAbility extends Ability{
 
     @Override
     public void addStats(Table t){
-        t.add("[lightgray]" + Stat.health.localized() + ": [white]" + Math.round(max));
+        super.addStats(t);
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(radius / tilesize, 2)));
         t.row();
-        t.add("[lightgray]" + Stat.shootRange.localized() + ": [white]" +  Strings.autoFixed(radius / tilesize, 2) + " " + StatUnit.blocks.localized());
+        t.add(abilityStat("shield", Strings.autoFixed(max, 2)));
         t.row();
-        t.add("[lightgray]" + Stat.repairSpeed.localized() + ": [white]" + Strings.autoFixed(regen * 60f, 2) + StatUnit.perSecond.localized());
-        t.row();
-        t.add("[lightgray]" + Stat.cooldownTime.localized() + ": [white]" + Strings.autoFixed(cooldown / 60f, 2) + " " + StatUnit.seconds.localized());
+        t.add(abilityStat("repairspeed", Strings.autoFixed(regen * 60f, 2)));
         t.row();
+        t.add(abilityStat("cooldown", Strings.autoFixed(cooldown / 60f, 2)));
     }
 
     @Override
diff --git a/core/src/mindustry/entities/abilities/LiquidExplodeAbility.java b/core/src/mindustry/entities/abilities/LiquidExplodeAbility.java
index 57b6100f66..cf6b16f6e8 100644
--- a/core/src/mindustry/entities/abilities/LiquidExplodeAbility.java
+++ b/core/src/mindustry/entities/abilities/LiquidExplodeAbility.java
@@ -1,6 +1,7 @@
 package mindustry.entities.abilities;
 
 import arc.math.*;
+import arc.scene.ui.layout.*;
 import arc.util.noise.*;
 import mindustry.content.*;
 import mindustry.entities.*;
@@ -16,6 +17,12 @@ public class LiquidExplodeAbility extends Ability{
     public float radAmountScale = 5f, radScale = 1f;
     public float noiseMag = 6.5f, noiseScl = 5f;
 
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add((liquid.hasEmoji() ? liquid.emoji() : "") + "[stat]" + liquid.localizedName);
+    }
+
     @Override
     public void death(Unit unit){
         //TODO what if noise is radial, so it looks like a splat?
diff --git a/core/src/mindustry/entities/abilities/LiquidRegenAbility.java b/core/src/mindustry/entities/abilities/LiquidRegenAbility.java
index 7f7d827f95..6f864035ce 100644
--- a/core/src/mindustry/entities/abilities/LiquidRegenAbility.java
+++ b/core/src/mindustry/entities/abilities/LiquidRegenAbility.java
@@ -1,6 +1,7 @@
 package mindustry.entities.abilities;
 
 import arc.math.*;
+import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
@@ -17,6 +18,14 @@ public class LiquidRegenAbility extends Ability{
     public float slurpEffectChance = 0.4f;
     public Effect slurpEffect = Fx.heal;
 
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add((liquid.hasEmoji() ? liquid.emoji() : "") + "[stat]" + liquid.localizedName);
+        t.row();
+        t.add(abilityStat("slurpheal", Strings.autoFixed(regenPerSlurp, 2)));
+    }
+
     @Override
     public void update(Unit unit){
         //TODO timer?
diff --git a/core/src/mindustry/entities/abilities/MoveLightningAbility.java b/core/src/mindustry/entities/abilities/MoveLightningAbility.java
index ab70313df4..c55849690b 100644
--- a/core/src/mindustry/entities/abilities/MoveLightningAbility.java
+++ b/core/src/mindustry/entities/abilities/MoveLightningAbility.java
@@ -5,12 +5,15 @@ import arc.audio.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
 
+import static mindustry.Vars.*;
+
 public class MoveLightningAbility extends Ability{
     /** Lightning damage */
     public float damage = 35f;
@@ -63,7 +66,15 @@ public class MoveLightningAbility extends Ability{
         this.maxSpeed = maxSpeed;
         this.color = color;
     }
-    
+
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add(abilityStat("minspeed", Strings.autoFixed(minSpeed * 60f / tilesize, 2)));
+        t.row();
+        t.add(Core.bundle.format("bullet.damage", damage));
+    }
+
     @Override
     public void update(Unit unit){
         float scl = Mathf.clamp((unit.vel().len() - minSpeed) / (maxSpeed - minSpeed));
diff --git a/core/src/mindustry/entities/abilities/RegenAbility.java b/core/src/mindustry/entities/abilities/RegenAbility.java
index 0a7bca80c9..ffcfe50e9d 100644
--- a/core/src/mindustry/entities/abilities/RegenAbility.java
+++ b/core/src/mindustry/entities/abilities/RegenAbility.java
@@ -1,10 +1,8 @@
 package mindustry.entities.abilities;
 
-import arc.Core;
 import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.gen.*;
-import mindustry.world.meta.*;
 
 public class RegenAbility extends Ability{
     /** Amount healed as percent per tick. */
@@ -14,13 +12,16 @@ public class RegenAbility extends Ability{
 
     @Override
     public void addStats(Table t){
-        if(amount > 0.01f){
-            t.add("[lightgray]" + Stat.repairSpeed.localized() + ": [white]" + Strings.autoFixed(amount * 60f, 2) + StatUnit.perSecond.localized());
-            t.row();
-        }
+        super.addStats(t);
 
-        if(percentAmount > 0.01f){
-            t.add(Core.bundle.format("bullet.healpercent", Strings.autoFixed(percentAmount * 60f, 2)) + StatUnit.perSecond.localized()); //stupid but works
+        boolean flat = amount >= 0.001f;
+        boolean percent = percentAmount >= 0.001f;
+
+        if(flat || percent){
+            t.add(abilityStat("regen",
+                (flat ? Strings.autoFixed(amount * 60f, 2) + (percent ? " [lightgray]+[stat] " : "") : "")
+                    + (percent ? Strings.autoFixed(percentAmount * 60f, 2) + "%" : "")
+            ));
         }
     }
 
diff --git a/core/src/mindustry/entities/abilities/RepairFieldAbility.java b/core/src/mindustry/entities/abilities/RepairFieldAbility.java
index fb42cc7018..7c871978cc 100644
--- a/core/src/mindustry/entities/abilities/RepairFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/RepairFieldAbility.java
@@ -1,13 +1,13 @@
 package mindustry.entities.abilities;
 
+import arc.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
-import mindustry.world.meta.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class RepairFieldAbility extends Ability{
     public float amount = 1, reload = 100, range = 60;
@@ -28,9 +28,10 @@ public class RepairFieldAbility extends Ability{
 
     @Override
     public void addStats(Table t){
-        t.add("[lightgray]" + Stat.repairSpeed.localized() + ": [white]" + Strings.autoFixed(amount * 60f / reload, 2) + StatUnit.perSecond.localized());
+        super.addStats(t);
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(range / tilesize, 2)));
         t.row();
-        t.add("[lightgray]" + Stat.shootRange.localized() + ": [white]" +  Strings.autoFixed(range / tilesize, 2) + " " + StatUnit.blocks.localized());
+        t.add(abilityStat("repairspeed", Strings.autoFixed(amount * 60f / reload, 2)));
     }
 
     @Override
diff --git a/core/src/mindustry/entities/abilities/ShieldArcAbility.java b/core/src/mindustry/entities/abilities/ShieldArcAbility.java
index b63a88bf1e..a7d41cdaf7 100644
--- a/core/src/mindustry/entities/abilities/ShieldArcAbility.java
+++ b/core/src/mindustry/entities/abilities/ShieldArcAbility.java
@@ -13,7 +13,6 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
 import mindustry.ui.*;
-import mindustry.world.meta.*;
 
 public class ShieldArcAbility extends Ability{
     private static Unit paramUnit;
@@ -69,12 +68,12 @@ public class ShieldArcAbility extends Ability{
 
     @Override
     public void addStats(Table t){
-        t.add("[lightgray]" + Stat.health.localized() + ": [white]" + Math.round(max));
+        super.addStats(t);
+        t.add(abilityStat("shield", Strings.autoFixed(max, 2)));
         t.row();
-        t.add("[lightgray]" + Stat.repairSpeed.localized() + ": [white]" + Strings.autoFixed(regen * 60f, 2) + StatUnit.perSecond.localized());
-        t.row();
-        t.add("[lightgray]" + Stat.cooldownTime.localized() + ": [white]" + Strings.autoFixed(cooldown / 60f, 2) + " " + StatUnit.seconds.localized());
+        t.add(abilityStat("repairspeed", Strings.autoFixed(regen * 60f, 2)));
         t.row();
+        t.add(abilityStat("cooldown", Strings.autoFixed(cooldown / 60f, 2)));
     }
 
     @Override
diff --git a/core/src/mindustry/entities/abilities/ShieldRegenFieldAbility.java b/core/src/mindustry/entities/abilities/ShieldRegenFieldAbility.java
index 51d1f79175..c34ce359ce 100644
--- a/core/src/mindustry/entities/abilities/ShieldRegenFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/ShieldRegenFieldAbility.java
@@ -1,14 +1,13 @@
 package mindustry.entities.abilities;
 
-import arc.Core;
+import arc.*;
 import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
-import mindustry.world.meta.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class ShieldRegenFieldAbility extends Ability{
     public float amount = 1, max = 100f, reload = 100, range = 60;
@@ -30,12 +29,12 @@ public class ShieldRegenFieldAbility extends Ability{
 
     @Override
     public void addStats(Table t){
-        t.add("[lightgray]" + Core.bundle.get("waves.shields") + ": [white]" + Math.round(max)); //extremely stupid usage
+        super.addStats(t);
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(range / tilesize, 2)));
         t.row();
-        t.add("[lightgray]" + Stat.shootRange.localized() + ": [white]" +  Strings.autoFixed(range / tilesize, 2) + " " + StatUnit.blocks.localized());
-        t.row();
-        t.add("[lightgray]" + Stat.reload.localized() + ": [white]" + Strings.autoFixed(60f / reload, 2) + " " + StatUnit.perSecond.localized());
+        t.add(abilityStat("firingrate", Strings.autoFixed(60f / reload, 2)));
         t.row();
+        t.add(abilityStat("shield", Strings.autoFixed(max, 2)));
     }
 
     @Override
diff --git a/core/src/mindustry/entities/abilities/SpawnDeathAbility.java b/core/src/mindustry/entities/abilities/SpawnDeathAbility.java
index 8aac58776a..6bc5b0a49d 100644
--- a/core/src/mindustry/entities/abilities/SpawnDeathAbility.java
+++ b/core/src/mindustry/entities/abilities/SpawnDeathAbility.java
@@ -27,7 +27,8 @@ public class SpawnDeathAbility extends Ability{
 
     @Override
     public void addStats(Table t){
-        t.add((randAmount > 0 ? amount + "-" + (amount + randAmount) : amount) + " " + unit.emoji() + " " + unit.localizedName);
+        super.addStats(t);
+        t.add("[stat]" + (randAmount > 0 ? amount + "x-" + (amount + randAmount) : amount) + "x[] " + (unit.hasEmoji() ? unit.emoji() : "") + "[stat]" + unit.localizedName);
     }
 
     @Override
diff --git a/core/src/mindustry/entities/abilities/StatusFieldAbility.java b/core/src/mindustry/entities/abilities/StatusFieldAbility.java
index 7bc7bcb375..c0ca12d381 100644
--- a/core/src/mindustry/entities/abilities/StatusFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/StatusFieldAbility.java
@@ -1,15 +1,15 @@
 package mindustry.entities.abilities;
 
+import arc.*;
 import arc.math.*;
-import arc.scene.ui.layout.Table;
+import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.type.*;
-import mindustry.world.meta.*;
 
-import static mindustry.Vars.tilesize;
+import static mindustry.Vars.*;
 
 public class StatusFieldAbility extends Ability{
     public StatusEffect effect;
@@ -33,11 +33,12 @@ public class StatusFieldAbility extends Ability{
 
     @Override
     public void addStats(Table t){
-        t.add("[lightgray]" + Stat.reload.localized() + ": [white]" + Strings.autoFixed(60f / reload, 2) + " " + StatUnit.perSecond.localized());
+        super.addStats(t);
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(range / tilesize, 2)));
         t.row();
-        t.add("[lightgray]" + Stat.shootRange.localized() + ": [white]" +  Strings.autoFixed(range / tilesize, 2) + " " + StatUnit.blocks.localized());
+        t.add(abilityStat("firingrate", Strings.autoFixed(60f / reload, 2)));
         t.row();
-        t.add(effect.emoji() + " " + effect.localizedName);
+        t.add((effect.hasEmoji() ? effect.emoji() : "") + "[stat]" + effect.localizedName);
     }
 
     @Override
diff --git a/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java b/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java
index d421ebf848..be69a45797 100644
--- a/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java
@@ -1,12 +1,17 @@
 package mindustry.entities.abilities;
 
+import arc.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.scene.ui.layout.*;
 import arc.util.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.type.*;
+
+import static mindustry.Vars.*;
 
 public class SuppressionFieldAbility extends Ability{
     protected static Rand rand = new Rand();
@@ -33,6 +38,19 @@ public class SuppressionFieldAbility extends Ability{
 
     protected float timer;
 
+    @Override
+    public void init(UnitType type){
+        if(!active) display = false;
+    }
+
+    @Override
+    public void addStats(Table t){
+        super.addStats(t);
+        t.add(Core.bundle.format("bullet.range", Strings.autoFixed(range / tilesize, 2)));
+        t.row();
+        t.add(abilityStat("duration", Strings.autoFixed(reload / 60f, 2)));
+    }
+
     @Override
     public void update(Unit unit){
         if(!active) return;
diff --git a/core/src/mindustry/entities/abilities/UnitSpawnAbility.java b/core/src/mindustry/entities/abilities/UnitSpawnAbility.java
index f4e0f5ecb0..f7ab3667f4 100644
--- a/core/src/mindustry/entities/abilities/UnitSpawnAbility.java
+++ b/core/src/mindustry/entities/abilities/UnitSpawnAbility.java
@@ -12,7 +12,6 @@ import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
-import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
@@ -36,9 +35,10 @@ public class UnitSpawnAbility extends Ability{
 
     @Override
     public void addStats(Table t){
-        t.add("[lightgray]" + Stat.buildTime.localized() + ": [white]" + Strings.autoFixed(spawnTime / 60f, 2) + " " + StatUnit.seconds.localized());
+        super.addStats(t);
+        t.add(abilityStat("buildtime", Strings.autoFixed(spawnTime / 60f, 2)));
         t.row();
-        t.add(unit.emoji() + " " + unit.localizedName);
+        t.add((unit.hasEmoji() ? unit.emoji() : "") + "[stat]" + unit.localizedName);
     }
 
     @Override
diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java
index 36872d3546..9c548f2836 100644
--- a/core/src/mindustry/world/meta/StatValues.java
+++ b/core/src/mindustry/world/meta/StatValues.java
@@ -374,17 +374,23 @@ public class StatValues{
     public static StatValue abilities(Seq<Ability> abilities){
         return table -> {
             table.row();
-            table.table(t -> abilities.each(ability -> {
-                if(ability.display){
-                    t.row();
-                    t.table(Styles.grayPanel, a -> {
-                        a.add("[accent]" + ability.localized()).padBottom(4);
-                        a.row();
-                        a.left().top().defaults().left();
-                        ability.addStats(a);
-                    }).pad(5).margin(10).growX();
-                }
-            }));
+            table.table(t -> {
+                int count = 0;
+                for(Ability ability : abilities){
+                    if(ability.display){
+                        t.table(Styles.grayPanel, a -> {
+                            a.add("[accent]" + ability.localized()).padBottom(4).center().top().expandX();
+                            a.row();
+                            a.left().top().defaults().left();
+                            ability.addStats(a);
+                        }).pad(5).margin(10).growX().top().uniformX();
+                        if((++count) == 2){
+                            count = 0;
+                            t.row();
+                        }
+                    }
+                };
+            });
         };
     }
 
@@ -496,7 +502,7 @@ public class StatValues{
                     }
 
                     if(type.status != StatusEffects.none){
-                        sep(bt, (type.status.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName + (type.status.reactive ? "" : "[lightgray] ~ [stat]" + ((int)(type.statusDuration / 60f)) + "[lightgray] " + Core.bundle.get("unit.seconds")));
+                        sep(bt, (type.status.hasEmoji() ? type.status.emoji() : "") + "[stat]" + type.status.localizedName + (type.status.reactive ? "" : "[lightgray] ~ [stat]" + ((int)(type.statusDuration / 60f)) + "[lightgray] " + Core.bundle.get("unit.seconds")));
                     }
 
                     if(type.intervalBullet != null){
@@ -554,4 +560,4 @@ public class StatValues{
     private static TextureRegion icon(UnlockableContent t){
         return t.uiIcon;
     }
-}
\ No newline at end of file
+}

From 304d7d9602aefa3df91b4cf1fd81d69fff142644 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az1118-461.jboa14ee0bjuvjv5ua334yvpdd.cx.internal.cloudapp.net>
Date: Sat, 30 Mar 2024 04:12:20 +0000
Subject: [PATCH 313/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_bg.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_ca.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_cs.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_da.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_de.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_es.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_et.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_eu.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_fi.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_fil.properties   | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_fr.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_hu.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_id_ID.properties | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_it.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_ja.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_ko.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_lt.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_nl.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_nl_BE.properties | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_pl.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_pt_BR.properties | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_pt_PT.properties | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_ro.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_ru.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_sr.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_sv.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_th.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_tk.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_tr.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_uk_UA.properties | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_vi.properties    | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_zh_CN.properties | 34 +++++++++++++++++++--
 core/assets/bundles/bundle_zh_TW.properties | 34 +++++++++++++++++++--
 34 files changed, 1088 insertions(+), 68 deletions(-)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index e3a469caac..1ff2a88c87 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -971,17 +971,46 @@ stat.immunities = Імунітэт
 stat.healing = Аднаўленне
 
 ability.forcefield = Сіловое Поле
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Поле Рамонту
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Поле Статусу
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Завод
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Васстанўляюяае Поле Шчыта
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Рух Маланкі
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Шчытавая Дуга
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Энэргетычнае Поле
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 bar.onlycoredeposit = Даступны Толькі Перанос Рэсурсаў У Ядро
 
 bar.drilltierreq = Патрабуецца свідар лепей
@@ -1283,6 +1312,7 @@ rules.unitdamagemultiplier = Множнік страт баяв. адз.
 rules.unitcrashdamagemultiplier = Множнік Падрыўнога Пашкоджання Юніта
 rules.solarmultiplier = Множнік Сонечнай Энергіі
 rules.unitcapvariable = Ядра Спрыяюць Колькасці Юнітаў
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Асноўная Колькасць Юнітаў
 rules.limitarea = Абмежаваць Вобласць Мапы
 rules.enemycorebuildradius = Радыус абароны варожае. ядраў: [lightgray] (блок.)
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index bd83830718..ff6ddd795c 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -981,17 +981,46 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Енергийно Поле
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Възстановяващо Поле
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Подсилващо Поле
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Възстановяващо броня Поле
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Подвижна светкавица
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 
@@ -1294,6 +1323,7 @@ rules.unitdamagemultiplier = Множител на Щетите на Едини
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Ядрата Увеличават Максималния Брой Единици
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Максимален Брой Единици
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Радиус на Защитена от Строене Зона Около Ядрата:[lightgray] (полета)
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index 2e2b9b9827..a889b32ffb 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -985,17 +985,46 @@ stat.immunities = Immunitats
 stat.healing = Reparador
 
 ability.forcefield = Camp de força
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repara el camp de força
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Estat del camp
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Fàbrica
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Regenerador de camps de força
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Moviment llampec
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Escut de descàrregues
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Camp de força
-ability.energyfield.sametypehealmultiplier = [lightgray]Mateix tipus de guarició: [white]{0} %
-ability.energyfield.maxtargets = [lightgray]Objectius màx.: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneració
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Només es permet depositar al nucli.
 bar.drilltierreq = Cal una perforadora millor.
@@ -1297,6 +1326,7 @@ rules.unitdamagemultiplier = Multiplicador del dany de les unitats
 rules.unitcrashdamagemultiplier = Multiplicador del dany de xoc de les unitats
 rules.solarmultiplier = Multiplicador de l’energia solar
 rules.unitcapvariable = Els nuclis contribueixen al límit d’unitats
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Capacitat base d’unitats
 rules.limitarea = Limita l’àrea del mapa
 rules.enemycorebuildradius = Radi de no construcció del nucli enemic:[lightgray] (caselles)
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index cdd5a9fdae..34ac915c51 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -983,17 +983,46 @@ stat.immunities = Imunity
 stat.healing = Léčí se
 
 ability.forcefield = Silové pole
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Opravit pole
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Stav pole
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = továrna
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Silově opravné pole
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Pohybující se blesk
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Štítovy Oblouk
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energetické pole
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Pouze Ukládání do Jádra je povoleno
 
@@ -1296,6 +1325,7 @@ rules.unitdamagemultiplier = Násobek poškození jednotkami
 rules.unitcrashdamagemultiplier = Násobek poškození při nárazu jednotky
 rules.solarmultiplier = Násobek Solární Energie
 rules.unitcapvariable = Jádra Zvýšujou Maximum Počtu Jednotek
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Základní Maximum Počtu Jednotek
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Poloměr, ve kterém se okolo nepřátelského jádra nesmí stavět: [lightgray](dlaždic)[]
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 1e23ad4055..f0bf3f405b 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -972,17 +972,46 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Kraftfelt
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Reparationsfelt
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Statusfelt
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Fabrik
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Skjold-regenereringsfelt
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 
@@ -1285,6 +1314,7 @@ rules.unitdamagemultiplier = Enheds-skade-forstærker
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Radius af fjendtlig kernes ubebyggelig zone:[lightgray] (felter)
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 04488a8786..7ec71b9203 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -994,17 +994,46 @@ stat.immunities = Immunitäten
 stat.healing = Heilung
 
 ability.forcefield = Kraftfeld
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Heilungsfeld
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Statusfeld
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Fabrik
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Schildregenerationsfeld
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Bewegungsblitze
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Lichtbogenschild
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Heilungsunterdrückungsfeld
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energiefeld
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Nur Kernablage möglich
 
@@ -1307,6 +1336,7 @@ rules.unitdamagemultiplier = Einheit-Schaden-Multiplikator
 rules.unitcrashdamagemultiplier = Einheiten-Absturzschaden-Multiplikator
 rules.solarmultiplier = Solarstrom-Multiplikator
 rules.unitcapvariable = Kerne zählen zum Einheiten-Limit dazu
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Einheiten-Limit
 rules.limitarea = Kartenbereich begrenzen
 rules.enemycorebuildradius = Bauverbot-Radius durch feindlichen Kern:[lightgray] (Kacheln)
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 18a16ca4d9..e4b1770621 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -991,17 +991,46 @@ stat.immunities = Inmune a
 stat.healing = Curación
 
 ability.forcefield = Área de Escudo
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Área de Reparación
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Área de Potenciación
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Fábrica
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Área de Regeneración de Armaduras
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movimiento Relámpago
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Sector de Escudo
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Área de Bloqueo de Regeneración
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Campo de Energía
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Sólo se permite depositar en el núcleo
 bar.drilltierreq = Requiere un taladro mejor
@@ -1303,6 +1332,7 @@ rules.unitdamagemultiplier = Multiplicador de daño de unidades
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Multiplicador de energía solar
 rules.unitcapvariable = Las categorías del núcleo alteran el límite máximo de unidades
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Límite base de unidades
 rules.limitarea = Limitar área del mapa
 rules.enemycorebuildradius = Radio de zona anti-construcción del núcleo enemigo:[lightgray] (bloques)
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index a56915c145..395e330d14 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -972,17 +972,46 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 
@@ -1285,6 +1314,7 @@ rules.unitdamagemultiplier = Väeüksuste hävitusvõime kordaja
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Vaenlaste tuumiku ehitistevaba ala raadius:[lightgray] (ühik)
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 8ce90d62e5..7bc7d6ffa8 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -974,17 +974,46 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 
@@ -1287,6 +1316,7 @@ rules.unitdamagemultiplier = Unitateen kalte-biderkatzailea
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Etsaien muinaren ez-eraikitze erradioa:[lightgray] (lauzak)
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 7a31835dde..25767ac142 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -971,17 +971,46 @@ stat.immunities = Immuuni
 stat.healing = Parantuu
 
 ability.forcefield = Voimakenttä
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Korjauskenttä
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Statuskenttä
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Tehdas
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Kilvenvahvistuskenttä
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Salamointi liikkuessa
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Kilpikaari
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energiakenttä
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Sijoittaminen sallittua vain ytimeen
 
@@ -1284,6 +1313,7 @@ rules.unitdamagemultiplier = Yksikköjen vahinkokerroin
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Aurinkovoimakerroin
 rules.unitcapvariable = Ytimet vaikuttavat yksikkörajaan
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Perusyksikköraja
 rules.limitarea = Rajoita kartan aluetta
 rules.enemycorebuildradius = Vihollisytimen rakennuksenestosäde:[lightgray] (laattoina)
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 92bf22e804..d66dbabc0f 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -971,17 +971,46 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 
@@ -1284,6 +1313,7 @@ rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index ce9882b068..c44718029a 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -997,17 +997,46 @@ stat.immunities = Immunités
 stat.healing = Guérison
 
 ability.forcefield = Champ de Force
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Champ de Réparation
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Champ d'Amélioration
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Usine
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Champ de régénération de bouclier
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Déplacement éclair
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Arc de Bouclier
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Champ de Suppression de Soins
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Champ d'énergie
-ability.energyfield.sametypehealmultiplier = [lightgray]Soins des Unités du Même Type: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Cibles Maximales: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Régénération
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Seul le dépôt de ressources dans le Noyau est autorisé
 bar.drilltierreq = Meilleure Foreuse Requise
@@ -1312,6 +1341,7 @@ rules.unitdamagemultiplier = Multiplicateur de Dégât des Unités
 rules.unitcrashdamagemultiplier = Multiplicateur de Dégât de chute des Unités
 rules.solarmultiplier = Multiplicateur de l'Efficacité des Panneaux Solaires
 rules.unitcapvariable = Les Noyaux contribuent à la limite d'Unités actives
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Limite initiale d'Unités actives
 rules.limitarea = Limite de la zone de jeu de la Carte
 rules.enemycorebuildradius = Périmètre Non-Constructible autour du Noyau ennemi :[lightgray] (blocs)
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 88ac610b4f..bdaf5bbf1e 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -998,17 +998,46 @@ stat.immunities = Immunitások
 stat.healing = Gyógyulás
 
 ability.forcefield = Erőtér
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Javító mező
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Állapotmező
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Gyár
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Pajzsregeneráló mező
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Villámcsapás
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Pajzs ív
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Javítás elnyomása
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energiamező
-ability.energyfield.sametypehealmultiplier = [lightgray]Azonos típusú gyógyítás: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Célpontok maximális száma: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneráció
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Csak a támaszpont elhelyezése megengedett
 bar.drilltierreq = Erősebb fúró szükséges
@@ -1313,6 +1342,7 @@ rules.unitdamagemultiplier = Egység sebzésszorzója
 rules.unitcrashdamagemultiplier = Egység ütközési sebzésszorzója
 rules.solarmultiplier = Napenergia szorzója
 rules.unitcapvariable = A támaszpontok befolyásolják a gyártható egységek darabszámát
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Alap egységdarabszám
 rules.limitarea = Játékterület korlátozása
 rules.enemycorebuildradius = Ellenséges támaszpont körüli tiltott zóna sugara:[lightgray] (csempe)
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index 9abf0debce..0446601dd9 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -991,17 +991,46 @@ stat.immunities = Kekebalan
 stat.healing = Menyembuhkan
 
 ability.forcefield = Bidang Kekuatan
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Bidang Perbaikan
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Bidang Status
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Pabrik
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Bidang Regenerasi Perisai
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Pergerakan Petir
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Bidang Tenaga
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Hanya Penyetoran Inti yang Diizinkan
 bar.drilltierreq = Membutuhkan Bor yang Lebih Baik
@@ -1303,6 +1332,7 @@ rules.unitdamagemultiplier = Penggandaan Kekuatan Unit
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Penggandaan Tenaga Surya
 rules.unitcapvariable = Inti Memengaruhi Batas Unit
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Batas Unit Dasar
 rules.limitarea = Batas Area Peta
 rules.enemycorebuildradius = Dilarang Membangun Radius Inti Musuh :[lightgray] (blok)
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 01262c1e95..00f76cef1f 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -977,17 +977,46 @@ stat.immunities = Immunità
 stat.healing = Rigenerazione
 
 ability.forcefield = Campo di Forza
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Campo Riparativo
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Campo di Stato
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Fabbrica
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Campo di Rigenerazione Scudo
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movimento Fulminante
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Campo energetico
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Concesso solo il deposito al nucleo
 
@@ -1290,6 +1319,7 @@ rules.unitdamagemultiplier = Moltiplicatore Danno Unità
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Moltiplicatore energia solare
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limite dimensioni mappa
 rules.enemycorebuildradius = Raggio di protezione del Nucleo Nemico dalle costruzioni:[lightgray] (blocchi)
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 773c80759e..618db72f7a 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -983,17 +983,46 @@ stat.immunities = 耐性
 stat.healing = 治癒
 
 ability.forcefield = フォースフィールド
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = リペアフィールド
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = ステータスフィールド
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = 生産
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = シールドリペアフィールド
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = ムーブメントライトニング
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = シールドアーク
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = リジェネ抑制フィールド
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = エネルギー範囲
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = コアにのみ搬入できます。
 
@@ -1296,6 +1325,7 @@ rules.unitdamagemultiplier = ユニットのダメージ倍率
 rules.unitcrashdamagemultiplier = ユニットの衝突ダメージ倍率
 rules.solarmultiplier = 太陽光の倍率
 rules.unitcapvariable = コア数によってユニット上限を変動
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = 基礎ユニット上限数
 rules.limitarea = マップエリアを制限
 rules.enemycorebuildradius = 敵コア周辺の建設禁止区域の半径:[lightgray] (タイル)
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index ca902dbb80..1fabbfdbc6 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -983,17 +983,46 @@ stat.immunities = 상태이상 면역
 stat.healing = 회복량
 
 ability.forcefield = 보호막 필드
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = 수리 필드
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = 상태이상 필드
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = 공장
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = 방어막 복구 필드
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = 가속 전격
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = 방어막 아크
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = 재생성 억제 필드
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = 에너지 필드
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = 코어에만 투입할 수 있습니다
 bar.drilltierreq = 더 좋은 드릴 필요
@@ -1295,6 +1324,7 @@ rules.unitdamagemultiplier = 기체 피해량 배수
 rules.unitcrashdamagemultiplier = 기체 파손 피해량 배수
 rules.solarmultiplier = 태양광 전력 배수
 rules.unitcapvariable = 코어 기체수 제한 추가
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = 기본 기체 제한
 rules.limitarea = 맵 영역 제한
 rules.enemycorebuildradius = 적 코어 건설금지 범위:[lightgray] (타일)
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 0cf772d249..40904c3e94 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -972,17 +972,46 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 
@@ -1285,6 +1314,7 @@ rules.unitdamagemultiplier = Vienetų Žalos Daugiklis
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Nestatymo aplink priešų branduolį spindulys:[lightgray] (blokais)
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index fb8fbe5f10..ad980d279a 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -984,17 +984,46 @@ stat.immunities = Immuniteiten
 stat.healing = Genezing
 
 ability.forcefield = Krachtveld
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Reparatieveld
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Statusveld
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Fabriek
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Schild Regeneratie Veld
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Beweging Bliksem
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Schild Boog
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regeneratie Onderdrukkingsveld
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energieveld
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Alleen materialen in de Core toegestaan.
 
@@ -1297,6 +1326,7 @@ rules.unitdamagemultiplier = Eenheid Schade Vermenigvuldiger
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Zonne-Energie Vermenigvuldiger
 rules.unitcapvariable = Cores Dragen Bij Aan Eenheidslimiet
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Bais Eenheidlimiet
 rules.limitarea = Limiteer Kaart Gebied
 rules.enemycorebuildradius = Niet-Bouw Bereik Vijandelijke Cores:[lightgray] (tegels)
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index e03d97d06c..baa57101d7 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -972,17 +972,46 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 
@@ -1285,6 +1314,7 @@ rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index 5e19b1e4e4..afe941105e 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -981,17 +981,46 @@ stat.immunities = Odporności
 stat.healing = Leczy
 
 ability.forcefield = Pole Siłowe
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Pole Naprawy
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Pole Statusu
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Fabryka Jednostek
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Strefa Tarczy Regenerującej
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Pioruny Poruszania
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Łuk Tarczy
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Pole Tłumienia Regeneracji
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Pole Energii
-ability.energyfield.sametypehealmultiplier = [lightgray]Ten sam typ leczenia: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Maksymalne cele: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneracja
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Dozwolone jest tylko przeniesienie z rdzenia
 
@@ -1294,6 +1323,7 @@ rules.unitdamagemultiplier = Mnożnik Obrażeń jednostek
 rules.unitcrashdamagemultiplier = Obrażenia Zadawane Po Zniszczeniu
 rules.solarmultiplier = Mnożnik Mocy Paneli Słonecznych
 rules.unitcapvariable = Rdzenie mają wpływ na limit jednostek
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Podstawowy limit jednostek
 rules.limitarea = Limit Obszaru Mapy
 rules.enemycorebuildradius = Zasięg Blokady Budowy Przy Rdzeniu Wroga:[lightgray] (kratki)
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 8c757e81b6..5d854f1e64 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -992,17 +992,46 @@ stat.immunities = Imunidades
 stat.healing = Reparo
 
 ability.forcefield = Campo de Força
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Campo de Reparação
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Campo de Status
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Fábrica
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Raio de Regeneração do Escudo
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Raio de Movimento
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Arco do Escudo
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Campo de Energia
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Somente depósito no núcleo permitido
 bar.drilltierreq = Broca melhor necessária.
@@ -1304,6 +1333,7 @@ rules.unitdamagemultiplier = Multiplicador de dano de Unidade
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Multiplicador de Energia Solar
 rules.unitcapvariable = Núcleos contribuem para a capacidade da unidade
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Capacidade base da Unidade
 rules.limitarea = Limitar área do mapa
 rules.enemycorebuildradius = Raio de "não-criação" de núcleo inimigo:[lightgray] (blocos)
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index f5eb2863fa..0ce81ecf7d 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -972,17 +972,46 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 
@@ -1285,6 +1314,7 @@ rules.unitdamagemultiplier = Multiplicador de dano de Unidade
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Raio de "Não-criação" de core inimigo:[lightgray] (blocos)
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index eb1d0ce995..da51937357 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -983,17 +983,46 @@ stat.immunities = Immunities
 stat.healing = Reparare
 
 ability.forcefield = Câmp de Forță
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Câmp de Reparare
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Câmp de Stare
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Fabrică
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Câmp Regenerare Scut
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Mișcare Fulger
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Câmp de Energie
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 
@@ -1296,6 +1325,7 @@ rules.unitdamagemultiplier = Multiplicatorul Deteriorării Unităților
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Nucleele Contribuie la Limita Unităților
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Limita de Bază a Unităților
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Interzisă Construirea în Jurul Nucleului Inamic:[lightgray] (pătrate)
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 268d96520c..b0b35d7083 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -984,17 +984,46 @@ stat.immunities = Невосприимчив
 stat.healing = Ремонт
 
 ability.forcefield = Силовое поле
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Ремонтирующее поле
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Усиливающее поле
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Завод единиц �
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Поле восстановления щита
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Молнии при движении
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Дуговой щит
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Поле подавления регенерации
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Энергетическое поле
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 bar.onlycoredeposit = Доступен перенос только в ядро
 
 bar.drilltierreq = Требуется бур получше
@@ -1296,6 +1325,7 @@ rules.unitdamagemultiplier = Множитель урона боев. ед.
 rules.unitcrashdamagemultiplier = Множитель урона от падения боев. ед.
 rules.solarmultiplier = Множитель солнечной энергии
 rules.unitcapvariable = Ядра увеличивают лимит единиц
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Начальный лимит единиц
 rules.limitarea = Ограничить область карты
 rules.enemycorebuildradius = Радиус защиты враж. ядер:[lightgray] (блок.)
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 588f323ef7..fac38a433f 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -985,17 +985,46 @@ stat.immunities = Imuniteti
 stat.healing = Popravlja
 
 ability.forcefield = Polje Sile
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Polje Popravke
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Statusno Polje
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Fabrika
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Brzina Obnove Štita
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Munje Pri Kretanju
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Elektrolučni Štit
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Polje Prigušivanja Popravki
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energetsko Polje
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Dozvoljeno Dostavljanje Samo Unutar Jezgra
 
@@ -1298,6 +1327,7 @@ rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Jezgara Povećavaju Maksimalni Broj Jedinica
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Maksimalni Broj Jedinica (ne računajući jezgra)
 rules.limitarea = Ograniči Prostor Mape
 rules.enemycorebuildradius = Radius Neprijateljskog jezgra bez gradnje:[lightgray] (polja)
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index d20f0fd841..25e3813f40 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -972,17 +972,46 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 
@@ -1285,6 +1314,7 @@ rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 56c4c85f16..72356a9518 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -985,17 +985,46 @@ stat.immunities = ต่อต้านสถานะ
 stat.healing = การรักษา
 
 ability.forcefield = โล่พลังงาน
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = สนามซ่อมแซม
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = สนามเอฟเฟกต์
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = โรงงานผลิต
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = สนามรักษาโล่
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = ปล่อยสายฟ้าเมื่อเคลื่อนที่
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = โล่พลังงานโค้ง
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = สนามระงับการฟื้นฟู
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = สนามพลังงาน
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = ขนย้ายทรัพยากรลงแกนกลางได้เท่านั้น
 bar.drilltierreq = ต้องมีเครื่องขุดที่ดีกว่านี้
@@ -1297,6 +1326,7 @@ rules.unitdamagemultiplier = พหุคูณพลังโจมตีขอ
 rules.unitcrashdamagemultiplier = พหูคูณดาเมจการตกของยานยูนิต
 rules.solarmultiplier = พหูคุณพลังงานแสงอาทิตย์
 rules.unitcapvariable = เพิ่มจำนวนยูนิตสูงสุดต่อแกนกลาง
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = ขีดกำจัดยูนิตสูงสุดพื้นฐาน
 rules.limitarea = จำกัดพื้นที่แมพ
 rules.enemycorebuildradius = รัศมีห้ามสร้างบริเวณแกนกลางของศัตรู:[lightgray] (ช่อง)
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 36106ee582..7231208b63 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -972,17 +972,46 @@ stat.immunities = Immunities
 stat.healing = Healing
 
 ability.forcefield = Force Field
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Repair Field
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Status Field
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Factory
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Shield Regen Field
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Movement Lightning
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Energy Field
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Only Core Depositing Allowed
 
@@ -1285,6 +1314,7 @@ rules.unitdamagemultiplier = Unit Damage Multiplier
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = Solar Power Multiplier
 rules.unitcapvariable = Cores Contribute To Unit Cap
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Base Unit Cap
 rules.limitarea = Limit Map Area
 rules.enemycorebuildradius = Enemy Core No-Build Radius:[lightgray] (tiles)
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 9eca8e0bea..e7c192a09e 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -982,17 +982,46 @@ stat.immunities = Bağışıklıklar
 stat.healing = Tamir Eder
 
 ability.forcefield = Güç Kalkanı
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Onarma Alanı
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Hızlandırma Alanı
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Birliği Fabrikası
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Kalkan Yenileme Alanı
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Hareket Enerjisi
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Ark Kalkanı
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Tamir Engelleme Alanı
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Güç Kalkanı
-ability.energyfield.sametypehealmultiplier = [lightgray]Aynı Türden İyileştirme: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Azami Hedefler: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Yenilenme
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 bar.onlycoredeposit = Sadece Merkeze Aktarım Mümkün
 
 bar.drilltierreq = Daha Güçlü Matkap Gerekli
@@ -1294,6 +1323,7 @@ rules.unitdamagemultiplier = Birim Hasar Çapanı
 rules.unitcrashdamagemultiplier = Birim Çakılma Hasar Çarpanı
 rules.solarmultiplier = Güneş Paneli Üretim Çarpanı
 rules.unitcapvariable = Merkezler Birim Sınırını Etkiler
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Sabit Birim Sınırı
 rules.limitarea = Haritayı Sınırla
 rules.enemycorebuildradius = Düşman Merkezi İnşa Yasağı Yarıçapı: [lightgray](kare)
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index a6b59822ba..f640333cb5 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -993,17 +993,46 @@ stat.immunities = Імунітети
 stat.healing = Відновлювання
 
 ability.forcefield = Щитове поле
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Ремонтувальне поле
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Поле підсилення
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Завод одиниць �
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Щитовідновлювальне поле
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Блискавки під час руху
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Щитова дуга
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Поле пригнічення відновлення
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Енергетичне поле
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = Передача предметів дозволена лише до ядра
 bar.drilltierreq = Потрібен ліпший бур
@@ -1305,6 +1334,7 @@ rules.unitdamagemultiplier = Множник шкоди бойових одини
 rules.unitcrashdamagemultiplier = Множник шкоди одиниці при зіткненні одиниць
 rules.solarmultiplier = Множник сонячної енергії
 rules.unitcapvariable = Ядра збільшують обмеження на кількість одиниць
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Початкове обмеження одиниць
 rules.limitarea = Обмежити територію мапи
 rules.enemycorebuildradius = Радіус оборони для ворожого ядра:[lightgray] (плитки)
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index a8c7a612ae..cb1a9d8886 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -986,17 +986,46 @@ stat.immunities = Miễn nhiễm
 stat.healing = Sửa chữa
 
 ability.forcefield = Tạo khiên
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Sửa chữa/Xây dựng
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = Vùng gia tốc
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = Sản xuất
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = Tạo khiên nhỏ
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = Phóng điện khi di chuyển
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Khiên Vòng Cung
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Trường sửa chữa
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = Trường điện từ
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 bar.onlycoredeposit = Chỉ có thể đưa vào căn cứ
 
 bar.drilltierreq = Cần máy khoan tốt hơn
@@ -1298,6 +1327,7 @@ rules.unitdamagemultiplier = Hệ số sát thương của đơn vị
 rules.unitcrashdamagemultiplier = Hệ số sát thương của đơn vị khi bị bắn rơi
 rules.solarmultiplier = Hệ số năng lượng mặt trời
 rules.unitcapvariable = Căn cứ tăng giới hạn đơn vị
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Giới hạn đơn vị
 rules.limitarea = Giới hạn kích thước bản đồ
 rules.enemycorebuildradius = Bán kính không xây dựng trong căn cứ của kẻ địch:[lightgray] (ô)
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 4b4b1ab1ae..0337770822 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -994,17 +994,46 @@ stat.immunities = 免疫
 stat.healing = 治疗
 
 ability.forcefield = 力墙场
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = 修复场
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = 状态场
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = 单位工厂
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = 护盾再生场
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = 闪电助推器
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = 弧形护盾
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = 修复压制场
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = 能量场：
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = 仅核心可丢入资源
 bar.drilltierreq = 需要更高级的钻头
@@ -1306,6 +1335,7 @@ rules.unitdamagemultiplier = 单位伤害倍率
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = 太阳能发电倍率
 rules.unitcapvariable = 核心可增加单位上限
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = 基础单位上限
 rules.limitarea = 限制地图有效区域
 rules.enemycorebuildradius = 敌方核心不可建造区域半径：[lightgray]（格）
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 93e43f4741..7fcd78b424 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -990,17 +990,46 @@ stat.immunities = Immunities
 stat.healing = 治癒
 
 ability.forcefield = 防護罩
+ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = 維修力場
+ability.repairfield.description = Repairs nearby units
 ability.statusfield = 狀態力場
+ability.statusfield.description = Applies a status effect to nearby units
 ability.unitspawn = 工廠
+ability.unitspawn.description = Constructs units
 ability.shieldregenfield = 護盾充能力場
+ability.shieldregenfield.description = Regenerates shields of nearby units
 ability.movelightning = 移動閃電
+ability.movelightning.description = Releases lightning while moving
+ability.armorplate = Armor Plate
+ability.armorplate.description = Reduces damage taken while shooting
 ability.shieldarc = Shield Arc
+ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
 ability.suppressionfield = Regen Suppression Field
+ability.suppressionfield.description = Stops nearby repair buildings
 ability.energyfield = 能量場：
-ability.energyfield.sametypehealmultiplier = [lightgray]Same Type Healing: [white]{0}%
-ability.energyfield.maxtargets = [lightgray]Max Targets: [white]{0}
+ability.energyfield.description = Zaps nearby enemies
+ability.energyfield.healdescription = Zaps nearby enemies and heals allies
 ability.regen = Regeneration
+ability.regen.description = Regenerates own health over time
+ability.liquidregen = Liquid Absorption
+ability.liquidregen.description = Absorbs liquid to heal itself
+ability.spawndeath = Death Spawns
+ability.spawndeath.description = Releases units on death
+ability.liquidexplode = Death Spillage
+ability.liquidexplode.description = Spills liquid on death
+ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
+ability.stat.regen = [stat]{0}[lightgray] health/sec
+ability.stat.shield = [stat]{0}[lightgray] shield
+ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
+ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
+ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
+ability.stat.maxtargets = [stat]{0}[lightgray] max targets
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
+ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
+ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
+ability.stat.duration = [stat]{0} sec[lightgray] duration
+ability.stat.buildtime = [stat]{0} sec[lightgray] build time
 
 bar.onlycoredeposit = 僅允許向核心放置物品
 bar.drilltierreq = 需要更好的鑽頭
@@ -1302,6 +1331,7 @@ rules.unitdamagemultiplier = 單位傷害加成
 rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
 rules.solarmultiplier = 太陽能電加成
 rules.unitcapvariable = 核心限制單位上限
+rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = 基礎單位上限
 rules.limitarea = 限制地圖區域
 rules.enemycorebuildradius = 敵人核心禁止建設半徑︰[lightgray]（格）

From d4abcc91efb981411a736c6a658268645e6d0c4d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 30 Mar 2024 09:53:08 -0400
Subject: [PATCH 314/369] Removed unit formation minSpeed

---
 core/src/mindustry/ai/UnitGroup.java       | 20 --------------------
 core/src/mindustry/ai/types/CommandAI.java |  9 ---------
 core/src/mindustry/input/InputHandler.java |  8 --------
 gradle.properties                          |  2 +-
 4 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/core/src/mindustry/ai/UnitGroup.java b/core/src/mindustry/ai/UnitGroup.java
index 2721c07d55..c712885846 100644
--- a/core/src/mindustry/ai/UnitGroup.java
+++ b/core/src/mindustry/ai/UnitGroup.java
@@ -12,30 +12,12 @@ import mindustry.async.*;
 import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.gen.*;
-import mindustry.world.blocks.environment.*;
 
 public class UnitGroup{
     public Seq<Unit> units = new Seq<>();
     public int collisionLayer;
     public volatile float[] positions, originalPositions;
     public volatile boolean valid;
-    public long lastSpeedUpdate = -1;
-    public float minSpeed = 999999f;
-
-    public void updateMinSpeed(){
-        if(lastSpeedUpdate == Vars.state.updateId) return;
-
-        lastSpeedUpdate = Vars.state.updateId;
-        minSpeed = 999999f;
-
-        for(Unit unit : units){
-            //don't factor in the floor speed multiplier
-            Floor on = unit.isFlying() ? Blocks.air.asFloor() : unit.floorOn();
-            minSpeed = Math.min(unit.speed() / on.speedMultiplier, minSpeed);
-        }
-
-        if(Float.isInfinite(minSpeed) || Float.isNaN(minSpeed)) minSpeed = 999999f;
-    }
     
     public void calculateFormation(Vec2 dest, int collisionLayer){
         this.collisionLayer = collisionLayer;
@@ -58,8 +40,6 @@ public class UnitGroup{
             unit.command().groupIndex = i;
         }
 
-        updateMinSpeed();
-
         //run on new thread to prevent stutter
         Vars.mainExecutor.submit(() -> {
             //unused space between circles that needs to be reached for compression to end
diff --git a/core/src/mindustry/ai/types/CommandAI.java b/core/src/mindustry/ai/types/CommandAI.java
index 692aff98c8..1fc6a83a8d 100644
--- a/core/src/mindustry/ai/types/CommandAI.java
+++ b/core/src/mindustry/ai/types/CommandAI.java
@@ -148,10 +148,6 @@ public class CommandAI extends AIController{
             }
         }
 
-        if(group != null){
-            group.updateMinSpeed();
-        }
-
         if(!net.client() && command == UnitCommand.enterPayloadCommand && unit.buildOn() != null && (targetPos == null || (world.buildWorld(targetPos.x, targetPos.y) != null && world.buildWorld(targetPos.x, targetPos.y) == unit.buildOn()))){
             var build = unit.buildOn();
             tmpPayload.unit = unit;
@@ -363,11 +359,6 @@ public class CommandAI extends AIController{
         }
     }
 
-    @Override
-    public float prefSpeed(){
-        return group == null ? super.prefSpeed() : Math.min(group.minSpeed, unit.speed());
-    }
-
     @Override
     public boolean shouldFire(){
         return stance != UnitStance.holdFire;
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 77fa4e668c..e4ba051bac 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -311,18 +311,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
                 }
             }
 
-            float minSpeed = 100000000f;
             for(int i = 0; i < groups.length; i ++){
                 var group = groups[i];
                 if(group != null && group.units.size > 0){
                     group.calculateFormation(targetAsVec, i);
-                    minSpeed = Math.min(group.minSpeed, minSpeed);
-                }
-            }
-
-            for(var group : groups){
-                if(group != null){
-                    group.minSpeed = minSpeed;
                 }
             }
         }
diff --git a/gradle.properties b/gradle.properties
index 50034acf47..1733b891ba 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=8d5651a6ad
+archash=e312cc96f5

From a8588c38b404d9067148efa176aa792bffafb8cd Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 30 Mar 2024 14:22:22 -0400
Subject: [PATCH 315/369] Fixed #9687

---
 core/assets/bundles/bundle.properties     | 2 +-
 core/src/mindustry/logic/LStatements.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 94d1e5d086..239a70034a 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -2346,7 +2346,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a unit.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Spawn a wave.
 lst.explosion = Create an explosion at a location.
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index e04293a8e7..29dde175b5 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -1380,7 +1380,7 @@ public class LStatements{
         }
     }
 
-    @RegisterStatement("weathersensor")
+    @RegisterStatement("weathersense")
     public static class WeatherSenseStatement extends LStatement{
         public String to = "result";
         public String weather = "@rain";

From ba1cacb55f6042cbe1fc73476808fa74ce713e95 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az695-622.gmayhch2cacunn5b1cp1zlasod.dx.internal.cloudapp.net>
Date: Sat, 30 Mar 2024 18:23:20 +0000
Subject: [PATCH 316/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 2 +-
 core/assets/bundles/bundle_bg.properties    | 2 +-
 core/assets/bundles/bundle_ca.properties    | 2 +-
 core/assets/bundles/bundle_cs.properties    | 2 +-
 core/assets/bundles/bundle_da.properties    | 2 +-
 core/assets/bundles/bundle_de.properties    | 2 +-
 core/assets/bundles/bundle_es.properties    | 2 +-
 core/assets/bundles/bundle_et.properties    | 2 +-
 core/assets/bundles/bundle_eu.properties    | 2 +-
 core/assets/bundles/bundle_fi.properties    | 2 +-
 core/assets/bundles/bundle_fil.properties   | 2 +-
 core/assets/bundles/bundle_fr.properties    | 2 +-
 core/assets/bundles/bundle_hu.properties    | 2 +-
 core/assets/bundles/bundle_id_ID.properties | 2 +-
 core/assets/bundles/bundle_it.properties    | 2 +-
 core/assets/bundles/bundle_ja.properties    | 2 +-
 core/assets/bundles/bundle_ko.properties    | 2 +-
 core/assets/bundles/bundle_lt.properties    | 2 +-
 core/assets/bundles/bundle_nl.properties    | 2 +-
 core/assets/bundles/bundle_nl_BE.properties | 2 +-
 core/assets/bundles/bundle_pl.properties    | 2 +-
 core/assets/bundles/bundle_pt_BR.properties | 2 +-
 core/assets/bundles/bundle_pt_PT.properties | 2 +-
 core/assets/bundles/bundle_ro.properties    | 2 +-
 core/assets/bundles/bundle_ru.properties    | 2 +-
 core/assets/bundles/bundle_sr.properties    | 2 +-
 core/assets/bundles/bundle_sv.properties    | 2 +-
 core/assets/bundles/bundle_th.properties    | 2 +-
 core/assets/bundles/bundle_tk.properties    | 2 +-
 core/assets/bundles/bundle_tr.properties    | 2 +-
 core/assets/bundles/bundle_uk_UA.properties | 2 +-
 core/assets/bundles/bundle_vi.properties    | 2 +-
 core/assets/bundles/bundle_zh_CN.properties | 2 +-
 core/assets/bundles/bundle_zh_TW.properties | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index 1ff2a88c87..28be5a9d62 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -2294,7 +2294,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index ff6ddd795c..7c6656a87e 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -2308,7 +2308,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index a889b32ffb..6e373a2606 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -2318,7 +2318,7 @@ lst.getblock = Obtén les dades d’un bloc en qualsevol posició.
 lst.setblock = Estableix les dades d’un bloc en qualsevol posició.
 lst.spawnunit = Fes aparèixer una unitat en una posició.
 lst.applystatus = Aplica o esborra un efecte d’estat d’una unitat.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simula l’aparició d’una onada enemiga en una posició arbitrària.\nEl comptador d’onades no s’incrementarà.
 lst.explosion = Crea una explosió en una posició.
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 34ac915c51..a44a8cea4c 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -2313,7 +2313,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index f0bf3f405b..ba68c6cb22 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -2294,7 +2294,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 7ec71b9203..ad2c09c8f7 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -2343,7 +2343,7 @@ lst.getblock = Lese Tile-Daten von jedem Standort.
 lst.setblock = Setze Tile-Daten an jedem Standort.
 lst.spawnunit = Einheit an einem Standort erstellen.
 lst.applystatus = Füge einer Einheit einen Effekt hinzu oder entferne ihn.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Schickt die nächste Welle.
 lst.explosion = Erstellt an einer beliebigen Stelle eine Explosion.
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index e4b1770621..37aaf8fa5c 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -2336,7 +2336,7 @@ lst.getblock = Obtiene los datos de un bloque en cualquier lugar.
 lst.setblock = Cambia los datos de un bloque en cualquier lugar.
 lst.spawnunit = Crea una unidad en una localización.
 lst.applystatus = Aplica o elimina un efecto de alteración de estado a una unidad.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simula la aparición de una oleada de enemigos en una localización arbitraria.\nNo incrementará el contador de oleadas.
 lst.explosion = Crea una explosión en una localización.
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 395e330d14..cf46c49acf 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -2296,7 +2296,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 7bc7d6ffa8..f97845fc3e 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -2298,7 +2298,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 25767ac142..011cb44d22 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -2299,7 +2299,7 @@ lst.getblock = Selvitä laattadata missä tahansa sijainnissa.
 lst.setblock = Aseta laattadata missä tahansa sijainnissa.
 lst.spawnunit = Luo joukko tietyssä sijainnissa.
 lst.applystatus = Lisää tai poista statusefekti yksiköltä.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simuloi tason syntymistä mielivaltaisessa sijainnissa.\nEi vaikuta tasolaskuriin.
 lst.explosion = Luo räjähdys tietyssä sijainnissa.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index d66dbabc0f..92634c5367 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -2295,7 +2295,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index c44718029a..d044c45163 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -2344,7 +2344,7 @@ lst.getblock = Obtient les données d'une tuile à n'importe quel emplacement.
 lst.setblock = Définit les données d'une tuile à n'importe quel emplacement.
 lst.spawnunit = Fait apparaître une unité à un emplacement.
 lst.applystatus = Ajoute ou enlève un effet de statut d'une unité.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simule un déclenchement de vague à n'importe quel emplacement.\nCela n'incrémente pas le compteur de vaugues.
 lst.explosion = Crée une explosion à un emplacement.
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index bdaf5bbf1e..bb618d854c 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -2345,7 +2345,7 @@ lst.getblock = Csempeadatok lekérdezése tetszőleges helyen.
 lst.setblock = Csempeadatok beállítása tetszőleges helyen.
 lst.spawnunit = Egység lerakása az adott helyen.
 lst.applystatus = Állapothatás alkalmazása vagy törlése egy egységről.
-lst.weathersensor = Ellenőrzés, hogy egy adott időjárástípus aktív-e.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Az időjárástípus jelenlegi állapotának megadása.
 lst.spawnwave = Egy hullám indítása.
 lst.explosion = Robbanás létrehozása az adott helyen.
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index 0446601dd9..e9040f5bab 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -2334,7 +2334,7 @@ lst.getblock = Mendapatkan data petak di lokasi manapun.
 lst.setblock = Menentukan data petak di lokasi manapun.
 lst.spawnunit = Munculkan unit pada tempat yang ditentukan.
 lst.applystatus = Menerapkan atau menghapus status efek dari sebuah unit.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulasikan adanya gelombang pada lokasi acak.\nTidak akan ditambahkan pada jumlah gelombang keseluruhan.
 lst.explosion = Membuat sebuah ledakan pada lokasi yang ditentukan.
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 00f76cef1f..1db134fcd2 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -2308,7 +2308,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 618db72f7a..d67268871a 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -2312,7 +2312,7 @@ lst.getblock = 任意の座標のタイルの情報を取得します。
 lst.setblock = 任意の座標のタイルの情報を変更します。
 lst.spawnunit = 任意の座標にユニットをスポーンさせます。
 lst.applystatus = ユニットからステータス効果を適用または削除する。
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = 任意の座標で発生するウェーブをシミュレーションします。\nウェーブを進めません。
 lst.explosion = ある場所で爆発を起こします。
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 1fabbfdbc6..8cdb1beacf 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -2311,7 +2311,7 @@ lst.getblock = 특정 위치의 타일 정보를 불러옴
 lst.setblock = 특정 위치의 타일 정보 설정
 lst.spawnunit = 특정 위치에 기체 소환
 lst.applystatus = 기체에게 상태이상을 적용하거나 삭제
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = 특정 위치에 이전 단계를 실행\n실제 단계가 넘어가지 않습니다
 lst.explosion = 특정 위치에 폭발 생성
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 40904c3e94..210ccafb06 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -2296,7 +2296,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index ad980d279a..a193ffe2dd 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -2309,7 +2309,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index baa57101d7..5691be2512 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -2296,7 +2296,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index afe941105e..e991692472 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -2330,7 +2330,7 @@ lst.getblock = Uzyskaj dane dla dowolnej lokalizacji.
 lst.setblock = Ustaw dane dla dowolnej lokalizacji.
 lst.spawnunit = Odródź jednostkę w lokalizacji.
 lst.applystatus = Zastosuj lub wyczyść efekty statusu jednostki.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Symuluj falę odradzającą się w dowolnym miejscu.\nNie zwiększy licznika fali.
 lst.explosion = Stwórz eksplozję w lokalizacji.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 5d854f1e64..aea3126a21 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -2329,7 +2329,7 @@ lst.getblock = Obtenha dados de blocos em qualquer local.
 lst.setblock = Defina os dados do bloco em qualquer local.
 lst.spawnunit = Gere uma unidade em um local.
 lst.applystatus = Aplique ou elimine um efeito de status de uma unidade.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Gerar uma onda.
 lst.explosion = Crie uma explosão em um local.
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 0ce81ecf7d..a0be18e995 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -2296,7 +2296,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index da51937357..ed8fc6bb60 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -2313,7 +2313,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index b0b35d7083..2587e514ba 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -2315,7 +2315,7 @@ lst.getblock = Получает данные о плитке в любом ме
 lst.setblock = Устанавливает плитку в любом месте.
 lst.spawnunit = Создает боевую единицу на локации.
 lst.applystatus = Применяет или снимает эффект статуса с боевой единицы.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Имитация волны, создаваемой в произвольном месте.\nСчетчик волн не увеличивается.
 lst.explosion = Создает взрыв на локации.
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index fac38a433f..56582bbae8 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -2316,7 +2316,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Prizovi jedinicu na mestu.
 lst.applystatus = Dodaj ili ukloni statusni efekat na jedinicu/e.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Izazovi eksploziju na mestu.
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 25e3813f40..65d440cab3 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -2296,7 +2296,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 72356a9518..222c4fbb21 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -2333,7 +2333,7 @@ lst.getblock = รับข้อมูลของช่องที่ตำ
 lst.setblock = ปรับแต่งข้อมูลของช่องที่ตำแหน่งใดๆ
 lst.spawnunit = เสกยูนิตมาที่ตำแหน่งที่กำหนดไว้
 lst.applystatus = ใส่หรือล้างเอฟเฟกต์สถานะจากยูนิต
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = จำลองคลื่นที่ตำแหน่งใดๆ
 lst.explosion = เสกระเบิดที่ตำแหน่ง
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 7231208b63..881abd92f9 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -2296,7 +2296,7 @@ lst.getblock = Get tile data at any location.
 lst.setblock = Set tile data at any location.
 lst.spawnunit = Spawn unit at a location.
 lst.applystatus = Apply or clear a status effect from a uniut.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Simulate a wave being spawned at a arbitrary location.\nWill not increment the wave counter.
 lst.explosion = Create an explosion at a location.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index e7c192a09e..f50ff06f3a 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -2313,7 +2313,7 @@ lst.getblock = Herhangi bir yerdeki blok bilgisini al.
 lst.setblock = Herhangi bir yerdeki blok bilgisini değiştir.
 lst.spawnunit = Herhangi bir yerde birim var et.
 lst.applystatus = Bir Birime Durum Etkisi ekle.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Bellir bir noktada dalga başlat.\nDalga Zamanlayıcı Oluşturmaz!
 lst.explosion = Bir Noktada Patlama oluştur.
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index f640333cb5..e6743cbee4 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -2340,7 +2340,7 @@ lst.getblock = Отримує дані плитки в будь-якому мі
 lst.setblock = Установлює дані плитки в будь-якому місці.
 lst.spawnunit = Породжує одиницю на певному місці.
 lst.applystatus = Застосовує або видаляє ефект стану з одиниці.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Змодельовує хвилю, що виникає у довільному місці.\nНе збільшує лічильник хвиль.
 lst.explosion = Створює вибух у певному місці.
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index cb1a9d8886..a254aab849 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -2314,7 +2314,7 @@ lst.getblock = Lấy dữ liệu từ ô từ vị trí bất kì.
 lst.setblock = Chỉnh sửa dữ liệu từ ô từ vị trí bất kì.
 lst.spawnunit = Tạo ra quân từ vị trí.
 lst.applystatus = Áp dụng hoặc loại bỏ một hiệu ứng trạng thái cho một đơn vị.
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = Mô phỏng một lượt xuất hiện ở vị trí tùy ý.\nSẽ không tăng số đếm lượt.
 lst.explosion = Tạo ra một vụ nổ tại vị trí đó.
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 0337770822..ddd3e316d9 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -2339,7 +2339,7 @@ lst.getblock = 获取任意位置的地块数据
 lst.setblock = 设置任意位置的地块数据
 lst.spawnunit = 在指定位置生成单位
 lst.applystatus = 添加或清除单位的一个状态效果
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = 在任意位置生成一波敌人\n并不记录在波数计数器中
 lst.explosion = 在某个位置生成爆炸
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 7fcd78b424..465a18589d 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -2325,7 +2325,7 @@ lst.getblock = 由位置取方塊數據
 lst.setblock = 由位置設置方塊數據
 lst.spawnunit = 在某一位置生成單位
 lst.applystatus = 爲單位添加或移除狀態效果
-lst.weathersensor = Check if a type of weather is active.
+lst.weathersense = Check if a type of weather is active.
 lst.weatherset = Set the current state of a type of weather.
 lst.spawnwave = 在某一位置生成一波敵人\n不計入波數
 lst.explosion = 在某一位置製造爆炸

From 47467e5bd20832acf07afa05f70f5e375f24a599 Mon Sep 17 00:00:00 2001
From: Marko Zajc <marko@zajc.eu.org>
Date: Sun, 31 Mar 2024 04:29:39 +0200
Subject: [PATCH 317/369] Add gradle-wrapper-validation.yml (#9688)

---
 .github/workflows/gradle-wrapper-validation.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/workflows/gradle-wrapper-validation.yml

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
new file mode 100644
index 0000000000..95cce8bab6
--- /dev/null
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2

From 396869dec36e58bfb9ec5131a1f1010046eceede Mon Sep 17 00:00:00 2001
From: SITUVNgcd <44901211+SITUVNgcd@users.noreply.github.com>
Date: Sun, 31 Mar 2024 10:24:24 +0700
Subject: [PATCH 318/369] Translate & revert Vietnamese translation (#9560)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Translate, revert

- Translated new strings.
- Fixed some typos.
- Corrected translation for some strings.
- Revert `Kho lưu trữ` to `Repo`, some Vietnamese need that, idk!

https://github.com/Anuken/Mindustry/commit/c3ee92fba701f010b5033aa1d519b6b541d976c2

* Translate new strings

https://github.com/Anuken/Mindustry/commit/97010a5064178309b638e4a0adf72add4018bc0a

* Remove #note

https://github.com/Anuken/Mindustry/commit/97010a5064178309b638e4a0adf72add4018bc0a

* World Switch

https://github.com/Anuken/Mindustry/commit/76cb36fdea60ea38814765bfaf7f7fde1e812f41

* Translate new strings

https://github.com/Anuken/Mindustry/commit/824c6eedb39fba26b41ec8f0843595d2addc7fc0

* Translate new strings

https://github.com/Anuken/Mindustry/commit/304d7d9602aefa3df91b4cf1fd81d69fff142644

---------

Co-authored-by: Anuken <arnukren@gmail.com>
---
 core/assets/bundles/bundle_vi.properties | 299 +++++++++++++----------
 1 file changed, 170 insertions(+), 129 deletions(-)

diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index a254aab849..e8be02a566 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -31,8 +31,8 @@ load.map = Bản đồ
 load.image = Hình ảnh
 load.content = Nội dung
 load.system = Hệ thống
-load.mod = Mods
-load.scripts = Scripts
+load.mod = Bản mod
+load.scripts = Ngữ lệnh
 
 be.update = Đã tìm thấy bản cập nhật mới:
 be.update.confirm = Tải xuống và khởi động lại ngay bây giờ?
@@ -77,9 +77,9 @@ schematic.tags = Thẻ:
 schematic.edittags = Chỉnh sửa thẻ
 schematic.addtag = Thêm thẻ
 schematic.texttag = Thẻ văn bản
-schematic.icontag = Thẻ icon
+schematic.icontag = Thẻ biểu tượng
 schematic.renametag = Đổi tên thẻ
-schematic.tagged = {0} đã gắn thẻ
+schematic.tagged = {0} thẻ đã gắn
 schematic.tagdelconfirm = Xóa thẻ này?
 schematic.tagexists = Thẻ đã tồn tại.
 
@@ -243,8 +243,8 @@ host.invalid = [scarlet]Không thể kết nối đến máy chủ.
 
 servers.local = Máy chủ cục bộ
 servers.local.steam = Màn chơi hiện có & Máy chủ cục bộ
-servers.remote = Máy chủ tùy chỉnh
-servers.global = Máy chủ từ cộng đồng
+servers.remote = Máy chủ từ xa
+servers.global = Máy chủ cộng đồng
 
 servers.disclaimer = Nhà phát triển [accent]không[] sở hữu và kiểm soát máy chủ cộng đồng.\n\nMáy chủ có thể chứa nội dung do người dùng tạo và không phù hợp với mọi lứa tuổi.
 servers.showhidden = Hiển thị Máy chủ Ẩn
@@ -256,7 +256,7 @@ trace = Tìm người chơi
 trace.playername = Tên người chơi: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = ID: [accent]{0}
-trace.language = Language: [accent]{0}
+trace.language = Ngôn ngữ: [accent]{0}
 trace.mobile = Máy khách di động: [accent]{0}
 trace.modclient = Máy khách tùy chỉnh: [accent]{0}
 trace.times.joined = Số lần tham gia: [accent]{0}
@@ -342,23 +342,23 @@ open = Mở
 customize = Luật tùy chỉnh
 cancel = Hủy
 command = Mệnh lệnh
-command.queue = [lightgray][Queuing]
+command.queue = [lightgray][Đang lệnh tuần tự]
 command.mine = Đào
 command.repair = Sửa Chữa
 command.rebuild = Xây Dựng
 command.assist = Hỗ Trợ Người Chơi
 command.move = Di Chuyển
 command.boost = Tăng Cường
-command.enterPayload = Enter Payload Block
-command.loadUnits = Load Units
-command.loadBlocks = Load Blocks
-command.unloadPayload = Unload Payload
-stance.stop = Cancel Orders
-stance.shoot = Stance: Shoot
-stance.holdfire = Stance: Hold Fire
-stance.pursuetarget = Stance: Pursue Target
-stance.patrol = Stance: Patrol Path
-stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
+command.enterPayload = Nhập khối hàng vào công trình
+command.loadUnits = Nhận đơn vị
+command.loadBlocks = Nhận khối công trình
+command.unloadPayload = Dỡ khối hàng
+stance.stop = Hủy mệnh lệnh
+stance.shoot = Tư thế: Bắn
+stance.holdfire = Tư thế: Ngừng bắn
+stance.pursuetarget = Tư thế: Bám đuổi mục tiêu
+stance.patrol = Tư thế: Đường tuần tra
+stance.ram = Tư thế: Tông thẳng\n[lightgray]Đi theo đường thẳng, không tìm đường
 openlink = Mở liên kết
 copylink = Sao chép liên kết
 back = Quay lại
@@ -439,7 +439,7 @@ editor.waves = Lượt:
 editor.rules = Luật:
 editor.generation = Cấu trúc:
 editor.objectives = Mục tiêu
-editor.locales = Locale Bundles
+editor.locales = Gói ngôn ngữ
 editor.ingame = Chỉnh sửa trong trò chơi
 editor.playtest = Chơi thử
 editor.publish.workshop = Xuất bản lên Workshop
@@ -459,7 +459,7 @@ waves.title = Đợt
 waves.remove = Xóa
 waves.every = mỗi
 waves.waves = đợt
-waves.health = health: {0}%
+waves.health = độ bền: {0}%
 waves.perspawn = mỗi lần xuất hiện
 waves.shields = khiên/đợt
 waves.to = đến
@@ -480,7 +480,7 @@ waves.none = Không có kẻ thù được xác định.\nLưu ý rằng bố c
 waves.sort = Sắp xếp theo
 waves.sort.reverse = Đảo ngược sắp xếp
 waves.sort.begin = Bắt đầu
-waves.sort.health = Máu
+waves.sort.health = Độ bền
 waves.sort.type = Thể loại
 waves.search = Tìm kiếm các lượt...
 waves.filter = Bộ lọc đơn vị
@@ -490,13 +490,13 @@ waves.units.show = Hiện tất cả
 #these are intentionally in lower case
 wavemode.counts = số lượng
 wavemode.totals = tổng số
-wavemode.health = máu
+wavemode.health = độ bền
 
 editor.default = [lightgray]<Mặc định>
 details = Chi tiết...
 edit = Chỉnh sửa...
 variables = Thông số
-logic.globals = Built-in Variables
+logic.globals = Thông số sẵn có
 editor.name = Tên:
 editor.spawn = Thêm kẻ địch
 editor.removeunit = Xóa kẻ địch
@@ -508,7 +508,7 @@ editor.errorlegacy = Bản đồ này quá cũ, và sử dụng định dạng b
 editor.errornot = Đây không phải là tệp bản đồ.
 editor.errorheader = Tệp bản đồ này không hợp lệ hoặc bị hỏng.
 editor.errorname = Bản đồ không có tên được xác định. Bạn đang cố gắng tải một bản lưu?
-editor.errorlocales = Error reading invalid locale bundles.
+editor.errorlocales = Lỗi đọc gói ngôn ngữ không hợp lệ.
 editor.update = Cập nhật
 editor.randomize = Ngẫu nhiên
 editor.moveup = Di chuyển lên
@@ -520,7 +520,7 @@ editor.sectorgenerate = Tạo ra khu vực
 editor.resize = Thay đổi kích thước
 editor.loadmap = Mở bản đồ
 editor.savemap = Lưu bản đồ
-editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
+editor.savechanges = [scarlet]Bạn có thay đổi chưa lưu!\n\n[]Bạn có muốn lưu chúng không?
 editor.saved = Đã lưu!
 editor.save.noname = Bản đồ của bạn không có tên! Hãy đặt một cái tên trong 'Thông tin bản đồ'.
 editor.save.overwrite = Bản đồ của bạn ghi đè lên một bản đồ đã có sẵn! Hãy chọn một cái tên khác trong 'Thông tin bản đồ'.
@@ -607,23 +607,23 @@ filter.option.floor2 = Nền phụ
 filter.option.threshold2 = Ngưỡng phụ
 filter.option.radius = Bán kính
 filter.option.percentile = Phần trăm
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
-locales.deletelocale = Are you sure you want to delete this locale bundle?
-locales.applytoall = Apply Changes To All Locales
-locales.addtoother = Add To Other Locales
-locales.rollback = Rollback to last applied
-locales.filter = Property filter
-locales.searchname = Search name...
-locales.searchvalue = Search value...
-locales.searchlocale = Search locale...
-locales.byname = By name
-locales.byvalue = By value
-locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
-locales.showmissing = Show properties that are missing in some locales
-locales.showsame = Show properties that have same values in different locales
-locales.viewproperty = View in all locales
-locales.viewing = Viewing property "{0}"
-locales.addicon = Add Icon
+locales.info = Tại đây, bạn có thể thêm gói ngôn ngữ cho ngôn ngữ cụ thể vào bản đồ của bạn. Trong gói ngôn ngữ, mỗi thuộc tính có tên và giá trị. Những thuộc tính này có thể được sử dụng bởi Bộ xử lý thế giới và Mục tiêu nhiệm vụ bằng tên của chúng. Chúng hỗ trợ định dạng văn bản (thay thế kí tự giữ chỗ bằng giá trị thực tế).\n\n[cyan]Ví dụ thuộc tính:\n[]tên: [accent]timer[]\nvalue: [accent]Bộ đếm thời gian ví dụ, thời gian còn lại: @[]\n\n[cyan]Cách dùng:\n[]Đặt làm văn bản cho Mục tiêu nhiệm vụ: [accent]@timer\n\n[]In nó trong Bộ xử lý thế giới:\n[accent]localeprint "timer"\nformat time\n[gray](với time là biến được tính toán riêng biệt)
+locales.deletelocale = Bạn có chắc muốn xóa gói ngôn ngữ này?
+locales.applytoall = Áp dụng thay đổi cho tất cả gói ngôn ngữ
+locales.addtoother = Thêm vào các gói ngôn ngữ khác
+locales.rollback = Khôi phục lại lầ áp dụng cuối
+locales.filter = Lọc thuộc tính
+locales.searchname = Tìm tên...
+locales.searchvalue = Tìm giá trị...
+locales.searchlocale = Tìm ngôn ngữ...
+locales.byname = Theo tên
+locales.byvalue = Theo giá trị
+locales.showcorrect = Hiện thuộc tính có trong tất cả ngôn ngữ và có giá trị riêng biệt mỗi nơi
+locales.showmissing = Hiện thuộc tính bị mất trong một số ngôn ngữ
+locales.showsame = Hiện thuộc tính có giá trị giống nhau trong các ngôn ngữ khác nhau
+locales.viewproperty = Xem trong tất cả ngôn ngữ
+locales.viewing = Đang xem thuộc tính "{0}"
+locales.addicon = Thêm biểu tượng
 
 width = Chiều rộng:
 height = Chiều cao:
@@ -674,11 +674,11 @@ objective.destroycore.name = Phá huỷ căn cứ
 objective.commandmode.name = Chế độ ra lệnh
 objective.flag.name = Cờ
 marker.shapetext.name = Hình dạng văn bản
-marker.point.name = Point
+marker.point.name = Điểm
 marker.shape.name = Hình dạng
 marker.text.name = Văn bản
-marker.line.name = Line
-marker.quad.name = Quad
+marker.line.name = Đường kẻ
+marker.quad.name = Bốn điểm
 marker.background = Nền
 marker.outline = Đường viền
 objective.research = [accent]Nghiên cứu:\n[]{0}[lightgray]{1}
@@ -762,8 +762,8 @@ sector.curlost = Khu vực đã mất
 sector.missingresources = [scarlet]Không đủ tài nguyên căn cứ
 sector.attacked = Khu vực [accent]{0}[white] đang bị tấn công!
 sector.lost = Khu vực [accent]{0}[white] đã mất!
-sector.capture = Sector [accent]{0}[white]Captured!
-sector.capture.current = Sector Captured!
+sector.capture = Khu vực [accent]{0}[white] đã chiếm!
+sector.capture.current = Khu vực đã chiếm!
 sector.changeicon = Thay đổi biểu tượng
 sector.noswitch.title = Không thể thay đổi sang khu vực khác
 sector.noswitch = Bạn không thể đổi sang khu vực khác khi một khu vực đang bị tấn công.\n\nKhu vực: [accent]{0}[] ở [accent]{1}[]
@@ -986,6 +986,46 @@ stat.immunities = Miễn nhiễm
 stat.healing = Sửa chữa
 
 ability.forcefield = Tạo khiên
+ability.forcefield.description = Phát một khiên trường lực hấp thụ các loại đạn
+ability.repairfield = Sửa chữa/Xây dựng
+ability.repairfield.description = Sửa chữa các đơn vị gần đó
+ability.statusfield = Vùng gia tốc
+ability.statusfield.description = Áp dụng hiệu ứng trạng thái vào các đơn vị gần đó
+ability.unitspawn = Sản xuất
+ability.unitspawn.description = Sản xuất đơn vị
+ability.shieldregenfield = Tạo khiên nhỏ
+ability.shieldregenfield.description = Tạo khiên cho các đơn vị gần đó
+ability.movelightning = Phóng điện khi di chuyển
+ability.movelightning.description = Giải phóng tia điện khi di chuyển
+ability.armorplate = Mảnh giáp
+ability.armorplate.description = Giảm sát thương gánh chịu trong khi bắn
+ability.shieldarc = Khiên vòng cung
+ability.shieldarc.description = Phát một khiên trường lực vòng cung hấp thụ các loại đạn
+ability.suppressionfield = Ngăn chặn sửa chữa
+ability.suppressionfield.description = Ngăn chặn các công trình sửa chữa
+ability.energyfield = Trường điện từ
+ability.energyfield.description = Giật điện các kẻ thù gần đó
+ability.energyfield.healdescription = Giật điện các kẻ thù gần đó và hồi phục đồng minh
+ability.regen = Hồi phục
+ability.regen.description = Tự hồi phục theo thời gian
+ability.liquidregen = Hấp thụ chất lỏng
+ability.liquidregen.description = Hấp thụ chất lỏng để tự hồi phục
+ability.spawndeath = Chết sản sinh
+ability.spawndeath.description = Sinh ra đơn vị khi chết
+ability.liquidexplode = Chết tràn dịch
+ability.liquidexplode.description = Tràn chất lỏng khi chết
+ability.stat.firingrate = tốc bắn [stat]{0}/giây[lightgray]
+ability.stat.regen = [stat]{0}[lightgray] độ bền/giây
+ability.stat.shield = [stat]{0}[lightgray] khiên
+ability.stat.repairspeed = [stat]{0}/giây[lightgray] tốc độ sửa chữa
+ability.stat.slurpheal = [stat]{0}[lightgray] độ bền/đơn vị chất lỏng
+ability.stat.cooldown = [stat]{0} giây[lightgray] hồi chiêu
+ability.stat.maxtargets = [stat]{0}[lightgray] mục tiêu tối đa
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] số lượng sửa chữa cùng kiểu
+ability.stat.damagereduction = [stat]{0}%[lightgray] giảm sát thương
+ability.stat.minspeed = tốc độ tối thiểu [stat]{0} ô/giây[lightgray]
+ability.stat.duration = thời hạn [stat]{0} giây[lightgray]
+ability.stat.buildtime = thời gian xây [stat]{0} giây[lightgray]
 ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Sửa chữa/Xây dựng
 ability.repairfield.description = Repairs nearby units
@@ -1065,7 +1105,7 @@ bullet.splashdamage = [stat]{0}[lightgray] sát thương diện rộng ~[stat] {
 bullet.incendiary = [stat]cháy
 bullet.homing = [stat]truy đuổi
 bullet.armorpierce = [stat]xuyên giáp
-bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
+bullet.maxdamagefraction = [stat]{0}%[lightgray] giới hạn sát thương
 bullet.suppression = [stat]{0} giây[lightgray] ngăn sửa chữa ~ [stat]{1}[lightgray] ô
 bullet.interval = [stat]{0}/giây[lightgray] interval bullets:
 bullet.frags = [stat]phá mảnh
@@ -1120,8 +1160,8 @@ setting.logichints.name = Gợi ý Logic
 setting.backgroundpause.name = Tạm dừng trong nền
 setting.buildautopause.name = Tự động dừng xây dựng
 setting.doubletapmine.name = Nhấn đúp để Đào
-setting.commandmodehold.name = Nhấn giữ để vào chế độ khiển quân
-setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.commandmodehold.name = Nhấn giữ để vào chế độ khiển đơn vị
+setting.distinctcontrolgroups.name = Giới hạn một nhóm điều khiển cho mỗi đơn vị
 setting.modcrashdisable.name = Tắt các mod khi gặp sự cố trong khởi động
 setting.animatedwater.name = Hiệu ứng nước
 setting.animatedshields.name = Hiệu ứng khiên
@@ -1168,14 +1208,14 @@ setting.position.name = Hiển thị vị trí người chơi
 setting.mouseposition.name = Hiện vị trí trỏ chuột
 setting.musicvol.name = Âm lượng nhạc
 setting.atmosphere.name = Hiển thị bầu khí quyển hành tinh
-setting.drawlight.name = Draw Darkness/Lighting
+setting.drawlight.name = Vẽ Bóng tối/Ánh sáng
 setting.ambientvol.name = Âm lượng tổng
 setting.mutemusic.name = Tắt nhạc
 setting.sfxvol.name = Âm lượng SFX
 setting.mutesound.name = Tắt tiếng
 setting.crashreport.name = Gửi báo cáo sự cố
 setting.savecreate.name = Tự động lưu
-setting.steampublichost.name = Public Game Visibility
+setting.steampublichost.name = Hiển thị trò chơi công khai
 setting.playerlimit.name = Giới hạn người chơi
 setting.chatopacity.name = Độ mờ trò chuyện
 setting.lasersopacity.name = Độ mờ kết nối năng lượng
@@ -1195,7 +1235,7 @@ keybind.title = Sửa phím
 keybinds.mobile = [scarlet]Hầu hết phím ở đây không hoạt động trên thiết bị di động. Chỉ hỗ trợ di chuyển cơ bản.
 category.general.name = Chung
 category.view.name = Xem
-category.command.name = Unit Command
+category.command.name = Mệnh lệnh đơn vị
 category.multiplayer.name = Nhiều người chơi
 category.blocks.name = Chọn khối
 placement.blockselectkeys = \n[lightgray]Phím: [{0},
@@ -1212,24 +1252,24 @@ keybind.move_y.name = Di chuyển Y
 keybind.mouse_move.name = Theo chuột
 keybind.pan.name = Di chuyển góc nhìn
 keybind.boost.name = Tăng tốc
-keybind.command_mode.name = Chế độ điều khiển quân
-keybind.command_queue.name = Unit Command Queue
-keybind.create_control_group.name = Create Control Group
-keybind.cancel_orders.name = Cancel Orders
-keybind.unit_stance_shoot.name = Unit Stance: Shoot
-keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
-keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
-keybind.unit_stance_patrol.name = Unit Stance: Patrol
-keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.command_mode.name = Chế độ mệnh lệnh
+keybind.command_queue.name = Lệnh tuần tự đơn vị
+keybind.create_control_group.name = Tạo nhóm điều khiển
+keybind.cancel_orders.name = Hủy lệnh
+keybind.unit_stance_shoot.name = Tư thế đơn vị: Bắn
+keybind.unit_stance_hold_fire.name = Tư thế đơn vị: Ngừng bắn
+keybind.unit_stance_pursue_target.name = Tư thế đơn vị: Bám đuổi mục tiêu
+keybind.unit_stance_patrol.name = Tư thế đơn vị: Tuần tra
+keybind.unit_stance_ram.name = Tư thế đơn vị: Tông thẳng
+keybind.unit_command_move = Mệnh lệnh đơn vị: Di chuyển
+keybind.unit_command_repair = Mệnh lệnh đơn vị: Sửa chữa
+keybind.unit_command_rebuild = Mệnh lệnh đơn vị: Xây lại
+keybind.unit_command_assist = Mệnh lệnh đơn vị: Hỗ trợ
+keybind.unit_command_mine = Mệnh lệnh đơn vị: Khai thác
+keybind.unit_command_boost = Mệnh lệnh đơn vị: Tăng cường l
+keybind.unit_command_load_units = Mệnh lệnh đơn vị: Nhập đơn vị
+keybind.unit_command_load_blocks = Mệnh lệnh đơn vị: Nhập khối công trình
+keybind.unit_command_unload_payload = Mệnh lệnh đơn vị: Dỡ khối hàng
 keybind.rebuild_select.name = Chọn khu vực xây dựng lại
 keybind.schematic_select.name = Chọn khu vực
 keybind.schematic_menu.name = Menu bản thiết kế
@@ -1293,12 +1333,12 @@ mode.pvp.description = Chiến đấu với những người chơi khác trên c
 mode.attack.name = Tấn công
 mode.attack.description = Phá hủy căn cứ của kẻ địch. \n[gray]Cần căn cứ màu đỏ trong bản đồ để chơi.
 mode.custom = Tùy chỉnh luật
-rules.invaliddata = Invalid clipboard data.
-rules.hidebannedblocks = Ẩn Các Khối Bị Cấm
+rules.invaliddata = Dữ liệu bộ nhớ tạm không hợp lệ.
+rules.hidebannedblocks = Ẩn các khối bị cấm
 
 rules.infiniteresources = Tài nguyên vô hạn
 rules.onlydepositcore = Chỉ cho phép đưa tài nguyên vào căn cứ
-rules.derelictrepair = Allow Derelict Block Repair
+rules.derelictrepair = Cho phép sửa khối bỏ hoang
 rules.reactorexplosions = Nổ lò phản ứng
 rules.coreincinerates = Hủy vật phẩm khi căn cứ đầy
 rules.disableworldprocessors = Vô hiệu hoá bộ xử lý thế giới
@@ -1322,11 +1362,12 @@ rules.blockhealthmultiplier = Hệ số độ bền khối
 rules.blockdamagemultiplier = Hệ số sát thương của khối
 rules.unitbuildspeedmultiplier = Hệ số tốc độ sản xuất lính
 rules.unitcostmultiplier = Hệ số yêu cầu tài nguyên sản xuất đơn vị
-rules.unithealthmultiplier = Hệ số máu của đơn vị
+rules.unithealthmultiplier = Hệ số độ bền của đơn vị
 rules.unitdamagemultiplier = Hệ số sát thương của đơn vị
 rules.unitcrashdamagemultiplier = Hệ số sát thương của đơn vị khi bị bắn rơi
 rules.solarmultiplier = Hệ số năng lượng mặt trời
 rules.unitcapvariable = Căn cứ tăng giới hạn đơn vị
+rules.unitpayloadsexplode = Khối hàng mang theo phát nổ cùng đơn vị
 rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Giới hạn đơn vị
 rules.limitarea = Giới hạn kích thước bản đồ
@@ -1579,7 +1620,7 @@ block.inverted-sorter.name = Bộ lọc ngược
 block.message.name = Thông điệp
 block.reinforced-message.name = Thông điệp [Gia cố]
 block.world-message.name = Thông điệp thế giới
-block.world-switch.name = World Switch
+block.world-switch.name = Công tắc thế giới
 block.illuminator.name = Đèn
 block.overflow-gate.name = Cổng tràn
 block.underflow-gate.name = Cổng tràn ngược
@@ -1856,7 +1897,7 @@ block.memory-bank.name = Bộ nhớ lớn
 team.malis.name = Malis
 team.crux.name = Crux
 team.sharded.name = Sharded
-team.derelict.name = Không xác định
+team.derelict.name = Bỏ hoang
 team.green.name = Xanh lá cây
 team.blue.name = Xanh dương
 
@@ -1871,7 +1912,7 @@ hint.desktopPause = Nhấn [accent][[Space][] để tạm dừng và tiếp tụ
 hint.breaking = [accent]Chuột phải[] và kéo để phá vỡ các khối.
 hint.breaking.mobile = Kích hoạt \ue817 [accent]Cây búa[] ở phía dưới cùng bên phải và nhấn để phá vỡ các khối.\n\nGiữ ngón tay của bạn trong một giây và kéo để phá khối trong vùng được chọn.
 hint.blockInfo = Xem thông tin của một khối bằng cách chọn nó trong [accent]menu xây dựng[], Sau đó chọn nút [accent][[?][] ở bên phải.
-hint.derelict = [accent]Không xác định[] là các công trình bị hỏng của các căn cứ cũ mà không còn hoạt động.\n\nCác công trình này có thể [accent]được tháo dỡ[] để nhận được nguyên liệu.
+hint.derelict = [accent]Bỏ hoang[] là các công trình bị hỏng của các căn cứ cũ mà không còn hoạt động.\n\nCác công trình này có thể [accent]được tháo dỡ[] để nhận được nguyên liệu.
 hint.research = Sử dụng nút \ue875 [accent]Nghiên cứu[] để nghiên cứu công nghệ mới.
 hint.research.mobile = Sử dụng nút \ue875 [accent]Nghiên cứu[] trong \ue88c [accent]Trình đơn[] để nghiên cứu công nghệ mới.
 hint.unitControl = Giữ [accent][[L-ctrl][] và [accent]nhấp chuột[] để điều khiển đơn vị của bạn hoặc súng.
@@ -1937,13 +1978,13 @@ onset.turrets = Các đơn vị rất tốt, nhưng [accent]súng[] cung cấp k
 onset.turretammo = Tiếp đạn cho súng bằng [accent]beryllium[].
 onset.walls = [accent]Tường[] có thể ngăn chặn sát thương đến các công trình.\nĐặt một số \uf6ee [accent]tường beryllium[] xung quanh súng.
 onset.enemies = Quân địch đang đến, hãy chuẩn bị phòng thủ.
-onset.defenses = [accent]Set up defenses:[lightgray] {0}
+onset.defenses = [accent]Thiết lập phòng thủ:[lightgray] {0}
 onset.attack = Quân địch đã suy yếu.\nHãy phản công.
 onset.cores = Các căn cứ có thể được đặt trên [accent]ô căn cứ[].\nCác căn cứ mới có thể được đặt ở bất kỳ đâu trên bản đồ.\nĐặt một \uf725 căn cứ.
 onset.detect = Quân địch sẽ phát hiện bạn trong vòng 2 phút.\nHãy chuẩn bị phòng thủ, khai thác và sản xuất.
 onset.commandmode = Giữ [accent]Shift[] để vào [accent]chế độ điều khiển quân[].\n[accent]Nhấp chuột trái và kéo[] để chọn các đơn vị.\n[accent]Chuộc phải[] để điều khiển các đơn vị di chuyển hoặc tấn công.
 onset.commandmode.mobile = Nhấn vào [accent]nút điều khiển[] để vào [accent]chế độ điều khiển quân[].\nGiữ một ngón tay, sau đó [accent]kéo[] để chọn các đơn vị.\n[accent]Nhấp[] để điều khiển các đơn vị di chuyển hoặc tấn công.
-aegis.tungsten = Tungsten can be mined using an [accent]impact drill[].\nThis structure requires [accent]water[] and [accent]power[].
+aegis.tungsten = Tungsten có thể khai thác bằng [accent]khoan thủy lực[].\nCông trình này cần có [accent]nước[] và [accent]năng lượng[].
 split.pickup = Một số khối có thể được mang bởi đơn vị.\nNhấp vào [accent]container[] và đặt nó lên [accent]máy nạp vật phẩm[].\n(Phím mặc định là [ và ] để mang và thả)
 split.pickup.mobile = Một số khối có thể được mang bởi đơn vị.\nNhấp vào [accent]container[] và đặt nó lên [accent]máy nạp vật phẩm[].\n(Để mang hoặc thả một khối, ấn giữ nó một chút.)
 split.acquire = Bạn cần một số tungsten để sản xuất đơn vị.
@@ -1988,7 +2029,7 @@ liquid.nitrogen.description = Được sử dụng trong khai thác tài nguyên
 liquid.neoplasm.description = Một sản phẩm phụ sinh học nguy hiểm của lò phản ứng Neoplasia. Lan nhanh sang bất kì khối chứa nước nào mà nó chạm vào và gây hư hại chúng. Nhớt.
 liquid.neoplasm.details = Neoplasm. Một khối lượng các tế bào tổng hợp phân chia nhanh chóng không kiểm soát với độ đặc giống như bùn. Kháng nhiệt. Cực kì nguy hiểm cho bất cứ khối nào có liên quan đến nước.\n\nQuá phức tạp và không ổn định để được phân tích. Chưa rõ được tiềm năng và ứng dụng của nó. Khuyến nghị đốt chúng trong xỉ nóng chảy
 
-block.derelict = \uf77e [lightgray]Không xác định
+block.derelict = \uf77e [lightgray]Bỏ hoang
 block.armored-conveyor.description = Vận chuyển vật phẩm về phía trước. Không nhận đầu vào từ phía bên cạnh.
 block.illuminator.description = Phát sáng.
 block.message.description = Lưu trữ tin nhắn giao tiếp giữa đồng đội.
@@ -2128,7 +2169,7 @@ block.additive-reconstructor.description = Nâng cấp quân của bạn lên c
 block.multiplicative-reconstructor.description = Nâng cấp quân của bạn lên cấp ba.
 block.exponential-reconstructor.description = Nâng cấp quân của bạn lên cấp bốn.
 block.tetrative-reconstructor.description = Nâng cấp quân của bạn lên cấp năm (cuối cùng).
-block.switch.description = Công tắc, trạng thái có thể được đọc và điều khiển với vi xử lý logic.
+block.switch.description = Công tắc, trạng thái có thể được đọc và điều khiển với xử lý logic.
 block.micro-processor.description = Chạy tập hợp các chỉ dẫn trong một vòng lặp, có thể dùng để điều khiển robot và công trình.
 block.logic-processor.description = Chạy tập hợp các chỉ dẫn trong một vòng lặp, có thể dùng để điều khiển robot và công trình. Nhanh hơn bộ xử lý nhỏ.
 block.hyper-processor.description = Chạy tập hợp các chỉ dẫn trong một vòng lặp, có thể dùng để điều khiển robot và công trình. Nhanh hơn bộ xử lý.
@@ -2291,10 +2332,10 @@ unit.emanate.description = Xây công trình để phòng thủ lõi Acropolis.
 lst.read = Đọc một số từ bộ nhớ được liên kết.
 lst.write = Ghi một số vào bộ nhớ được liên kết.
 lst.print = Thêm văn bản vào bộ nhớ in.\nKhông hiển thị gì cho đến khi sử dụng [accent]Print Flush[].
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
 lst.draw = Thêm một thao tác vào bộ nhớ vẽ.\nKhông hiển thị gì cho đến khi sử dụng [accent]Draw Flush[].
 lst.drawflush = Chuyển các thao tác [accent]Draw[] đến màn hình.
 lst.printflush = Chuyển các thao tác [accent]Print[] đến khối tin nhắn.
+lst.format = Thay thế kí tự giữ chỗ tiếp theo ("[accent]@[]") trong bộ đệm văn bản bằng giá trị.\nVí dụ:\n[accent]print "test @"\nformat "example"
 lst.getlink = Nhận liên kết bộ xử lý theo thứ tự. Bắt đầu từ 0.
 lst.control = Điều khiển một khối.
 lst.radar = Định vị các đơn vị trong phạm vi xung quanh một khối.
@@ -2314,8 +2355,8 @@ lst.getblock = Lấy dữ liệu từ ô từ vị trí bất kì.
 lst.setblock = Chỉnh sửa dữ liệu từ ô từ vị trí bất kì.
 lst.spawnunit = Tạo ra quân từ vị trí.
 lst.applystatus = Áp dụng hoặc loại bỏ một hiệu ứng trạng thái cho một đơn vị.
-lst.weathersense = Check if a type of weather is active.
-lst.weatherset = Set the current state of a type of weather.
+lst.weathersense = Kiểm tra kiểu thời tiết đang hoạt động.
+lst.weatherset = Thiết lập trạng thái hiện tại của kiểu thời tiết.
 lst.spawnwave = Mô phỏng một lượt xuất hiện ở vị trí tùy ý.\nSẽ không tăng số đếm lượt.
 lst.explosion = Tạo ra một vụ nổ tại vị trí đó.
 lst.setrate = Đặt tốc độ thực thi khối xử lý theo chỉ thị/tíc-tắc.
@@ -2329,45 +2370,45 @@ lst.getflag = Kiểm tra nếu cờ toàn cục được đặt.
 lst.setprop = Đặt một thuộc tính của đơn vị hoặc công trình.
 lst.effect = Tạo một phần hiệu ứng nhỏ.
 lst.sync = Đồng bộ giá trị biến qua mạng.\nChỉ gọi tối đa 10 lần mỗi giây.
-lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
-lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
-lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lst.makemarker = Tạo mới điểm đánh dấu lô-gic trên thế giới.\n Một định danh cho điểm đánh dấu này phải được cung cấp.\nĐiểm đánh dấu hiện tại bị giới hạn 20,000 trên mỗi thế giới.
+lst.setmarker = Lập một thuộc tính cho một điểm đánh dấu.\n Định danh phải giống như định danh ở chỉ dẫn lệnh Tạo Điểm đánh dấu (Make Marker).\nGiá trị [accent]null [] sẽ bị phớt lờ thay vì chuyển thành 0.
+lst.localeprint = Thêm một giá trị thuộc tính ngôn ngữ của bản đồ vào bộ đệm văn bản.\nĐể thiết đặt gói ngôn ngữ trong trình chỉnh sửa bản đồ, xem qua [accent]Thông tin bản đồ > Gói ngôn ngữ[].\nNếu máy khách là một thiết bị di động, sẽ cố in thuộc tính kết thúc bằng ".mobile" trước tiên.
 lglobal.false = 0
 lglobal.true = 1
 lglobal.null = null
-lglobal.@pi = The mathematical constant pi (3.141...)
-lglobal.@e = The mathematical constant e (2.718...)
-lglobal.@degToRad = Multiply by this number to convert degrees to radians
-lglobal.@radToDeg = Multiply by this number to convert radians to degrees
-lglobal.@time = Playtime of current save, in milliseconds
-lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
-lglobal.@second = Playtime of current save, in seconds
-lglobal.@minute = Playtime of current save, in minutes
-lglobal.@waveNumber = Current wave number, if waves are enabled
-lglobal.@waveTime = Countdown timer for waves, in seconds
-lglobal.@mapw = Map width in tiles
-lglobal.@maph = Map height in tiles
-lglobal.sectionMap = Map
-lglobal.sectionGeneral = General
-lglobal.sectionNetwork = Network/Clientside [World Processor Only]
-lglobal.sectionProcessor = Processor
-lglobal.sectionLookup = Lookup
-lglobal.@this = The logic block executing the code
-lglobal.@thisx = X coordinate of block executing the code
-lglobal.@thisy = Y coordinate of block executing the code
-lglobal.@links = Total number of blocks linked to this processors
-lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
-lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
-lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
-lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
-lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
-lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
-lglobal.@client = True if the code is running on a client connected to a server
-lglobal.@clientLocale = Locale of the client running the code. For example: en_US
-lglobal.@clientUnit = Unit of client running the code
-lglobal.@clientName = Player name of client running the code
-lglobal.@clientTeam = Team ID of client running the code
-lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+lglobal.@pi = Hằng số toán học pi (3.141...)
+lglobal.@e = Hằng số toán học e (2.718...)
+lglobal.@degToRad = Nhân với số này để chuyển từ độ (deg) sang radian (rad)
+lglobal.@radToDeg = Nhân với số này để chuyển từ radian (rad) sang độ (deg)
+lglobal.@time = Thời gian chơi của bản lưu hiện tại, tính bằng mili-giây
+lglobal.@tick = Thời gian chơi của bản lưu hiện tại, tính bằng tích-tắc (1 giây = 60 tích-tắc)
+lglobal.@second = Thời gian chơi của bản lưu hiện tại, tính bằng giây
+lglobal.@minute = Thời gian chơi của bản lưu hiện tại, tính bằng phút
+lglobal.@waveNumber = Số lượt hiện tại, nếu chế độ lượt được bật
+lglobal.@waveTime = Thời gian đếm ngược của lượt, tính bằng giây
+lglobal.@mapw = Độ rộng bản đồ, tính bằng ô
+lglobal.@maph = Độ cao bản đồ, tính bằng ô
+lglobal.sectionMap = Bản đồ
+lglobal.sectionGeneral = Chung
+lglobal.sectionNetwork = Mạng/Máy khách [Chỉ Bộ xử lý thế giới]
+lglobal.sectionProcessor = Bộ xử lý
+lglobal.sectionLookup = Tra cứu
+lglobal.@this = Khối lô-gíc đang thực thi đoạn mã
+lglobal.@thisx = Tọa độ x của khối đang thực thi đoạn mã
+lglobal.@thisy = Tọa độ y của khối đang thực thi đoạn mã
+lglobal.@links = Tổng số khối đã liên kết đến bộ xử lý này
+lglobal.@ipt = Tốc độ thực thi của bộ xử lý tính bằng lệnh mỗi tích-tắc (60 tích-tắc = 1 giây)
+lglobal.@unitCount = Tổng số kiểu mẫu đơn vị trong trò chơi; được dùng với lệnh tra cứu
+lglobal.@blockCount = Tổng số kiểu mẫu khối trong trò chơi; được dùng với lệnh tra cứu
+lglobal.@itemCount = Tổng số kiểu mẫu vật phẩm trong trò chơi; được dùng với lệnh tra cứu
+lglobal.@liquidCount = Tổng số kiểu mẫu chất lỏng trong trò chơi; được dùng với lệnh tra cứu
+lglobal.@server = True nếu đoạn mã chạy trên máy chủ hoặc chơi đơn, ngược lại là false
+lglobal.@client = True nếu đoạn mã chạy trên máy khách được kết nối đến máy chủ
+lglobal.@clientLocale = Ngôn ngữ của máy khách đang chạy đoạn mã. Ví dụ: vi_VN
+lglobal.@clientUnit = Đơn vị máy khách đang chạy đoạn mã
+lglobal.@clientName = Tên người chơi của máy khách đang chạy đoạn mã
+lglobal.@clientTeam = Định danh đội của máy khách đang chạy đoạn mã
+lglobal.@clientMobile = True nếu máy khách đang chạy đoạn mã trên thiết bị di động, ngược lại là false
 
 logic.nounitbuild = [red]Lô-gíc xây dựng đơn vị không được phép ở đây.
 
@@ -2410,7 +2451,7 @@ graphicstype.poly = Tô vào đa giác đều.
 graphicstype.linepoly = Vẽ đường viền đa giác đều.
 graphicstype.triangle = Tô một hình tam giác.
 graphicstype.image = Vẽ hình ảnh một số nội dung.\nVí dụ: [accent]@router[] hoặc [accent]@dagger[].
-graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+graphicstype.print = Vẽ văn bản từ bộ đệm in ra.\nLàm sạch bộ đệm.
 
 lenum.always = Luôn đúng.
 lenum.idiv = Chia lấy phần nguyên.
@@ -2519,10 +2560,10 @@ lenum.build = Xây công trình.
 lenum.getblock = Lấy một cấu trúc và kiểu tại một tọa độ.\nĐơn vị phải nằm trong tầm của vị trí.\nKhối rắn không phải công trình có kiểu [accent]@solid[].
 lenum.within = Kiểm tra xem đơn vị có gần vị trí không.
 lenum.boost = Bắt đầu/Dừng tăng tốc.
-lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
-lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
-lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
-lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
-lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
-lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
-lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.flushtext = Lấp đầy nội dung của bộ đệm cho điểm đánh dấu, nếu có thể áp dụng.\n Nếu [accent]fetch[] gắn là [accent]true[], sẽ cố truy vấn các thuộc tính từ gói ngôn ngữ của bản đồ hoặc trò chơi.
+lenum.texture = Tên kết cấu lấy thẳng từ bản khung kết cấu của trò chơi (dùng kiểu tên kebab-case, tên-chữ-thường-chứa-gạch-nối).\nNếu printFlush gán bằng true, sẽ sử dụng nội dung bộ đệm văn bản làm tham số văn bản.
+lenum.texturesize = Kích thước của kết cấu bằng ô. Giá trị 0 chia tỷ lệ chiều rộng của điểm đánh dấu theo kích thước của kết cấu ban đầu.
+lenum.autoscale = Có chia tỷ lệ điểm đánh dấu tương ứng với mức thu phóng của người chơi hay không.
+lenum.posi = Vị trí theo chỉ số, dùng cho điểm đánh dấu đường kẻ (line) và bốn điểm (quad) với 0 là vị trí đầu tiên.
+lenum.uvi = Vị trí của kết cấu trong phạm vi từ 0 đến 1, dùng cho đánh dấu bốn điểm (quad).
+lenum.colori = Màu theo chỉ số, dùng cho điểm đánh dấu đường kẻ (line) và bốn điểm (quad) với 0 là màu đầu tiên.
\ No newline at end of file

From a14e8d61898456b20bfc0a87c6d6b1032e619c9a Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az665-543.fog2pefswkletp0y445k1dqqob.bx.internal.cloudapp.net>
Date: Sun, 31 Mar 2024 03:25:10 +0000
Subject: [PATCH 319/369] Automatic bundle update

---
 core/assets/bundles/bundle_vi.properties | 45 ++----------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index e8be02a566..393ff981cb 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -986,46 +986,6 @@ stat.immunities = Miễn nhiễm
 stat.healing = Sửa chữa
 
 ability.forcefield = Tạo khiên
-ability.forcefield.description = Phát một khiên trường lực hấp thụ các loại đạn
-ability.repairfield = Sửa chữa/Xây dựng
-ability.repairfield.description = Sửa chữa các đơn vị gần đó
-ability.statusfield = Vùng gia tốc
-ability.statusfield.description = Áp dụng hiệu ứng trạng thái vào các đơn vị gần đó
-ability.unitspawn = Sản xuất
-ability.unitspawn.description = Sản xuất đơn vị
-ability.shieldregenfield = Tạo khiên nhỏ
-ability.shieldregenfield.description = Tạo khiên cho các đơn vị gần đó
-ability.movelightning = Phóng điện khi di chuyển
-ability.movelightning.description = Giải phóng tia điện khi di chuyển
-ability.armorplate = Mảnh giáp
-ability.armorplate.description = Giảm sát thương gánh chịu trong khi bắn
-ability.shieldarc = Khiên vòng cung
-ability.shieldarc.description = Phát một khiên trường lực vòng cung hấp thụ các loại đạn
-ability.suppressionfield = Ngăn chặn sửa chữa
-ability.suppressionfield.description = Ngăn chặn các công trình sửa chữa
-ability.energyfield = Trường điện từ
-ability.energyfield.description = Giật điện các kẻ thù gần đó
-ability.energyfield.healdescription = Giật điện các kẻ thù gần đó và hồi phục đồng minh
-ability.regen = Hồi phục
-ability.regen.description = Tự hồi phục theo thời gian
-ability.liquidregen = Hấp thụ chất lỏng
-ability.liquidregen.description = Hấp thụ chất lỏng để tự hồi phục
-ability.spawndeath = Chết sản sinh
-ability.spawndeath.description = Sinh ra đơn vị khi chết
-ability.liquidexplode = Chết tràn dịch
-ability.liquidexplode.description = Tràn chất lỏng khi chết
-ability.stat.firingrate = tốc bắn [stat]{0}/giây[lightgray]
-ability.stat.regen = [stat]{0}[lightgray] độ bền/giây
-ability.stat.shield = [stat]{0}[lightgray] khiên
-ability.stat.repairspeed = [stat]{0}/giây[lightgray] tốc độ sửa chữa
-ability.stat.slurpheal = [stat]{0}[lightgray] độ bền/đơn vị chất lỏng
-ability.stat.cooldown = [stat]{0} giây[lightgray] hồi chiêu
-ability.stat.maxtargets = [stat]{0}[lightgray] mục tiêu tối đa
-ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] số lượng sửa chữa cùng kiểu
-ability.stat.damagereduction = [stat]{0}%[lightgray] giảm sát thương
-ability.stat.minspeed = tốc độ tối thiểu [stat]{0} ô/giây[lightgray]
-ability.stat.duration = thời hạn [stat]{0} giây[lightgray]
-ability.stat.buildtime = thời gian xây [stat]{0} giây[lightgray]
 ability.forcefield.description = Projects a force shield that absorbs bullets
 ability.repairfield = Sửa chữa/Xây dựng
 ability.repairfield.description = Repairs nearby units
@@ -1367,7 +1327,6 @@ rules.unitdamagemultiplier = Hệ số sát thương của đơn vị
 rules.unitcrashdamagemultiplier = Hệ số sát thương của đơn vị khi bị bắn rơi
 rules.solarmultiplier = Hệ số năng lượng mặt trời
 rules.unitcapvariable = Căn cứ tăng giới hạn đơn vị
-rules.unitpayloadsexplode = Khối hàng mang theo phát nổ cùng đơn vị
 rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
 rules.unitcap = Giới hạn đơn vị
 rules.limitarea = Giới hạn kích thước bản đồ
@@ -2332,10 +2291,10 @@ unit.emanate.description = Xây công trình để phòng thủ lõi Acropolis.
 lst.read = Đọc một số từ bộ nhớ được liên kết.
 lst.write = Ghi một số vào bộ nhớ được liên kết.
 lst.print = Thêm văn bản vào bộ nhớ in.\nKhông hiển thị gì cho đến khi sử dụng [accent]Print Flush[].
+lst.format = Thay thế kí tự giữ chỗ tiếp theo ("[accent]@[]") trong bộ đệm văn bản bằng giá trị.\nVí dụ:\n[accent]print "test @"\nformat "example"
 lst.draw = Thêm một thao tác vào bộ nhớ vẽ.\nKhông hiển thị gì cho đến khi sử dụng [accent]Draw Flush[].
 lst.drawflush = Chuyển các thao tác [accent]Draw[] đến màn hình.
 lst.printflush = Chuyển các thao tác [accent]Print[] đến khối tin nhắn.
-lst.format = Thay thế kí tự giữ chỗ tiếp theo ("[accent]@[]") trong bộ đệm văn bản bằng giá trị.\nVí dụ:\n[accent]print "test @"\nformat "example"
 lst.getlink = Nhận liên kết bộ xử lý theo thứ tự. Bắt đầu từ 0.
 lst.control = Điều khiển một khối.
 lst.radar = Định vị các đơn vị trong phạm vi xung quanh một khối.
@@ -2566,4 +2525,4 @@ lenum.texturesize = Kích thước của kết cấu bằng ô. Giá trị 0 chi
 lenum.autoscale = Có chia tỷ lệ điểm đánh dấu tương ứng với mức thu phóng của người chơi hay không.
 lenum.posi = Vị trí theo chỉ số, dùng cho điểm đánh dấu đường kẻ (line) và bốn điểm (quad) với 0 là vị trí đầu tiên.
 lenum.uvi = Vị trí của kết cấu trong phạm vi từ 0 đến 1, dùng cho đánh dấu bốn điểm (quad).
-lenum.colori = Màu theo chỉ số, dùng cho điểm đánh dấu đường kẻ (line) và bốn điểm (quad) với 0 là màu đầu tiên.
\ No newline at end of file
+lenum.colori = Màu theo chỉ số, dùng cho điểm đánh dấu đường kẻ (line) và bốn điểm (quad) với 0 là màu đầu tiên.

From 45bdceb7fba0425f41a386f88b5afa5a0403785e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 30 Mar 2024 23:32:19 -0400
Subject: [PATCH 320/369] Update bundle_vi.properties

---
 core/assets/bundles/bundle_vi.properties | 70 ++++++++++++------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 393ff981cb..377ce2fff4 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -986,46 +986,46 @@ stat.immunities = Miễn nhiễm
 stat.healing = Sửa chữa
 
 ability.forcefield = Tạo khiên
-ability.forcefield.description = Projects a force shield that absorbs bullets
+ability.forcefield.description = Phát một khiên trường lực hấp thụ các loại đạn
 ability.repairfield = Sửa chữa/Xây dựng
-ability.repairfield.description = Repairs nearby units
+ability.repairfield.description = Sửa chữa các đơn vị gần đó
 ability.statusfield = Vùng gia tốc
-ability.statusfield.description = Applies a status effect to nearby units
+ability.statusfield.description = Áp dụng hiệu ứng trạng thái vào các đơn vị gần đó
 ability.unitspawn = Sản xuất
-ability.unitspawn.description = Constructs units
+ability.unitspawn.description = Sản xuất đơn vị
 ability.shieldregenfield = Tạo khiên nhỏ
-ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.shieldregenfield.description = Tạo khiên cho các đơn vị gần đó
 ability.movelightning = Phóng điện khi di chuyển
-ability.movelightning.description = Releases lightning while moving
-ability.armorplate = Armor Plate
-ability.armorplate.description = Reduces damage taken while shooting
-ability.shieldarc = Khiên Vòng Cung
-ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
-ability.suppressionfield = Trường sửa chữa
-ability.suppressionfield.description = Stops nearby repair buildings
+ability.movelightning.description = Giải phóng tia điện khi di chuyển
+ability.armorplate = Mảnh giáp
+ability.armorplate.description = Giảm sát thương gánh chịu trong khi bắn
+ability.shieldarc = Khiên vòng cung
+ability.shieldarc.description = Phát một khiên trường lực vòng cung hấp thụ các loại đạn
+ability.suppressionfield = Ngăn chặn sửa chữa
+ability.suppressionfield.description = Ngăn chặn các công trình sửa chữa
 ability.energyfield = Trường điện từ
-ability.energyfield.description = Zaps nearby enemies
-ability.energyfield.healdescription = Zaps nearby enemies and heals allies
-ability.regen = Regeneration
-ability.regen.description = Regenerates own health over time
-ability.liquidregen = Liquid Absorption
-ability.liquidregen.description = Absorbs liquid to heal itself
-ability.spawndeath = Death Spawns
-ability.spawndeath.description = Releases units on death
-ability.liquidexplode = Death Spillage
-ability.liquidexplode.description = Spills liquid on death
-ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
-ability.stat.regen = [stat]{0}[lightgray] health/sec
-ability.stat.shield = [stat]{0}[lightgray] shield
-ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
-ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
-ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
-ability.stat.maxtargets = [stat]{0}[lightgray] max targets
-ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
-ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
-ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
-ability.stat.duration = [stat]{0} sec[lightgray] duration
-ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+ability.energyfield.description = Giật điện các kẻ thù gần đó
+ability.energyfield.healdescription = Giật điện các kẻ thù gần đó và hồi phục đồng minh
+ability.regen = Hồi phục
+ability.regen.description = Tự hồi phục theo thời gian
+ability.liquidregen = Hấp thụ chất lỏng
+ability.liquidregen.description = Hấp thụ chất lỏng để tự hồi phục
+ability.spawndeath = Chết sản sinh
+ability.spawndeath.description = Sinh ra đơn vị khi chết
+ability.liquidexplode = Chết tràn dịch
+ability.liquidexplode.description = Tràn chất lỏng khi chết
+ability.stat.firingrate = tốc bắn [stat]{0}/giây[lightgray]
+ability.stat.regen = [stat]{0}[lightgray] độ bền/giây
+ability.stat.shield = [stat]{0}[lightgray] khiên
+ability.stat.repairspeed = [stat]{0}/giây[lightgray] tốc độ sửa chữa
+ability.stat.slurpheal = [stat]{0}[lightgray] độ bền/đơn vị chất lỏng
+ability.stat.cooldown = [stat]{0} giây[lightgray] hồi chiêu
+ability.stat.maxtargets = [stat]{0}[lightgray] mục tiêu tối đa
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] số lượng sửa chữa cùng kiểu
+ability.stat.damagereduction = [stat]{0}%[lightgray] giảm sát thương
+ability.stat.minspeed = tốc độ tối thiểu [stat]{0} ô/giây[lightgray]
+ability.stat.duration = thời hạn [stat]{0} giây[lightgray]
+ability.stat.buildtime = thời gian xây [stat]{0} giây[lightgray]
 bar.onlycoredeposit = Chỉ có thể đưa vào căn cứ
 
 bar.drilltierreq = Cần máy khoan tốt hơn
@@ -1327,7 +1327,7 @@ rules.unitdamagemultiplier = Hệ số sát thương của đơn vị
 rules.unitcrashdamagemultiplier = Hệ số sát thương của đơn vị khi bị bắn rơi
 rules.solarmultiplier = Hệ số năng lượng mặt trời
 rules.unitcapvariable = Căn cứ tăng giới hạn đơn vị
-rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitpayloadsexplode = Khối hàng mang theo phát nổ cùng đơn vị
 rules.unitcap = Giới hạn đơn vị
 rules.limitarea = Giới hạn kích thước bản đồ
 rules.enemycorebuildradius = Bán kính không xây dựng trong căn cứ của kẻ địch:[lightgray] (ô)

From 40cd2fd27605029151a446d0d0bffb6a27fa355c Mon Sep 17 00:00:00 2001
From: FelixDesyatirikov <53256666+FelixDes@users.noreply.github.com>
Date: Sun, 31 Mar 2024 23:16:58 +0300
Subject: [PATCH 321/369] Fix pause toggling (#9696)

---
 server/src/mindustry/server/ServerControl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java
index 8462871083..44e12c76f8 100644
--- a/server/src/mindustry/server/ServerControl.java
+++ b/server/src/mindustry/server/ServerControl.java
@@ -527,7 +527,7 @@ public class ServerControl implements ApplicationListener{
             }
             boolean pause = arg[0].equals("on");
             autoPaused = false;
-            state.set(state.isPaused() ? State.playing : State.paused);
+            state.set(pause ? State.paused : State.playing);
             info(pause ? "Game paused." : "Game unpaused.");
         });
 

From b2b29d3900f439c8abe8e782688f9eb662e0bbcf Mon Sep 17 00:00:00 2001
From: c6b2qb5g <160118416+c6b2qb5g@users.noreply.github.com>
Date: Mon, 1 Apr 2024 04:52:52 +0700
Subject: [PATCH 322/369] Update servers_v7.json (#9698)

* Update servers_v7.json

* Update servers_v7.json
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index d62c916a04..430814f6c4 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -295,7 +295,7 @@
   },
   {
     "name": "NPTS",
-    "address": ["77.87.215.102:26863"]
+    "address": ["94.198.54.132:26863"]
   },
   {
     "name": "Skywar.VN",

From dd083061b5b9a0746c27e3650f3ab71d098a805a Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Mon, 1 Apr 2024 04:53:22 +0700
Subject: [PATCH 323/369] Update servers_v7.json (#9697)

delete abcxyz ip and replace it with a completely new ip
---
 servers_v7.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index 430814f6c4..56f07af980 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -242,8 +242,8 @@
     "address": ["play.3midustry.xyz:6001", "play.3midustry.xyz:6002", "play.3midustry.xyz:6003", "play.3midustry.xyz:6004", "play.3midustry.xyz:6005", "play.3midustry.xyz:6006", "play.3midustry.xyz:6007", "play.3midustry.xyz:6008", "play.3midustry.xyz:6009", "play.3midustry.xyz:6010"]
   },
   {
-    "name": "ABCXYZ Community",
-    "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269", "144.76.57.59:24235", "144.76.57.59:24133", "51.81.57.217:24902"]
+    "name": "Siege Siege",
+    "address": ["157.90.4.54:25421"]
   },
   {
     "name": "CroCraft Network",

From 3f6deea7197321dab390cd432c7abe706f78d874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=85=AA=E6=A1=A6=E5=A7=AC?=
 <147405396+LaoHuaJiOfficial@users.noreply.github.com>
Date: Mon, 1 Apr 2024 22:30:14 +0800
Subject: [PATCH 324/369] Update bundle_zh_CN.properties(ready to merge)
 (#9690)

* Update bundle_zh_CN.properties(ready to merge)

* small fix

* translation fix

* small fix and done
---
 core/assets/bundles/bundle_zh_CN.properties | 379 ++++++++++----------
 1 file changed, 191 insertions(+), 188 deletions(-)

diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index ddd3e316d9..0ec1c2bb1c 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -152,17 +152,17 @@ mod.incompatiblemod = [red]不兼容
 mod.blacklisted = [red]不支持
 mod.unmetdependencies = [red]缺少前置模组
 mod.erroredcontent = [scarlet]内容错误
-mod.circulardependencies = [red]Circular Dependencies
-mod.incompletedependencies = [red]Incomplete Dependencies
+mod.circulardependencies = [red]循环依赖
+mod.incompletedependencies = [red]缺失依赖
 
-mod.requiresversion.details = 所需的最低游戏版本：[accent]{0}[]\n您的游戏版本过低。 这个模组需要更新的游戏版本（通常是beta/alpha版本）才能工作。
-mod.outdatedv7.details = 这个模组与最新版游戏不兼容。 作者必须更新它，并在[accent]mod.json[]文件中写入[accent]minGameVersion: 136[]。
-mod.blacklisted.details = 这个模组由于造成该版本游戏崩溃或其他原因被手动禁用了。 不要使用它。
+mod.requiresversion.details = 所需的最低游戏版本：[accent]{0}[]\n您的游戏版本过低。 此模组需要更新的游戏版本（通常是beta/alpha版本）才能工作。
+mod.outdatedv7.details = 此模组与最新版游戏不兼容。 作者必须更新它，并在[accent]mod.json[]文件中写入[accent]minGameVersion: 136[]。
+mod.blacklisted.details = 此模组由于造成该版本游戏崩溃或其他原因被手动禁用了。 不要使用它。
 mod.missingdependencies.details = 缺少前置模组：{0}
-mod.erroredcontent.details = 这个模组在游戏加载时发生了错误。 请通知模组作者修复它。
-mod.circulardependencies.details = This mod has dependencies that depends on each other.
-mod.incompletedependencies.details = This mod is unable to be loaded due to invalid or missing dependencies: {0}.
-mod.requiresversion = Requires game version: [red]{0}
+mod.erroredcontent.details = 此模组在游戏加载时发生了错误。 请通知模组作者修复它。
+mod.circulardependencies.details = 此模组与其他模组相互依赖。
+mod.incompletedependencies.details = 由于依赖项无效或缺失，此模组无法加载：{0}.
+mod.requiresversion = 需要游戏版本: [red]{0}
 
 mod.errors = 读取内容时发生错误。
 mod.noerrorplay = [scarlet]您的模组发生了错误。 []禁用相关模组或修复错误后才能进入游戏。
@@ -258,19 +258,19 @@ trace = 跟踪玩家
 trace.playername = 玩家名称：[accent]{0}
 trace.ip = IP地址：[accent]{0}
 trace.id = 玩家 ID：[accent]{0}
-trace.language = Language: [accent]{0}
+trace.language = 语言: [accent]{0}
 trace.mobile = 移动客户端：[accent]{0}
 trace.modclient = 自定义客户端：[accent]{0}
 trace.times.joined = 进入服务器次数: [accent]{0}
 trace.times.kicked = 踢出服务器次数: [accent]{0}
-trace.ips = IPs:
-trace.names = Names:
+trace.ips = 曾用IP:
+trace.names = 曾用名:
 invalidid = 无效的客户端ID！提交一个错误报告。
-player.ban = Ban
-player.kick = Kick
-player.trace = Trace
-player.admin = Toggle Admin
-player.team = Change Team
+player.ban = 封禁
+player.kick = 踢出
+player.trace = 追朔
+player.admin = 切换管理员
+player.team = 改变队伍
 server.bans = 黑名单
 server.bans.none = 没有被封禁的玩家！
 server.admins = 管理员
@@ -287,8 +287,8 @@ confirmkick = 确定踢出玩家“{0}[white]”？
 confirmunban = 确定解封这名玩家？
 confirmadmin = 确定给予玩家“{0}[white]”管理员权限？
 confirmunadmin = 确定收回玩家“{0}[white]”的管理员权限？
-votekick.reason = Vote-Kick Reason
-votekick.reason.message = Are you sure you want to vote-kick "{0}[white]"?\nIf yes, please enter the reason:
+votekick.reason = 投票踢出理由
+votekick.reason.message = 确定投票踢出玩家"{0}[white]"?\n如果是，请输入理由：
 joingame.title = 加入游戏
 joingame.ip = 地址：
 disconnect = 已断开连接
@@ -306,7 +306,7 @@ server.invalidport = 无效的端口！
 server.error = [scarlet]创建服务器错误。
 save.new = 新存档
 save.overwrite = 确定要覆盖这个存档吗？
-save.nocampaign = Individual save files from the campaign cannot be imported.
+save.nocampaign = 无法导入战役中的单个保存文件。
 overwrite = 覆盖
 save.none = 没有找到存档！
 savefail = 保存失败！
@@ -344,23 +344,23 @@ open = 打开
 customize = 自定义规则
 cancel = 取消
 command = 指挥
-command.queue = [lightgray][Queuing]
+command.queue = [lightgray][排队中]
 command.mine = 挖矿
 command.repair = 维修
 command.rebuild = 重建
 command.assist = 协助建造
 command.move = 移动
-command.boost = Boost
-command.enterPayload = Enter Payload Block
-command.loadUnits = Load Units
-command.loadBlocks = Load Blocks
-command.unloadPayload = Unload Payload
-stance.stop = Cancel Orders
-stance.shoot = Stance: Shoot
-stance.holdfire = Stance: Hold Fire
-stance.pursuetarget = Stance: Pursue Target
-stance.patrol = Stance: Patrol Path
-stance.ram = Stance: Ram\n[lightgray]Straight line movement, no pathfinding
+command.boost = 助推
+command.enterPayload = 进入载荷建筑
+command.loadUnits = 拾取单位
+command.loadBlocks = 拾取建筑
+command.unloadPayload = 卸载载荷
+stance.stop = 取消指令
+stance.shoot = 姿态: 射击
+stance.holdfire = 姿态: 停火
+stance.pursuetarget = 姿态: 追逐目标
+stance.patrol = 姿态: 路径巡逻
+stance.ram = 姿态: 冲锋\n[lightgray]径直移动，不进行寻路。
 openlink = 打开链接
 copylink = 复制链接
 back = 返回
@@ -386,8 +386,8 @@ pausebuilding = 按[accent][[{0}][]键暂停建造
 resumebuilding = 按[scarlet][[{0}][]键恢复建造
 enablebuilding = 按[scarlet][[{0}][]键启用建造
 showui = UI已隐藏\n按[accent][[{0}][]键显示UI
-commandmode.name = [accent]Command Mode
-commandmode.nounits = [no units]
+commandmode.name = [accent]指挥模式
+commandmode.nounits = [无单位]
 wave = [accent]第{0}波
 wave.cap = [accent]波次 {0}/{1}
 wave.waiting = [lightgray]下一波倒计时：{0}秒
@@ -441,7 +441,7 @@ editor.waves = 波次
 editor.rules = 规则
 editor.generation = 生成
 editor.objectives = 目标
-editor.locales = Locale Bundles
+editor.locales = 本地化语言包
 editor.ingame = 游戏内编辑
 editor.playtest = 游戏内测试
 editor.publish.workshop = 上传到创意工坊
@@ -473,7 +473,7 @@ waves.max = 最大单位数
 waves.guardian = Boss
 waves.preview = 预览
 waves.edit = 编辑…
-waves.random = Random
+waves.random = 随机
 waves.copy = 复制到剪贴板
 waves.load = 从剪贴板读取
 waves.invalid = 剪贴板中的波次信息无效。
@@ -484,12 +484,12 @@ waves.sort.reverse = 反向排序
 waves.sort.begin = 出场顺序
 waves.sort.health = 生命值
 waves.sort.type = 类型
-waves.search = Search waves...
-waves.filter = Unit Filter
+waves.search = 搜索波次...
+waves.filter = 单位过滤器
 waves.units.hide = 全部隐藏
 waves.units.show = 全部显示
 
-#these are intentionally in lower case（中文无关）
+#these are intentionally in lower case
 wavemode.counts = 数目
 wavemode.totals = 总数
 wavemode.health = 生命值
@@ -498,7 +498,7 @@ editor.default = [lightgray]<默认>
 details = 详情…
 edit = 编辑…
 variables = 变量
-logic.globals = Built-in Variables
+logic.globals = 内置变量
 editor.name = 名称：
 editor.spawn = 生成单位
 editor.removeunit = 移除单位
@@ -510,7 +510,7 @@ editor.errorlegacy = 此地图太旧了，旧的地图格式已不再支持。
 editor.errornot = 这不是地图文件。
 editor.errorheader = 此地图文件无效或已损坏。
 editor.errorname = 地图没有定义名称。 加载的可能是存档文件？
-editor.errorlocales = Error reading invalid locale bundles.
+editor.errorlocales = 读取无效本地化语言包时出错。
 editor.update = 更新
 editor.randomize = 重新生成
 editor.moveup = 上移
@@ -522,7 +522,7 @@ editor.sectorgenerate = 生成区块
 editor.resize = 改变尺寸
 editor.loadmap = 载入地图
 editor.savemap = 保存地图
-editor.savechanges = [scarlet]You have unsaved changes!\n\n[]Do you want to save them?
+editor.savechanges = [scarlet]您有未保存的更改！\n\n[]您想要保存他们吗？
 editor.saved = 已保存！
 editor.save.noname = 您还没有指定地图的名称！在“地图信息”菜单里设置一个名称。
 editor.save.overwrite = 您正试图覆盖一张内置地图！在“地图信息”菜单里重新设置一个其他的名称。
@@ -561,8 +561,8 @@ toolmode.eraseores = 擦除矿脉
 toolmode.eraseores.description = 仅擦除矿脉，不影响其他物体。
 toolmode.fillteams = 填充队伍
 toolmode.fillteams.description = 不再填充方块，而是填充队伍颜色。
-toolmode.fillerase = Fill Erase
-toolmode.fillerase.description = Erase blocks of the same type.
+toolmode.fillerase = 擦除同类
+toolmode.fillerase.description = 擦除同种种类的方块。
 toolmode.drawteams = 绘制队伍
 toolmode.drawteams.description = 不再绘制方块，而是绘制队伍颜色。
 #未使用
@@ -610,23 +610,23 @@ filter.option.floor2 = 内层地形
 filter.option.threshold2 = 内层比例
 filter.option.radius = 半径
 filter.option.percentile = 百分比
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
-locales.deletelocale = Are you sure you want to delete this locale bundle?
-locales.applytoall = Apply Changes To All Locales
-locales.addtoother = Add To Other Locales
-locales.rollback = Rollback to last applied
-locales.filter = Property filter
-locales.searchname = Search name...
-locales.searchvalue = Search value...
-locales.searchlocale = Search locale...
-locales.byname = By name
-locales.byvalue = By value
-locales.showcorrect = Show properties that are present in all locales and have unique values everywhere
-locales.showmissing = Show properties that are missing in some locales
-locales.showsame = Show properties that have same values in different locales
-locales.viewproperty = View in all locales
-locales.viewing = Viewing property "{0}"
-locales.addicon = Add Icon
+locales.info = 在这里，您可以为特定语言添加本地化语言包到您的地图中。在本地化语言包中，每个文本属性都有一个名称和一个值。这些文本属性可以由世界处理器和游戏目标使用它们的名称。它们支持文本格式化（用实际值替换占位符）。\n\n[cyan]示例文本属性：\n[]名称: [accent]timer[]\值: [accent]示例计时器, 剩余时间: @[]\n\n[cyan]用法:\n[]将其设置为目标的文本: [accent]@timer\n\n[]在世界处理器中打印它：\n[accent]localeprint "timer"\n格式化时间\n[gray](时间是一个单独计算的变量)
+locales.deletelocale = 您确定要删除该本地化语言包吗？
+locales.applytoall = 将更改应用于所有本地化语言包
+locales.addtoother = 添加到其他本地化语言包
+locales.rollback = 回滚到上次应用的状态
+locales.filter = 文本属性过滤器
+locales.searchname = 搜索名称...
+locales.searchvalue = 搜索值...
+locales.searchlocale = 搜索本地化...
+locales.byname = 按名称
+locales.byvalue = 按值
+locales.showcorrect = 显示所有本地化语言包中存在并且在所有地方具有唯一值的文本属性
+locales.showmissing = 显示在某些本地化语言包中缺失的文本属性
+locales.showsame = 显示在不同本地化语言包中具有相同值的文本属性
+locales.viewproperty = 在所有本地化语言包中查看
+locales.viewing = 查看文本属性 "{0}"
+locales.addicon = 添加图标
 
 width = 宽度：
 height = 高度：
@@ -679,11 +679,11 @@ objective.commandmode.name = 指挥模式
 objective.flag.name = 标签
 
 marker.shapetext.name = 带形状文本
-marker.point.name = Point
+marker.point.name = 点
 marker.shape.name = 形状
 marker.text.name = 文本
-marker.line.name = Line
-marker.quad.name = Quad
+marker.line.name = 线
+marker.quad.name = 四边形
 
 marker.background = 背景
 marker.outline = 轮廓
@@ -771,8 +771,8 @@ sector.curlost = 区块已丢失
 sector.missingresources = [scarlet]建造核心所需资源不足
 sector.attacked = 区块[accent]{0}[white]受到攻击！
 sector.lost = 区块[accent]{0}[white]已丢失！
-sector.capture = Sector [accent]{0}[white]Captured!
-sector.capture.current = Sector Captured!
+sector.capture = 区块[accent]{0}[white]已占领!
+sector.capture.current = 区块已占领!
 sector.changeicon = 更改图标
 sector.noswitch.title = 无法切换区块
 sector.noswitch = 你无法在当前区块遭受攻击时切换区块。\n\n区块：[accent]{0}[]位于[accent]{1}[]
@@ -947,7 +947,7 @@ stat.repairspeed = 修理速度
 stat.weapons = 武器
 stat.bullet = 子弹
 stat.moduletier = 模块等级
-stat.unittype = Unit Type
+stat.unittype = 单位类型
 stat.speedincrease = 提速
 stat.range = 范围
 stat.drilltier = 可钻探矿物
@@ -994,46 +994,47 @@ stat.immunities = 免疫
 stat.healing = 治疗
 
 ability.forcefield = 力墙场
-ability.forcefield.description = Projects a force shield that absorbs bullets
+ability.forcefield.description = 投射一个能吸收子弹的力场护盾
 ability.repairfield = 修复场
-ability.repairfield.description = Repairs nearby units
+ability.repairfield.description = 修复附近的单位
 ability.statusfield = 状态场
-ability.statusfield.description = Applies a status effect to nearby units
-ability.unitspawn = 单位工厂
-ability.unitspawn.description = Constructs units
+ability.statusfield.description = 对附近的单位施加状态效果
+ability.unitspawn = 单位生成
+ability.unitspawn.description = 建造单位
 ability.shieldregenfield = 护盾再生场
-ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.shieldregenfield.description = 再生附近单位的护盾
 ability.movelightning = 闪电助推器
-ability.movelightning.description = Releases lightning while moving
-ability.armorplate = Armor Plate
-ability.armorplate.description = Reduces damage taken while shooting
+ability.movelightning.description = 移动时释放闪电
+ability.armorplate = 装甲板
+ability.armorplate.description = 在射击时减少受到的伤害
 ability.shieldarc = 弧形护盾
-ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.shieldarc.description = 投射一个弧形的力场护盾，能吸收子弹
 ability.suppressionfield = 修复压制场
-ability.suppressionfield.description = Stops nearby repair buildings
-ability.energyfield = 能量场：
-ability.energyfield.description = Zaps nearby enemies
-ability.energyfield.healdescription = Zaps nearby enemies and heals allies
-ability.regen = Regeneration
-ability.regen.description = Regenerates own health over time
-ability.liquidregen = Liquid Absorption
-ability.liquidregen.description = Absorbs liquid to heal itself
-ability.spawndeath = Death Spawns
-ability.spawndeath.description = Releases units on death
-ability.liquidexplode = Death Spillage
-ability.liquidexplode.description = Spills liquid on death
-ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
-ability.stat.regen = [stat]{0}[lightgray] health/sec
-ability.stat.shield = [stat]{0}[lightgray] shield
-ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
-ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
-ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
-ability.stat.maxtargets = [stat]{0}[lightgray] max targets
-ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
-ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
-ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
-ability.stat.duration = [stat]{0} sec[lightgray] duration
-ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+ability.suppressionfield.description = 使附近的修复建筑停止工作
+ability.energyfield = 能量场
+ability.energyfield.description = 对附近的敌人释放电击
+ability.energyfield.healdescription = 对附近的敌人释放电击，并治疗友方
+ability.regen = 再生
+ability.regen.description = 随着时间的推移恢复自己的生命值
+ability.liquidregen = 液体吸收
+ability.liquidregen.description = 吸收液体以治疗自身
+ability.spawndeath = 死亡产生单位
+ability.spawndeath.description = 死亡时释放单位
+ability.liquidexplode = 死亡溢液
+ability.liquidexplode.description = 死亡时释放液体
+ability.stat.firingrate = [stat]{0}/秒[lightgray] 射速
+ability.stat.regen = [stat]{0}/秒[lightgray] 生命恢复速度
+ability.stat.shield = [stat]{0}[lightgray] 护盾
+ability.stat.repairspeed = [stat]{0}/秒[lightgray] 修复速度
+ability.stat.slurpheal = [stat]{0}[lightgray] 生命/液体单位
+ability.stat.cooldown = [stat]{0} 秒[lightgray] 冷却时间
+ability.stat.maxtargets = [stat]{0}[lightgray] 最大目标数
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] 同类型修复量
+ability.stat.damagereduction = [stat]{0}%[lightgray] 伤害减免
+ability.stat.minspeed = [stat]{0} 格/秒[lightgray] 最低速度
+ability.stat.duration = [stat]{0} 秒[lightgray] 持续时间
+ability.stat.buildtime = [stat]{0} 秒[lightgray] 建造时间
+
 
 bar.onlycoredeposit = 仅核心可丢入资源
 bar.drilltierreq = 需要更高级的钻头
@@ -1073,9 +1074,9 @@ bullet.splashdamage = [stat]{0}[lightgray]范围伤害~[stat] {1}[lightgray]格
 bullet.incendiary = [stat]燃烧
 bullet.homing = [stat]追踪
 bullet.armorpierce = [stat]穿甲
-bullet.maxdamagefraction = [stat]{0}%[lightgray] damage limit
-bullet.suppression = [stat]{0} sec[lightgray] repair suppression ~ [stat]{1}[lightgray] tiles
-bullet.interval = [stat]{0}/sec[lightgray] interval bullets:
+bullet.maxdamagefraction = [stat]{0}%[lightgray] 伤害上限
+bullet.suppression = [stat]{0}秒[lightgray] 修复压制 ~ [stat]{1}[lightgray] 格
+bullet.interval = [stat]{0}/秒[lightgray] 分裂子弹：
 bullet.frags = [stat]{0}[lightgray]x分裂子弹：
 bullet.lightning = [stat]{0}[lightgray]x闪电~[stat]{1}[lightgray]伤害
 bullet.buildingdamage = [stat]{0}%[lightgray]对建筑伤害
@@ -1129,7 +1130,7 @@ setting.backgroundpause.name = 游戏在后台时自动暂停
 setting.buildautopause.name = 自动暂停建造
 setting.doubletapmine.name = 双击采矿
 setting.commandmodehold.name = 长按保持指挥模式
-setting.distinctcontrolgroups.name = Limit One Control Group Per Unit 
+setting.distinctcontrolgroups.name = 每单位限制一个编队
 setting.modcrashdisable.name = 游戏启动崩溃后禁用模组
 setting.animatedwater.name = 动态液体
 setting.animatedshields.name = 动态力场
@@ -1176,14 +1177,14 @@ setting.position.name = 显示玩家坐标
 setting.mouseposition.name = 显示鼠标坐标
 setting.musicvol.name = 音乐音量
 setting.atmosphere.name = 显示行星大气层
-setting.drawlight.name = Draw Darkness/Lighting
+setting.drawlight.name = 绘制阴影/光照
 setting.ambientvol.name = 环境音量
 setting.mutemusic.name = 禁用音乐
 setting.sfxvol.name = 音效音量
 setting.mutesound.name = 禁用音效
 setting.crashreport.name = 发送匿名的崩溃报告
 setting.savecreate.name = 自动创建存档
-setting.steampublichost.name = Public Game Visibility
+setting.steampublichost.name = 公共游戏可见性
 setting.playerlimit.name = 玩家数量限制
 setting.chatopacity.name = 聊天界面不透明度
 setting.lasersopacity.name = 电力连接线不透明度
@@ -1193,8 +1194,8 @@ setting.showweather.name = 显示天气效果
 setting.hidedisplays.name = 不显示逻辑绘图
 setting.macnotch.name = 立陶宛語
 setting.macnotch.description = 需要重新启动
-steam.friendsonly = Friends Only
-steam.friendsonly.tooltip = Whether only Steam friends will be able to join your game.\nUnchecking this box will make your game public - anyone can join.
+steam.friendsonly = 仅限好友
+steam.friendsonly.tooltip = 是否只有 Steam 好友才能加入您的游戏。\n取消选中此选项将使您的游戏公开 - 任何人都可以加入。
 public.beta = 请注意，测试版的游戏不能公开可见。
 uiscale.reset = UI缩放比例已更改。\n点击“确定”接受更改。\n[accent]{0}[]秒后[scarlet]将自动退出并还原设置。
 uiscale.cancel = 取消并退出
@@ -1203,7 +1204,7 @@ keybind.title = 重新绑定按键
 keybinds.mobile = [scarlet]除了基本的移动以外，大多数按键绑定在移动设备上无效。
 category.general.name = 常规
 category.view.name = 视图
-category.command.name = Unit Command
+category.command.name = 单位指挥
 category.multiplayer.name = 多人游戏
 category.blocks.name = 建筑选择
 placement.blockselectkeys = \n[lightgray]按键：[{0},
@@ -1221,23 +1222,23 @@ keybind.mouse_move.name = 单位跟随鼠标
 keybind.pan.name = 鼠标控制镜头
 keybind.boost.name = 启动助推
 keybind.command_mode.name = 指挥模式
-keybind.command_queue.name = Unit Command Queue
-keybind.create_control_group.name = Create Control Group
-keybind.cancel_orders.name = Cancel Orders
-keybind.unit_stance_shoot.name = Unit Stance: Shoot
-keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
-keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
-keybind.unit_stance_patrol.name = Unit Stance: Patrol
-keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.command_queue.name = 单位指挥队列
+keybind.create_control_group.name = 创建操控队伍
+keybind.cancel_orders.name = 取消指令
+keybind.unit_stance_shoot.name = 单位姿态：射击
+keybind.unit_stance_hold_fire.name = 单位姿态：停火
+keybind.unit_stance_pursue_target.name = 单位姿态：追逐目标
+keybind.unit_stance_patrol.name = 单位姿态：巡逻
+keybind.unit_stance_ram.name = 单位姿态：冲锋
+keybind.unit_command_move = 单位指挥：移动
+keybind.unit_command_repair = 单位指挥：修复
+keybind.unit_command_rebuild = 单位指挥：重建
+keybind.unit_command_assist = 单位指挥：协助
+keybind.unit_command_mine = 单位指挥：采矿
+keybind.unit_command_boost = 单位指挥：助推
+keybind.unit_command_load_units = 单位指挥：拾取单位
+keybind.unit_command_load_blocks = 单位指挥：拾取建筑
+keybind.unit_command_unload_payload = 单位指挥：卸载载荷
 keybind.rebuild_select.name = 重建建筑
 keybind.schematic_select.name = 框选建筑
 keybind.schematic_menu.name = 蓝图目录
@@ -1301,12 +1302,12 @@ mode.pvp.description = 与其他玩家对战。 \n[gray]需要地图中有至少
 mode.attack.name = 进攻
 mode.attack.description = 摧毁敌人的基地。 \n[gray]需要地图中有敌方队伍的核心。
 mode.custom = 自定义模式
-rules.invaliddata = Invalid clipboard data.
+rules.invaliddata = 无效剪贴板数据。
 rules.hidebannedblocks = 隐藏禁用的建筑
 
 rules.infiniteresources = 无限资源
 rules.onlydepositcore = 仅核心可放入资源
-rules.derelictrepair = Allow Derelict Block Repair
+rules.derelictrepair = 允许修复残骸建筑
 rules.reactorexplosions = 反应堆爆炸
 rules.coreincinerates = 核心焚烧
 rules.disableworldprocessors = 禁用世界处理器
@@ -1315,8 +1316,8 @@ rules.wavetimer = 波次计时器
 rules.wavesending = 波次可跳波
 rules.waves = 波次
 rules.attack = 进攻模式
-rules.buildai = Base Builder AI
-rules.buildaitier = Builder AI Tier
+rules.buildai = 基础建筑者 AI
+rules.buildaitier = 建筑者 AI 等级
 rules.rtsai = RTS AI
 rules.rtsminsquadsize = 最小部队规模
 rules.rtsmaxsquadsize = 最大部队规模
@@ -1332,10 +1333,10 @@ rules.unitbuildspeedmultiplier = 单位生产速度倍率
 rules.unitcostmultiplier = 单位生产花费倍率
 rules.unithealthmultiplier = 单位生命倍率
 rules.unitdamagemultiplier = 单位伤害倍率
-rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
+rules.unitcrashdamagemultiplier = 单位坠毁伤害倍率
 rules.solarmultiplier = 太阳能发电倍率
 rules.unitcapvariable = 核心可增加单位上限
-rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitpayloadsexplode = 单位携带载荷与单位一起爆炸
 rules.unitcap = 基础单位上限
 rules.limitarea = 限制地图有效区域
 rules.enemycorebuildradius = 敌方核心不可建造区域半径：[lightgray]（格）
@@ -1345,7 +1346,7 @@ rules.buildcostmultiplier = 建造花费倍率
 rules.buildspeedmultiplier = 建造速度倍率
 rules.deconstructrefundmultiplier = 拆除返还倍率
 rules.waitForWaveToEnd = 等待波次结束
-rules.wavelimit = Map Ends After Wave
+rules.wavelimit = 地图在有限波次后结束
 rules.dropzoneradius = 敌人出生点禁区大小：[lightgray]（格）
 rules.unitammo = 单位有弹药限制
 rules.enemyteam = 敌方队伍
@@ -2339,8 +2340,8 @@ lst.getblock = 获取任意位置的地块数据
 lst.setblock = 设置任意位置的地块数据
 lst.spawnunit = 在指定位置生成单位
 lst.applystatus = 添加或清除单位的一个状态效果
-lst.weathersense = Check if a type of weather is active.
-lst.weatherset = Set the current state of a type of weather.
+lst.weathersense = 检查特定种类的天气当前是否启用。
+lst.weatherset = 设置当前状态为特定类型天气。
 lst.spawnwave = 在任意位置生成一波敌人\n并不记录在波数计数器中
 lst.explosion = 在某个位置生成爆炸
 lst.setrate = 在指令/时间刻的时间下设置处理器处理速度
@@ -2349,50 +2350,51 @@ lst.packcolor = 将[0,1]范围内的RGBA分量整合成单个数字，用于绘
 lst.setrule = 设置地图规则
 lst.flushmessage = 在屏幕中央投影文字缓存区的内容\n会等待上一个文字显示结束
 lst.cutscene = 控制玩家游戏视角
-lst.setflag = 设置一个可以被所有处理器读取的全局flag
-lst.getflag = 检查是否设置了全局flag
-lst.setprop = Sets a property of a unit or building.
-lst.effect = Create a particle effect.
-lst.sync = Sync a variable across the network.\nOnly invoked 10 times a second at most.
-lst.makemarker = Create a new logic marker in the world.\nAn ID to identify this marker must be provided.\nMarkers currently limited to 20,000 per world.
-lst.setmarker = Set a property for a marker.\nThe ID used must be the same as in the Make Marker instruction.
-lst.localeprint = Add map locale property value to the text buffer.\nTo set map locale bundles in map editor, check [accent]Map Info > Locale Bundles[].\nIf client is a mobile device, tries to print a property ending in ".mobile" first.
+lst.setflag = 设置一个可以被所有处理器读取的全局标志。
+lst.getflag = 检查是否设置了全局标志。
+lst.setprop = 设置单位或建筑物的属性。
+lst.effect = 创建一个粒子效果。
+lst.sync = 在网络中同步一个变量。\n最多每秒调用10次。
+lst.makemarker = 在世界中创建一个新的逻辑标记。\n必须提供一个用于标识此标记的ID。\n目前每个世界限制最多20000个标记。
+lst.setmarker = 为标记设置属性。\n使用的ID必须与制作标记指令中的相同。
+lst.localeprint = 将地图本地化文本属性值添加到文本缓冲区中。\n要在地图编辑器中设置地图本地化包，请检查 [accent]地图信息 > 本地化包[]。\n如果客户端是移动设备，则尝试首先打印以 ".mobile" 结尾的属性。
 lglobal.false = 0
 lglobal.true = 1
 lglobal.null = null
-lglobal.@pi = The mathematical constant pi (3.141...)
-lglobal.@e = The mathematical constant e (2.718...)
-lglobal.@degToRad = Multiply by this number to convert degrees to radians
-lglobal.@radToDeg = Multiply by this number to convert radians to degrees
-lglobal.@time = Playtime of current save, in milliseconds
-lglobal.@tick = Playtime of current save, in ticks (1 second = 60 ticks)
-lglobal.@second = Playtime of current save, in seconds
-lglobal.@minute = Playtime of current save, in minutes
-lglobal.@waveNumber = Current wave number, if waves are enabled
-lglobal.@waveTime = Countdown timer for waves, in seconds
-lglobal.@mapw = Map width in tiles
-lglobal.@maph = Map height in tiles
-lglobal.sectionMap = Map
-lglobal.sectionGeneral = General
-lglobal.sectionNetwork = Network/Clientside [World Processor Only]
-lglobal.sectionProcessor = Processor
-lglobal.sectionLookup = Lookup
-lglobal.@this = The logic block executing the code
-lglobal.@thisx = X coordinate of block executing the code
-lglobal.@thisy = Y coordinate of block executing the code
-lglobal.@links = Total number of blocks linked to this processors
-lglobal.@ipt = Execution speed of the processor in instructions per tick (60 ticks = 1 second)
-lglobal.@unitCount = Total number of types of unit content in the game; used with the lookup instruction
-lglobal.@blockCount = Total number of types of block content in the game; used with the lookup instruction
-lglobal.@itemCount = Total number of types of item content in the game; used with the lookup instruction
-lglobal.@liquidCount = Total number of types of liquid content in the game; used with the lookup instruction
-lglobal.@server = True if the code is running on a server or in singleplayer, false otherwise
-lglobal.@client = True if the code is running on a client connected to a server
-lglobal.@clientLocale = Locale of the client running the code. For example: en_US
-lglobal.@clientUnit = Unit of client running the code
-lglobal.@clientName = Player name of client running the code
-lglobal.@clientTeam = Team ID of client running the code
-lglobal.@clientMobile = True is the client running the code is on mobile, false otherwise
+lglobal.@pi = 数学常数 pi (3.141...)
+lglobal.@e = 数学常数 e (2.718...)
+lglobal.@degToRad = 将角度制转换为弧度制
+lglobal.@radToDeg = 将弧度制转换为角度制
+lglobal.@time = 当前保存的游戏时间，以毫秒为单位
+lglobal.@tick = 当前保存的游戏时间，以tick为单位（1秒 = 60 tick）
+lglobal.@second = 当前保存的游戏时间，以秒为单位
+lglobal.@minute = 当前保存的游戏时间，以分钟为单位
+lglobal.@waveNumber = 如果启用了波次，则为当前波次编号
+lglobal.@waveTime = 波次的倒计时计时器，以秒为单位
+lglobal.@mapw = 地图宽度（单位：格）
+lglobal.@maph = 地图高度（单位：格）
+lglobal.sectionMap = 地图
+lglobal.sectionGeneral = 通用
+lglobal.sectionNetwork = 网络/客户端 [仅限世界处理器]
+lglobal.sectionProcessor = 处理器
+lglobal.sectionLookup = 查找
+lglobal.@this = 执行代码的逻辑块
+lglobal.@thisx = 执行代码的逻辑块的 X 坐标
+lglobal.@thisy = 执行代码的逻辑块的 Y 坐标
+lglobal.@links = 连接到此处理器的总块数
+lglobal.@ipt = 处理器每 tick 的执行速度（每秒 60 tick）
+lglobal.@unitCount = 游戏中单位内容的类型总数；与查找指令一起使用
+lglobal.@blockCount = 游戏中块内容的类型总数；与查找指令一起使用
+lglobal.@itemCount = 游戏中物品内容的类型总数；与查找指令一起使用
+lglobal.@liquidCount = 游戏中液体内容的类型总数；与查找指令一起使用
+lglobal.@server = 如果代码正在服务器上运行或单人游戏中运行，则为真，否则为假
+lglobal.@client = 如果代码正在连接到服务器的客户端上运行，则为真
+lglobal.@clientLocale = 运行代码的客户端的区域设置。例如：en_US
+lglobal.@clientUnit = 运行代码的客户端的单位
+lglobal.@clientName = 运行代码的客户端的玩家名称
+lglobal.@clientTeam = 运行代码的客户端的团队 ID
+lglobal.@clientMobile = 如果运行代码的客户端在移动设备上，则为真，否则为假
+
 
 logic.nounitbuild = [red]此处不允许处理器操控单位去建设
 
@@ -2408,7 +2410,7 @@ laccess.dead = 单位或建筑是否已被摧毁或者已失效
 laccess.controlled = 若单位的控制方是处理器，返回[accent]@ctrlProcessor[]\n若单位/建筑由玩家控制，返回[accent]@ctrlPlayer[]\n若单位在编队中，返回[accent]@ctrlFormation[]\n其他情况，返回0
 laccess.progress = 进度，0到1之间的数值。 \n返回工厂生产、 炮塔装填，或者建筑建造的进度
 laccess.speed = 单位的最高速度（格/秒）
-laccess.id = ID of a unit/block/item/liquid.\nThis is the inverse of the lookup operation.
+laccess.id = 单位/块/物品/液体的ID。\n这是 Lookup 的反向操作。
 
 lcategory.unknown = 未知
 lcategory.unknown.description = 未分类的指令
@@ -2436,7 +2438,7 @@ graphicstype.poly = 绘制实心正多边形
 graphicstype.linepoly = 绘制正多边形轮廓
 graphicstype.triangle = 绘制实心三角形
 graphicstype.image = 画出某个游戏内容的图像\n例如[accent]@router[]或者[accent]@dagger[]
-graphicstype.print = Draws text from the print buffer.\nClears the print buffer.
+graphicstype.print = 从打印缓冲区绘制文本。\n清除打印缓冲区。
 
 lenum.always = 无条件跳转
 lenum.idiv = 整数除法，返回不带小数的商
@@ -2456,7 +2458,7 @@ lenum.xor = 按位异或
 lenum.min = 取较小值
 lenum.max = 取较大值
 lenum.angle = 返回向量的辐角（角度制）
-lenum.anglediff = Absolute distance between two angles in degrees.
+lenum.anglediff = 返回两个角度之间的绝对距离（角度制）。
 lenum.len = 返回向量的长度
 
 lenum.sin = 正弦（角度制）
@@ -2531,7 +2533,7 @@ lenum.unbind = 停用单位的逻辑控制\n恢复常规AI
 lenum.move = 移动到某个位置
 lenum.approach = 靠近某个位置至一定的距离内
 lenum.pathfind = 寻路移动至敌人出生点
-lenum.autopathfind = Automatically pathfinds to the nearest enemy core or drop point.\nThis is the same as standard wave enemy pathfinding.
+lenum.autopathfind = "自动寻找最近的敌方核心或敌人生成点。\n这与波次中的敌人寻路相同。"
 lenum.target = 向某个位置瞄准/射击
 lenum.targetp = 根据提前量向某个目标瞄准/射击
 lenum.itemdrop = 将携带的物品放入一座建筑
@@ -2545,10 +2547,11 @@ lenum.build = 建造建筑
 lenum.getblock = 获取某个坐标处的建筑及其类型\n坐标需要在单位的感知范围内\n无建筑的地面返回[accent]@air[]，墙壁返回[accent]@solid[]
 lenum.within = 检查单位是否接近了某个位置
 lenum.boost = 开始/停止助推
-lenum.flushtext = Flush print buffer's content to marker, if applicable.\nIf fetch is set to true, tries to fetch properties from map locale bundle or game's bundle.
-lenum.texture = Texture name straight from game's texture atlas (using kebab-case naming style).\nIf printFlush is set to true, consumes text buffer content as text argument.
-lenum.texturesize = Size of texture in tiles. Zero value scales marker width to original texture's size.
-lenum.autoscale = Whether to scale marker corresponding to player's zoom level.
-lenum.posi = Indexed position, used for line and quad markers with index zero being the first position.
-lenum.uvi = Texture's position ranging from zero to one, used for quad markers.
-lenum.colori = Indexed position, used for line and quad markers with index zero being the first color.
+lenum.flushtext = 如果适用的话，将打印缓冲区的内容刷新到标记。\n如果 fetch 设置为 true，则尝试从地图本地化包或游戏的包中获取属性。
+lenum.texture = 直接来自游戏纹理图集的纹理名称（使用 kebab-case 命名风格）。\n如果 printFlush 设置为 true，则将文本缓冲区内容作为文本参数消耗。
+lenum.texturesize = 纹理的大小（格）。零值将标记宽度缩放为原始纹理的大小。
+lenum.autoscale = 是否根据玩家的缩放级别缩放标记。
+lenum.posi = 索引位置，用于线和四边形标记，索引零表示第一个位置。
+lenum.uvi = 纹理的位置范围从零到一，用于四边形标记。
+lenum.colori = 索引位置，用于线和四边形标记，索引零表示第一个颜色。
+

From 1f5d8b1f045cbace88d81de4b3b0b6323f723e0a Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az1251-970.04bx5wyvw5tenjekzxp54pa3vd.cx.internal.cloudapp.net>
Date: Mon, 1 Apr 2024 14:30:58 +0000
Subject: [PATCH 325/369] Automatic bundle update

---
 core/assets/bundles/bundle_zh_CN.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 0ec1c2bb1c..2a74a48802 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -610,7 +610,7 @@ filter.option.floor2 = 内层地形
 filter.option.threshold2 = 内层比例
 filter.option.radius = 半径
 filter.option.percentile = 百分比
-locales.info = 在这里，您可以为特定语言添加本地化语言包到您的地图中。在本地化语言包中，每个文本属性都有一个名称和一个值。这些文本属性可以由世界处理器和游戏目标使用它们的名称。它们支持文本格式化（用实际值替换占位符）。\n\n[cyan]示例文本属性：\n[]名称: [accent]timer[]\值: [accent]示例计时器, 剩余时间: @[]\n\n[cyan]用法:\n[]将其设置为目标的文本: [accent]@timer\n\n[]在世界处理器中打印它：\n[accent]localeprint "timer"\n格式化时间\n[gray](时间是一个单独计算的变量)
+locales.info = 在这里，您可以为特定语言添加本地化语言包到您的地图中。在本地化语言包中，每个文本属性都有一个名称和一个值。这些文本属性可以由世界处理器和游戏目标使用它们的名称。它们支持文本格式化（用实际值替换占位符）。\n\n[cyan]示例文本属性：\n[]名称: [accent]timer[]值: [accent]示例计时器, 剩余时间: @[]\n\n[cyan]用法:\n[]将其设置为目标的文本: [accent]@timer\n\n[]在世界处理器中打印它：\n[accent]localeprint "timer"\n格式化时间\n[gray](时间是一个单独计算的变量)
 locales.deletelocale = 您确定要删除该本地化语言包吗？
 locales.applytoall = 将更改应用于所有本地化语言包
 locales.addtoother = 添加到其他本地化语言包
@@ -2554,4 +2554,3 @@ lenum.autoscale = 是否根据玩家的缩放级别缩放标记。
 lenum.posi = 索引位置，用于线和四边形标记，索引零表示第一个位置。
 lenum.uvi = 纹理的位置范围从零到一，用于四边形标记。
 lenum.colori = 索引位置，用于线和四边形标记，索引零表示第一个颜色。
-

From bfd8dbd769d13baac82921c1f8c2559ea8a65d64 Mon Sep 17 00:00:00 2001
From: GlFolker <63218676+GlennFolker@users.noreply.github.com>
Date: Mon, 1 Apr 2024 21:46:44 +0700
Subject: [PATCH 326/369] Enable full customization of core launching/landing
 animations. (#9693)

* Extract all updates and draws of core launch/land animations to CoreBlock/CoreBuild

* Re-add removed methods as deprecated

* Fixed tests failing

* anuke said no

* Extract launch effect
---
 core/src/mindustry/Vars.java                  |   5 +-
 core/src/mindustry/core/Control.java          |  31 +---
 core/src/mindustry/core/Renderer.java         | 154 ++++++------------
 .../mindustry/ui/dialogs/PlanetDialog.java    |   9 +-
 .../mindustry/ui/fragments/HudFragment.java   |   6 +
 .../world/blocks/storage/CoreBlock.java       | 154 +++++++++++++++++-
 6 files changed, 221 insertions(+), 138 deletions(-)

diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index 0dc1cf9e3f..552f0ac54f 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -28,6 +28,7 @@ import mindustry.net.*;
 import mindustry.service.*;
 import mindustry.ui.dialogs.*;
 import mindustry.world.*;
+import mindustry.world.blocks.storage.*;
 import mindustry.world.meta.*;
 
 import java.io.*;
@@ -105,8 +106,8 @@ public class Vars implements Loadable{
     public static final float invasionGracePeriod = 20;
     /** min armor fraction damage; e.g. 0.05 = at least 5% damage */
     public static final float minArmorDamage = 0.1f;
-    /** land/launch animation duration */
-    public static final float coreLandDuration = 160f;
+    /** @deprecated see {@link CoreBlock#landDuration} instead! */
+    public static final @Deprecated float coreLandDuration = 160f;
     /** size of tiles in units */
     public static final int tilesize = 8;
     /** size of one tile payload (^2) */
diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index d39b338b9b..bc730c44c4 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -30,6 +30,7 @@ import mindustry.net.*;
 import mindustry.type.*;
 import mindustry.ui.dialogs.*;
 import mindustry.world.*;
+import mindustry.world.blocks.storage.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 
 import java.io.*;
@@ -191,43 +192,29 @@ public class Control implements ApplicationListener, Loadable{
 
         Events.run(Trigger.newGame, () -> {
             var core = player.bestCore();
-
             if(core == null) return;
 
             camera.position.set(core);
             player.set(core);
 
             float coreDelay = 0f;
-
             if(!settings.getBool("skipcoreanimation") && !state.rules.pvp){
-                coreDelay = coreLandDuration;
+                coreDelay = core.landDuration();
                 //delay player respawn so animation can play.
-                player.deathTimer = Player.deathDelay - coreLandDuration;
+                player.deathTimer = Player.deathDelay - core.landDuration();
                 //TODO this sounds pretty bad due to conflict
                 if(settings.getInt("musicvol") > 0){
-                    Musics.land.stop();
-                    Musics.land.play();
-                    Musics.land.setVolume(settings.getInt("musicvol") / 100f);
+                    //TODO what to do if another core with different music is already playing?
+                    Music music = core.landMusic();
+                    music.stop();
+                    music.play();
+                    music.setVolume(settings.getInt("musicvol") / 100f);
                 }
 
-                app.post(() -> ui.hudfrag.showLand());
-                renderer.showLanding();
-
-                Time.run(coreLandDuration, () -> {
-                    Fx.launch.at(core);
-                    Effect.shake(5f, 5f, core);
-                    core.thrusterTime = 1f;
-
-                    if(state.isCampaign() && Vars.showSectorLandInfo && (state.rules.sector.preset == null || state.rules.sector.preset.showSectorLandInfo)){
-                        ui.announce("[accent]" + state.rules.sector.name() + "\n" +
-                        (state.rules.sector.info.resources.any() ? "[lightgray]" + bundle.get("sectors.resources") + "[white] " +
-                        state.rules.sector.info.resources.toString(" ", u -> u.emoji()) : ""), 5);
-                    }
-                });
+                renderer.showLanding(core);
             }
 
             if(state.isCampaign()){
-
                 //don't run when hosting, that doesn't really work.
                 if(state.rules.sector.planet.prebuildBase){
                     toBePlaced.clear();
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index 7b7d1dc155..3eb3b169b0 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -13,7 +13,6 @@ import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
-import mindustry.content.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
@@ -30,11 +29,6 @@ public class Renderer implements ApplicationListener{
     /** These are global variables, for headless access. Cached. */
     public static float laserOpacity = 0.5f, bridgeOpacity = 0.75f;
 
-    private static final float cloudScaling = 1700f, cfinScl = -2f, cfinOffset = 0.3f, calphaFinOffset = 0.25f;
-    private static final float[] cloudAlphas = {0, 0.5f, 1f, 0.1f, 0, 0f};
-    private static final float cloudAlpha = 0.81f;
-    private static final Interp landInterp = Interp.pow3;
-
     public final BlockRenderer blocks = new BlockRenderer();
     public final FogRenderer fog = new FogRenderer();
     public final MinimapRenderer minimap = new MinimapRenderer();
@@ -55,18 +49,15 @@ public class Renderer implements ApplicationListener{
     public TextureRegion[] bubbles = new TextureRegion[16], splashes = new TextureRegion[12];
     public TextureRegion[][] fluidFrames;
 
+    //currently landing core, null if there are no cores or it has finished landing.
     private @Nullable CoreBuild landCore;
     private @Nullable CoreBlock launchCoreType;
     private Color clearColor = new Color(0f, 0f, 0f, 1f);
     private float
-    //seed for cloud visuals, 0-1
-    cloudSeed = 0f,
     //target camera scale that is lerp-ed to
     targetscale = Scl.scl(4),
     //current actual camera scale
     camerascale = targetscale,
-    //minimum camera zoom value for landing/launching; constant TODO make larger?
-    minZoomScl = Scl.scl(0.02f),
     //starts at coreLandDuration, ends at 0. if positive, core is landing.
     landTime,
     //timer for core landing particles
@@ -113,10 +104,6 @@ public class Renderer implements ApplicationListener{
             setupBloom();
         }
 
-        Events.run(Trigger.newGame, () -> {
-            landCore = player.bestCore();
-        });
-
         EnvRenderers.init();
         for(int i = 0; i < bubbles.length; i++) bubbles[i] = atlas.find("bubble-" + i);
         for(int i = 0; i < splashes.length; i++) splashes[i] = atlas.find("splash-" + i);
@@ -181,32 +168,26 @@ public class Renderer implements ApplicationListener{
         enableEffects = settings.getBool("effects");
         drawDisplays = !settings.getBool("hidedisplays");
         drawLight = settings.getBool("drawlight", true);
-        pixelate = Core.settings.getBool("pixelate");
+        pixelate = settings.getBool("pixelate");
 
+        //don't bother drawing landing animation if core is null
+        if(landCore == null) landTime = 0f;
         if(landTime > 0){
-            if(!state.isPaused()){
-                CoreBuild build = landCore == null ? player.bestCore() : landCore;
-                if(build != null){
-                    build.updateLandParticles();
-                }
-            }
+            if(!state.isPaused()) landCore.updateLaunching();
 
-            if(!state.isPaused()){
-                landTime -= Time.delta;
-            }
-            float fin = landTime / coreLandDuration;
-            if(!launching) fin = 1f - fin;
-            camerascale = landInterp.apply(minZoomScl, Scl.scl(4f), fin);
             weatherAlpha = 0f;
+            camerascale = landCore.zoomLaunching();
 
-            //snap camera to cutscene core regardless of player input
-            if(landCore != null){
-                camera.position.set(landCore);
-            }
+            if(!state.isPaused()) landTime -= Time.delta;
         }else{
             weatherAlpha = Mathf.lerpDelta(weatherAlpha, 1f, 0.08f);
         }
 
+        if(landCore != null && landTime <= 0f){
+            landCore.endLaunch();
+            landCore = null;
+        }
+
         camera.width = graphics.getWidth() / camerascale;
         camera.height = graphics.getHeight() / camerascale;
 
@@ -304,7 +285,7 @@ public class Renderer implements ApplicationListener{
         graphics.clear(clearColor);
         Draw.reset();
 
-        if(Core.settings.getBool("animatedwater") || animateShields){
+        if(settings.getBool("animatedwater") || animateShields){
             effectBuffer.resize(graphics.getWidth(), graphics.getHeight());
         }
 
@@ -393,7 +374,10 @@ public class Renderer implements ApplicationListener{
 
         Draw.draw(Layer.overlayUI, overlays::drawTop);
         if(state.rules.fog) Draw.draw(Layer.fogOfWar, fog::drawFog);
-        Draw.draw(Layer.space, this::drawLanding);
+        Draw.draw(Layer.space, () -> {
+            if(landCore == null || landTime <= 0f) return;
+            landCore.drawLanding(launching && launchCoreType != null ? launchCoreType : (CoreBlock)landCore.block);
+        });
 
         Events.fire(Trigger.drawOver);
         blocks.drawBlocks();
@@ -481,61 +465,6 @@ public class Renderer implements ApplicationListener{
         if(state.rules.customBackgroundCallback != null && customBackgrounds.containsKey(state.rules.customBackgroundCallback)){
             customBackgrounds.get(state.rules.customBackgroundCallback).run();
         }
-
-    }
-
-    void drawLanding(){
-        CoreBuild build = landCore == null ? player.bestCore() : landCore;
-        var clouds = assets.get("sprites/clouds.png", Texture.class);
-        if(landTime > 0 && build != null){
-            float fout = landTime / coreLandDuration;
-            if(launching) fout = 1f - fout;
-            float fin = 1f - fout;
-            float scl = Scl.scl(4f) / camerascale;
-            float pfin = Interp.pow3Out.apply(fin), pf = Interp.pow2In.apply(fout);
-
-            //draw particles
-            Draw.color(Pal.lightTrail);
-            Angles.randLenVectors(1, pfin, 100, 800f * scl * pfin, (ax, ay, ffin, ffout) -> {
-                Lines.stroke(scl * ffin * pf * 3f);
-                Lines.lineAngle(build.x + ax, build.y + ay, Mathf.angle(ax, ay), (ffin * 20 + 1f) * scl);
-            });
-            Draw.color();
-
-            CoreBlock block = launching && launchCoreType != null ? launchCoreType : (CoreBlock)build.block;
-            block.drawLanding(build, build.x, build.y);
-
-            Draw.color();
-            Draw.mixcol(Color.white, Interp.pow5In.apply(fout));
-
-            //accent tint indicating that the core was just constructed
-            if(launching){
-                float f = Mathf.clamp(1f - fout * 12f);
-                if(f > 0.001f){
-                    Draw.mixcol(Pal.accent, f);
-                }
-            }
-
-            //draw clouds
-            if(state.rules.cloudColor.a > 0.0001f){
-                float scaling = cloudScaling;
-                float sscl = Math.max(1f + Mathf.clamp(fin + cfinOffset)* cfinScl, 0f) * camerascale;
-
-                Tmp.tr1.set(clouds);
-                Tmp.tr1.set(
-                (camera.position.x - camera.width/2f * sscl) / scaling,
-                (camera.position.y - camera.height/2f * sscl) / scaling,
-                (camera.position.x + camera.width/2f * sscl) / scaling,
-                (camera.position.y + camera.height/2f * sscl) / scaling);
-
-                Tmp.tr1.scroll(10f * cloudSeed, 10f * cloudSeed);
-
-                Draw.alpha(Mathf.sample(cloudAlphas, fin + calphaFinOffset) * cloudAlpha);
-                Draw.mixcol(state.rules.cloudColor, state.rules.cloudColor.a);
-                Draw.rect(Tmp.tr1, camera.position.x, camera.position.y, camera.width, camera.height);
-                Draw.reset();
-            }
-        }
     }
 
     public void scaleCamera(float amount){
@@ -580,6 +509,13 @@ public class Renderer implements ApplicationListener{
         return landTime;
     }
 
+    public float getLandTimeIn(){
+        if(landCore == null) return 0f;
+        float fin = landTime / landCore.landDuration();
+        if(!launching) fin = 1f - fin;
+        return fin;
+    }
+
     public float getLandPTimer(){
         return landPTimer;
     }
@@ -588,25 +524,37 @@ public class Renderer implements ApplicationListener{
         this.landPTimer = landPTimer;
     }
 
+    @Deprecated
     public void showLanding(){
-        launching = false;
-        camerascale = minZoomScl;
-        landTime = coreLandDuration;
-        cloudSeed = Mathf.random(1f);
+        var core = player.bestCore();
+        if(core != null) showLanding(core);
     }
 
+    public void showLanding(CoreBuild landCore){
+        this.landCore = landCore;
+        launching = false;
+        landTime = landCore.landDuration();
+
+        landCore.beginLaunch(null);
+        camerascale = landCore.zoomLaunching();
+    }
+
+    @Deprecated
     public void showLaunch(CoreBlock coreType){
-        Vars.ui.hudfrag.showLaunch();
-        Vars.control.input.config.hideConfig();
-        Vars.control.input.inv.hide();
-        launchCoreType = coreType;
+        var core = player.team().core();
+        if(core != null) showLaunch(core, coreType);
+    }
+
+    public void showLaunch(CoreBuild landCore, CoreBlock coreType){
+        control.input.config.hideConfig();
+        control.input.inv.hide();
+
+        this.landCore = landCore;
         launching = true;
-        landCore = player.team().core();
-        cloudSeed = Mathf.random(1f);
-        landTime = coreLandDuration;
-        if(landCore != null){
-            Fx.coreLaunchConstruct.at(landCore.x, landCore.y, coreType.size);
-        }
+        landTime = landCore.landDuration();
+        launchCoreType = coreType;
+
+        landCore.beginLaunch(coreType);
     }
 
     public void takeMapScreenshot(){
@@ -648,7 +596,7 @@ public class Renderer implements ApplicationListener{
             Fi file = screenshotDirectory.child("screenshot-" + Time.millis() + ".png");
             PixmapIO.writePng(file, fullPixmap);
             fullPixmap.dispose();
-            app.post(() -> ui.showInfoFade(Core.bundle.format("screenshot", file.toString())));
+            app.post(() -> ui.showInfoFade(bundle.format("screenshot", file.toString())));
         });
     }
 
diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index 9a230d0fc6..0345b04775 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -35,6 +35,7 @@ import mindustry.maps.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.blocks.storage.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
 
 import static arc.Core.*;
 import static mindustry.Vars.*;
@@ -1244,7 +1245,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
 
                     Events.fire(new SectorLaunchLoadoutEvent(sector, from, loadout));
 
-                    if(settings.getBool("skipcoreanimation")){
+                    CoreBuild core = player.team().core();
+                    if(core == null || settings.getBool("skipcoreanimation")){
                         //just... go there
                         control.playSector(from, sector);
                         //hide only after load screen is shown
@@ -1256,9 +1258,9 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                         //allow planet dialog to finish hiding before actually launching
                         Time.runTask(5f, () -> {
                             Runnable doLaunch = () -> {
-                                renderer.showLaunch(schemCore);
+                                renderer.showLaunch(core, schemCore);
                                 //run with less delay, as the loading animation is delayed by several frames
-                                Time.runTask(coreLandDuration - 8f, () -> control.playSector(from, sector));
+                                Time.runTask(core.landDuration() - 8f, () -> control.playSector(from, sector));
                             };
 
                             //load launchFrom sector right before launching so animation is correct
@@ -1276,7 +1278,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         }else if(mode == select){
             listener.get(sector);
         }else if(mode == planetLaunch){ //TODO make sure it doesn't have a base already.
-
             //TODO animation
             //schematic selection and cost handled by listener
             listener.get(sector);
diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java
index cb92cb77ad..c882edc714 100644
--- a/core/src/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/mindustry/ui/fragments/HudFragment.java
@@ -27,6 +27,8 @@ import mindustry.input.*;
 import mindustry.net.Packets.*;
 import mindustry.type.*;
 import mindustry.ui.*;
+import mindustry.world.blocks.storage.*;
+import mindustry.world.blocks.storage.CoreBlock.*;
 
 import static mindustry.Vars.*;
 import static mindustry.gen.Tex.*;
@@ -584,6 +586,8 @@ public class HudFragment{
         }
     }
 
+    /** @deprecated see {@link CoreBuild#beginLaunch(CoreBlock)} */
+    @Deprecated
     public void showLaunch(){
         float margin = 30f;
 
@@ -602,6 +606,8 @@ public class HudFragment{
         Core.scene.add(image);
     }
 
+    /** @deprecated see {@link CoreBuild#beginLaunch(CoreBlock)} */
+    @Deprecated
     public void showLand(){
         Image image = new Image();
         image.color.a = 1f;
diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java
index ff24181b79..184523e3be 100644
--- a/core/src/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java
@@ -1,11 +1,15 @@
 package mindustry.world.blocks.storage;
 
 import arc.*;
+import arc.audio.*;
 import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.scene.actions.*;
+import arc.scene.event.*;
+import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
@@ -29,6 +33,9 @@ import mindustry.world.modules.*;
 import static mindustry.Vars.*;
 
 public class CoreBlock extends StorageBlock{
+    protected static final float cloudScaling = 1700f, cfinScl = -2f, cfinOffset = 0.3f, calphaFinOffset = 0.25f, cloudAlpha = 0.81f;
+    protected static final float[] cloudAlphas = {0, 0.5f, 1f, 0.1f, 0, 0f};
+
     //hacky way to pass item modules between methods
     private static ItemModule nextItems;
     protected static final float[] thrusterSizes = {0f, 0f, 0f, 0f, 0.3f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 1f, 0f};
@@ -42,6 +49,12 @@ public class CoreBlock extends StorageBlock{
     public boolean incinerateNonBuildable = false;
 
     public UnitType unitType = UnitTypes.alpha;
+    public float landDuration = 160f;
+    public Music landMusic = Musics.land;
+    public Effect launchEffect = Fx.launch;
+
+    public Interp landZoomInterp = Interp.pow3;
+    public float landZoomFrom = 0.02f, landZoomTo = 4f;
 
     public float captureInvicibility = 60f * 15f;
 
@@ -217,11 +230,8 @@ public class CoreBlock extends StorageBlock{
     }
 
     public void drawLanding(CoreBuild build, float x, float y){
-        float fout = renderer.getLandTime() / coreLandDuration;
-
-        if(renderer.isLaunching()) fout = 1f - fout;
-
-        float fin = 1f - fout;
+        float fin = renderer.getLandTimeIn();
+        float fout = 1f - fin;
 
         float scl = Scl.scl(4f) / renderer.getDisplayScale();
         float shake = 0f;
@@ -312,6 +322,17 @@ public class CoreBlock extends StorageBlock{
         public float iframes = -1f;
         public float thrusterTime = 0f;
 
+        protected float cloudSeed;
+
+        //utility methods for less Block-to-CoreBlock casts. also allows for more customization
+        public float landDuration(){
+            return landDuration;
+        }
+
+        public Music landMusic(){
+            return landMusic;
+        }
+
         @Override
         public void draw(){
             //draw thrusters when just landed
@@ -331,6 +352,115 @@ public class CoreBlock extends StorageBlock{
             }
         }
 
+        // `launchType` is null if it's landing instead of launching.
+        public void beginLaunch(@Nullable CoreBlock launchType){
+            cloudSeed = Mathf.random(1f);
+            if(launchType != null){
+                Fx.coreLaunchConstruct.at(x, y, launchType.size);
+            }
+
+            if(!headless){
+                // Add fade-in and fade-out foreground when landing or launching.
+                if(renderer.isLaunching()){
+                    float margin = 30f;
+
+                    Image image = new Image();
+                    image.color.a = 0f;
+                    image.touchable = Touchable.disabled;
+                    image.setFillParent(true);
+                    image.actions(Actions.delay((landDuration() - margin) / 60f), Actions.fadeIn(margin / 60f, Interp.pow2In), Actions.delay(6f / 60f), Actions.remove());
+                    image.update(() -> {
+                        image.toFront();
+                        ui.loadfrag.toFront();
+                        if(state.isMenu()){
+                            image.remove();
+                        }
+                    });
+                    Core.scene.add(image);
+                }else{
+                    Image image = new Image();
+                    image.color.a = 1f;
+                    image.touchable = Touchable.disabled;
+                    image.setFillParent(true);
+                    image.actions(Actions.fadeOut(35f / 60f), Actions.remove());
+                    image.update(() -> {
+                        image.toFront();
+                        ui.loadfrag.toFront();
+                        if(state.isMenu()){
+                            image.remove();
+                        }
+                    });
+                    Core.scene.add(image);
+
+                    Time.run(landDuration(), () -> {
+                        launchEffect.at(this);
+                        Effect.shake(5f, 5f, this);
+                        thrusterTime = 1f;
+
+                        if(state.isCampaign() && Vars.showSectorLandInfo && (state.rules.sector.preset == null || state.rules.sector.preset.showSectorLandInfo)){
+                            ui.announce("[accent]" + state.rules.sector.name() + "\n" +
+                                (state.rules.sector.info.resources.any() ? "[lightgray]" + Core.bundle.get("sectors.resources") + "[white] " +
+                                    state.rules.sector.info.resources.toString(" ", UnlockableContent::emoji) : ""), 5);
+                        }
+                    });
+                }
+            }
+        }
+
+        public void endLaunch(){}
+
+        public void drawLanding(CoreBlock block){
+            var clouds = Core.assets.get("sprites/clouds.png", Texture.class);
+
+            float fin = renderer.getLandTimeIn();
+            float cameraScl = renderer.getDisplayScale();
+
+            float fout = 1f - fin;
+            float scl = Scl.scl(4f) / cameraScl;
+            float pfin = Interp.pow3Out.apply(fin), pf = Interp.pow2In.apply(fout);
+
+            //draw particles
+            Draw.color(Pal.lightTrail);
+            Angles.randLenVectors(1, pfin, 100, 800f * scl * pfin, (ax, ay, ffin, ffout) -> {
+                Lines.stroke(scl * ffin * pf * 3f);
+                Lines.lineAngle(x + ax, y + ay, Mathf.angle(ax, ay), (ffin * 20 + 1f) * scl);
+            });
+            Draw.color();
+
+            block.drawLanding(this, x, y);
+
+            Draw.color();
+            Draw.mixcol(Color.white, Interp.pow5In.apply(fout));
+
+            //accent tint indicating that the core was just constructed
+            if(renderer.isLaunching()){
+                float f = Mathf.clamp(1f - fout * 12f);
+                if(f > 0.001f){
+                    Draw.mixcol(Pal.accent, f);
+                }
+            }
+
+            //draw clouds
+            if(state.rules.cloudColor.a > 0.0001f){
+                float scaling = cloudScaling;
+                float sscl = Math.max(1f + Mathf.clamp(fin + cfinOffset) * cfinScl, 0f) * cameraScl;
+
+                Tmp.tr1.set(clouds);
+                Tmp.tr1.set(
+                    (Core.camera.position.x - Core.camera.width/2f * sscl) / scaling,
+                    (Core.camera.position.y - Core.camera.height/2f * sscl) / scaling,
+                    (Core.camera.position.x + Core.camera.width/2f * sscl) / scaling,
+                    (Core.camera.position.y + Core.camera.height/2f * sscl) / scaling);
+
+                Tmp.tr1.scroll(10f * cloudSeed, 10f * cloudSeed);
+
+                Draw.alpha(Mathf.sample(cloudAlphas, fin + calphaFinOffset) * cloudAlpha);
+                Draw.mixcol(state.rules.cloudColor, state.rules.cloudColor.a);
+                Draw.rect(Tmp.tr1, Core.camera.position.x, Core.camera.position.y, Core.camera.width, Core.camera.height);
+                Draw.reset();
+            }
+        }
+
         public void drawThrusters(float frame){
             float length = thrusterLength * (frame - 1f) - 1f/4f;
             for(int i = 0; i < 4; i++){
@@ -409,9 +539,19 @@ public class CoreBlock extends StorageBlock{
             thrusterTime -= Time.delta/90f;
         }
 
+        /** @return Camera zoom while landing or launching. May optionally do other things such as setting camera position to itself. */
+        public float zoomLaunching(){
+            Core.camera.position.set(this);
+            return landZoomInterp.apply(Scl.scl(landZoomFrom), Scl.scl(landZoomTo), renderer.getLandTimeIn());
+        }
+
+        public void updateLaunching(){
+            updateLandParticles();
+        }
+
         public void updateLandParticles(){
-            float time = renderer.isLaunching() ? coreLandDuration - renderer.getLandTime() : renderer.getLandTime();
-            float tsize = Mathf.sample(thrusterSizes, (time + 35f) / coreLandDuration);
+            float in = renderer.getLandTimeIn() * landDuration();
+            float tsize = Mathf.sample(thrusterSizes, (in + 35f) / landDuration());
 
             renderer.setLandPTimer(renderer.getLandPTimer() + tsize * Time.delta);
             if(renderer.getLandTime() >= 1f){

From 83656a14814452897f4cc7aae85d66822344ad78 Mon Sep 17 00:00:00 2001
From: PolarStar <107398572+PoIarStar@users.noreply.github.com>
Date: Mon, 1 Apr 2024 17:48:36 +0300
Subject: [PATCH 327/369] Update servers_v7.json (#9700)

April fools day name change
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 56f07af980..ce7a6765fb 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -33,7 +33,7 @@
     "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"]
   },
   {
-    "name": "CMS Empire",
+    "name": "Chilldustry",
     "address": ["trelesco.xyz", "95.84.198.97"]
   },
   {

From e177035593e0d03579ce0e6ac0930c0487a84d3f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 2 Apr 2024 09:51:17 -0400
Subject: [PATCH 328/369] Removed unnecessary hit effect calls

---
 core/src/mindustry/entities/Damage.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java
index 2c2426deba..158cba605b 100644
--- a/core/src/mindustry/entities/Damage.java
+++ b/core/src/mindustry/entities/Damage.java
@@ -293,7 +293,6 @@ public class Damage{
         collided.each(c -> {
             if(hitter.damage > 0 && (pierceCap <= 0 || collideCount[0] < pierceCap)){
                 if(c.target instanceof Unit u){
-                    effect.at(c.x, c.y);
                     u.collision(hitter, c.x, c.y);
                     hitter.collision(u, c.x, c.y);
                     collideCount[0]++;
@@ -344,7 +343,6 @@ public class Damage{
 
         Units.nearbyEnemies(team, rect.setCentered(x, y, 1f), u -> {
             if(u.checkTarget(hitter.type.collidesAir, hitter.type.collidesGround) && u.hittable()){
-                effect.at(x, y);
                 u.collision(hitter, x, y);
                 hitter.collision(u, x, y);
             }

From d3a78a9d423b6044b782e35d854592e846f8e1a1 Mon Sep 17 00:00:00 2001
From: Cubical box <67639725+BlueTheCube@users.noreply.github.com>
Date: Tue, 2 Apr 2024 22:03:14 +0800
Subject: [PATCH 329/369] Fetching unit by type, build without type, and fixing
 a nullpointer crash (#9703)

* Pluh

* Pluh

* Update LExecutor.java

* fixed the null

* Update LExecutor.java

* I will point your null exception

* is it null or nah

* it is nah

* Update LExecutor.java

* Update LExecutor.java

* null zero
---
 core/src/mindustry/logic/LExecutor.java   | 14 +++++++++++---
 core/src/mindustry/logic/LStatements.java |  8 +++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index ba9b194364..91cb4575e2 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1363,13 +1363,21 @@ public class LExecutor{
             TeamData data = t.data();
 
             switch(type){
-                case unit -> exec.setobj(result, i < 0 || i >= data.units.size ? null : data.units.get(i));
+                case unit -> {
+                    UnitType type = exec.obj(extra) instanceof UnitType u ? u : null;
+                    if(type == null){
+                        exec.setobj(result, i < 0 || i >= data.units.size ? null : data.units.get(i));
+                    }else{
+                        var units = data.unitCache(type);
+                        exec.setobj(result, units == null || i < 0 || i >= units.size ? null : units.get(i));
+                    }
+                }
                 case player -> exec.setobj(result, i < 0 || i >= data.players.size || data.players.get(i).unit().isNull() ? null : data.players.get(i).unit());
                 case core -> exec.setobj(result, i < 0 || i >= data.cores.size ? null : data.cores.get(i));
                 case build -> {
                     Block block = exec.obj(extra) instanceof Block b ? b : null;
                     if(block == null){
-                        exec.setobj(result, null);
+                        exec.setobj(result, i < 0 || i >= data.buildings.size ? null : data.buildings.get(i));
                     }else{
                         var builds = data.getBuildings(block);
                         exec.setobj(result, i < 0 || i >= builds.size ? null : builds.get(i));
@@ -1380,7 +1388,7 @@ public class LExecutor{
                     if(type == null){
                         exec.setnum(result, data.units.size);
                     }else{
-                        exec.setnum(result, data.unitsByType[type.id].size);
+                        exec.setnum(result, data.unitCache(type) == null ? 0 : data.unitCache(type).size);
                     }
                 }
                 case coreCount -> exec.setnum(result, data.cores.size);
diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java
index 29dde175b5..31cce56e0c 100644
--- a/core/src/mindustry/logic/LStatements.java
+++ b/core/src/mindustry/logic/LStatements.java
@@ -1856,11 +1856,17 @@ public class LStatements{
                 fields(table, index, i -> index = i);
             }
 
-            if(type == FetchType.buildCount || type == FetchType.build || type == FetchType.unitCount){
+            if(type == FetchType.buildCount || type == FetchType.build){
                 row(table);
 
                 fields(table, "block", extra, i -> extra = i);
             }
+
+            if(type == FetchType.unitCount || type == FetchType.unit){
+                row(table);
+
+                fields(table, "unit", extra, i -> extra = i);
+            }
         }
 
         @Override

From 0c52385c6b435855c3fe1ab2a6a8636475acd400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@mailbox.org>
Date: Tue, 2 Apr 2024 16:06:23 +0200
Subject: [PATCH 330/369] Update Hungarian translation (#9694)

* Update bundle_hu.properties

I've translated the new strings.

* Update bundle_hu.properties

Requested change

* Fixed capitalization
---
 core/assets/bundles/bundle_hu.properties | 72 ++++++++++++------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index bb618d854c..b501f41f78 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -832,7 +832,7 @@ sector.planetaryTerminal.description = A végső célpont.\n\nEzen a vízparti b
 sector.coastline.description = Ezen a helyen egy haditengerészeti egység technológiájának maradványait azonosították. Verd vissza az ellenséges támadásokat, foglald el ezt a szektort, és szerezd meg a technológiát.
 sector.navalFortress.description = Az ellenség bázist létesített egy távoli, természetes erődítményes szigeten. Pusztítsd el ezt az előőrsöt. Szerezd meg a fejlett hadihajó-technológiájukat, és fejleszd ki te is.
 
-sector.onset.name = A Kezdet
+sector.onset.name = A kezdet
 sector.aegis.name = Égisz
 sector.lake.name = Tó
 sector.intersect.name = Metszéspont
@@ -866,7 +866,7 @@ sector.crevice.description = Ebben a szektorban az ellenség kegyetlen támadóe
 sector.siege.description = Ebben a szektorban két párhuzamos kanyon található, amelyek két irányból érkező támadásokat tesznek lehetővé.\nFejleszd ki a [accent]diciánt[], hogy még erősebb tankegységeket hozhass létre.\nVigyázat: ellenséges, nagy hatótávolságú rakéták észlelve. A rakéták a becsapódásuk előtt megsemmisíthetők.
 sector.crossroads.description = Az ellenséges támaszpontok ebben a szektorban változó terepviszonyok között alakultak ki. Ahhoz, hogy alkalmazkodni tudj, fejlessz ki különböző egységeket.\nEzenkívül egyes bázisokat pajzsok védenek. Találd ki, hogyan táplálják őket.
 sector.karst.description = Ez a szektor gazdag a nyersanyagokban, de amint egy új támaszpont leszáll, az ellenség megtámadja azt.\nHasználd ki a nyersanyagokat és fedezd fel a [accent]tóritkvarcot[].
-sector.origin.description = Az utolsó szektor, jelentős ellenséges jelenléttel.\nNem valószínű, hogy további fejlesztési lehetőségek maradtak – koncentrálj az ellenséges támaszpontok elpusztítására.
+sector.origin.description = Az utolsó szektor, jelentős ellenséges jelenléttel.\nNem valószínű, hogy maradtak további fejlesztési lehetőségek – koncentrálj az ellenséges támaszpontok elpusztítására.
 
 status.burning.name = Égő
 status.freezing.name = Fagyos
@@ -998,46 +998,46 @@ stat.immunities = Immunitások
 stat.healing = Gyógyulás
 
 ability.forcefield = Erőtér
-ability.forcefield.description = Projects a force shield that absorbs bullets
+ability.forcefield.description = Erőteret vetít ki, mely elnyeli a lövedékeket
 ability.repairfield = Javító mező
-ability.repairfield.description = Repairs nearby units
+ability.repairfield.description = Megjavítja a közeli egységeket
 ability.statusfield = Állapotmező
-ability.statusfield.description = Applies a status effect to nearby units
+ability.statusfield.description = Állapothatást alkalmaz a közeli egységekre
 ability.unitspawn = Gyár
-ability.unitspawn.description = Constructs units
+ability.unitspawn.description = Egységeket gyárt
 ability.shieldregenfield = Pajzsregeneráló mező
-ability.shieldregenfield.description = Regenerates shields of nearby units
+ability.shieldregenfield.description = Regenerálja a közeli egységek pajzsát
 ability.movelightning = Villámcsapás
-ability.movelightning.description = Releases lightning while moving
-ability.armorplate = Armor Plate
-ability.armorplate.description = Reduces damage taken while shooting
+ability.movelightning.description = Mozgás közben villámokat bocsát ki
+ability.armorplate = Páncéllemez
+ability.armorplate.description = Csökkenti a kapott sebzést lövés közben
 ability.shieldarc = Pajzs ív
-ability.shieldarc.description = Projects a force shield in an arc that absorbs bullets
+ability.shieldarc.description = Erőteret vetít ki egy ívben, mely elnyeli a lövedékeket
 ability.suppressionfield = Javítás elnyomása
-ability.suppressionfield.description = Stops nearby repair buildings
+ability.suppressionfield.description = Leállítja a közeli javítóépületeket
 ability.energyfield = Energiamező
-ability.energyfield.description = Zaps nearby enemies
-ability.energyfield.healdescription = Zaps nearby enemies and heals allies
+ability.energyfield.description = Megrázza a közeli ellenségeket
+ability.energyfield.healdescription = Megrázza a közeli ellenségeket, és gyógyítja a szövetségeseket
 ability.regen = Regeneráció
-ability.regen.description = Regenerates own health over time
-ability.liquidregen = Liquid Absorption
-ability.liquidregen.description = Absorbs liquid to heal itself
-ability.spawndeath = Death Spawns
-ability.spawndeath.description = Releases units on death
-ability.liquidexplode = Death Spillage
-ability.liquidexplode.description = Spills liquid on death
-ability.stat.firingrate = [stat]{0}/sec[lightgray] firing rate
-ability.stat.regen = [stat]{0}[lightgray] health/sec
-ability.stat.shield = [stat]{0}[lightgray] shield
-ability.stat.repairspeed = [stat]{0}/sec[lightgray] repair speed
-ability.stat.slurpheal = [stat]{0}[lightgray] health/liquid unit
-ability.stat.cooldown = [stat]{0} sec[lightgray] cooldown
-ability.stat.maxtargets = [stat]{0}[lightgray] max targets
-ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] same type repair amount
-ability.stat.damagereduction = [stat]{0}%[lightgray] damage reduction
-ability.stat.minspeed = [stat]{0} tiles/sec[lightgray] min speed
-ability.stat.duration = [stat]{0} sec[lightgray] duration
-ability.stat.buildtime = [stat]{0} sec[lightgray] build time
+ability.regen.description = Idővel regenerálja a saját életerejét
+ability.liquidregen = Folyadékelnyelés
+ability.liquidregen.description = Folyadékot nyel el, hogy gyógyítsa magát
+ability.spawndeath = Szétesés
+ability.spawndeath.description = Megsemmisülésekor egységeket bocsát ki
+ability.liquidexplode = Szétömlés
+ability.liquidexplode.description = Megsemmisülésekor folyadék ömlik ki belőle
+ability.stat.firingrate = [stat]{0}/mp[lightgray] tüzelési sebesség
+ability.stat.regen = [stat]{0}[lightgray] életerő/mp
+ability.stat.shield = [stat]{0}[lightgray] pajzs
+ability.stat.repairspeed = [stat]{0}/mp[lightgray] javítási sebesség
+ability.stat.slurpheal = [stat]{0}[lightgray] életerő/folyadékegység
+ability.stat.cooldown = [stat]{0} mp[lightgray] újratöltődés
+ability.stat.maxtargets = [stat]{0}[lightgray] max. célpont
+ability.stat.sametypehealmultiplier = [stat]{0}%[lightgray] javítási mennyiség (azonos típusnál)
+ability.stat.damagereduction = [stat]{0}%[lightgray] sebzéscsökkentés
+ability.stat.minspeed = [stat]{0} csempe/mp[lightgray] min. sebesség
+ability.stat.duration = [stat]{0} mp[lightgray] időtartam
+ability.stat.buildtime = [stat]{0} mp[lightgray] építési idő
 
 bar.onlycoredeposit = Csak a támaszpont elhelyezése megengedett
 bar.drilltierreq = Erősebb fúró szükséges
@@ -1316,7 +1316,7 @@ rules.onlydepositcore = Csak a támaszpontok elhelyezése engedélyezett
 rules.derelictrepair = Az elhagyatott épületek javításának engedélyezése
 rules.reactorexplosions = Reaktorrobbanások
 rules.coreincinerates = Többletnyersanyagok megsemmisítése a támaszpontban
-rules.disableworldprocessors = Világfeldolgozók letiltása
+rules.disableworldprocessors = Világprocesszorok letiltása
 rules.schematic = Vázlatok engedélyezése
 rules.wavetimer = Hullámok időzítése
 rules.wavesending = Hullámok küldése
@@ -1342,7 +1342,7 @@ rules.unitdamagemultiplier = Egység sebzésszorzója
 rules.unitcrashdamagemultiplier = Egység ütközési sebzésszorzója
 rules.solarmultiplier = Napenergia szorzója
 rules.unitcapvariable = A támaszpontok befolyásolják a gyártható egységek darabszámát
-rules.unitpayloadsexplode = Carried Payloads Explode With The Unit
+rules.unitpayloadsexplode = A szállított rakományok az egységgel együtt felrobbannak
 rules.unitcap = Alap egységdarabszám
 rules.limitarea = Játékterület korlátozása
 rules.enemycorebuildradius = Ellenséges támaszpont körüli tiltott zóna sugara:[lightgray] (csempe)
@@ -2345,7 +2345,7 @@ lst.getblock = Csempeadatok lekérdezése tetszőleges helyen.
 lst.setblock = Csempeadatok beállítása tetszőleges helyen.
 lst.spawnunit = Egység lerakása az adott helyen.
 lst.applystatus = Állapothatás alkalmazása vagy törlése egy egységről.
-lst.weathersense = Check if a type of weather is active.
+lst.weathersense = Ellenőrzés, hogy egy bizonyos típusú időjárás aktív-e.
 lst.weatherset = Az időjárástípus jelenlegi állapotának megadása.
 lst.spawnwave = Egy hullám indítása.
 lst.explosion = Robbanás létrehozása az adott helyen.

From 4d916f5b2394534598d3636595a2c422053f5359 Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <redstonneur1256mc@gmail.com>
Date: Wed, 3 Apr 2024 00:52:02 +0200
Subject: [PATCH 331/369] Update servers_v7.json (#9704)

---
 servers_v7.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index ce7a6765fb..58e1268346 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -269,10 +269,6 @@
     "name": "Atomic",
     "address": ["atomic-de.ddns.net:35876", "atomic-de.ddns.net:35663", "atomic-de.ddns.net:35724", "atomic-de.ddns.net:35847"]
   },
-  {
-    "name": "SkyPlex",
-    "address": ["mc-skyplex.net"]
-  },
   {
     "name": "Gadgetroch's Server",
     "address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568", "mindustry.gadgetroch.com:6569"]

From d1538a168dc955e984042aab0c2e84a32f4e21bc Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 4 Apr 2024 09:21:25 -0400
Subject: [PATCH 332/369] Fixed #9708

---
 core/src/mindustry/world/blocks/units/UnitAssembler.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/blocks/units/UnitAssembler.java b/core/src/mindustry/world/blocks/units/UnitAssembler.java
index bff1cdf800..f77f2119ac 100644
--- a/core/src/mindustry/world/blocks/units/UnitAssembler.java
+++ b/core/src/mindustry/world/blocks/units/UnitAssembler.java
@@ -23,6 +23,8 @@ import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
+import mindustry.world.blocks.ConstructBlock.*;
 import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.units.UnitAssemblerModule.*;
 import mindustry.world.consumers.*;
@@ -85,7 +87,9 @@ public class UnitAssembler extends PayloadBlock{
     public boolean canPlaceOn(Tile tile, Team team, int rotation){
         //overlapping construction areas not allowed; grow by a tiny amount so edges can't overlap either.
         Rect rect = getRect(Tmp.r1, tile.worldx() + offset, tile.worldy() + offset, rotation).grow(0.1f);
-        return !indexer.getFlagged(team, BlockFlag.unitAssembler).contains(b -> getRect(Tmp.r2, b.x, b.y, b.rotation).overlaps(rect));
+        return
+            !indexer.getFlagged(team, BlockFlag.unitAssembler).contains(b -> getRect(Tmp.r2, b.x, b.y, b.rotation).overlaps(rect)) &&
+            !team.data().getBuildings(ConstructBlock.get(size)).contains(b -> ((ConstructBuild)b).current instanceof UnitAssembler && getRect(Tmp.r2, b.x, b.y, b.rotation).overlaps(rect));
     }
 
     @Override

From 89433ddeb48aa3410ac316e2550798e625c113bb Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 4 Apr 2024 18:14:32 -0400
Subject: [PATCH 333/369] Trail length FPS independence

---
 core/src/mindustry/graphics/Trail.java | 34 ++++++++++++++++----------
 gradle.properties                      |  2 +-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/core/src/mindustry/graphics/Trail.java b/core/src/mindustry/graphics/Trail.java
index 7594257642..48e8ff900e 100644
--- a/core/src/mindustry/graphics/Trail.java
+++ b/core/src/mindustry/graphics/Trail.java
@@ -97,12 +97,11 @@ public class Trail{
 
     /** Removes the last point from the trail at intervals. */
     public void shorten(){
-        if((counter += Time.delta) >= 1f){
-            if(points.size >= 3){
-                points.removeRange(0, 2);
-            }
+        int count = (int)(counter += Time.delta);
+        counter -= count;
 
-            counter %= 1f;
+        if(points.size + ((count - 1) * 3) > length * 3){
+            points.removeRange(0, Math.min(3 * count - 1, points.size - 1));
         }
     }
 
@@ -113,18 +112,27 @@ public class Trail{
 
     /** Adds a new point to the trail at intervals. */
     public void update(float x, float y, float width){
-        //TODO fix longer trails at low FPS
-        if((counter += Time.delta) >= 1f){
-            if(points.size > length*3){
-                points.removeRange(0, 2);
+        int count = (int)(counter += Time.delta);
+        counter -= count;
+
+        if(count > 0){
+            int toRemove = points.size + (count - 1 - length) * 3;
+            if(toRemove > 0){
+                points.removeRange(0, Math.min(toRemove - 1, points.size - 1));
             }
 
-            points.add(x, y, width);
-
-            counter %= 1f;
+            //if lastX is -1, this trail has never updated, so only add one point - there is nothing to interpolate with
+            if(count == 1 || lastX == -1f){
+                points.add(x, y, width);
+            }else{
+                for(int i = 0; i < count; i++){
+                    float f = (i + 1f) / count;
+                    points.add(Mathf.lerp(lastX, x, f), Mathf.lerp(lastY, y, f), Mathf.lerp(lastW, width, f));
+                }
+            }
         }
 
-        //update last position regardless, so it joins
+        //update last position regardless, so it joins at the origin
         lastAngle = -Angles.angleRad(x, y, lastX, lastY);
         lastX = x;
         lastY = y;
diff --git a/gradle.properties b/gradle.properties
index 1733b891ba..5aca247a29 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=e312cc96f5
+archash=4ea3d3b7e8

From 275199fe1679db416532f72a80549e071f1ef728 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 4 Apr 2024 23:24:58 -0400
Subject: [PATCH 334/369] Trail tail smoothened

---
 core/src/mindustry/graphics/Trail.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/src/mindustry/graphics/Trail.java b/core/src/mindustry/graphics/Trail.java
index 48e8ff900e..813623a7bf 100644
--- a/core/src/mindustry/graphics/Trail.java
+++ b/core/src/mindustry/graphics/Trail.java
@@ -65,6 +65,12 @@ public class Trail{
                 x2 = items[i + 3];
                 y2 = items[i + 4];
                 w2 = items[i + 5];
+
+                if(i == 0){
+                    x1 = Mathf.lerp(x1, x2, counter);
+                    y1 = Mathf.lerp(y1, y2, counter);
+                    w1 = Mathf.lerp(w1, w2, counter);
+                }
             }else{
                 x2 = lastX;
                 y2 = lastY;

From ca37e1903d8aa2777ec655f37dc1ef157249a882 Mon Sep 17 00:00:00 2001
From: Hahaa13 <108379326+Hahaa13@users.noreply.github.com>
Date: Fri, 5 Apr 2024 19:52:59 +0700
Subject: [PATCH 335/369] Update servers_v7.json (#9711)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 58e1268346..1bc2162697 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -279,7 +279,7 @@
   },
   {
     "name": "AZDustry",
-    "address": ["118.127.8.162:25628"]
+    "address": ["23.175.144.70:25845"]
   },
   {
     "name": "Erepulo",

From 7bec60de1298f9f39b3e9f85a44a55c62c830b76 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 5 Apr 2024 21:00:37 -0400
Subject: [PATCH 336/369] Fixed snow name

---
 core/assets/bundles/bundle.properties       | 2 +-
 core/assets/bundles/bundle_be.properties    | 2 +-
 core/assets/bundles/bundle_bg.properties    | 2 +-
 core/assets/bundles/bundle_ca.properties    | 2 +-
 core/assets/bundles/bundle_cs.properties    | 2 +-
 core/assets/bundles/bundle_da.properties    | 2 +-
 core/assets/bundles/bundle_de.properties    | 2 +-
 core/assets/bundles/bundle_es.properties    | 2 +-
 core/assets/bundles/bundle_et.properties    | 2 +-
 core/assets/bundles/bundle_eu.properties    | 2 +-
 core/assets/bundles/bundle_fi.properties    | 2 +-
 core/assets/bundles/bundle_fil.properties   | 2 +-
 core/assets/bundles/bundle_fr.properties    | 2 +-
 core/assets/bundles/bundle_hu.properties    | 2 +-
 core/assets/bundles/bundle_id_ID.properties | 2 +-
 core/assets/bundles/bundle_it.properties    | 2 +-
 core/assets/bundles/bundle_ja.properties    | 2 +-
 core/assets/bundles/bundle_ko.properties    | 2 +-
 core/assets/bundles/bundle_lt.properties    | 2 +-
 core/assets/bundles/bundle_nl.properties    | 2 +-
 core/assets/bundles/bundle_nl_BE.properties | 2 +-
 core/assets/bundles/bundle_pl.properties    | 2 +-
 core/assets/bundles/bundle_pt_BR.properties | 2 +-
 core/assets/bundles/bundle_pt_PT.properties | 2 +-
 core/assets/bundles/bundle_ro.properties    | 2 +-
 core/assets/bundles/bundle_ru.properties    | 2 +-
 core/assets/bundles/bundle_sr.properties    | 2 +-
 core/assets/bundles/bundle_sv.properties    | 2 +-
 core/assets/bundles/bundle_th.properties    | 2 +-
 core/assets/bundles/bundle_tk.properties    | 2 +-
 core/assets/bundles/bundle_tr.properties    | 2 +-
 core/assets/bundles/bundle_uk_UA.properties | 2 +-
 core/assets/bundles/bundle_vi.properties    | 2 +-
 core/assets/bundles/bundle_zh_CN.properties | 2 +-
 core/assets/bundles/bundle_zh_TW.properties | 2 +-
 35 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 239a70034a..08afa6d5fd 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -738,7 +738,7 @@ error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index 28be5a9d62..dea9e38c94 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -716,7 +716,7 @@ error.any = Невядомая сеткавая памылка.
 error.bloom = Не атрымалася ініцыялізаваць свячэнне (Bloom). \nМагчыма, зараз Вашая прылада не падтрымлівае яго.
 
 weather.rain.name = Дождж
-weather.snow.name = Снег
+weather.snowing.name = Снег
 weather.sandstorm.name = Пясчаная бура
 weather.sporestorm.name = Спаравая бура
 weather.fog.name = Туман
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 7c6656a87e..a3dc513594 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -723,7 +723,7 @@ error.any = Неизвестна мрежова грешка.
 error.bloom = Неуспешно инициализиране на Сияния.\nВашето устройство може да не поддържа този ефект.
 
 weather.rain.name = Дъжд
-weather.snow.name = Сняг
+weather.snowing.name = Сняг
 weather.sandstorm.name = Пясъчна буря
 weather.sporestorm.name = Спорова буря
 weather.fog.name = Мъгла
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index 6e373a2606..8af95acac6 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -727,7 +727,7 @@ error.any = S’ha produït un error de xarxa desconegut.
 error.bloom = No s’ha pogut inicialitzar l’efecte «bloom».\nPotser el dispositiu no admet aquesta funció.
 
 weather.rain.name = Pluja
-weather.snow.name = Neu
+weather.snowing.name = Neu
 weather.sandstorm.name = Tempesta de sorra
 weather.sporestorm.name = Tempesta d’espores
 weather.fog.name = Boira
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index a44a8cea4c..5459cf49fa 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -725,7 +725,7 @@ error.any = Neznámá chyba sítě.
 error.bloom = Chyba inicializace filtru Bloom.\nTvé zařízení ho nejspíš nepodporuje.
 
 weather.rain.name = Déšť
-weather.snow.name = Sníh
+weather.snowing.name = Sníh
 weather.sandstorm.name = Písečná ouře
 weather.sporestorm.name = Spórová bouře
 weather.fog.name = Mlha
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index ba68c6cb22..563f6134f8 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -717,7 +717,7 @@ error.any = Ukendt netværksfejl.
 error.bloom = Kunne ikke etablere bloom-effekt.\nMåske understøtter din enhed den ikke.
 
 weather.rain.name = Regn
-weather.snow.name = Sne
+weather.snowing.name = Sne
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Tåge
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index ad2c09c8f7..7d1a5caa72 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -734,7 +734,7 @@ error.any = Unbekannter Netzwerkfehler.
 error.bloom = Bloom konnte nicht initialisiert werden.\nEs kann sein, dass dein Gerät es nicht unterstützt.
 
 weather.rain.name = Regen
-weather.snow.name = Schnee
+weather.snowing.name = Schnee
 weather.sandstorm.name = Sandsturm
 weather.sporestorm.name = Sporensturm
 weather.fog.name = Nebel
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 37aaf8fa5c..e833d94709 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -731,7 +731,7 @@ error.any = Error de red desconocido.
 error.bloom = Error al cargar el efecto de bloom.\nPuede que tu dispositivo no sea compatible con esta característica.
 
 weather.rain.name = Lluvia
-weather.snow.name = Nieve
+weather.snowing.name = Nieve
 weather.sandstorm.name = Tormenta de arena
 weather.sporestorm.name = Tormenta de esporas
 weather.fog.name = Niebla
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index cf46c49acf..1f653ca8cb 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -717,7 +717,7 @@ error.any = Teadmata viga võrgus.
 error.bloom = Bloom-efekti lähtestamine ebaõnnestus.\nSinu seade ei pruugi seda efekti toetada.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index f97845fc3e..937455c5ae 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -719,7 +719,7 @@ error.any = Sareko errore ezezaguna.
 error.bloom = Ezin izan da distira hasieratu.\nAgian zure gailuak ez du onartzen.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 011cb44d22..a510f47d8b 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -717,7 +717,7 @@ error.any = Tuntematon verkon virhe.
 error.bloom = Bloomin initialisointi epäonnistui.\nLaitteesi ei ehkä tue sitä.
 
 weather.rain.name = Sade
-weather.snow.name = Lumi
+weather.snowing.name = Lumi
 weather.sandstorm.name = Hiekkamyrsky
 weather.sporestorm.name = Sienimyräkkä
 weather.fog.name = Sumu
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 92634c5367..4c1af29c96 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -717,7 +717,7 @@ error.any = Unknown network error.
 error.bloom = Nabigong simulan ang bloom.\nMaaaring hindi ito sinusuportahan ng iyong device.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index d044c45163..8b950668e4 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -737,7 +737,7 @@ error.any = Erreur de réseau inconnue.
 error.bloom = Échec de l'initialisation du flou lumineux.\nIl se peut que votre appareil ne le prenne pas en charge.
 
 weather.rain.name = Pluie
-weather.snow.name = Neige
+weather.snowing.name = Neige
 weather.sandstorm.name = Tempête de sable
 weather.sporestorm.name = Tempête de spores
 weather.fog.name = Brouillard
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index b501f41f78..997e33631c 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -738,7 +738,7 @@ error.any = Ismeretlen hálózati hiba.
 error.bloom = A bloom hatás előkészítése nem sikerült.\nElőfordulhat, hogy az eszköz nem támogatja.
 
 weather.rain.name = Eső
-weather.snow.name = Hóesés
+weather.snowing.name = Hóesés
 weather.sandstorm.name = Homokvihar
 weather.sporestorm.name = Spóravihar
 weather.fog.name = Köd
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index e9040f5bab..d8e91ab50c 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -731,7 +731,7 @@ error.any = Terjadi kesalahan Jaringan tidak diketahui.
 error.bloom = Gagal untuk menjalankan bloom.\nPerangkat Anda mungkin tidak mendukung fitur ini.
 
 weather.rain.name = Hujan
-weather.snow.name = Salju
+weather.snowing.name = Salju
 weather.sandstorm.name = Badai Pasir
 weather.sporestorm.name = Badai Spora
 weather.fog.name = Kabut
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 1db134fcd2..138b8cef13 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -721,7 +721,7 @@ error.any = Errore di rete sconosciuto.
 error.bloom = Errore dell'avvio delle shaders.\nIl tuo dispositivo potrebbe non supportarle.
 
 weather.rain.name = Pioggia
-weather.snow.name = Neve
+weather.snowing.name = Neve
 weather.sandstorm.name = Tempesta di Sabbia
 weather.sporestorm.name = Tempesta di Spore
 weather.fog.name = Nebbia
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index d67268871a..7e021ec285 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -725,7 +725,7 @@ error.any = 不明なネットワークエラーです。
 error.bloom = ブルームの初期化に失敗しました。\n恐らくあなたのデバイスではブルームがサポートされていません。
 
 weather.rain.name = 雨
-weather.snow.name = 雪
+weather.snowing.name = 雪
 weather.sandstorm.name = 砂嵐
 weather.sporestorm.name = 胞子嵐
 weather.fog.name = 霧
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 8cdb1beacf..be380aa335 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -726,7 +726,7 @@ error.any = 알 수 없는 네트워크 오류
 error.bloom = 블룸 그래픽 효과를 적용하지 못했습니다.\n기기가 이 기능을 지원하지 않는 것일 수도 있습니다.
 
 weather.rain.name = 비
-weather.snow.name = 눈
+weather.snowing.name = 눈
 weather.sandstorm.name = 모래 폭풍
 weather.sporestorm.name = 포자 폭풍
 weather.fog.name = 안개
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 210ccafb06..68a0e9319b 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -717,7 +717,7 @@ error.any = Nžinoma tinklo klaida.
 error.bloom = Nepavyko inicijuoti spindėjimo.\nJūsų įrenginys gali nepalaikyti šios funkcijos.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index a193ffe2dd..8af4933743 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -728,7 +728,7 @@ error.any = Onbekende netwerk fout.
 error.bloom = Bloom aanzetten mislukt.\nJe apparaat ondersteunt het waarschijnlijk niet.
 
 weather.rain.name = Regen
-weather.snow.name = Sneeuw
+weather.snowing.name = Sneeuw
 weather.sandstorm.name = Zandstorm
 weather.sporestorm.name = Schimmelstorm
 weather.fog.name = Mist
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 5691be2512..34a4da88f5 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -717,7 +717,7 @@ error.any = Unknown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index e991692472..9127fbfaf2 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -723,7 +723,7 @@ error.any = Nieznany błąd sieci.
 error.bloom = Nie udało się załadować funkcji bloom.\nTwoje urządzenie może nie wspierać tej funkcji.
 
 weather.rain.name = Deszcz
-weather.snow.name = Śnieg
+weather.snowing.name = Śnieg
 weather.sandstorm.name = Burza piaskowa
 weather.sporestorm.name = Burza zarodników
 weather.fog.name = Mgła
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index aea3126a21..77fd5923d3 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -731,7 +731,7 @@ error.any = Erro de rede desconhecido.
 error.bloom = Falha ao inicializar bloom.\nSeu dispositivo talvez não o suporte.
 
 weather.rain.name = Chuva
-weather.snow.name = Neve
+weather.snowing.name = Neve
 weather.sandstorm.name = Tempestade de Areia
 weather.sporestorm.name = Tempestade de Esporos
 weather.fog.name = Névoa
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index a0be18e995..f0d6701020 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -717,7 +717,7 @@ error.any = Erro de rede desconhecido.
 error.bloom = Falha ao inicializar bloom.\nSeu aparelho talvez não o suporte.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index ed8fc6bb60..409cf3be17 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -725,7 +725,7 @@ error.any = Eroare de rețea necunoscută.
 error.bloom = Inițializarea strălucirii a eșuat.\nS-ar putea ca dispozitivul tău să nu suporte funcția.
 
 weather.rain.name = Ploaie
-weather.snow.name = Ninsoare
+weather.snowing.name = Ninsoare
 weather.sandstorm.name = Furtună de nisip
 weather.sporestorm.name = Furtună de spori
 weather.fog.name = Ceață
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 2587e514ba..13eec1407e 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -725,7 +725,7 @@ error.any = Неизвестная сетевая ошибка.
 error.bloom = Не удалось инициализировать свечение (Bloom).\nВозможно, ваше устройство не поддерживает его.
 
 weather.rain.name = Дождь
-weather.snow.name = Снегопад
+weather.snowing.name = Снегопад
 weather.sandstorm.name = Песчаная буря
 weather.sporestorm.name = Споровая буря
 weather.fog.name = Туман
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 56582bbae8..218940ccd3 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -726,7 +726,7 @@ error.any = Nepoznata greška u mreži.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
 weather.rain.name = Kiša
-weather.snow.name = Sneg
+weather.snowing.name = Sneg
 weather.sandstorm.name = Peščana Oluja
 weather.sporestorm.name = Sporna Oluja
 weather.fog.name = Magla
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 65d440cab3..5a30521e0c 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -717,7 +717,7 @@ error.any = Okänt nätverksfel.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 222c4fbb21..e1032d277c 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -725,7 +725,7 @@ error.any = ข้อผิดพลาด: เครือข่ายที่
 error.bloom = ไม่สามารถเริ่มต้นบลูมได้\nอุปกรณ์ของคุณอาจไม่รองรับ
 
 weather.rain.name = ฝน
-weather.snow.name = หิมะ
+weather.snowing.name = หิมะ
 weather.sandstorm.name = พายุทราย
 weather.sporestorm.name = พายุสปอร์
 weather.fog.name = หมอก
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 881abd92f9..18c9cb6235 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -717,7 +717,7 @@ error.any = Unkown network error.
 error.bloom = Failed to initialize bloom.\nYour device may not support it.
 
 weather.rain.name = Rain
-weather.snow.name = Snow
+weather.snowing.name = Snow
 weather.sandstorm.name = Sandstorm
 weather.sporestorm.name = Sporestorm
 weather.fog.name = Fog
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index f50ff06f3a..9a60f81d7c 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -725,7 +725,7 @@ error.any = Bilinmeyen ağ hatası.
 error.bloom = Kamaşma başlatılamadı.\nCihazınız bu özelliği desteklemiyor olabilir.
 
 weather.rain.name = Yağmur
-weather.snow.name = Kar
+weather.snowing.name = Kar
 weather.sandstorm.name = Kum Fırtınası
 weather.sporestorm.name = Spor Fırtınası
 weather.fog.name = Sis
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index e6743cbee4..6b0e45de61 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -733,7 +733,7 @@ error.any = Невідома мережева помилка
 error.bloom = Не вдалося ініціалізувати світіння.\nВаш пристрій, мабуть, не підтримує це.
 
 weather.rain.name = Дощ
-weather.snow.name = Сніг
+weather.snowing.name = Сніг
 weather.sandstorm.name = Піщана буря
 weather.sporestorm.name = Спорова буря
 weather.fog.name = Туман
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 377ce2fff4..59ff78b06e 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -726,7 +726,7 @@ error.any = Lỗi mạng không xác định.
 error.bloom = Không khởi tạo được hiệu ứng phát sáng.\nThiết bị của bạn có thể không hỗ trợ.
 
 weather.rain.name = Mưa
-weather.snow.name = Tuyết
+weather.snowing.name = Tuyết
 weather.sandstorm.name = Bão cát
 weather.sporestorm.name = Bão bào tử
 weather.fog.name = Sương mù
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 2a74a48802..4044a20dbc 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -734,7 +734,7 @@ error.any = 未知网络错误。
 error.bloom = 未能初始化光效。 \n您的设备可能不支持。
 
 weather.rain.name = 降雨
-weather.snow.name = 降雪
+weather.snowing.name = 降雪
 weather.sandstorm.name = 沙尘暴
 weather.sporestorm.name = 孢子风暴
 weather.fog.name = 雾
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 465a18589d..35cbef4819 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -731,7 +731,7 @@ error.any = 未知網路錯誤。
 error.bloom = 初始化特效失敗。\n您的裝置可能不支援
 
 weather.rain.name = 雨
-weather.snow.name = 雪
+weather.snowing.name = 雪
 weather.sandstorm.name = 沙塵暴
 weather.sporestorm.name = 孢子風暴
 weather.fog.name = 霧

From 08c8ab08a2b8d0be42f2a35b8fb8c414f40a6f9b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 6 Apr 2024 09:49:30 -0400
Subject: [PATCH 337/369] Fixed #9713

---
 core/src/mindustry/graphics/Trail.java | 4 ++--
 gradle.properties                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/graphics/Trail.java b/core/src/mindustry/graphics/Trail.java
index 813623a7bf..426f7215b3 100644
--- a/core/src/mindustry/graphics/Trail.java
+++ b/core/src/mindustry/graphics/Trail.java
@@ -106,7 +106,7 @@ public class Trail{
         int count = (int)(counter += Time.delta);
         counter -= count;
 
-        if(points.size + ((count - 1) * 3) > length * 3){
+        if(points.size + ((count - 1) * 3) > length * 3 && points.size > 0){
             points.removeRange(0, Math.min(3 * count - 1, points.size - 1));
         }
     }
@@ -123,7 +123,7 @@ public class Trail{
 
         if(count > 0){
             int toRemove = points.size + (count - 1 - length) * 3;
-            if(toRemove > 0){
+            if(toRemove > 0 && points.size > 0){
                 points.removeRange(0, Math.min(toRemove - 1, points.size - 1));
             }
 
diff --git a/gradle.properties b/gradle.properties
index 5aca247a29..ba5ca31b4a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=4ea3d3b7e8
+archash=6ad7aca01b

From 8ad39a5944c787ea695977fceac03a7eae19feb0 Mon Sep 17 00:00:00 2001
From: NealRead <160118416+NealRead@users.noreply.github.com>
Date: Sat, 6 Apr 2024 20:50:08 +0700
Subject: [PATCH 338/369] Update servers_v7.json (#9712)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 1bc2162697..d77ae5e3a9 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -291,7 +291,7 @@
   },
   {
     "name": "NPTS",
-    "address": ["94.198.54.132:26863"]
+    "address": ["81.94.156.54"]
   },
   {
     "name": "Skywar.VN",

From ef0f89efcfa42aaeb0df5ac8c9e520ab9ad79ed8 Mon Sep 17 00:00:00 2001
From: TheCrux_ <134880334+The1Crux@users.noreply.github.com>
Date: Sat, 6 Apr 2024 09:50:19 -0400
Subject: [PATCH 339/369] Update servers_v7.json (#9699)

don't ask how did i got 9 servers, just enjoy it
---
 servers_v7.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index d77ae5e3a9..5ae3b91ff5 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -29,8 +29,8 @@
     "address": ["cn1.meiqiumdt.top","cn1.meiqiumdt.top:7000","cn1.meiqiumdt.top:8000","cn1.meiqiumdt.top:7013","cn1.meiqiumdt.top:9000"]
   },
   {
-    "name": "Crux's Revelations",
-    "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"]
+    "name": "Crux's Citadel",
+    "address": ["45.158.9.198:32865","45.158.9.198:30055","45.158.9.198:32175","45.158.9.198:30252","94.130.132.149:35899","129.154.47.57:26645","94.130.132.149:35930","129.154.47.57:27993","129.154.47.57:26881"]
   },
   {
     "name": "Chilldustry",

From 58d6b3e2d6a646698b88a0d09490e2a0e32259dd Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sat, 6 Apr 2024 06:52:39 -0700
Subject: [PATCH 340/369] Make ChildComp work with turrets (#9706)

---
 .../mindustry/entities/comp/ChildComp.java    | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/core/src/mindustry/entities/comp/ChildComp.java b/core/src/mindustry/entities/comp/ChildComp.java
index f34a9198c9..03465fbf78 100644
--- a/core/src/mindustry/entities/comp/ChildComp.java
+++ b/core/src/mindustry/entities/comp/ChildComp.java
@@ -4,6 +4,7 @@ import arc.math.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
+import mindustry.world.blocks.defense.turrets.BaseTurret.*;
 
 @Component
 abstract class ChildComp implements Posc, Rotc{
@@ -18,9 +19,14 @@ abstract class ChildComp implements Posc, Rotc{
         if(parent != null){
             offsetX = x - parent.getX();
             offsetY = y - parent.getY();
-            if(rotWithParent && parent instanceof Rotc r){
-                offsetPos = -r.rotation();
-                offsetRot = rotation - r.rotation();
+            if(rotWithParent){
+                if(parent instanceof Rotc r){
+                    offsetPos = -r.rotation();
+                    offsetRot = rotation - r.rotation();
+                }else if(parent instanceof BaseTurretBuild build){
+                    offsetPos = -build.rotation;
+                    offsetRot = rotation - build.rotation;
+                }
             }
         }
     }
@@ -28,10 +34,16 @@ abstract class ChildComp implements Posc, Rotc{
     @Override
     public void update(){
         if(parent != null){
-            if(rotWithParent && parent instanceof Rotc r){
-                x = parent.getX() + Angles.trnsx(r.rotation() + offsetPos, offsetX, offsetY);
-                y = parent.getY() + Angles.trnsy(r.rotation() + offsetPos, offsetX, offsetY);
-                rotation = r.rotation() + offsetRot;
+            if(rotWithParent){
+                if(parent instanceof Rotc r){
+                    x = parent.getX() + Angles.trnsx(r.rotation() + offsetPos, offsetX, offsetY);
+                    y = parent.getY() + Angles.trnsy(r.rotation() + offsetPos, offsetX, offsetY);
+                    rotation = r.rotation() + offsetRot;
+                }else if(parent instanceof BaseTurretBuild build){
+                    x = parent.getX() + Angles.trnsx(build.rotation + offsetPos, offsetX, offsetY);
+                    y = parent.getY() + Angles.trnsy(build.rotation + offsetPos, offsetX, offsetY);
+                    rotation = build.rotation + offsetRot;
+                }
             }else{
                 x = parent.getX() + offsetX;
                 y = parent.getY() + offsetY;

From 33f01112cae7a85780c519675ec7fe41742190df Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 6 Apr 2024 18:20:45 -0400
Subject: [PATCH 341/369] Fixed #9714

---
 core/src/mindustry/world/Block.java                   |  5 +++++
 .../world/blocks/payloads/PayloadLoader.java          |  2 +-
 .../world/blocks/payloads/PayloadUnloader.java        |  2 +-
 .../src/mindustry/world/blocks/units/UnitFactory.java |  2 +-
 .../world/consumers/ConsumePowerDynamic.java          | 11 ++++++++++-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 5dcf542400..2e9f291b7d 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -993,6 +993,11 @@ public class Block extends UnlockableContent implements Senseable{
         return consume(new ConsumePowerDynamic((Floatf<Building>)usage));
     }
 
+    /** Creates a consumer that consumes a dynamic amount of power. */
+    public <T extends Building> ConsumePower consumePowerDynamic(float displayed, Floatf<T> usage){
+        return consume(new ConsumePowerDynamic(displayed, (Floatf<Building>)usage));
+    }
+
     /**
      * Creates a consumer which stores power.
      * @param powerCapacity The maximum capacity in power units.
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
index 301789e54b..d323c69feb 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
@@ -76,7 +76,7 @@ public class PayloadLoader extends PayloadBlock{
     public void init(){
         if(loadPowerDynamic){
             basePowerUse = consPower != null ? consPower.usage : 0f;
-            consumePowerDynamic((PayloadLoaderBuild loader) -> loader.shouldConsume() ? (loader.hasBattery() && !loader.exporting ? maxPowerConsumption + basePowerUse : basePowerUse) : 0f);
+            consumePowerDynamic(basePowerUse, (PayloadLoaderBuild loader) -> loader.shouldConsume() ? (loader.hasBattery() && !loader.exporting ? maxPowerConsumption + basePowerUse : basePowerUse) : 0f);
         }
 
         super.init();
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadUnloader.java b/core/src/mindustry/world/blocks/payloads/PayloadUnloader.java
index fac5f083a1..205402fdd6 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadUnloader.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadUnloader.java
@@ -87,7 +87,7 @@ public class PayloadUnloader extends PayloadLoader{
                     (liquids.current() == payload.build.liquids.current() || liquids.currentAmount() <= 0.2f)){
                     var liq = payload.build.liquids.current();
                     float remaining = liquidCapacity - liquids.currentAmount();
-                    float flow = Math.min(Math.min(liquidsLoaded * delta(), remaining), payload.build.liquids.currentAmount());
+                    float flow = Math.min(Math.min(liquidsLoaded * edelta(), remaining), payload.build.liquids.currentAmount());
 
                     liquids.add(liq, flow);
                     payload.build.liquids.remove(liq, flow);
diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java
index 7b98b80e2f..b89d945c65 100644
--- a/core/src/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/mindustry/world/blocks/units/UnitFactory.java
@@ -137,7 +137,7 @@ public class UnitFactory extends UnitBlock{
                                 }
 
                                 ItemStack stack = plan.requirements[i];
-                                req.add(new ItemDisplay(stack.item, stack.amount, false)).pad(5);
+                                req.add(new ItemDisplay(stack.item, stack.amount, plan.time, true)).pad(5);
                             }
                         }).right().grow().pad(10f);
                     }else{
diff --git a/core/src/mindustry/world/consumers/ConsumePowerDynamic.java b/core/src/mindustry/world/consumers/ConsumePowerDynamic.java
index f444c7c66f..fb40c0aaa9 100644
--- a/core/src/mindustry/world/consumers/ConsumePowerDynamic.java
+++ b/core/src/mindustry/world/consumers/ConsumePowerDynamic.java
@@ -7,12 +7,19 @@ import mindustry.world.meta.*;
 /** A power consumer that uses a dynamic amount of power. */
 public class ConsumePowerDynamic extends ConsumePower{
     private final Floatf<Building> usage;
+    private float displayedPowerUsage;
 
     public ConsumePowerDynamic(Floatf<Building> usage){
         super(0, 0, false);
         this.usage = usage;
     }
 
+    public ConsumePowerDynamic(float displayed, Floatf<Building> usage){
+        super(0, 0, false);
+        this.displayedPowerUsage = displayed;
+        this.usage = usage;
+    }
+
     @Override
     public float requestedPower(Building entity){
         return usage.get(entity);
@@ -20,6 +27,8 @@ public class ConsumePowerDynamic extends ConsumePower{
 
     @Override
     public void display(Stats stats){
-
+        if(displayedPowerUsage != 0f){
+            stats.add(Stat.powerUse, displayedPowerUsage * 60f, StatUnit.powerSecond);
+        }
     }
 }

From c96d4fc5006090622402f1af8f895c6dce89fae4 Mon Sep 17 00:00:00 2001
From: TheRadioactiveBanana
 <89061718+TheRadioactiveBanana@users.noreply.github.com>
Date: Sun, 7 Apr 2024 07:45:24 +0530
Subject: [PATCH 342/369] Host massmurder (#9715)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 5ae3b91ff5..3d9e63dfc8 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -146,7 +146,7 @@
   },
   {
     "name": "Eradication Mindustry",
-    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "130.61.22.183:7005", "130.61.220.99:7000", "130.61.220.99:7001", "130.61.220.99:7002", "130.61.220.99:7003", "130.61.220.99:7004", "130.61.220.99:7005", "62.30.47.116:7000", "62.30.47.116:7001", "62.30.47.116:7002"]
+    "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "140.238.246.78:7004", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "130.61.22.183:7004", "130.61.22.183:7005", "130.61.22.183:7006", "130.61.22.183:7007", "130.61.22.183:7008", "130.61.22.183:7009"]
   },
   {
     "name": "Conservatory",

From a9a5fb6396bd280dec4044151b6d1f3ea1cae921 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 7 Apr 2024 12:36:45 -0400
Subject: [PATCH 343/369] Support for adding to ObjectMaps in JSON with `add:
 true`

---
 core/src/mindustry/mod/ContentParser.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 40da31c7d1..5c2d59513f 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -1054,7 +1054,21 @@ public class ContentParser{
             }
             Field field = metadata.field;
             try{
-                field.set(object, parser.readValue(field.getType(), metadata.elementType, child, metadata.keyType));
+                boolean mergeMap = ObjectMap.class.isAssignableFrom(field.getType()) && child.has("add") && child.get("add").isBoolean() && child.getBoolean("add", false);
+
+                if(mergeMap){
+                    child.remove("add");
+                }
+
+                Object readField = parser.readValue(field.getType(), metadata.elementType, child, metadata.keyType);
+
+                //if a map has add: true, add its contents to the map instead
+                if(mergeMap && field.get(object) instanceof ObjectMap<?,?> baseMap){
+                    baseMap.putAll((ObjectMap)readField);
+                }else{
+                    field.set(object, readField);
+                }
+
             }catch(IllegalAccessException ex){
                 throw new SerializationException("Error accessing field: " + field.getName() + " (" + type.getName() + ")", ex);
             }catch(SerializationException ex){

From 91fad3f7070aef9f67220f7037d108e222ebdafe Mon Sep 17 00:00:00 2001
From: TheCrux_ <134880334+The1Crux@users.noreply.github.com>
Date: Sun, 7 Apr 2024 14:15:49 -0400
Subject: [PATCH 344/369] Update servers_v7.json (#9721)

yes again me (toomanyservershelp)
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 3d9e63dfc8..931e0738ed 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -30,7 +30,7 @@
   },
   {
     "name": "Crux's Citadel",
-    "address": ["45.158.9.198:32865","45.158.9.198:30055","45.158.9.198:32175","45.158.9.198:30252","94.130.132.149:35899","129.154.47.57:26645","94.130.132.149:35930","129.154.47.57:27993","129.154.47.57:26881"]
+    "address": ["45.158.9.198:32865","45.158.9.198:30055","45.158.9.198:32175","45.158.9.198:30252","176.9.150.40:35899","129.154.47.57:26645","176.9.150.40:35930","129.154.47.57:27993","129.154.47.57:26881","176.9.150.40:35168","176.9.150.40:35900","176.9.150.40:35031","176.9.150.40:35154"]
   },
   {
     "name": "Chilldustry",

From 11c1211d6534bd1633da6477127ec5a0df8b0008 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 7 Apr 2024 20:54:01 -0400
Subject: [PATCH 345/369] Fixed #9722

---
 core/assets/bundles/bundle.properties | 20 +++++++++++---------
 gradle.properties                     |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 08afa6d5fd..ef4cccb584 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -688,6 +688,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 
 marker.background = Background
 marker.outline = Outline
@@ -1236,15 +1237,16 @@ keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
 
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
diff --git a/gradle.properties b/gradle.properties
index ba5ca31b4a..e3a8642e0a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=6ad7aca01b
+archash=8b6f34c036

From 3b0fac1ba26af7ad61e4d9a988e8da83ab8b5bd3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 8 Apr 2024 10:45:30 -0400
Subject: [PATCH 346/369] Fixed #9726

---
 .../world/blocks/ConstructBlock.java          | 56 +++++++++++++++++--
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java
index df7434a222..15553854a9 100644
--- a/core/src/mindustry/world/blocks/ConstructBlock.java
+++ b/core/src/mindustry/world/blocks/ConstructBlock.java
@@ -166,6 +166,7 @@ public class ConstructBlock extends Block{
 
         private float[] accumulator;
         private float[] totalAccumulator;
+        private int[] itemsLeft;
 
         @Override
         public String getDisplayName(){
@@ -270,7 +271,7 @@ public class ConstructBlock extends Block{
 
             for(int i = 0; i < current.requirements.length; i++){
                 int reqamount = Math.round(state.rules.buildCostMultiplier * current.requirements[i].amount);
-                accumulator[i] += Math.min(reqamount * maxProgress, reqamount - totalAccumulator[i] + 0.00001f); //add min amount progressed to the accumulator
+                accumulator[i] += Math.min(reqamount * maxProgress, reqamount - totalAccumulator[i]); //add min amount progressed to the accumulator
                 totalAccumulator[i] = Math.min(totalAccumulator[i] + reqamount * maxProgress, reqamount);
             }
 
@@ -279,9 +280,28 @@ public class ConstructBlock extends Block{
             progress = Mathf.clamp(progress + maxProgress);
 
             if(progress >= 1f || state.rules.infiniteResources){
-                if(lastBuilder == null) lastBuilder = builder;
-                if(!net.client()){
-                    constructed(tile, current, lastBuilder, (byte)rotation, builder.team, config);
+                boolean canFinish = true;
+
+                //look at leftover resources to consume, get them from the core if necessary, delay building if not
+                if(!state.rules.infiniteResources){
+                    for(int i = 0; i < itemsLeft.length; i++){
+                        if(itemsLeft[i] > 0){
+                            if(core != null && core.items.has(current.requirements[i].item, itemsLeft[i])){
+                                core.items.remove(current.requirements[i].item, itemsLeft[i]);
+                                itemsLeft[i] = 0;
+                            }else{
+                                canFinish = false;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if(canFinish){
+                    if(lastBuilder == null) lastBuilder = builder;
+                    if(!net.client()){
+                        constructed(tile, current, lastBuilder, (byte)rotation, builder.team, config);
+                    }
                 }
             }
         }
@@ -321,6 +341,7 @@ public class ConstructBlock extends Block{
                         int accepting = Math.min(accumulated, core.storageCapacity - core.items.get(requirements[i].item));
                         //transfer items directly, as this is not production.
                         core.items.add(requirements[i].item, accepting);
+                        itemsLeft[i] -= accepting;
                         accumulator[i] -= accepting;
                     }else{
                         accumulator[i] -= accumulated;
@@ -331,6 +352,14 @@ public class ConstructBlock extends Block{
             progress = Mathf.clamp(progress - amount);
 
             if(progress <= current.deconstructThreshold || state.rules.infiniteResources){
+                //add any leftover items that weren't obtained due to rounding errors
+                if(core != null){
+                    for(int i = 0; i < itemsLeft.length; i++){
+                        core.items.add(current.requirements[i].item, Mathf.clamp(itemsLeft[i], 0, core.storageCapacity - core.items.get(current.requirements[i].item)));
+                        itemsLeft[i] = 0;
+                    }
+                }
+
                 if(lastBuilder == null) lastBuilder = builder;
                 Call.deconstructFinish(tile, this.current, lastBuilder);
             }
@@ -341,6 +370,11 @@ public class ConstructBlock extends Block{
             boolean infinite = team.rules().infiniteResources || state.rules.infiniteResources;
 
             for(int i = 0; i < current.requirements.length; i++){
+                //there is no need to remove items that have already been fully taken out
+                if(itemsLeft[i] == 0){
+                    continue;
+                }
+
                 int sclamount = Math.round(state.rules.buildCostMultiplier * current.requirements[i].amount);
                 int required = (int)(accumulator[i]); //calculate items that are required now
 
@@ -360,6 +394,7 @@ public class ConstructBlock extends Block{
                     //remove stuff that is actually used
                     if(remove && !infinite){
                         inventory.remove(current.requirements[i].item, maxUse);
+                        itemsLeft[i] -= maxUse;
                     }
                 }
                 //else, no items are required yet, so just keep going
@@ -368,6 +403,7 @@ public class ConstructBlock extends Block{
             return maxProgress;
         }
 
+        @Override
         public float progress(){
             return progress;
         }
@@ -380,8 +416,14 @@ public class ConstructBlock extends Block{
             this.current = block;
             this.previous = previous;
             this.buildCost = block.buildCost * state.rules.buildCostMultiplier;
+            this.itemsLeft = new int[block.requirements.length];
             this.accumulator = new float[block.requirements.length];
             this.totalAccumulator = new float[block.requirements.length];
+
+            ItemStack[] requirements = current.requirements;
+            for(int i = 0; i < requirements.length; i++){
+                this.itemsLeft[i] = Mathf.round(requirements[i].amount * state.rules.buildCostMultiplier);
+            }
             pathfinder.updateTile(tile);
         }
 
@@ -394,8 +436,14 @@ public class ConstructBlock extends Block{
             this.progress = 1f;
             this.current = previous;
             this.buildCost = previous.buildCost * state.rules.buildCostMultiplier;
+            this.itemsLeft = new int[previous.requirements.length];
             this.accumulator = new float[previous.requirements.length];
             this.totalAccumulator = new float[previous.requirements.length];
+
+            ItemStack[] requirements = current.requirements;
+            for(int i = 0; i < requirements.length; i++){
+                this.itemsLeft[i] = Mathf.round(requirements[i].amount * state.rules.buildCostMultiplier * state.rules.deconstructRefundMultiplier);
+            }
             pathfinder.updateTile(tile);
         }
 

From 5ee979783897470ce372b83942bc2a8dbb4cec96 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az881-321.kxqfgnpkrxgetcyd3drl2yrtfd.ex.internal.cloudapp.net>
Date: Mon, 8 Apr 2024 14:46:33 +0000
Subject: [PATCH 347/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_bg.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_ca.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_cs.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_da.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_de.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_es.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_et.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_eu.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_fi.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_fil.properties   | 20 +++++++++++---------
 core/assets/bundles/bundle_fr.properties    | 21 +++++++++++----------
 core/assets/bundles/bundle_hu.properties    | 21 +++++++++++----------
 core/assets/bundles/bundle_id_ID.properties | 20 +++++++++++---------
 core/assets/bundles/bundle_it.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_ja.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_ko.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_lt.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_nl.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_nl_BE.properties | 20 +++++++++++---------
 core/assets/bundles/bundle_pl.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_pt_BR.properties | 20 +++++++++++---------
 core/assets/bundles/bundle_pt_PT.properties | 20 +++++++++++---------
 core/assets/bundles/bundle_ro.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_ru.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_sr.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_sv.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_th.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_tk.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_tr.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_uk_UA.properties | 20 +++++++++++---------
 core/assets/bundles/bundle_vi.properties    | 20 +++++++++++---------
 core/assets/bundles/bundle_zh_CN.properties | 20 +++++++++++---------
 core/assets/bundles/bundle_zh_TW.properties | 20 +++++++++++---------
 34 files changed, 374 insertions(+), 308 deletions(-)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index dea9e38c94..2a0e4c4e9e 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -670,6 +670,7 @@ marker.shape.name = Форма
 marker.text.name = Тэкст
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Задні Фон
 marker.outline = Контур
 objective.research = [accent]Даследаваць:\n[]{0}[lightgray]{1}
@@ -1206,15 +1207,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Перабудаваць Рэгіён
 keybind.schematic_select.name = Абраць Вобласць
 keybind.schematic_menu.name = Меню Схем
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index a3dc513594..530c050bbd 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -676,6 +676,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1217,15 +1218,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Избери Регион
 keybind.schematic_menu.name = Меню със Схеми
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index 8af95acac6..f7642061f9 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -679,6 +679,7 @@ marker.shape.name = Forma
 marker.text.name = Text
 marker.line.name = Línia
 marker.quad.name = Rectangle
+marker.texture.name = Texture
 marker.background = Fons
 marker.outline = Contorn
 
@@ -1220,15 +1221,16 @@ keybind.unit_stance_hold_fire.name = Comportament: Mantén el foc
 keybind.unit_stance_pursue_target.name = Comportament: Persegueix l’objectiu
 keybind.unit_stance_patrol.name = Comportament: Patrulla
 keybind.unit_stance_ram.name = Comportament: Senzill
-keybind.unit_command_move = Comportament: Mou
-keybind.unit_command_repair = Comportament: Repara
-keybind.unit_command_rebuild = Comportament: Reconstrueix
-keybind.unit_command_assist = Comportament: Assisteix
-keybind.unit_command_mine = Comportament: Extrau
-keybind.unit_command_boost = Comportament: Sobrevola
-keybind.unit_command_load_units = Comportament: Carrega unitats
-keybind.unit_command_load_blocks = Comportament: Carrega blocs
-keybind.unit_command_unload_payload = Comportament: Descarrega
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Reconstrueix la regió
 keybind.schematic_select.name = Selecciona una regió
 keybind.schematic_menu.name = Menú de plànols
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 5459cf49fa..bd98459a70 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -678,6 +678,7 @@ marker.shape.name = Tvar
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Pozadí
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1219,15 +1220,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Přestavět Region
 keybind.schematic_select.name = Vybrat oblast
 keybind.schematic_menu.name = Nabídka šablon
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 563f6134f8..687a4be97e 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -671,6 +671,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1208,15 +1209,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Vælg region
 keybind.schematic_menu.name = Skabelon-visning
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 7d1a5caa72..023a6da38a 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -684,6 +684,7 @@ marker.shape.name = Form
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 
 marker.background = Hintergrund
 marker.outline = Umriss
@@ -1230,15 +1231,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Region wiederaufbauen
 keybind.schematic_select.name = Bereich auswählen
 keybind.schematic_menu.name = Entwurfsmenü
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index e833d94709..8e2ab61238 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -681,6 +681,7 @@ marker.shape.name = Forma
 marker.text.name = Texto
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 
 marker.background = Fondo
 marker.outline = Bordes
@@ -1226,15 +1227,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Reconstruir región
 keybind.schematic_select.name = Seleccionar región
 keybind.schematic_menu.name = Menú de esquemas
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 1f653ca8cb..3acece8285 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -671,6 +671,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1208,15 +1209,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 937455c5ae..d29722b775 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -673,6 +673,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1210,15 +1211,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Hautatu eskualdea
 keybind.schematic_menu.name = Eskema menua
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index a510f47d8b..d2cfbbeb4a 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -671,6 +671,7 @@ marker.shape.name = Shape
 marker.text.name = Teksti
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Tutki:\n[]{0}[lightgray]{1}
@@ -1207,15 +1208,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Valitse alue
 keybind.schematic_menu.name = Kaavio Valikko
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 4c1af29c96..85fe063009 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -671,6 +671,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1207,15 +1208,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 8b950668e4..0dea263859 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -687,6 +687,7 @@ marker.shape.name = Forme
 marker.text.name = Texte
 marker.line.name = Ligne
 marker.quad.name = Quad
+marker.texture.name = Texture
 
 marker.background = Fond
 marker.outline = Contour
@@ -1233,16 +1234,16 @@ keybind.unit_stance_hold_fire.name = Ordre: Ne pas tirer
 keybind.unit_stance_pursue_target.name = Ordre: Poursuivre la cible
 keybind.unit_stance_patrol.name = Ordre: Patrouille
 keybind.unit_stance_ram.name = Ordre: Charger
-
-keybind.unit_command_move = Commande: Bouger
-keybind.unit_command_repair = Commande: Réparer
-keybind.unit_command_rebuild = Commande: Reconstruire
-keybind.unit_command_assist = Commande: Assister
-keybind.unit_command_mine = Commande: Miner
-keybind.unit_command_boost = Commande: Boost
-keybind.unit_command_load_units = Commande: Transporter unités
-keybind.unit_command_load_blocks = Commande: Transporter blocs
-keybind.unit_command_unload_payload = Commande: Poser chargement
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 
 keybind.rebuild_select.name = Reconstruire la Zone
 keybind.schematic_select.name = Sélectionner une Région
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index 997e33631c..d3886064a3 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -688,6 +688,7 @@ marker.shape.name = Alakzat
 marker.text.name = Szöveg
 marker.line.name = Vonal
 marker.quad.name = Négyzet
+marker.texture.name = Texture
 
 marker.background = Háttér
 marker.outline = Körvonal
@@ -1234,16 +1235,16 @@ keybind.unit_stance_hold_fire.name = Egység viselkedése: tüzet szüntess
 keybind.unit_stance_pursue_target.name = Egység viselkedése: célpont követése
 keybind.unit_stance_patrol.name = Egység viselkedése: járőrözés
 keybind.unit_stance_ram.name = Egység viselkedése: ütközés
-
-keybind.unit_command_move = Egységparancs: mozgás
-keybind.unit_command_repair = Egységparancs: javítás
-keybind.unit_command_rebuild = Egységparancs: újjáépítés
-keybind.unit_command_assist = Egységparancs: támogatás
-keybind.unit_command_mine = Egységparancs: bányászás
-keybind.unit_command_boost = Egységparancs: erősítés
-keybind.unit_command_load_units = Egységparancs: egységek berakodása
-keybind.unit_command_load_blocks = Egységparancs: blokkok berakodása
-keybind.unit_command_unload_payload = Egységparancs: kirakodás
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 
 keybind.rebuild_select.name = Régió újjáépítése
 keybind.schematic_select.name = Terület kijelölése
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index d8e91ab50c..f9a2127af0 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -681,6 +681,7 @@ marker.shape.name = Bentuk
 marker.text.name = Teks
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 
 marker.background = Latar Belakang
 marker.outline = Garis Luar
@@ -1226,15 +1227,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Pilih Daerah
 keybind.schematic_menu.name = Menu Skema
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 138b8cef13..c5d871dd97 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -674,6 +674,7 @@ marker.shape.name = Forma
 marker.text.name = Testo
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Sfondo
 marker.outline = Outline
 objective.research = [accent]Ricerca:\n[]{0}[lightgray]{1}
@@ -1213,15 +1214,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Seleziona Regione
 keybind.schematic_menu.name = Menu Schematica
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 7e021ec285..59f64d47b1 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -678,6 +678,7 @@ marker.shape.name = 図形
 marker.text.name = 文章
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = 背景
 marker.outline = 輪郭
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1219,15 +1220,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = リージョンの再構築
 keybind.schematic_select.name = 範囲選択
 keybind.schematic_menu.name = 設計図メニュー
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index be380aa335..f3c014faed 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -678,6 +678,7 @@ marker.shape.name = 도형
 marker.text.name = 문자
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = 배경
 marker.outline = 외곽선
 
@@ -1218,15 +1219,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = 지역 재건
 keybind.schematic_select.name = 영역 설정
 keybind.schematic_menu.name = 설계도 메뉴
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 68a0e9319b..6bc26f33fd 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -671,6 +671,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1208,15 +1209,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Pasirinkite Regioną
 keybind.schematic_menu.name = Schemų Meniu
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 8af4933743..46eb33949b 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -682,6 +682,7 @@ marker.shape.name = Vorm
 marker.text.name = Tekst
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Achtergrond
 marker.outline = Omtrek
 objective.research = [accent]Onderzoek:\n[]{0}[lightgray]{1}
@@ -1220,15 +1221,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Herbouw Regio
 keybind.schematic_select.name = Selecteer gebied
 keybind.schematic_menu.name = Ontwerpmenu
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 34a4da88f5..01a6cf3f1f 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -671,6 +671,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1208,15 +1209,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index 9127fbfaf2..0de92a7351 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -676,6 +676,7 @@ marker.shape.name = Figura
 marker.text.name = Tekst
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Tło
 marker.outline = Kontur
 objective.research = [accent]Zbadaj:\n[]{0}[lightgray]{1}
@@ -1217,15 +1218,16 @@ keybind.unit_stance_hold_fire.name = Wstrzymaj ogień
 keybind.unit_stance_pursue_target.name = Goń Cel
 keybind.unit_stance_patrol.name = Patroluj
 keybind.unit_stance_ram.name = Taranuj
-keybind.unit_command_move = Porusz
-keybind.unit_command_repair = Naprawiaj
-keybind.unit_command_rebuild = Odbudowywuj
-keybind.unit_command_assist = Asystuj
-keybind.unit_command_mine = Kop
-keybind.unit_command_boost = Przyspieszaj
-keybind.unit_command_load_units = Załaduj jednostki
-keybind.unit_command_load_blocks = Załaduj Bloki
-keybind.unit_command_unload_payload = Rozładuj Ładunek
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Odbuduj Region
 keybind.schematic_select.name = Wybierz Region
 keybind.schematic_menu.name = Menu Schematów
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 77fd5923d3..4883362261 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -681,6 +681,7 @@ marker.shape.name = Shape
 marker.text.name = Texto
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 
 marker.background = Fundo
 marker.outline = Contorno
@@ -1227,15 +1228,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Selecionar região
 keybind.schematic_menu.name = Menu de Esquemas
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index f0d6701020..cf29525e4c 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -671,6 +671,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1208,15 +1209,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Selecionar região
 keybind.schematic_menu.name = Menu esquemático
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index 409cf3be17..d9e45b96ca 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -678,6 +678,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1219,15 +1220,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Selectează Regiunea
 keybind.schematic_menu.name = Meniu Scheme
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 13eec1407e..c5ccfc459c 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -678,6 +678,7 @@ marker.shape.name = Фигура
 marker.text.name = Текст
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Фон
 marker.outline = Контур
 objective.research = [accent]Исследуйте:\n[]{0}[lightgray]{1}
@@ -1219,15 +1220,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Перестроить в области
 keybind.schematic_select.name = Выбрать область
 keybind.schematic_menu.name = Меню схем
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 218940ccd3..52cf175915 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -678,6 +678,7 @@ marker.shape.name = Oblik
 marker.text.name = Tekst
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Pozadina
 marker.outline = Outline
 objective.research = [accent]Izuči:\n[]{0}[lightgray]{1}
@@ -1221,15 +1222,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Ponovo Sagradi Region
 keybind.schematic_select.name = Izaberi Region
 keybind.schematic_menu.name = Menu Šema
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 5a30521e0c..be714b7f2b 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -671,6 +671,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1208,15 +1209,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index e1032d277c..9f5f8253b8 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -678,6 +678,7 @@ marker.shape.name = รูปทรง
 marker.text.name = ข้อความ
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = พื้นหลัง
 marker.outline = โครงร่าง
 objective.research = [accent]วิจัย:\n[]{0}[lightgray]{1}
@@ -1220,15 +1221,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = เลือกพื้นที่สร้างใหม่
 keybind.schematic_select.name = เลือกพื้นที่
 keybind.schematic_menu.name = เมนูแผนผัง
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 18c9cb6235..cca3894127 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -671,6 +671,7 @@ marker.shape.name = Shape
 marker.text.name = Text
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Background
 marker.outline = Outline
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
@@ -1208,15 +1209,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = Select Region
 keybind.schematic_menu.name = Schematic Menu
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 9a60f81d7c..3df7fa80c7 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -678,6 +678,7 @@ marker.shape.name = Şekil
 marker.text.name = Yazı
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 marker.background = Arkaplan
 marker.outline = Anahat
 objective.research = [accent]Araştır:\n[]{0}[lightgray]{1}
@@ -1217,15 +1218,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Alanı Geri İşaa Et
 keybind.schematic_select.name = Bölge Seç
 keybind.schematic_menu.name = Şema Menüsü
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 6b0e45de61..6f94bbdf57 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -683,6 +683,7 @@ marker.shape.name = Форма
 marker.text.name = Текст
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 
 marker.background = Фон
 marker.outline = Контур
@@ -1228,15 +1229,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Відбудувати регіон
 keybind.schematic_select.name = Вибрати ділянку
 keybind.schematic_menu.name = Меню схем
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 59ff78b06e..931daa4dd9 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -679,6 +679,7 @@ marker.shape.name = Hình dạng
 marker.text.name = Văn bản
 marker.line.name = Đường kẻ
 marker.quad.name = Bốn điểm
+marker.texture.name = Texture
 marker.background = Nền
 marker.outline = Đường viền
 objective.research = [accent]Nghiên cứu:\n[]{0}[lightgray]{1}
@@ -1221,15 +1222,16 @@ keybind.unit_stance_hold_fire.name = Tư thế đơn vị: Ngừng bắn
 keybind.unit_stance_pursue_target.name = Tư thế đơn vị: Bám đuổi mục tiêu
 keybind.unit_stance_patrol.name = Tư thế đơn vị: Tuần tra
 keybind.unit_stance_ram.name = Tư thế đơn vị: Tông thẳng
-keybind.unit_command_move = Mệnh lệnh đơn vị: Di chuyển
-keybind.unit_command_repair = Mệnh lệnh đơn vị: Sửa chữa
-keybind.unit_command_rebuild = Mệnh lệnh đơn vị: Xây lại
-keybind.unit_command_assist = Mệnh lệnh đơn vị: Hỗ trợ
-keybind.unit_command_mine = Mệnh lệnh đơn vị: Khai thác
-keybind.unit_command_boost = Mệnh lệnh đơn vị: Tăng cường l
-keybind.unit_command_load_units = Mệnh lệnh đơn vị: Nhập đơn vị
-keybind.unit_command_load_blocks = Mệnh lệnh đơn vị: Nhập khối công trình
-keybind.unit_command_unload_payload = Mệnh lệnh đơn vị: Dỡ khối hàng
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Chọn khu vực xây dựng lại
 keybind.schematic_select.name = Chọn khu vực
 keybind.schematic_menu.name = Menu bản thiết kế
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 4044a20dbc..7386027dfa 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -684,6 +684,7 @@ marker.shape.name = 形状
 marker.text.name = 文本
 marker.line.name = 线
 marker.quad.name = 四边形
+marker.texture.name = Texture
 
 marker.background = 背景
 marker.outline = 轮廓
@@ -1230,15 +1231,16 @@ keybind.unit_stance_hold_fire.name = 单位姿态：停火
 keybind.unit_stance_pursue_target.name = 单位姿态：追逐目标
 keybind.unit_stance_patrol.name = 单位姿态：巡逻
 keybind.unit_stance_ram.name = 单位姿态：冲锋
-keybind.unit_command_move = 单位指挥：移动
-keybind.unit_command_repair = 单位指挥：修复
-keybind.unit_command_rebuild = 单位指挥：重建
-keybind.unit_command_assist = 单位指挥：协助
-keybind.unit_command_mine = 单位指挥：采矿
-keybind.unit_command_boost = 单位指挥：助推
-keybind.unit_command_load_units = 单位指挥：拾取单位
-keybind.unit_command_load_blocks = 单位指挥：拾取建筑
-keybind.unit_command_unload_payload = 单位指挥：卸载载荷
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = 重建建筑
 keybind.schematic_select.name = 框选建筑
 keybind.schematic_menu.name = 蓝图目录
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 35cbef4819..85afd5a50f 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -681,6 +681,7 @@ marker.shape.name = 稜框標示
 marker.text.name = 文字標示
 marker.line.name = Line
 marker.quad.name = Quad
+marker.texture.name = Texture
 
 marker.background = 反黑背景
 marker.outline = 描邊
@@ -1225,15 +1226,16 @@ keybind.unit_stance_hold_fire.name = Unit Stance: Hold Fire
 keybind.unit_stance_pursue_target.name = Unit Stance: Pursue Target
 keybind.unit_stance_patrol.name = Unit Stance: Patrol
 keybind.unit_stance_ram.name = Unit Stance: Ram
-keybind.unit_command_move = Unit Command: Move
-keybind.unit_command_repair = Unit Command: Repair
-keybind.unit_command_rebuild = Unit Command: Rebuild
-keybind.unit_command_assist = Unit Command: Assist
-keybind.unit_command_mine = Unit Command: Mine
-keybind.unit_command_boost = Unit Command: Boost
-keybind.unit_command_load_units = Unit Command: Load Units
-keybind.unit_command_load_blocks = Unit Command: Load Blocks
-keybind.unit_command_unload_payload = Unit Command: Unload Payload
+keybind.unit_command_move.name = Unit Command: Move
+keybind.unit_command_repair.name = Unit Command: Repair
+keybind.unit_command_rebuild.name = Unit Command: Rebuild
+keybind.unit_command_assist.name = Unit Command: Assist
+keybind.unit_command_mine.name = Unit Command: Mine
+keybind.unit_command_boost.name = Unit Command: Boost
+keybind.unit_command_load_units.name = Unit Command: Load Units
+keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
+keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
+keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
 keybind.rebuild_select.name = Rebuild Region
 keybind.schematic_select.name = 選擇區域
 keybind.schematic_menu.name = 藍圖目錄

From ad0d0a7e993e1242db78eba0e59b1df6373dc75c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 8 Apr 2024 12:22:32 -0400
Subject: [PATCH 348/369] Additional construction fixes

---
 .../world/blocks/ConstructBlock.java          | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java
index 15553854a9..1b34d2d994 100644
--- a/core/src/mindustry/world/blocks/ConstructBlock.java
+++ b/core/src/mindustry/world/blocks/ConstructBlock.java
@@ -341,7 +341,7 @@ public class ConstructBlock extends Block{
                         int accepting = Math.min(accumulated, core.storageCapacity - core.items.get(requirements[i].item));
                         //transfer items directly, as this is not production.
                         core.items.add(requirements[i].item, accepting);
-                        itemsLeft[i] -= accepting;
+                        itemsLeft[i] += accepting;
                         accumulator[i] -= accepting;
                     }else{
                         accumulator[i] -= accumulated;
@@ -355,8 +355,11 @@ public class ConstructBlock extends Block{
                 //add any leftover items that weren't obtained due to rounding errors
                 if(core != null){
                     for(int i = 0; i < itemsLeft.length; i++){
-                        core.items.add(current.requirements[i].item, Mathf.clamp(itemsLeft[i], 0, core.storageCapacity - core.items.get(current.requirements[i].item)));
-                        itemsLeft[i] = 0;
+                        int target = Mathf.round(requirements[i].amount * state.rules.buildCostMultiplier * state.rules.deconstructRefundMultiplier);
+                        int remaining = target - itemsLeft[i];
+
+                        core.items.add(current.requirements[i].item, Mathf.clamp(remaining, 0, core.storageCapacity - core.items.get(current.requirements[i].item)));
+                        itemsLeft[i] = target;
                     }
                 }
 
@@ -439,14 +442,14 @@ public class ConstructBlock extends Block{
             this.itemsLeft = new int[previous.requirements.length];
             this.accumulator = new float[previous.requirements.length];
             this.totalAccumulator = new float[previous.requirements.length];
-
-            ItemStack[] requirements = current.requirements;
-            for(int i = 0; i < requirements.length; i++){
-                this.itemsLeft[i] = Mathf.round(requirements[i].amount * state.rules.buildCostMultiplier * state.rules.deconstructRefundMultiplier);
-            }
             pathfinder.updateTile(tile);
         }
 
+        @Override
+        public byte version(){
+            return 1;
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
@@ -461,6 +464,7 @@ public class ConstructBlock extends Block{
                 for(int i = 0; i < accumulator.length; i++){
                     write.f(accumulator[i]);
                     write.f(totalAccumulator[i]);
+                    write.i(itemsLeft[i]);
                 }
             }
         }
@@ -479,6 +483,9 @@ public class ConstructBlock extends Block{
                 for(int i = 0; i < acsize; i++){
                     accumulator[i] = read.f();
                     totalAccumulator[i] = read.f();
+                    if(revision >= 1){
+                        itemsLeft[i] = read.i();
+                    }
                 }
             }
 

From 6b7260250af7513ecf429b7cd009f09e018e409f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 8 Apr 2024 19:07:58 -0400
Subject: [PATCH 349/369] Fixed #9728

---
 core/src/mindustry/graphics/Trail.java              | 2 +-
 core/src/mindustry/world/blocks/ConstructBlock.java | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/graphics/Trail.java b/core/src/mindustry/graphics/Trail.java
index 426f7215b3..f77a31fd31 100644
--- a/core/src/mindustry/graphics/Trail.java
+++ b/core/src/mindustry/graphics/Trail.java
@@ -66,7 +66,7 @@ public class Trail{
                 y2 = items[i + 4];
                 w2 = items[i + 5];
 
-                if(i == 0){
+                if(i == 0 && points.size >= (length - 1) * 3){
                     x1 = Mathf.lerp(x1, x2, counter);
                     y1 = Mathf.lerp(y1, y2, counter);
                     w1 = Mathf.lerp(w1, w2, counter);
diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java
index 1b34d2d994..796c7369bd 100644
--- a/core/src/mindustry/world/blocks/ConstructBlock.java
+++ b/core/src/mindustry/world/blocks/ConstructBlock.java
@@ -164,9 +164,9 @@ public class ConstructBlock extends Block{
         public boolean wasConstructing, activeDeconstruct;
         public float constructColor;
 
-        private float[] accumulator;
-        private float[] totalAccumulator;
-        private int[] itemsLeft;
+        private @Nullable float[] accumulator;
+        private @Nullable float[] totalAccumulator;
+        private @Nullable int[] itemsLeft;
 
         @Override
         public String getDisplayName(){
@@ -480,6 +480,7 @@ public class ConstructBlock extends Block{
             if(acsize != -1){
                 accumulator = new float[acsize];
                 totalAccumulator = new float[acsize];
+                itemsLeft = new int[acsize];
                 for(int i = 0; i < acsize; i++){
                     accumulator[i] = read.f();
                     totalAccumulator[i] = read.f();

From e8e8189a9239bc338420c93e4f35b24be33648be Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <redstonneur1256mc@gmail.com>
Date: Tue, 9 Apr 2024 01:51:50 +0200
Subject: [PATCH 350/369] Add ShapeMarker starting and ending angles (#9729)

---
 core/src/mindustry/game/MapObjectives.java   | 14 ++++++++++----
 core/src/mindustry/logic/LMarkerControl.java |  1 +
 gradle.properties                            |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index fe7a3b235d..d1ba8ffbc6 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -851,7 +851,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
     /** Displays a shape with an outline and color. */
     public static class ShapeMarker extends PosMarker{
-        public float radius = 8f, rotation = 0f, stroke = 1f;
+        public float radius = 8f, rotation = 0f, stroke = 1f, startAngle = 0f, endAngle = 360f;
         public boolean fill = false, outline = true;
         public int sides = 4;
         public Color color = Color.valueOf("ffd37f");
@@ -877,14 +877,18 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             if(!fill){
                 if(outline){
                     Lines.stroke((stroke + 2f) * scaleFactor, Pal.gray);
-                    Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation);
+                    Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation + startAngle, rotation + endAngle);
                 }
 
                 Lines.stroke(stroke * scaleFactor, color);
-                Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation);
+                Lines.poly(pos.x, pos.y, sides, (radius + 1f) * scaleFactor, rotation + startAngle, rotation + endAngle);
             }else{
                 Draw.color(color);
-                Fill.poly(pos.x, pos.y, sides, radius * scaleFactor, rotation);
+                if (startAngle < endAngle){
+                    Fill.arc(pos.x, pos.y, radius * scaleFactor, (endAngle - startAngle) / 360f, rotation + startAngle, sides);
+                }else{
+                    Fill.arc(pos.x, pos.y, radius * scaleFactor, (startAngle - endAngle) / 360f, rotation + endAngle, sides);
+                }
             }
 
             Draw.reset();
@@ -901,12 +905,14 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                     case rotation -> rotation = (float)p1;
                     case color -> color.fromDouble(p1);
                     case shape -> sides = (int)p1;
+                    case arc -> startAngle = (float)p1;
                 }
             }
 
             if(!Double.isNaN(p2)){
                 switch(type){
                     case shape -> fill = !Mathf.equal((float)p2, 0f);
+                    case arc -> endAngle = (float)p2;
                 }
             }
 
diff --git a/core/src/mindustry/logic/LMarkerControl.java b/core/src/mindustry/logic/LMarkerControl.java
index 16a9aaa9c6..c24775af02 100644
--- a/core/src/mindustry/logic/LMarkerControl.java
+++ b/core/src/mindustry/logic/LMarkerControl.java
@@ -13,6 +13,7 @@ public enum LMarkerControl{
     stroke("stroke"),
     rotation("rotation"),
     shape("sides", "fill", "outline"),
+    arc("start", "end"),
     flushText("fetch"),
     fontSize("size"),
     textHeight("height"),
diff --git a/gradle.properties b/gradle.properties
index e3a8642e0a..25be0e37a2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=8b6f34c036
+archash=8a2decd656

From ddb8783c7d33851bf721b1aef20189319e5cbc6c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 8 Apr 2024 20:05:03 -0400
Subject: [PATCH 351/369] White region is now 1x1

---
 core/assets-raw/sprites/effects/white.png | Bin 71 -> 81 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/core/assets-raw/sprites/effects/white.png b/core/assets-raw/sprites/effects/white.png
index ba9bf827c1f3fd6fc95544f0d9c34f0ffc29a2ec..e8b825eae04d68ecdc8bc6003f5880024eb09320 100644
GIT binary patch
literal 81
zcmeAS@N?(olHy`uVBq!ia0y~yU|<Ac4mJh`26@pVoghwekh>GZx^prw85kJ2JzX3_
gIA$jQ;Adgr{LTFLap<Qx3=9kmp00i_>zopr0B8dfHvj+t

literal 71
zcmeAS@N?(olHy`uVBq!ia0y~yU|<Ge4mJh`hA@q-`xzJ*_&i-4Ln>}1|LA9tC@5ms
Y-L8DMZ{jL11_lNOPgg&ebxsLQ0QJBTl>h($


From 17913f8949e973717a585dcd8e082f7addf88a12 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Tue, 9 Apr 2024 07:52:41 -0700
Subject: [PATCH 352/369] Run applyColor before drawing unit parts (#9547)

* Run applyColor before drawing unit parts

* Run applyColor before drawing weapon parts
---
 core/src/mindustry/type/UnitType.java | 1 +
 core/src/mindustry/type/Weapon.java   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index d7dfcf16fe..b9f7ecd089 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -1270,6 +1270,7 @@ public class UnitType extends UnlockableContent implements Senseable{
                     DrawPart.params.life = s.fin();
                 }
 
+                applyColor(unit);
                 part.draw(DrawPart.params);
             }
         }
diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index 151a0f69ee..d67a1ca032 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -228,6 +228,7 @@ public class Weapon implements Cloneable{
                 var part = parts.get(i);
                 DrawPart.params.setRecoil(part.recoilIndex >= 0 && mount.recoils != null ? mount.recoils[part.recoilIndex] : mount.recoil);
                 if(part.under){
+                    unit.type.applyColor(unit);
                     part.draw(DrawPart.params);
                 }
             }
@@ -262,6 +263,7 @@ public class Weapon implements Cloneable{
                 var part = parts.get(i);
                 DrawPart.params.setRecoil(part.recoilIndex >= 0 && mount.recoils != null ? mount.recoils[part.recoilIndex] : mount.recoil);
                 if(!part.under){
+                    unit.type.applyColor(unit);
                     part.draw(DrawPart.params);
                 }
             }

From fd303524e9aed8759a9f683ab99df2aa872a0aea Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Tue, 9 Apr 2024 08:16:49 -0700
Subject: [PATCH 353/369] #9706 done smarter (#9723)

* Convert from explicit check to interface

* Apply the interface to other turret-like blocks
---
 core/src/mindustry/entities/comp/ChildComp.java  | 16 ++++++++--------
 core/src/mindustry/world/blocks/RotBlock.java    |  6 ++++++
 .../world/blocks/defense/BuildTurret.java        |  7 ++++++-
 .../world/blocks/defense/turrets/BaseTurret.java |  8 +++++++-
 .../world/blocks/distribution/MassDriver.java    |  8 +++++++-
 .../world/blocks/payloads/PayloadMassDriver.java |  8 +++++++-
 .../world/blocks/units/RepairTurret.java         |  8 +++++++-
 7 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 core/src/mindustry/world/blocks/RotBlock.java

diff --git a/core/src/mindustry/entities/comp/ChildComp.java b/core/src/mindustry/entities/comp/ChildComp.java
index 03465fbf78..2ae553480f 100644
--- a/core/src/mindustry/entities/comp/ChildComp.java
+++ b/core/src/mindustry/entities/comp/ChildComp.java
@@ -4,7 +4,7 @@ import arc.math.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
-import mindustry.world.blocks.defense.turrets.BaseTurret.*;
+import mindustry.world.blocks.*;
 
 @Component
 abstract class ChildComp implements Posc, Rotc{
@@ -23,9 +23,9 @@ abstract class ChildComp implements Posc, Rotc{
                 if(parent instanceof Rotc r){
                     offsetPos = -r.rotation();
                     offsetRot = rotation - r.rotation();
-                }else if(parent instanceof BaseTurretBuild build){
-                    offsetPos = -build.rotation;
-                    offsetRot = rotation - build.rotation;
+                }else if(parent instanceof RotBlock rot){
+                    offsetPos = -rot.buildRotation();
+                    offsetRot = rotation - rot.buildRotation();
                 }
             }
         }
@@ -39,10 +39,10 @@ abstract class ChildComp implements Posc, Rotc{
                     x = parent.getX() + Angles.trnsx(r.rotation() + offsetPos, offsetX, offsetY);
                     y = parent.getY() + Angles.trnsy(r.rotation() + offsetPos, offsetX, offsetY);
                     rotation = r.rotation() + offsetRot;
-                }else if(parent instanceof BaseTurretBuild build){
-                    x = parent.getX() + Angles.trnsx(build.rotation + offsetPos, offsetX, offsetY);
-                    y = parent.getY() + Angles.trnsy(build.rotation + offsetPos, offsetX, offsetY);
-                    rotation = build.rotation + offsetRot;
+                }else if(parent instanceof RotBlock rot){
+                    x = parent.getX() + Angles.trnsx(rot.buildRotation() + offsetPos, offsetX, offsetY);
+                    y = parent.getY() + Angles.trnsy(rot.buildRotation() + offsetPos, offsetX, offsetY);
+                    rotation = rot.buildRotation() + offsetRot;
                 }
             }else{
                 x = parent.getX() + offsetX;
diff --git a/core/src/mindustry/world/blocks/RotBlock.java b/core/src/mindustry/world/blocks/RotBlock.java
new file mode 100644
index 0000000000..470b9dd43a
--- /dev/null
+++ b/core/src/mindustry/world/blocks/RotBlock.java
@@ -0,0 +1,6 @@
+package mindustry.world.blocks;
+
+/** Any block that has 360-degree rotation */
+public interface RotBlock{
+    float buildRotation();
+}
diff --git a/core/src/mindustry/world/blocks/defense/BuildTurret.java b/core/src/mindustry/world/blocks/defense/BuildTurret.java
index 9dfaca633f..10330650ac 100644
--- a/core/src/mindustry/world/blocks/defense/BuildTurret.java
+++ b/core/src/mindustry/world/blocks/defense/BuildTurret.java
@@ -77,7 +77,7 @@ public class BuildTurret extends BaseTurret{
         return new TextureRegion[]{baseRegion, region};
     }
 
-    public class BuildTurretBuild extends BaseTurretBuild implements ControlBlock{
+    public class BuildTurretBuild extends BaseTurretBuild implements ControlBlock, RotBlock{
         public BlockUnitc unit = (BlockUnitc)unitType.create(team);
         public @Nullable Unit following;
         public @Nullable BlockPlan lastPlan;
@@ -92,6 +92,11 @@ public class BuildTurret extends BaseTurret{
             return true;
         }
 
+        @Override
+        public float buildRotation(){
+            return unit.rotation();
+        }
+
         @Override
         public Unit unit(){
             //make sure stats are correct
diff --git a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
index a959c00ba2..dbe7794611 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
@@ -9,6 +9,7 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.logic.*;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 
@@ -79,7 +80,7 @@ public class BaseTurret extends Block{
         stats.add(Stat.shootRange, range / tilesize, StatUnit.blocks);
     }
 
-    public class BaseTurretBuild extends Building implements Ranged{
+    public class BaseTurretBuild extends Building implements Ranged, RotBlock{
         public float rotation = 90;
 
         @Override
@@ -87,6 +88,11 @@ public class BaseTurret extends Block{
             return range;
         }
 
+        @Override
+        public float buildRotation(){
+            return rotation;
+        }
+
         @Override
         public void drawSelect(){
             Drawf.dashCircle(x, y, range(), team.color);
diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java
index 6366419242..7fc0d5f0ec 100644
--- a/core/src/mindustry/world/blocks/distribution/MassDriver.java
+++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java
@@ -18,6 +18,7 @@ import mindustry.graphics.*;
 import mindustry.logic.*;
 import mindustry.type.*;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
@@ -104,7 +105,7 @@ public class MassDriver extends Block{
         }
     }
 
-    public class MassDriverBuild extends Building{
+    public class MassDriverBuild extends Building implements RotBlock{
         public int link = -1;
         public float rotation = 90;
         public float reloadCounter = 0f;
@@ -112,6 +113,11 @@ public class MassDriver extends Block{
         //TODO use queue? this array usually holds about 3 shooters max anyway
         public OrderedSet<Building> waitingShooters = new OrderedSet<>();
 
+        @Override
+        public float buildRotation(){
+            return rotation;
+        }
+
         public Building currentShooter(){
             return waitingShooters.isEmpty() ? null : waitingShooters.first();
         }
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
index 314e77d5f7..0b3efc09c9 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
@@ -14,6 +14,7 @@ import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.logic.*;
+import mindustry.world.blocks.*;
 import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
@@ -126,7 +127,7 @@ public class PayloadMassDriver extends PayloadBlock{
         return new TextureRegion[]{leftRegion, rightRegion, capRegion};
     }
 
-    public class PayloadDriverBuild extends PayloadBlockBuild<Payload>{
+    public class PayloadDriverBuild extends PayloadBlockBuild<Payload> implements RotBlock{
         public int link = -1;
         public float turretRotation = 90;
         public float reloadCounter = 0f, charge = 0f;
@@ -143,6 +144,11 @@ public class PayloadMassDriver extends PayloadBlock{
             return waitingShooters.isEmpty() ? null : waitingShooters.first();
         }
 
+        @Override
+        public float buildRotation(){
+            return rotation;
+        }
+
         @Override
         public void updateTile(){
             super.updateTile();
diff --git a/core/src/mindustry/world/blocks/units/RepairTurret.java b/core/src/mindustry/world/blocks/units/RepairTurret.java
index 87624efb84..86b29c79a4 100644
--- a/core/src/mindustry/world/blocks/units/RepairTurret.java
+++ b/core/src/mindustry/world/blocks/units/RepairTurret.java
@@ -16,6 +16,7 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.logic.*;
 import mindustry.world.*;
+import mindustry.world.blocks.*;
 import mindustry.world.consumers.*;
 import mindustry.world.meta.*;
 
@@ -147,11 +148,16 @@ public class RepairTurret extends Block{
         }
     }
 
-    public class RepairPointBuild extends Building implements Ranged{
+    public class RepairPointBuild extends Building implements Ranged, RotBlock{
         public Unit target;
         public Vec2 offset = new Vec2(), lastEnd = new Vec2();
         public float strength, rotation = 90;
 
+        @Override
+        public float buildRotation(){
+            return rotation;
+        }
+
         @Override
         public void draw(){
             Draw.rect(baseRegion, x, y);

From e280edac67d0b5e36a027a2dd61a123e14ec5b89 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 10 Apr 2024 15:31:09 -0400
Subject: [PATCH 354/369] Fixed #9731

---
 core/src/mindustry/content/Blocks.java               |  3 +++
 core/src/mindustry/entities/Puddles.java             |  2 +-
 core/src/mindustry/entities/comp/PuddleComp.java     |  1 +
 core/src/mindustry/ui/fragments/HintsFragment.java   |  4 +++-
 .../world/blocks/distribution/StackConveyor.java     |  7 +++++++
 .../world/blocks/payloads/PayloadLoader.java         | 12 +++++++++++-
 .../mindustry/world/blocks/sandbox/LiquidVoid.java   |  6 ++++++
 7 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 08eb582a78..2e3d58b840 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2782,6 +2782,7 @@ public class Blocks{
             ambientSoundVolume = 0.06f;
             hasLiquids = true;
             boostScale = 1f / 9f;
+            itemCapacity = 0;
             outputLiquid = new LiquidStack(Liquids.water, 30f / 60f);
             consumePower(0.5f);
             liquidCapacity = 60f;
@@ -5791,6 +5792,8 @@ public class Blocks{
             heatOutput = 1000f;
             warmupRate = 1000f;
             regionRotated1 = 1;
+            itemCapacity = 0;
+            alwaysUnlocked = false;
             ambientSound = Sounds.none;
         }};
 
diff --git a/core/src/mindustry/entities/Puddles.java b/core/src/mindustry/entities/Puddles.java
index ec546882b4..7c3a555154 100644
--- a/core/src/mindustry/entities/Puddles.java
+++ b/core/src/mindustry/entities/Puddles.java
@@ -74,7 +74,7 @@ public class Puddles{
                 Puddle puddle = Puddle.create();
                 puddle.tile = tile;
                 puddle.liquid = liquid;
-                puddle.amount = amount;
+                puddle.amount = Math.min(amount, maxLiquid);
                 puddle.set(ax, ay);
                 register(puddle);
                 puddle.add();
diff --git a/core/src/mindustry/entities/comp/PuddleComp.java b/core/src/mindustry/entities/comp/PuddleComp.java
index 090a881060..a46bf01c32 100644
--- a/core/src/mindustry/entities/comp/PuddleComp.java
+++ b/core/src/mindustry/entities/comp/PuddleComp.java
@@ -59,6 +59,7 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc, Syncc{
 
         amount -= Time.delta * (1f - liquid.viscosity) / (5f + addSpeed);
         amount += accepting;
+        amount = Math.min(amount, maxLiquid);
         accepting = 0f;
 
         if(amount >= maxLiquid / 1.5f){
diff --git a/core/src/mindustry/ui/fragments/HintsFragment.java b/core/src/mindustry/ui/fragments/HintsFragment.java
index 2595fbb041..75528b9923 100644
--- a/core/src/mindustry/ui/fragments/HintsFragment.java
+++ b/core/src/mindustry/ui/fragments/HintsFragment.java
@@ -11,6 +11,7 @@ import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.*;
+import mindustry.ai.types.*;
 import mindustry.content.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
@@ -169,7 +170,8 @@ public class HintsFragment{
         depositItems(() -> player.unit().hasItem(), () -> !player.unit().hasItem()),
         desktopPause(visibleDesktop, () -> isTutorial.get() && !Vars.net.active() && state.wave >= 2, () -> Core.input.keyTap(Binding.pause)),
         unitControl(() -> isSerpulo() && state.rules.defaultTeam.data().units.size > 2 && !net.active() && !player.dead(), () -> !player.dead() && !player.unit().spawnedByCore),
-        unitSelectControl(() -> isSerpulo() && state.rules.defaultTeam.data().units.size > 3 && !net.active() && !player.dead(), () -> control.input.commandMode && control.input.selectedUnits.size > 0),
+        unitSelectControl(() -> isSerpulo() && state.rules.defaultTeam.data().units.size > 3 && !net.active() && !player.dead(),
+            () -> control.input.commandMode && control.input.selectedUnits.size > 0 && control.input.selectedUnits.first().controller() instanceof CommandAI ai && ai.targetPos != null),
         respawn(visibleMobile, () -> !player.dead() && !player.unit().spawnedByCore, () -> !player.dead() && player.unit().spawnedByCore),
         launch(() -> (isTutorial.get() || Vars.state.rules.sector == SectorPresets.onset.sector) && state.rules.sector.isCaptured(), () -> ui.planet.isShown()),
         schematicSelect(visibleDesktop, () -> ui.hints.placedBlocks.contains(Blocks.router) || ui.hints.placedBlocks.contains(Blocks.ductRouter), () -> Core.input.keyRelease(Binding.schematic_select) || Core.input.keyTap(Binding.pick)),
diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
index e107b08a67..357c3f8705 100644
--- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
@@ -189,6 +189,13 @@ public class StackConveyor extends Block implements Autotiler{
             Draw.rect(lastItem.fullIcon, Tmp.v1.x, Tmp.v1.y, size, size, 0);
         }
 
+        @Override
+        public void dropped(){
+            super.dropped();
+            var prev = Geometry.d4[(rotation + 2) % 4];
+            link = Point2.pack(tile.x + prev.x, tile.y + prev.y);
+        }
+
         @Override
         public void drawCracks(){
             Draw.z(Layer.block - 0.15f);
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
index d323c69feb..67a01ba0a7 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java
@@ -12,6 +12,7 @@ import mindustry.graphics.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 import mindustry.world.blocks.payloads.PayloadUnloader.*;
+import mindustry.world.blocks.sandbox.*;
 
 import static mindustry.Vars.*;
 
@@ -152,6 +153,7 @@ public class PayloadLoader extends PayloadBlock{
 
                 //load up items
                 if(payload.block().hasItems && items.any()){
+                    boolean acceptedAny = false;
                     if(efficiency > 0.01f && timer(timerLoad, loadTime / efficiency)){
                         //load up items a set amount of times
                         for(int j = 0; j < itemsLoaded && items.any(); j++){
@@ -162,6 +164,7 @@ public class PayloadLoader extends PayloadBlock{
                                     if(payload.build.acceptItem(payload.build, item)){
                                         payload.build.handleItem(payload.build, item);
                                         items.remove(item, 1);
+                                        acceptedAny = true;
                                         break;
                                     }else if(payload.block().separateItemCapacity || payload.block().consumesItem(item)){
                                         exporting = true;
@@ -171,6 +174,9 @@ public class PayloadLoader extends PayloadBlock{
                             }
                         }
                     }
+                    if(!acceptedAny){
+                        exporting = true;
+                    }
                 }
 
                 //load up liquids
@@ -180,8 +186,12 @@ public class PayloadLoader extends PayloadBlock{
                     float flow = Math.min(Math.min(liquidsLoaded * edelta(), payload.block().liquidCapacity - payload.build.liquids.get(liq)), total);
                     //TODO potential crash here
                     if(payload.build.acceptLiquid(payload.build, liq)){
-                        payload.build.liquids.add(liq, flow);
+                        if(!(payload.block() instanceof LiquidVoid)){
+                            payload.build.liquids.add(liq, flow);
+                        }
                         liquids.remove(liq, flow);
+                    }else{
+                        exporting = true;
                     }
                 }
 
diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java b/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java
index ef2c62c341..bc6a56cfe8 100644
--- a/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java
+++ b/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java
@@ -24,6 +24,12 @@ public class LiquidVoid extends Block{
     }
 
     public class LiquidVoidBuild extends Building{
+        @Override
+        public void placed(){
+            super.placed();
+            liquids.clear();
+        }
+
         @Override
         public boolean acceptLiquid(Building source, Liquid liquid){
             return enabled;

From 43fba9b6478c7b020b7a54e01cf00990bdf006e2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 10 Apr 2024 16:26:08 -0400
Subject: [PATCH 355/369] typo

---
 core/src/mindustry/content/Blocks.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 2e3d58b840..0cda3f8d2c 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -5793,7 +5793,7 @@ public class Blocks{
             warmupRate = 1000f;
             regionRotated1 = 1;
             itemCapacity = 0;
-            alwaysUnlocked = false;
+            alwaysUnlocked = true;
             ambientSound = Sounds.none;
         }};
 

From 24202dd20f21c12441f098681ed8befa7a02da26 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 10 Apr 2024 19:24:28 -0400
Subject: [PATCH 356/369] Fixed #9732

---
 core/src/mindustry/content/Blocks.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 0cda3f8d2c..e70394c328 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1181,6 +1181,7 @@ public class Blocks{
             rotate = true;
             invertFlip = true;
             group = BlockGroup.liquids;
+            itemCapacity = 0;
 
             liquidCapacity = 50f;
 
@@ -1231,6 +1232,7 @@ public class Blocks{
             }});
 
             researchCostMultiplier = 1.1f;
+            itemCapacity = 0;
             liquidCapacity = 40f;
             consumePower(2f);
             ambientSound = Sounds.extractLoop;

From a8135aa042885ebbd415cd21a88bf52f1244d329 Mon Sep 17 00:00:00 2001
From: ApsZoldat <128713348+ApsZoldat@users.noreply.github.com>
Date: Fri, 12 Apr 2024 00:56:34 +0300
Subject: [PATCH 357/369] Custom rules dialog enhancement, small fixes (#9665)

* Rule categories and search in custom rules dialog

* Fix wrong info about format placeholders in all unfinished locales

* Rule search fix, rule info system, some stuff for easier rules dialog modding

* Why not to fix what i can?
---
 core/assets/bundles/bundle.properties         |   3 +
 core/assets/bundles/bundle_be.properties      |   4 +-
 core/assets/bundles/bundle_bg.properties      |   4 +-
 core/assets/bundles/bundle_ca.properties      |   4 +-
 core/assets/bundles/bundle_cs.properties      |   4 +-
 core/assets/bundles/bundle_da.properties      |   4 +-
 core/assets/bundles/bundle_de.properties      |   4 +-
 core/assets/bundles/bundle_es.properties      |   4 +-
 core/assets/bundles/bundle_et.properties      |   4 +-
 core/assets/bundles/bundle_eu.properties      |   4 +-
 core/assets/bundles/bundle_fi.properties      |   4 +-
 core/assets/bundles/bundle_fil.properties     |   4 +-
 core/assets/bundles/bundle_fr.properties      |   4 +-
 core/assets/bundles/bundle_id_ID.properties   |   4 +-
 core/assets/bundles/bundle_it.properties      |   4 +-
 core/assets/bundles/bundle_ja.properties      |   4 +-
 core/assets/bundles/bundle_ko.properties      |   4 +-
 core/assets/bundles/bundle_lt.properties      |   4 +-
 core/assets/bundles/bundle_nl.properties      |   4 +-
 core/assets/bundles/bundle_nl_BE.properties   |   4 +-
 core/assets/bundles/bundle_pl.properties      |   4 +-
 core/assets/bundles/bundle_pt_BR.properties   |   4 +-
 core/assets/bundles/bundle_pt_PT.properties   |   4 +-
 core/assets/bundles/bundle_ro.properties      |   4 +-
 core/assets/bundles/bundle_ru.properties      |   6 +-
 core/assets/bundles/bundle_sr.properties      |   4 +-
 core/assets/bundles/bundle_sv.properties      |   4 +-
 core/assets/bundles/bundle_th.properties      |   4 +-
 core/assets/bundles/bundle_tk.properties      |   4 +-
 core/assets/bundles/bundle_tr.properties      |   4 +-
 core/assets/bundles/bundle_uk_UA.properties   |   4 +-
 core/assets/bundles/bundle_vi.properties      |   2 +-
 core/assets/bundles/bundle_zh_CN.properties   |   4 +-
 core/assets/bundles/bundle_zh_TW.properties   |   4 +-
 .../mindustry/editor/MapLocalesDialog.java    |   1 -
 .../ui/dialogs/CustomRulesDialog.java         | 235 ++++++++++++------
 36 files changed, 229 insertions(+), 142 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index ef4cccb584..cbf4f022d1 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1379,6 +1379,9 @@ rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
 
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
+
 content.item.name = Items
 content.liquid.name = Fluids
 content.unit.name = Units
diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index 2a0e4c4e9e..2757457626 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -598,7 +598,7 @@ filter.option.floor2 = Другая паверхню
 filter.option.threshold2 = Другасны гранічны парог
 filter.option.radius = Радыус
 filter.option.percentile = Процентль
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2273,7 +2273,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 530c050bbd..08d2bd5893 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -604,7 +604,7 @@ filter.option.floor2 = Втори под
 filter.option.threshold2 = Втори праг
 filter.option.radius = Радиус
 filter.option.percentile = Перцентил
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2287,7 +2287,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Прочети число от свързано хранилище за памет.
 lst.write = Запиши число в свързано хранилище за памет.
 lst.print = Добави текст в буфера за изписване.\nНе визуализира нищо докато не използвате [accent]Print Flush[].
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Добавя операция в буфера за изображение.\nНе показва нищо докато не използвате [accent]Draw Flush[].
 lst.drawflush = Изпълнява операции, поискани с команда [accent]Draw[] върху посочен дисплей.
 lst.printflush = Извежда текст натрупан с [accent]Print[] върху посочен блок за съобщение.
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index f7642061f9..bde7361028 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -607,7 +607,7 @@ filter.option.floor2 = Terra secundari
 filter.option.threshold2 = Llindar secundari
 filter.option.radius = Radi
 filter.option.percentile = Percentil
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2297,7 +2297,7 @@ unit.emanate.description = Construeix estructures per defensar el nucli Acròpol
 lst.read = Llegeix un nombre des d’una cel·la de memòria connectada.
 lst.write = Escriu un nombre en una cel·la de memòria connectada.
 lst.print = Afegeix un text a la cua d’impressió.\nEl text no es mostrarà fins que s’apliqui «[accent]Print Flush[]».
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Afegeix una instrucció de dibuix a la cua corresponent.\nEl resultat no es mostrarà fins que s’apliqui «[accent]Draw Flush[]».
 lst.drawflush = Executa les operacions de la cua de dibuix al monitor lògic.
 lst.printflush = Executa les operacions de la cua d’impressió al monitor lògic.
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index bd98459a70..acd90ddc68 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -606,7 +606,7 @@ filter.option.floor2 = Druhotný  povrch
 filter.option.threshold2 = Druhotný práh
 filter.option.radius = Poloměr
 filter.option.percentile = Percentil
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2292,7 +2292,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Přečte číslo z připojené paměti.
 lst.write = Zapíše číslo do připojené paměti.
 lst.print = Přídá text do vypisovacího buferu.\nNezobrazí nic dokud [accent]Print Flush[] je použít.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Přídá operaci do vykreslovacího buferu.\nNezobrazí nic dokud [accent]Draw Flush[] je použít.
 lst.drawflush = Provede všechny [accent]Draw[] operace na zobrazovač logiky. Pak vyčistí vykreslovací bufer.
 lst.printflush = Provede všechny [accent]Print[] operace do zprávy. Pak vyčistí vypisovací bufer.
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 687a4be97e..56e0977799 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -599,7 +599,7 @@ filter.option.floor2 = Sekundært gulv
 filter.option.threshold2 = Sekundær terskel
 filter.option.radius = Radius
 filter.option.percentile = Percentil
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2273,7 +2273,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 023a6da38a..260236969e 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -610,7 +610,7 @@ filter.option.floor2 = Sekundärer Boden
 filter.option.threshold2 = Sekundärer Grenzwert
 filter.option.radius = Radius
 filter.option.percentile = Perzentil
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2322,7 +2322,7 @@ unit.emanate.description = Baut Blöcke, um den Akropolis-Kern zu beschützen. H
 lst.read = Liest einen Wert aus einer verbundenen Speicherzelle.
 lst.write = Schreibt eine Zahl in einer verbundene Speicherzelle.
 lst.print = Fügt Text zum Textspeicher hinzu.\nZeigt nichts an, bis [accent]Print Flush[] verwendet wird.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Fügt eine [accent]Draw[]-Aufgabe zum Bildspeicher hinzu.\nZeigt nichts an, bis [accent]Draw Flush[] verwendet wird.
 lst.drawflush = Druckt [accent]Draw[]-Aufgaben aus dem Bildspeicher auf einen Bildschirm.
 lst.printflush = Druckt [accent]Print[]-Aufgaben aus dem Textspeicher auf einen Nachrichtenblock.
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 8e2ab61238..a1784ec9c6 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -607,7 +607,7 @@ filter.option.floor2 = Terreno secundario
 filter.option.threshold2 = Umbral secundario
 filter.option.radius = Radio
 filter.option.percentile = Percentil
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2315,7 +2315,7 @@ unit.emanate.description = Construye estructuras para defender el núcleo Acropo
 lst.read = Lee un número desde una unidad de memoria conectada.
 lst.write = Escribe un número en una unidad de memoria conectada.
 lst.print = Añade texto a la cola para imprimir texto.\nNo mostrará nada hasta que se use [accent]Print Flush[].
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Añade una operación a la cola para dibujar.\nNo mostrará nada hasta que se use [accent]Draw Flush[].
 lst.drawflush = Muestra los datos en cola de operaciones [accent]Draw[] en un monitor gráfico.
 lst.printflush = Muestra los datos en cola de operaciones de [accent]Print[] en un bloque de mensaje.
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 3acece8285..675204d69b 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -599,7 +599,7 @@ filter.option.floor2 = Teine põrand
 filter.option.threshold2 = Teine lävi
 filter.option.radius = Raadius
 filter.option.percentile = Protsentiil
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2275,7 +2275,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index d29722b775..e43fd2fdf6 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -601,7 +601,7 @@ filter.option.floor2 = Bigarren zorua
 filter.option.threshold2 = Bigarren atalasea
 filter.option.radius = Erradioa
 filter.option.percentile = Pertzentila
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2277,7 +2277,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index d2cfbbeb4a..a955c097ed 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -599,7 +599,7 @@ filter.option.floor2 = Toinen lattia
 filter.option.threshold2 = Toissijainen raja-arvo
 filter.option.radius = Säde
 filter.option.percentile = Prosentti
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2278,7 +2278,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Lue numero yhdistetystä muistisolusta.
 lst.write = Kirjoita numero yhdistettyyn muistisoluun.
 lst.print = Lisää tekstiä tekstipuskuriin.\nEi näytä mitään, kunnes [accent]Painosyötettä[] käytetään.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Lisää operaation piirtopuskuriin.\nEi näytä mitään, kunnes [accent]Piirtosyötettä[] käytetään.
 lst.drawflush = Syöttää jonottavat [accent]Piirto[]-operaatiot näyttöön.
 lst.printflush = Syöttää jonottavat [accent]Paino[]-operaatiot viestipalikkaan.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 85fe063009..08cd5e1fbd 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -599,7 +599,7 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2274,7 +2274,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 0dea263859..7e3d8ea6cd 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -613,7 +613,7 @@ filter.option.floor2 = Sol secondaire
 filter.option.threshold2 = Seuil secondaire
 filter.option.radius = Rayon
 filter.option.percentile = Pourcentage
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2322,7 +2322,7 @@ unit.emanate.description = Construit des structures pour défendre le Noyau acro
 lst.read = Lit un nombre depuis un bloc de mémoire relié au processeur.
 lst.write = Écrit un nombre dans un bloc de mémoire relié au processeur.
 lst.print = Ajoute du texte dans la mémoire tampon de l'imprimante.\nNe montrera aucun texte tant que [accent]Print Flush[] ne sera pas utilisé.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Ajoute une opération dans la mémoire tampon de dessin.\nNe montrera aucune image tant que [accent]Draw Flush[] ne sera pas utilisé.
 lst.drawflush = Affiche les opérations [accent]Draw[] en file d'attente vers un écran.
 lst.printflush = Affiche les opérations [accent]Print[] en file d'attente vers un bloc de message.
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index f9a2127af0..0f1bd6fd5e 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -607,7 +607,7 @@ filter.option.floor2 = Lantai Sekunder
 filter.option.threshold2 = Ambang Sekunder
 filter.option.radius = Radius
 filter.option.percentile = Perseratus
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2313,7 +2313,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Membaca angka dari memori sel yang dihubungkan.
 lst.write = Menulis angka ke memori sel yang dihubungkan.
 lst.print = Menambahkan teks ke daftar cetak.\nTidak dapat menampilkan apapun sampai [accent]Print Flush[] dipakai.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Menambahkan perintah ke daftar gambar.\nTidak dapat menampilkan apapun sampai [accent]Draw Flush[] dipakai.
 lst.drawflush = Mengeluarkan perintah [accent]Draw[] dari daftar antrean untuk ditampilkan.
 lst.printflush = Mengeluarkan perintah [accent]Print[] dari daftar antrean untuk blok pesan.
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index c5d871dd97..97221f7113 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -602,7 +602,7 @@ filter.option.floor2 = Terreno Secondario
 filter.option.threshold2 = Soglia Secondaria
 filter.option.radius = Raggio
 filter.option.percentile = Percentuale
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2287,7 +2287,7 @@ unit.emanate.description = Costruisce strutture per difendere il nucleo dell'Acr
 lst.read = Leggi un numero da una cella di memoria collegata.
 lst.write = Scrivi un numero in una cella di memoria collegata.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 59f64d47b1..b54b1f57f3 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -606,7 +606,7 @@ filter.option.floor2 = 2番目の地面
 filter.option.threshold2 = 2番目の閾値
 filter.option.radius = 半径
 filter.option.percentile = パーセンタイル
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2291,7 +2291,7 @@ unit.emanate.description = アクロポリスコアを敵から守ります。\n
 lst.read = リンクされたメモリセルから数値を読み取ります。
 lst.write = リンクされたメモリセルに数値を書き込みます。
 lst.print = メッセージブロックにテキストを追加します。[accent]Print Flush[] を使用するまで何も表示しません。
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = ロジックディスプレイに操作を追加します。[accent]Draw Flush[] を使用するまで何も表示しません。
 lst.drawflush = キューに入れられた [accent]Draw[] 操作をディスプレイにフラッシュします。
 lst.printflush = キューに入れられた [accent]Print[] 操作をメッセージ ブロックにフラッシュします。
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index f3c014faed..342c511010 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -606,7 +606,7 @@ filter.option.floor2 = 2번째 타일
 filter.option.threshold2 = 2번째 경계선
 filter.option.radius = 반경
 filter.option.percentile = 백분율
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2290,7 +2290,7 @@ unit.emanate.description = 코어: 도심을 지켜내기 위해 구조물을 
 lst.read = 연결된 메모리 셀에서 숫자 읽음
 lst.write = 연결된 메모리 셀에 숫자 작성
 lst.print = 프린트 버퍼에 텍스트 추가\n[accent]Print Flush[]가 사용되기 전까진 아무것도 보여주지 않습니다
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = 드로잉 버퍼에 실행문 추가\n[accent]Draw Flush[]가 사용되기 전까진 아무것도 보여주지 않습니다
 lst.drawflush = 대기중인 [accent]Draw[]실행문을 디스플레이에 출력
 lst.printflush = 대기중인 [accent]Print[]실행문을 메시지 블록에 출력
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 6bc26f33fd..f61d0b08b5 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -599,7 +599,7 @@ filter.option.floor2 = Antrasis sluoksnis
 filter.option.threshold2 = Antrasis slenkstis
 filter.option.radius = Spindulys
 filter.option.percentile = Procentilė
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2275,7 +2275,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 46eb33949b..66590f28e8 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -609,7 +609,7 @@ filter.option.floor2 = Secundaire Vloer
 filter.option.threshold2 = Secundaire Drempel
 filter.option.radius = Straal
 filter.option.percentile = percentiel
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2288,7 +2288,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 01a6cf3f1f..8d0e615414 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -599,7 +599,7 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2275,7 +2275,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index 0de92a7351..86cea38c99 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -604,7 +604,7 @@ filter.option.floor2 = Druga Podłoga
 filter.option.threshold2 = Drugi Próg
 filter.option.radius = Zasięg
 filter.option.percentile = Procent
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2309,7 +2309,7 @@ unit.emanate.description = Lotnicza jednostka aministracyjna zdolna do wydobycia
 lst.read = Wczytuje liczbę z połączonej komórki pamięci.
 lst.write = Zapisuje liczbę do połączonej komórki pamięci.
 lst.print = Dodaje tekst do buforu drukującego.\nNie wyświetla niczego dopóki [accent]Print Flush[] nie jest użyte.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Dodaje operacje do buforu rysującego.\nNie wyświetla niczego dopóki [accent]Draw Flush[] nie jest użyte.
 lst.drawflush = Wyświetla oczekujące operacje z funkcji [accent]Draw[] na wyświetlaczu.
 lst.printflush = Dodaje oczekujące operacje z funkcji [accent]Print[] do bloku wiadomości.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 4883362261..8ac998829a 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -607,7 +607,7 @@ filter.option.floor2 = Chão secundário
 filter.option.threshold2 = Margem secundária
 filter.option.radius = Raio
 filter.option.percentile = Percentual
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2308,7 +2308,7 @@ unit.emanate.description = Constrói estruturas para defender o Núcelo Acrópol
 lst.read = Ler um número de uma célula de memória vinculada.
 lst.write = Escrever um número de uma célula de memória vinculada.
 lst.print = Adiciona texto ao buffer de impressão.\nNão exibe nada até [accent]Print Flush[] ser usado.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Adicionar uma operação ao buffer de desenho.\nNão exibe nada até [accent]Draw Flush[] ser usado.
 lst.drawflush = Liberar operações [accent]Draw[] enfileiradas para um display.
 lst.printflush = Liberar operações [accent]Print[] enfileiradas para um bloco de mensagem.
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index cf29525e4c..17ca743e25 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -599,7 +599,7 @@ filter.option.floor2 = Chão secundário
 filter.option.threshold2 = Margem secundária
 filter.option.radius = Raio
 filter.option.percentile = Percentual
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2275,7 +2275,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index d9e45b96ca..a0d08c50f9 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -606,7 +606,7 @@ filter.option.floor2 = Podea Secundară
 filter.option.threshold2 = Cantitate Secundară
 filter.option.radius = Rază
 filter.option.percentile = Procent
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2292,7 +2292,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Citește un număr dintr-o celulă de memorie conectată.
 lst.write = Scrie un număr într-o celulă de memorie conectată.
 lst.print = Adaugă text în bufferul de tipărire.\nNu tipărește decât când se execută [accent]Print Flush[].
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Adaugă o operație în bufferul de desenare.\nNu afișează decât când se execută [accent]Draw Flush[].
 lst.drawflush = Afișează pe un monitor instrucțiunile [accent]Draw[] aflate în așteptare.
 lst.printflush = Tipărește  într-un bloc Mesaj instrucțiunile [accent]Print[] aflate în așteptare.
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index c5ccfc459c..3c593f330f 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -606,7 +606,7 @@ filter.option.floor2 = Вторая поверхность
 filter.option.threshold2 = Вторичный предельный порог
 filter.option.radius = Радиус
 filter.option.percentile = Процентиль
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -1297,7 +1297,7 @@ rules.invaliddata = Invalid clipboard data.
 rules.hidebannedblocks = Скрыть запрещенные блоки
 rules.infiniteresources = Бесконечные ресурсы
 rules.onlydepositcore = Разрешен перенос только в ядро
-rules.derelictrepair = Allow Derelict Block Repair
+rules.derelictrepair = Разрешить починку покинутых построек
 rules.reactorexplosions = Взрывы реакторов
 rules.coreincinerates = Ядро сжигает избыток ресурсов
 rules.disableworldprocessors = Отключить мировые процессоры
@@ -2294,7 +2294,7 @@ unit.emanate.description = Защищает ядро «Акрополь» от 
 lst.read = Считывает число из соединённой ячейки памяти.
 lst.write = Записывает число в соединённую ячейку памяти.
 lst.print = Добавляет текст в текстовый буфер. Ничего не отображает, пока не будет вызван [accent]Print Flush[].
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Добавляет операцию в буфер отрисовки. Ничего не отображает, пока не будет вызван [accent]Draw Flush[].
 lst.drawflush = Сбрасывает буфер [accent]Draw[] операций на дисплей.
 lst.printflush = Сбрасывает буфер [accent]Print[] операций в блок-сообщение.
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index 52cf175915..de821a980a 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -606,7 +606,7 @@ filter.option.floor2 = Drugi Pod
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2295,7 +2295,7 @@ unit.emanate.description = Gradi građevine da odbrani Veliki Grad jezgro. Popra
 lst.read = Čita broj iz povezane memorijske ćelije.
 lst.write = Piše broj u povezanu memorijsku ćeliju.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index be714b7f2b..8d025a4cae 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -599,7 +599,7 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radie
 filter.option.percentile = Percentile
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2275,7 +2275,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 9f5f8253b8..fa345d3212 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -606,7 +606,7 @@ filter.option.floor2 = พื้นชั้นสอง
 filter.option.threshold2 = เกณฑ์ชั้นสอง
 filter.option.radius = รัศมี
 filter.option.percentile = เปอร์เซ็นต์ไทล์
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2312,7 +2312,7 @@ unit.emanate.description = สร้างสิ่งต่างๆ เพื
 lst.read = อ่านเลขจากเซลล์ความจำที่เชื่อมต่อไว้
 lst.write = เขียนเลขไปยังเซลล์ความจำที่เชื่อมต่อไว้
 lst.print = เพิ่มข้อความไปยังคิวข้อความ\nข้อความจะยังไม่แสดงจนกว่าจะใช้คำสั่ง [accent]Print Flush[]
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = เพิ่มรูปไปยังคิวการวาด\nภาพจะยังไม่แสดงจนกว่าจะใช้คำสั่ง [accent]Draw Flush[]
 lst.drawflush = ปล่อยคิว [accent]Draw[] ไปยังหน้าจอลอจิกที่เชื่อมต่อไว้
 lst.printflush = ปล่อยคิว [accent]Print[] ไปยังตัวเก็บข้อความที่เชื่อมต่อไว้
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index cca3894127..63422c96b9 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -599,7 +599,7 @@ filter.option.floor2 = Secondary Floor
 filter.option.threshold2 = Secondary Threshold
 filter.option.radius = Radius
 filter.option.percentile = Percentile
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2275,7 +2275,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 3df7fa80c7..ebc53ffe12 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -606,7 +606,7 @@ filter.option.floor2 = İkincil Duvar
 filter.option.threshold2 = İkincil Eşik
 filter.option.radius = Yarıçap
 filter.option.percentile = Yüzdelik
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2292,7 +2292,7 @@ unit.emanate.description = Akropolis Merkezini korumak için binalar inşa eder.
 lst.read = Bağlı hafıza kutusundaki numarayı okur.
 lst.write = Bağlı hafıza kutuaundaki numaraya yazar.
 lst.print = Yazı yazar.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Ekrana Çizer.
 lst.drawflush = Ekrana Çizimi Aktarır.
 lst.printflush = Mesaj bloğuna metnini aktarır,
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 6f94bbdf57..94e234dfa3 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -609,7 +609,7 @@ filter.option.floor2 = Друга поверхня
 filter.option.threshold2 = Вторинний граничний поріг
 filter.option.radius = Радіус
 filter.option.percentile = Спад
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2319,7 +2319,7 @@ unit.emanate.description = Англійська назва: Emanate\nБудує
 lst.read = Зчитує число із з’єднаної комірки пам’яті.
 lst.write = Записує числу у з’єднану комірку пам’яті.
 lst.print = Додайте текст до буфера друку.\nНічого не відображає, поки [accent]Print Flush[] використовується.
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Додає операцію до буфера рисунка.\nНічого не відображає, поки [accent]Draw Flush[] використовується.
 lst.drawflush = Скидає буфер операцій [accent]Draw[] на дисплей.
 lst.printflush = Скидає буфер операцій [accent]Print[] у блок «Повідомлення».
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 931daa4dd9..7d74309dec 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -607,7 +607,7 @@ filter.option.floor2 = Nền phụ
 filter.option.threshold2 = Ngưỡng phụ
 filter.option.radius = Bán kính
 filter.option.percentile = Phần trăm
-locales.info = Tại đây, bạn có thể thêm gói ngôn ngữ cho ngôn ngữ cụ thể vào bản đồ của bạn. Trong gói ngôn ngữ, mỗi thuộc tính có tên và giá trị. Những thuộc tính này có thể được sử dụng bởi Bộ xử lý thế giới và Mục tiêu nhiệm vụ bằng tên của chúng. Chúng hỗ trợ định dạng văn bản (thay thế kí tự giữ chỗ bằng giá trị thực tế).\n\n[cyan]Ví dụ thuộc tính:\n[]tên: [accent]timer[]\nvalue: [accent]Bộ đếm thời gian ví dụ, thời gian còn lại: @[]\n\n[cyan]Cách dùng:\n[]Đặt làm văn bản cho Mục tiêu nhiệm vụ: [accent]@timer\n\n[]In nó trong Bộ xử lý thế giới:\n[accent]localeprint "timer"\nformat time\n[gray](với time là biến được tính toán riêng biệt)
+locales.info = Tại đây, bạn có thể thêm gói ngôn ngữ cho ngôn ngữ cụ thể vào bản đồ của bạn. Trong gói ngôn ngữ, mỗi thuộc tính có tên và giá trị. Những thuộc tính này có thể được sử dụng bởi Bộ xử lý thế giới và Mục tiêu nhiệm vụ bằng tên của chúng. Chúng hỗ trợ định dạng văn bản (thay thế kí tự giữ chỗ bằng giá trị thực tế).\n\n[cyan]Ví dụ thuộc tính:\n[]tên: [accent]timer[]\nvalue: [accent]Bộ đếm thời gian ví dụ, thời gian còn lại: {0}[]\n\n[cyan]Cách dùng:\n[]Đặt làm văn bản cho Mục tiêu nhiệm vụ: [accent]@timer\n\n[]In nó trong Bộ xử lý thế giới:\n[accent]localeprint "timer"\nformat time\n[gray](với time là biến được tính toán riêng biệt)
 locales.deletelocale = Bạn có chắc muốn xóa gói ngôn ngữ này?
 locales.applytoall = Áp dụng thay đổi cho tất cả gói ngôn ngữ
 locales.addtoother = Thêm vào các gói ngôn ngữ khác
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 7386027dfa..9cc26e8dfd 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -610,7 +610,7 @@ filter.option.floor2 = 内层地形
 filter.option.threshold2 = 内层比例
 filter.option.radius = 半径
 filter.option.percentile = 百分比
-locales.info = 在这里，您可以为特定语言添加本地化语言包到您的地图中。在本地化语言包中，每个文本属性都有一个名称和一个值。这些文本属性可以由世界处理器和游戏目标使用它们的名称。它们支持文本格式化（用实际值替换占位符）。\n\n[cyan]示例文本属性：\n[]名称: [accent]timer[]值: [accent]示例计时器, 剩余时间: @[]\n\n[cyan]用法:\n[]将其设置为目标的文本: [accent]@timer\n\n[]在世界处理器中打印它：\n[accent]localeprint "timer"\n格式化时间\n[gray](时间是一个单独计算的变量)
+locales.info = 在这里，您可以为特定语言添加本地化语言包到您的地图中。在本地化语言包中，每个文本属性都有一个名称和一个值。这些文本属性可以由世界处理器和游戏目标使用它们的名称。它们支持文本格式化（用实际值替换占位符）。\n\n[cyan]示例文本属性：\n[]名称: [accent]timer[]值: [accent]示例计时器, 剩余时间: {0}[]\n\n[cyan]用法:\n[]将其设置为目标的文本: [accent]@timer\n\n[]在世界处理器中打印它：\n[accent]localeprint "timer"\n格式化时间\n[gray](时间是一个单独计算的变量)
 locales.deletelocale = 您确定要删除该本地化语言包吗？
 locales.applytoall = 将更改应用于所有本地化语言包
 locales.addtoother = 添加到其他本地化语言包
@@ -2319,7 +2319,7 @@ unit.emanate.description = 保护卫城核心，可建造建筑。 使用一对
 lst.read = 从连接的内存读取数字
 lst.write = 向连接的内存写入数字
 lst.print = 添加文字到打印缓存\n使用[accent]Print Flush[]后才会真正显示
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = 添加绘图操作到绘图缓存\n使用[accent]Draw Flush[]后才会真正显示
 lst.drawflush = 将绘图缓存中的[accent]Draw[]队列刷新到显示屏
 lst.printflush = 将打印缓存中的[accent]Print[]队列刷新到信息板
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 85afd5a50f..5330002f2f 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -607,7 +607,7 @@ filter.option.floor2 = 次要地板
 filter.option.threshold2 = 次要閾值
 filter.option.radius = 半徑
 filter.option.percentile = 百分比
-locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: @[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
+locales.info = Here, you can add locale bundles for specific languages to your map. In locale bundles, each property has a name and a value. These properties can be used by world processors and objectives using their names. They support text formatting (replacing placeholders with actual values).\n\n[cyan]Example property:\n[]name: [accent]timer[]\nvalue: [accent]Example timer, time left: {0}[]\n\n[cyan]Usage:\n[]Set it as objective's text: [accent]@timer\n\n[]Print it in a world processor:\n[accent]localeprint "timer"\nformat time\n[gray](where time is a separately calculated variable)
 locales.deletelocale = Are you sure you want to delete this locale bundle?
 locales.applytoall = Apply Changes To All Locales
 locales.addtoother = Add To Other Locales
@@ -2304,7 +2304,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = [accent]讀取[]記憶體中的一項數值
 lst.write = [accent]寫入[]一項數值到記憶體中
 lst.print = 將文字加入輸出的暫存中，搭配[accent]Print Flush[], [accent]Flush message[]使用
-lst.format = Replace next placeholder ("[accent]@[]") in text buffer with a value.\nExample:\n[accent]print "test @"\nformat "example"
+lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = 將圖形加入顯示的暫存中，搭配[accent]Draw Flush[]使用
 lst.drawflush = 將所有暫存的[accent]Draw[]指令推到顯示器上
 lst.printflush = 將所有暫存的[accent]Print[]指令推到訊息板上
diff --git a/core/src/mindustry/editor/MapLocalesDialog.java b/core/src/mindustry/editor/MapLocalesDialog.java
index 17cc9f2764..47d902639c 100644
--- a/core/src/mindustry/editor/MapLocalesDialog.java
+++ b/core/src/mindustry/editor/MapLocalesDialog.java
@@ -5,7 +5,6 @@ import arc.func.*;
 import arc.graphics.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
-import arc.scene.ui.Button.*;
 import arc.scene.ui.TextButton.*;
 import arc.scene.ui.layout.*;
 import arc.scene.utils.*;
diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index 1091c74c08..40f7e1a642 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -3,6 +3,7 @@ package mindustry.ui.dialogs;
 import arc.*;
 import arc.func.*;
 import arc.graphics.*;
+import arc.input.KeyCode;
 import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.ImageButton.*;
@@ -30,6 +31,12 @@ public class CustomRulesDialog extends BaseDialog{
     private Table main;
     private Prov<Rules> resetter;
     private LoadoutDialog loadoutDialog;
+    public Seq<Table> categories;
+    public Table current;
+    public Seq<String> categoryNames;
+    public String currentName;
+    public String ruleSearch = "";
+    public Seq<Runnable> additionalSetup; // for modding to easily add new rules
 
     public CustomRulesDialog(){
         super("@mode.custom");
@@ -40,6 +47,12 @@ public class CustomRulesDialog extends BaseDialog{
         shown(this::setup);
         addCloseButton();
 
+        additionalSetup = new Seq<>();
+        categories = new Seq<>();
+        categoryNames = new Seq<>();
+        currentName = "";
+        ruleSearch = "";
+
         buttons.button("@edit", Icon.pencil, () -> {
             BaseDialog dialog = new BaseDialog("@waves.edit");
             dialog.addCloseButton();
@@ -176,13 +189,26 @@ public class CustomRulesDialog extends BaseDialog{
     }
 
     void setup(){
+        categories.clear();
         cont.clear();
+        cont.table(t -> {
+            t.add("@search").padRight(10);
+            t.field(ruleSearch, text ->
+                ruleSearch = text.trim().replaceAll(" +", " ").toLowerCase()
+            ).grow().pad(8).get().keyDown(KeyCode.enter, this::setup);
+            t.button(Icon.cancel, Styles.emptyi, () -> {
+                ruleSearch = "";
+                setup();
+            }).padLeft(10f).size(35f);
+            t.button(Icon.zoom, Styles.emptyi, this::setup).size(54f);
+        }).row();
         cont.pane(m -> main = m).scrollX(false);
         main.margin(10f);
-        main.left().defaults().fillX().left().pad(5);
+        main.left().defaults().fillX().left();
         main.row();
 
-        title("@rules.title.waves");
+
+        category("waves");
         check("@rules.waves", b -> rules.waves = b, () -> rules.waves);
         check("@rules.wavesending", b -> rules.waveSending = b, () -> rules.waveSending, () -> rules.waves);
         check("@rules.wavetimer", b -> rules.waveTimer = b, () -> rules.waveTimer, () -> rules.waves);
@@ -195,7 +221,8 @@ public class CustomRulesDialog extends BaseDialog{
         }
         number("@rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> rules.waves);
 
-        title("@rules.title.resourcesbuilding");
+
+        category("resourcesbuilding");
         check("@rules.infiniteresources", b -> {
             rules.infiniteResources = b;
 
@@ -207,7 +234,7 @@ public class CustomRulesDialog extends BaseDialog{
                 setup();
             }
         }, () -> rules.infiniteResources);
-        check("@rules.onlydepositcore", b -> rules.onlyDepositCore = b, () -> rules.onlyDepositCore);
+        withInfo("@rules.onlydepositcore.info", () -> check("@rules.onlydepositcore", b -> rules.onlyDepositCore = b, () -> rules.onlyDepositCore));
         check("@rules.derelictrepair", b -> rules.derelictRepair = b, () -> rules.derelictRepair);
         check("@rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions);
         check("@rules.schematic", b -> rules.schematicsAllowed = b, () -> rules.schematicsAllowed);
@@ -220,18 +247,23 @@ public class CustomRulesDialog extends BaseDialog{
         number("@rules.blockhealthmultiplier", f -> rules.blockHealthMultiplier = f, () -> rules.blockHealthMultiplier);
         number("@rules.blockdamagemultiplier", f -> rules.blockDamageMultiplier = f, () -> rules.blockDamageMultiplier);
 
-        main.button("@configure",
-            () -> loadoutDialog.show(999999, rules.loadout,
-                i -> true,
-                () -> rules.loadout.clear().add(new ItemStack(Items.copper, 100)),
-                () -> {}, () -> {}
-        )).left().width(300f).row();
+        if(Core.bundle.get("configure").toLowerCase().contains(ruleSearch)){
+            current.button("@configure",
+                () -> loadoutDialog.show(999999, rules.loadout,
+                    i -> true,
+                    () -> rules.loadout.clear().add(new ItemStack(Items.copper, 100)),
+                    () -> {}, () -> {}
+            )).left().width(300f).row();
+        }
 
-        main.button("@bannedblocks", () -> showBanned("@bannedblocks", ContentType.block, rules.bannedBlocks, Block::canBeBuilt)).left().width(300f).row();
+        if(Core.bundle.get("bannedblocks").toLowerCase().contains(ruleSearch)){
+            current.button("@bannedblocks", () -> showBanned("@bannedblocks", ContentType.block, rules.bannedBlocks, Block::canBeBuilt)).left().width(300f).row();
+        }
         check("@rules.hidebannedblocks", b -> rules.hideBannedBlocks = b, () -> rules.hideBannedBlocks);
         check("@bannedblocks.whitelist", b -> rules.blockWhitelist = b, () -> rules.blockWhitelist);
 
-        title("@rules.title.unit");
+
+        category("unit");
         check("@rules.unitcapvariable", b -> rules.unitCapVariable = b, () -> rules.unitCapVariable);
         check("@rules.unitpayloadsexplode", b -> rules.unitPayloadsExplode = b, () -> rules.unitPayloadsExplode);
         numberi("@rules.unitcap", f -> rules.unitCap = f, () -> rules.unitCap, -999, 999);
@@ -241,17 +273,21 @@ public class CustomRulesDialog extends BaseDialog{
         number("@rules.unitcostmultiplier", f -> rules.unitCostMultiplier = f, () -> rules.unitCostMultiplier);
         number("@rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier);
 
-        main.button("@bannedunits", () -> showBanned("@bannedunits", ContentType.unit, rules.bannedUnits, u -> !u.isHidden())).left().width(300f).row();
+        if(Core.bundle.get("bannedunits").toLowerCase().contains(ruleSearch)){
+            current.button("@bannedunits", () -> showBanned("@bannedunits", ContentType.unit, rules.bannedUnits, u -> !u.isHidden())).left().width(300f).row();
+        }
         check("@bannedunits.whitelist", b -> rules.unitWhitelist = b, () -> rules.unitWhitelist);
 
-        title("@rules.title.enemy");
+
+        category("enemy");
         check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);
         check("@rules.corecapture", b -> rules.coreCapture = b, () -> rules.coreCapture);
-        check("@rules.placerangecheck", b -> rules.placeRangeCheck = b, () -> rules.placeRangeCheck);
+        withInfo("@rules.placerangecheck.info",() -> check("@rules.placerangecheck", b -> rules.placeRangeCheck = b, () -> rules.placeRangeCheck));
         check("@rules.polygoncoreprotection", b -> rules.polygonCoreProtection = b, () -> rules.polygonCoreProtection);
         number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200), () -> !rules.polygonCoreProtection);
 
-        title("@rules.title.environment");
+
+        category("environment");
         check("@rules.explosions", b -> rules.damageExplosions = b, () -> rules.damageExplosions);
         check("@rules.fire", b -> rules.fire = b, () -> rules.fire);
         check("@rules.fog", b -> rules.fog = b, () -> rules.fog);
@@ -267,63 +303,70 @@ public class CustomRulesDialog extends BaseDialog{
 
         number("@rules.solarmultiplier", f -> rules.solarMultiplier = f, () -> rules.solarMultiplier);
 
-        main.button(b -> {
-            b.left();
-            b.table(Tex.pane, in -> {
-                in.stack(new Image(Tex.alphaBg), new Image(Tex.whiteui){{
-                    update(() -> setColor(rules.ambientLight));
-                }}).grow();
-            }).margin(4).size(50f).padRight(10);
-            b.add("@rules.ambientlight");
-        }, () -> ui.picker.show(rules.ambientLight, rules.ambientLight::set)).left().width(250f).row();
+        if(Core.bundle.get("rules.ambientlight").toLowerCase().contains(ruleSearch)){
+            current.button(b -> {
+                b.left();
+                b.table(Tex.pane, in -> {
+                    in.stack(new Image(Tex.alphaBg), new Image(Tex.whiteui){{
+                        update(() -> setColor(rules.ambientLight));
+                    }}).grow();
+                }).margin(4).size(50f).padRight(10);
+                b.add("@rules.ambientlight");
+            }, () -> ui.picker.show(rules.ambientLight, rules.ambientLight::set)).left().width(250f).row();
+        }
 
-        main.button("@rules.weather", this::weatherDialog).width(250f).left().row();
+        if(Core.bundle.get("rules.weather").toLowerCase().contains(ruleSearch)){
+            current.button("@rules.weather", this::weatherDialog).width(250f).left().row();
+        }
 
-        title("@rules.title.planet");
 
-        main.table(Tex.button, t -> {
-            t.margin(10f);
-            var group = new ButtonGroup<>();
-            var style = Styles.flatTogglet;
+        category("planet");
+        if(Core.bundle.get("rules.title.planet").toLowerCase().contains(ruleSearch)){
+            current.table(Tex.button, t -> {
+                t.margin(10f);
+                var group = new ButtonGroup<>();
+                var style = Styles.flatTogglet;
 
-            t.defaults().size(140f, 50f);
+                t.defaults().size(140f, 50f);
 
-            for(Planet planet : content.planets().select(p -> p.accessible && p.visible && p.isLandable())){
-                t.button(planet.localizedName, style, () -> {
-                    planet.applyRules(rules);
-                }).group(group).checked(b -> rules.planet == planet);
+                for(Planet planet : content.planets().select(p -> p.accessible && p.visible && p.isLandable())){
+                    t.button(planet.localizedName, style, () -> {
+                        planet.applyRules(rules);
+                    }).group(group).checked(b -> rules.planet == planet);
 
-                if(t.getChildren().size % 3 == 0){
-                    t.row();
+                    if(t.getChildren().size % 3 == 0){
+                        t.row();
+                    }
                 }
-            }
 
-            t.button("@rules.anyenv", style, () -> {
-                rules.env = Vars.defaultEnv;
-                rules.hiddenBuildItems.clear();
-                rules.planet = Planets.sun;
-            }).group(group).checked(b -> rules.planet == Planets.sun);
-        }).left().fill(false).expand(false, false).row();
+                t.button("@rules.anyenv", style, () -> {
+                    rules.env = Vars.defaultEnv;
+                    rules.hiddenBuildItems.clear();
+                    rules.planet = Planets.sun;
+                }).group(group).checked(b -> rules.planet == Planets.sun);
+            }).left().fill(false).expand(false, false).row();
+        }
 
-        title("@rules.title.teams");
 
+        category("teams");
         team("@rules.playerteam", t -> rules.defaultTeam = t, () -> rules.defaultTeam);
         team("@rules.enemyteam", t -> rules.waveTeam = t, () -> rules.waveTeam);
 
         for(Team team : Team.baseTeams){
             boolean[] shown = {false};
-            Table wasMain = main;
+            Table wasCurrent = current;
 
-            main.button(team.coloredName(), Icon.downOpen, Styles.togglet, () -> {
+            Table teamRules = new Table(); // just button and collapser in one table
+            teamRules.button(team.coloredName(), Icon.downOpen, Styles.togglet, () -> {
                 shown[0] = !shown[0];
             }).marginLeft(14f).width(260f).height(55f).update(t -> {
                 ((Image)t.getChildren().get(1)).setDrawable(shown[0] ? Icon.upOpen : Icon.downOpen);
                 t.setChecked(shown[0]);
-            }).row();
+            }).left().padBottom(2f).row();
 
-            main.collapser(t -> {
-                t.left().defaults().fillX().left().pad(5);
-                main = t;
+            teamRules.collapser(c -> {
+                c.left().defaults().fillX().left().pad(5);
+                current = c;
                 TeamRule teams = rules.teams.get(team);
 
                 number("@rules.blockhealthmultiplier", f -> teams.blockHealthMultiplier = f, () -> teams.blockHealthMultiplier);
@@ -347,13 +390,42 @@ public class CustomRulesDialog extends BaseDialog{
                 number("@rules.unitcostmultiplier", f -> teams.unitCostMultiplier = f, () -> teams.unitCostMultiplier);
                 number("@rules.unithealthmultiplier", f -> teams.unitHealthMultiplier = f, () -> teams.unitHealthMultiplier);
 
-                main = wasMain;
-            }, () -> shown[0]).growX().row();
+                if(!current.hasChildren()){
+                    teamRules.clear();
+                }else{
+                    wasCurrent.add(teamRules).row();
+                }
+
+                current = wasCurrent;
+            }, () -> shown[0]).left().growX().row();
+        }
+
+        additionalSetup.each(Runnable::run);
+
+        for(var i = 0; i < categories.size; i++){
+            addToMain(categories.get(i), Core.bundle.get("rules.title." + categoryNames.get(i)));
         }
     }
 
-    void team(String text, Cons<Team> cons, Prov<Team> prov){
-        main.table(t -> {
+    public void category(String name){
+        current = new Table();
+        current.left().defaults().fillX().left().pad(5);
+        currentName = name;
+        categories.add(current);
+        categoryNames.add(currentName);
+    }
+
+    void addToMain(Table category, String title){
+        if(category.hasChildren()){
+            main.add(title).color(Pal.accent).padTop(20).padRight(100f).padBottom(-3).fillX().left().pad(5).row();
+            main.image().color(Pal.accent).height(3f).padRight(100f).padBottom(20).fillX().left().pad(5).row();
+            main.add(category).row();
+        }
+    }
+
+    public void team(String text, Cons<Team> cons, Prov<Team> prov){
+        if(!Core.bundle.get(text.substring(1)).toLowerCase().contains(ruleSearch)) return;
+        current.table(t -> {
             t.left();
             t.add(text).left().padRight(5);
 
@@ -365,28 +437,29 @@ public class CustomRulesDialog extends BaseDialog{
         }).padTop(0).row();
     }
 
-    void number(String text, Floatc cons, Floatp prov){
+    public void number(String text, Floatc cons, Floatp prov){
         number(text, false, cons, prov, () -> true, 0, Float.MAX_VALUE);
     }
 
-    void number(String text, Floatc cons, Floatp prov, float min, float max){
+    public void number(String text, Floatc cons, Floatp prov, float min, float max){
         number(text, false, cons, prov, () -> true, min, max);
     }
 
-    void number(String text, boolean integer, Floatc cons, Floatp prov, Boolp condition){
+    public void number(String text, boolean integer, Floatc cons, Floatp prov, Boolp condition){
         number(text, integer, cons, prov, condition, 0, Float.MAX_VALUE);
     }
 
-    void number(String text, Floatc cons, Floatp prov, Boolp condition){
+    public void number(String text, Floatc cons, Floatp prov, Boolp condition){
         number(text, false, cons, prov, condition, 0, Float.MAX_VALUE);
     }
 
-    void numberi(String text, Intc cons, Intp prov, int min, int max){
+    public void numberi(String text, Intc cons, Intp prov, int min, int max){
         numberi(text, cons, prov, () -> true, min, max);
     }
 
-    void numberi(String text, Intc cons, Intp prov, Boolp condition, int min, int max){
-        main.table(t -> {
+    public void numberi(String text, Intc cons, Intp prov, Boolp condition, int min, int max){
+        if(!Core.bundle.get(text.substring(1)).toLowerCase().contains(ruleSearch)) return;
+        current.table(t -> {
             t.left();
             t.add(text).left().padRight(5)
                 .update(a -> a.setColor(condition.get() ? Color.white : Color.gray));
@@ -397,8 +470,9 @@ public class CustomRulesDialog extends BaseDialog{
         }).padTop(0).row();
     }
 
-    void number(String text, boolean integer, Floatc cons, Floatp prov, Boolp condition, float min, float max){
-        main.table(t -> {
+    public void number(String text, boolean integer, Floatc cons, Floatp prov, Boolp condition, float min, float max){
+        if(!Core.bundle.get(text.substring(1)).toLowerCase().contains(ruleSearch)) return;
+        current.table(t -> {
             t.left();
             t.add(text).left().padRight(5)
             .update(a -> a.setColor(condition.get() ? Color.white : Color.gray));
@@ -407,23 +481,34 @@ public class CustomRulesDialog extends BaseDialog{
             .update(a -> a.setDisabled(!condition.get()))
             .valid(f -> Strings.canParsePositiveFloat(f) && Strings.parseFloat(f) >= min && Strings.parseFloat(f) <= max).width(120f).left();
         }).padTop(0);
-        main.row();
+        current.row();
     }
 
-    void check(String text, Boolc cons, Boolp prov){
+    public void check(String text, Boolc cons, Boolp prov){
         check(text, cons, prov, () -> true);
     }
 
-    void check(String text, Boolc cons, Boolp prov, Boolp condition){
-        main.check(text, cons).checked(prov.get()).update(a -> a.setDisabled(!condition.get())).padRight(100f).get().left();
-        main.row();
+    public void check(String text, Boolc cons, Boolp prov, Boolp condition){
+        if(!Core.bundle.get(text.substring(1)).toLowerCase().contains(ruleSearch)) return;
+        current.check(text, cons).checked(prov.get()).update(a -> a.setDisabled(!condition.get())).padRight(100f).get().left();
+        current.row();
     }
 
-    void title(String text){
-        main.add(text).color(Pal.accent).padTop(20).padRight(100f).padBottom(-3);
-        main.row();
-        main.image().color(Pal.accent).height(3f).padRight(100f).padBottom(20);
-        main.row();
+    public void withInfo(String info, Runnable add){
+        Table wasCurrent = current;
+        current = new Table();
+        current.left().defaults().fillX().left();
+
+        current.button(Icon.infoSmall, () -> ui.showInfo(info)).size(32f).padRight(10f);
+        add.run();
+
+        // rule does not match search pattern (runnable returned without adding anything)
+        if(current.getCells().size < 2){
+            current.clear();
+        }else{
+            wasCurrent.add(current).row();
+        }
+        current = wasCurrent;
     }
 
     Cell<TextField> field(Table table, float value, Floatc setter){

From 7f30cd8703f500a619357872a87df1773819b97d Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az802-295.15taxv3x2l5urdl5ou4x200swd.phxx.internal.cloudapp.net>
Date: Thu, 11 Apr 2024 21:57:25 +0000
Subject: [PATCH 358/369] Automatic bundle update

---
 core/assets/bundles/bundle_be.properties    | 4 +++-
 core/assets/bundles/bundle_bg.properties    | 4 +++-
 core/assets/bundles/bundle_ca.properties    | 4 +++-
 core/assets/bundles/bundle_cs.properties    | 4 +++-
 core/assets/bundles/bundle_da.properties    | 4 +++-
 core/assets/bundles/bundle_de.properties    | 4 +++-
 core/assets/bundles/bundle_es.properties    | 4 +++-
 core/assets/bundles/bundle_et.properties    | 4 +++-
 core/assets/bundles/bundle_eu.properties    | 4 +++-
 core/assets/bundles/bundle_fi.properties    | 4 +++-
 core/assets/bundles/bundle_fil.properties   | 4 +++-
 core/assets/bundles/bundle_fr.properties    | 4 +++-
 core/assets/bundles/bundle_hu.properties    | 2 ++
 core/assets/bundles/bundle_id_ID.properties | 4 +++-
 core/assets/bundles/bundle_it.properties    | 4 +++-
 core/assets/bundles/bundle_ja.properties    | 4 +++-
 core/assets/bundles/bundle_ko.properties    | 4 +++-
 core/assets/bundles/bundle_lt.properties    | 4 +++-
 core/assets/bundles/bundle_nl.properties    | 4 +++-
 core/assets/bundles/bundle_nl_BE.properties | 4 +++-
 core/assets/bundles/bundle_pl.properties    | 4 +++-
 core/assets/bundles/bundle_pt_BR.properties | 4 +++-
 core/assets/bundles/bundle_pt_PT.properties | 4 +++-
 core/assets/bundles/bundle_ro.properties    | 4 +++-
 core/assets/bundles/bundle_ru.properties    | 4 +++-
 core/assets/bundles/bundle_sr.properties    | 4 +++-
 core/assets/bundles/bundle_sv.properties    | 4 +++-
 core/assets/bundles/bundle_th.properties    | 4 +++-
 core/assets/bundles/bundle_tk.properties    | 4 +++-
 core/assets/bundles/bundle_tr.properties    | 4 +++-
 core/assets/bundles/bundle_uk_UA.properties | 4 +++-
 core/assets/bundles/bundle_vi.properties    | 2 ++
 core/assets/bundles/bundle_zh_CN.properties | 4 +++-
 core/assets/bundles/bundle_zh_TW.properties | 4 +++-
 34 files changed, 100 insertions(+), 32 deletions(-)

diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index 2757457626..b1a94fc891 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -1347,6 +1347,8 @@ rules.weather = Надвор'е
 rules.weather.frequency = Частата:
 rules.weather.always = Заўсёды
 rules.weather.duration = Працягласць:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Рэчывы
 content.liquid.name = Вадкасці
@@ -2273,7 +2275,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties
index 08d2bd5893..eafedcdd6b 100644
--- a/core/assets/bundles/bundle_bg.properties
+++ b/core/assets/bundles/bundle_bg.properties
@@ -1358,6 +1358,8 @@ rules.weather = Климат
 rules.weather.frequency = Честота:
 rules.weather.always = Винаги
 rules.weather.duration = Продължителност:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Предмети
 content.liquid.name = Течности
@@ -2287,7 +2289,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Прочети число от свързано хранилище за памет.
 lst.write = Запиши число в свързано хранилище за памет.
 lst.print = Добави текст в буфера за изписване.\nНе визуализира нищо докато не използвате [accent]Print Flush[].
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Добавя операция в буфера за изображение.\nНе показва нищо докато не използвате [accent]Draw Flush[].
 lst.drawflush = Изпълнява операции, поискани с команда [accent]Draw[] върху посочен дисплей.
 lst.printflush = Извежда текст натрупан с [accent]Print[] върху посочен блок за съобщение.
diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties
index bde7361028..149756ce51 100644
--- a/core/assets/bundles/bundle_ca.properties
+++ b/core/assets/bundles/bundle_ca.properties
@@ -1361,6 +1361,8 @@ rules.weather = Estat meteorològic
 rules.weather.frequency = Freqüència:
 rules.weather.always = Sempre
 rules.weather.duration = Durada:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Elements
 content.liquid.name = Fluids
@@ -2297,7 +2299,7 @@ unit.emanate.description = Construeix estructures per defensar el nucli Acròpol
 lst.read = Llegeix un nombre des d’una cel·la de memòria connectada.
 lst.write = Escriu un nombre en una cel·la de memòria connectada.
 lst.print = Afegeix un text a la cua d’impressió.\nEl text no es mostrarà fins que s’apliqui «[accent]Print Flush[]».
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Afegeix una instrucció de dibuix a la cua corresponent.\nEl resultat no es mostrarà fins que s’apliqui «[accent]Draw Flush[]».
 lst.drawflush = Executa les operacions de la cua de dibuix al monitor lògic.
 lst.printflush = Executa les operacions de la cua d’impressió al monitor lògic.
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index acd90ddc68..60ea6f6682 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -1360,6 +1360,8 @@ rules.weather = Počasí
 rules.weather.frequency = Četnost:
 rules.weather.always = Vždy
 rules.weather.duration = Trvání:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Předměty
 content.liquid.name = Kapaliny
@@ -2292,7 +2294,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Přečte číslo z připojené paměti.
 lst.write = Zapíše číslo do připojené paměti.
 lst.print = Přídá text do vypisovacího buferu.\nNezobrazí nic dokud [accent]Print Flush[] je použít.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Přídá operaci do vykreslovacího buferu.\nNezobrazí nic dokud [accent]Draw Flush[] je použít.
 lst.drawflush = Provede všechny [accent]Draw[] operace na zobrazovač logiky. Pak vyčistí vykreslovací bufer.
 lst.printflush = Provede všechny [accent]Print[] operace do zprávy. Pak vyčistí vypisovací bufer.
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 56e0977799..cb118a0b54 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -1349,6 +1349,8 @@ rules.weather = Vejr
 rules.weather.frequency = Frekvens:
 rules.weather.always = Always
 rules.weather.duration = Varighed:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Genstande
 content.liquid.name = Væsker
@@ -2273,7 +2275,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index 260236969e..4713fb1e5a 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -1371,6 +1371,8 @@ rules.weather = Wetter
 rules.weather.frequency = Häufigkeit:
 rules.weather.always = Immer
 rules.weather.duration = Dauer:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Materialien
 content.liquid.name = Flüssigkeiten
@@ -2322,7 +2324,7 @@ unit.emanate.description = Baut Blöcke, um den Akropolis-Kern zu beschützen. H
 lst.read = Liest einen Wert aus einer verbundenen Speicherzelle.
 lst.write = Schreibt eine Zahl in einer verbundene Speicherzelle.
 lst.print = Fügt Text zum Textspeicher hinzu.\nZeigt nichts an, bis [accent]Print Flush[] verwendet wird.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Fügt eine [accent]Draw[]-Aufgabe zum Bildspeicher hinzu.\nZeigt nichts an, bis [accent]Draw Flush[] verwendet wird.
 lst.drawflush = Druckt [accent]Draw[]-Aufgaben aus dem Bildspeicher auf einen Bildschirm.
 lst.printflush = Druckt [accent]Print[]-Aufgaben aus dem Textspeicher auf einen Nachrichtenblock.
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index a1784ec9c6..ce0c335822 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -1367,6 +1367,8 @@ rules.weather = Clima
 rules.weather.frequency = Frecuencia:
 rules.weather.always = Siempre
 rules.weather.duration = Duracion:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Objetos
 content.liquid.name = Líquidos
@@ -2315,7 +2317,7 @@ unit.emanate.description = Construye estructuras para defender el núcleo Acropo
 lst.read = Lee un número desde una unidad de memoria conectada.
 lst.write = Escribe un número en una unidad de memoria conectada.
 lst.print = Añade texto a la cola para imprimir texto.\nNo mostrará nada hasta que se use [accent]Print Flush[].
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Añade una operación a la cola para dibujar.\nNo mostrará nada hasta que se use [accent]Draw Flush[].
 lst.drawflush = Muestra los datos en cola de operaciones [accent]Draw[] en un monitor gráfico.
 lst.printflush = Muestra los datos en cola de operaciones de [accent]Print[] en un bloque de mensaje.
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 675204d69b..6e5dc5c842 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -1349,6 +1349,8 @@ rules.weather = Weather
 rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Ressursid
 content.liquid.name = Vedelikud
@@ -2275,7 +2277,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index e43fd2fdf6..20dcfa9f68 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -1351,6 +1351,8 @@ rules.weather = Weather
 rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Solidoak
 content.liquid.name = Likidoak
@@ -2277,7 +2279,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index a955c097ed..b81ad76e72 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -1348,6 +1348,8 @@ rules.weather = Sää
 rules.weather.frequency = Tiheys:
 rules.weather.always = Aina
 rules.weather.duration = Kesto:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Tavarat
 content.liquid.name = Nesteet
@@ -2278,7 +2280,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Lue numero yhdistetystä muistisolusta.
 lst.write = Kirjoita numero yhdistettyyn muistisoluun.
 lst.print = Lisää tekstiä tekstipuskuriin.\nEi näytä mitään, kunnes [accent]Painosyötettä[] käytetään.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Lisää operaation piirtopuskuriin.\nEi näytä mitään, kunnes [accent]Piirtosyötettä[] käytetään.
 lst.drawflush = Syöttää jonottavat [accent]Piirto[]-operaatiot näyttöön.
 lst.printflush = Syöttää jonottavat [accent]Paino[]-operaatiot viestipalikkaan.
diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties
index 08cd5e1fbd..18b9fd2aab 100644
--- a/core/assets/bundles/bundle_fil.properties
+++ b/core/assets/bundles/bundle_fil.properties
@@ -1348,6 +1348,8 @@ rules.weather = Weather
 rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Items
 content.liquid.name = Liquids
@@ -2274,7 +2276,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 7e3d8ea6cd..3ff26c05c4 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -1375,6 +1375,8 @@ rules.weather = Météo
 rules.weather.frequency = Fréquence :
 rules.weather.always = Permanent
 rules.weather.duration = Durée :
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Objets
 content.liquid.name = Liquides
@@ -2322,7 +2324,7 @@ unit.emanate.description = Construit des structures pour défendre le Noyau acro
 lst.read = Lit un nombre depuis un bloc de mémoire relié au processeur.
 lst.write = Écrit un nombre dans un bloc de mémoire relié au processeur.
 lst.print = Ajoute du texte dans la mémoire tampon de l'imprimante.\nNe montrera aucun texte tant que [accent]Print Flush[] ne sera pas utilisé.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Ajoute une opération dans la mémoire tampon de dessin.\nNe montrera aucune image tant que [accent]Draw Flush[] ne sera pas utilisé.
 lst.drawflush = Affiche les opérations [accent]Draw[] en file d'attente vers un écran.
 lst.printflush = Affiche les opérations [accent]Print[] en file d'attente vers un bloc de message.
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index d3886064a3..b04b225ac8 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -1376,6 +1376,8 @@ rules.weather = Időjárás
 rules.weather.frequency = Gyakoriság:
 rules.weather.always = Mindig
 rules.weather.duration = Időtartam:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Nyersanyagok
 content.liquid.name = Folyadékok
diff --git a/core/assets/bundles/bundle_id_ID.properties b/core/assets/bundles/bundle_id_ID.properties
index 0f1bd6fd5e..e42084a3a7 100644
--- a/core/assets/bundles/bundle_id_ID.properties
+++ b/core/assets/bundles/bundle_id_ID.properties
@@ -1367,6 +1367,8 @@ rules.weather = Cuaca
 rules.weather.frequency = Frekuensi:
 rules.weather.always = Selalu
 rules.weather.duration = Durasi:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Bahan
 content.liquid.name = Zat Cair
@@ -2313,7 +2315,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Membaca angka dari memori sel yang dihubungkan.
 lst.write = Menulis angka ke memori sel yang dihubungkan.
 lst.print = Menambahkan teks ke daftar cetak.\nTidak dapat menampilkan apapun sampai [accent]Print Flush[] dipakai.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Menambahkan perintah ke daftar gambar.\nTidak dapat menampilkan apapun sampai [accent]Draw Flush[] dipakai.
 lst.drawflush = Mengeluarkan perintah [accent]Draw[] dari daftar antrean untuk ditampilkan.
 lst.printflush = Mengeluarkan perintah [accent]Print[] dari daftar antrean untuk blok pesan.
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index 97221f7113..6383c512ca 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -1354,6 +1354,8 @@ rules.weather = Meteo
 rules.weather.frequency = Frequenza:
 rules.weather.always = sempre
 rules.weather.duration = Durata:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Oggetti
 content.liquid.name = Liquidi
@@ -2287,7 +2289,7 @@ unit.emanate.description = Costruisce strutture per difendere il nucleo dell'Acr
 lst.read = Leggi un numero da una cella di memoria collegata.
 lst.write = Scrivi un numero in una cella di memoria collegata.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index b54b1f57f3..ed0dc7cc69 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -1360,6 +1360,8 @@ rules.weather = 気象
 rules.weather.frequency = 頻度:
 rules.weather.always = 常時
 rules.weather.duration = 継続時間:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = アイテム
 content.liquid.name = 液体
@@ -2291,7 +2293,7 @@ unit.emanate.description = アクロポリスコアを敵から守ります。\n
 lst.read = リンクされたメモリセルから数値を読み取ります。
 lst.write = リンクされたメモリセルに数値を書き込みます。
 lst.print = メッセージブロックにテキストを追加します。[accent]Print Flush[] を使用するまで何も表示しません。
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = ロジックディスプレイに操作を追加します。[accent]Draw Flush[] を使用するまで何も表示しません。
 lst.drawflush = キューに入れられた [accent]Draw[] 操作をディスプレイにフラッシュします。
 lst.printflush = キューに入れられた [accent]Print[] 操作をメッセージ ブロックにフラッシュします。
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index 342c511010..2ec87a4548 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -1359,6 +1359,8 @@ rules.weather = 날씨 추가
 rules.weather.frequency = 빈도:
 rules.weather.always = 항상
 rules.weather.duration = 지속 시간:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = 자원
 content.liquid.name = 액체
@@ -2290,7 +2292,7 @@ unit.emanate.description = 코어: 도심을 지켜내기 위해 구조물을 
 lst.read = 연결된 메모리 셀에서 숫자 읽음
 lst.write = 연결된 메모리 셀에 숫자 작성
 lst.print = 프린트 버퍼에 텍스트 추가\n[accent]Print Flush[]가 사용되기 전까진 아무것도 보여주지 않습니다
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = 드로잉 버퍼에 실행문 추가\n[accent]Draw Flush[]가 사용되기 전까진 아무것도 보여주지 않습니다
 lst.drawflush = 대기중인 [accent]Draw[]실행문을 디스플레이에 출력
 lst.printflush = 대기중인 [accent]Print[]실행문을 메시지 블록에 출력
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index f61d0b08b5..90cb6efbf4 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -1349,6 +1349,8 @@ rules.weather = Weather
 rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Daiktai
 content.liquid.name = Skysčiai
@@ -2275,7 +2277,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 66590f28e8..fb69dc8371 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -1361,6 +1361,8 @@ rules.weather = Weer
 rules.weather.frequency = Frequentie:
 rules.weather.always = Altijd
 rules.weather.duration = Duur:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Materialen
 content.liquid.name = Vloeistoffen
@@ -2288,7 +2290,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index 8d0e615414..1f345b97e0 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -1349,6 +1349,8 @@ rules.weather = Weather
 rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Items
 content.liquid.name = Liquids
@@ -2275,7 +2277,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index 86cea38c99..53e9cf4317 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -1358,6 +1358,8 @@ rules.weather = Pogoda
 rules.weather.frequency = Częstotliwość:
 rules.weather.always = Zawsze
 rules.weather.duration = Czas trwania:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Przedmioty
 content.liquid.name = Płyny
@@ -2309,7 +2311,7 @@ unit.emanate.description = Lotnicza jednostka aministracyjna zdolna do wydobycia
 lst.read = Wczytuje liczbę z połączonej komórki pamięci.
 lst.write = Zapisuje liczbę do połączonej komórki pamięci.
 lst.print = Dodaje tekst do buforu drukującego.\nNie wyświetla niczego dopóki [accent]Print Flush[] nie jest użyte.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Dodaje operacje do buforu rysującego.\nNie wyświetla niczego dopóki [accent]Draw Flush[] nie jest użyte.
 lst.drawflush = Wyświetla oczekujące operacje z funkcji [accent]Draw[] na wyświetlaczu.
 lst.printflush = Dodaje oczekujące operacje z funkcji [accent]Print[] do bloku wiadomości.
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 8ac998829a..4ba31c527b 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -1368,6 +1368,8 @@ rules.weather = Clima
 rules.weather.frequency = Frequência:
 rules.weather.always = Sempre
 rules.weather.duration = Duração:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Itens
 content.liquid.name = Líquidos
@@ -2308,7 +2310,7 @@ unit.emanate.description = Constrói estruturas para defender o Núcelo Acrópol
 lst.read = Ler um número de uma célula de memória vinculada.
 lst.write = Escrever um número de uma célula de memória vinculada.
 lst.print = Adiciona texto ao buffer de impressão.\nNão exibe nada até [accent]Print Flush[] ser usado.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Adicionar uma operação ao buffer de desenho.\nNão exibe nada até [accent]Draw Flush[] ser usado.
 lst.drawflush = Liberar operações [accent]Draw[] enfileiradas para um display.
 lst.printflush = Liberar operações [accent]Print[] enfileiradas para um bloco de mensagem.
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 17ca743e25..1780792fe3 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -1349,6 +1349,8 @@ rules.weather = Weather
 rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Itens
 content.liquid.name = Liquidos
@@ -2275,7 +2277,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties
index a0d08c50f9..b2db9b66cd 100644
--- a/core/assets/bundles/bundle_ro.properties
+++ b/core/assets/bundles/bundle_ro.properties
@@ -1360,6 +1360,8 @@ rules.weather = Vreme
 rules.weather.frequency = Frevență:
 rules.weather.always = Încontinuu
 rules.weather.duration = Durată:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Materiale
 content.liquid.name = Lichide
@@ -2292,7 +2294,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Citește un număr dintr-o celulă de memorie conectată.
 lst.write = Scrie un număr într-o celulă de memorie conectată.
 lst.print = Adaugă text în bufferul de tipărire.\nNu tipărește decât când se execută [accent]Print Flush[].
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Adaugă o operație în bufferul de desenare.\nNu afișează decât când se execută [accent]Draw Flush[].
 lst.drawflush = Afișează pe un monitor instrucțiunile [accent]Draw[] aflate în așteptare.
 lst.printflush = Tipărește  într-un bloc Mesaj instrucțiunile [accent]Print[] aflate în așteptare.
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 3c593f330f..ae8defc92e 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -1360,6 +1360,8 @@ rules.weather = Погода
 rules.weather.frequency = Периодичность:
 rules.weather.always = Всегда
 rules.weather.duration = Длительность:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Предметы
 content.liquid.name = Жидкости
@@ -2294,7 +2296,7 @@ unit.emanate.description = Защищает ядро «Акрополь» от 
 lst.read = Считывает число из соединённой ячейки памяти.
 lst.write = Записывает число в соединённую ячейку памяти.
 lst.print = Добавляет текст в текстовый буфер. Ничего не отображает, пока не будет вызван [accent]Print Flush[].
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Добавляет операцию в буфер отрисовки. Ничего не отображает, пока не будет вызван [accent]Draw Flush[].
 lst.drawflush = Сбрасывает буфер [accent]Draw[] операций на дисплей.
 lst.printflush = Сбрасывает буфер [accent]Print[] операций в блок-сообщение.
diff --git a/core/assets/bundles/bundle_sr.properties b/core/assets/bundles/bundle_sr.properties
index de821a980a..57e10040b7 100644
--- a/core/assets/bundles/bundle_sr.properties
+++ b/core/assets/bundles/bundle_sr.properties
@@ -1362,6 +1362,8 @@ rules.weather = Vreme
 rules.weather.frequency = Učestalost:
 rules.weather.always = Stalno
 rules.weather.duration = Dužina:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Materijali
 content.liquid.name = Tečnosti
@@ -2295,7 +2297,7 @@ unit.emanate.description = Gradi građevine da odbrani Veliki Grad jezgro. Popra
 lst.read = Čita broj iz povezane memorijske ćelije.
 lst.write = Piše broj u povezanu memorijsku ćeliju.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 8d025a4cae..2268e25ca8 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -1349,6 +1349,8 @@ rules.weather = Weather
 rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Föremål
 content.liquid.name = Vätskor
@@ -2275,7 +2277,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index fa345d3212..91573f01ba 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -1361,6 +1361,8 @@ rules.weather = สภาพอากาศ
 rules.weather.frequency = ความถี่:
 rules.weather.always = ตลอด
 rules.weather.duration = ระยะเวลา:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = ไอเท็ม
 content.liquid.name = ของเหลว
@@ -2312,7 +2314,7 @@ unit.emanate.description = สร้างสิ่งต่างๆ เพื
 lst.read = อ่านเลขจากเซลล์ความจำที่เชื่อมต่อไว้
 lst.write = เขียนเลขไปยังเซลล์ความจำที่เชื่อมต่อไว้
 lst.print = เพิ่มข้อความไปยังคิวข้อความ\nข้อความจะยังไม่แสดงจนกว่าจะใช้คำสั่ง [accent]Print Flush[]
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = เพิ่มรูปไปยังคิวการวาด\nภาพจะยังไม่แสดงจนกว่าจะใช้คำสั่ง [accent]Draw Flush[]
 lst.drawflush = ปล่อยคิว [accent]Draw[] ไปยังหน้าจอลอจิกที่เชื่อมต่อไว้
 lst.printflush = ปล่อยคิว [accent]Print[] ไปยังตัวเก็บข้อความที่เชื่อมต่อไว้
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 63422c96b9..f2922470e8 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -1349,6 +1349,8 @@ rules.weather = Weather
 rules.weather.frequency = Frequency:
 rules.weather.always = Always
 rules.weather.duration = Duration:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Esyalar
 content.liquid.name = Sivilar
@@ -2275,7 +2277,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = Read a number from a linked memory cell.
 lst.write = Write a number to a linked memory cell.
 lst.print = Add text to the print buffer.\nDoes not display anything until [accent]Print Flush[] is used.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Add an operation to the drawing buffer.\nDoes not display anything until [accent]Draw Flush[] is used.
 lst.drawflush = Flush queued [accent]Draw[] operations to a display.
 lst.printflush = Flush queued [accent]Print[] operations to a message block.
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index ebc53ffe12..9a9ecead53 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -1358,6 +1358,8 @@ rules.weather = Hava Durumu
 rules.weather.frequency = Sıklık:
 rules.weather.always = Her zaman
 rules.weather.duration = Süreklilik:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Malzemeler
 content.liquid.name = Sıvılar
@@ -2292,7 +2294,7 @@ unit.emanate.description = Akropolis Merkezini korumak için binalar inşa eder.
 lst.read = Bağlı hafıza kutusundaki numarayı okur.
 lst.write = Bağlı hafıza kutuaundaki numaraya yazar.
 lst.print = Yazı yazar.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Ekrana Çizer.
 lst.drawflush = Ekrana Çizimi Aktarır.
 lst.printflush = Mesaj bloğuna metnini aktarır,
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 94e234dfa3..24a8cf4738 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -1369,6 +1369,8 @@ rules.weather = Погода
 rules.weather.frequency = Повторюваність:
 rules.weather.always = Завжди
 rules.weather.duration = Тривалість:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Предмети
 content.liquid.name = Рідини
@@ -2319,7 +2321,7 @@ unit.emanate.description = Англійська назва: Emanate\nБудує
 lst.read = Зчитує число із з’єднаної комірки пам’яті.
 lst.write = Записує числу у з’єднану комірку пам’яті.
 lst.print = Додайте текст до буфера друку.\nНічого не відображає, поки [accent]Print Flush[] використовується.
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = Додає операцію до буфера рисунка.\nНічого не відображає, поки [accent]Draw Flush[] використовується.
 lst.drawflush = Скидає буфер операцій [accent]Draw[] на дисплей.
 lst.printflush = Скидає буфер операцій [accent]Print[] у блок «Повідомлення».
diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 7d74309dec..6b641c3c0e 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -1362,6 +1362,8 @@ rules.weather = Thời tiết
 rules.weather.frequency = Tần suất:
 rules.weather.always = Luôn luôn
 rules.weather.duration = Thời gian:
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = Vật phẩm
 content.liquid.name = Chất lỏng
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index 9cc26e8dfd..a908d005a5 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -1371,6 +1371,8 @@ rules.weather = 天气
 rules.weather.frequency = 周期：
 rules.weather.always = 永久
 rules.weather.duration = 时长：
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = 物品
 content.liquid.name = 液体
@@ -2319,7 +2321,7 @@ unit.emanate.description = 保护卫城核心，可建造建筑。 使用一对
 lst.read = 从连接的内存读取数字
 lst.write = 向连接的内存写入数字
 lst.print = 添加文字到打印缓存\n使用[accent]Print Flush[]后才会真正显示
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = 添加绘图操作到绘图缓存\n使用[accent]Draw Flush[]后才会真正显示
 lst.drawflush = 将绘图缓存中的[accent]Draw[]队列刷新到显示屏
 lst.printflush = 将打印缓存中的[accent]Print[]队列刷新到信息板
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index 5330002f2f..049f543412 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -1366,6 +1366,8 @@ rules.weather = 天氣
 rules.weather.frequency = 頻率：
 rules.weather.always = 永遠
 rules.weather.duration = 持續時間：
+rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
+rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
 
 content.item.name = 物品
 content.liquid.name = 液體
@@ -2304,7 +2306,7 @@ unit.emanate.description = Builds structures to defend the Acropolis core. Repai
 lst.read = [accent]讀取[]記憶體中的一項數值
 lst.write = [accent]寫入[]一項數值到記憶體中
 lst.print = 將文字加入輸出的暫存中，搭配[accent]Print Flush[], [accent]Flush message[]使用
-lst.format =  Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
+lst.format = Replace next placeholder in text buffer with a value.\nDoes not do anything if placeholder pattern is invalid.\nPlaceholder pattern: "{[accent]number 0-9[]}"\nExample:\n[accent]print "test {0}"\nformat "example"
 lst.draw = 將圖形加入顯示的暫存中，搭配[accent]Draw Flush[]使用
 lst.drawflush = 將所有暫存的[accent]Draw[]指令推到顯示器上
 lst.printflush = 將所有暫存的[accent]Print[]指令推到訊息板上

From 5159355cbc2de34eb3dd342931841fe1028dbad9 Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Fri, 12 Apr 2024 20:33:48 +0700
Subject: [PATCH 359/369] I want to bring back the abcxyz server (#9734)

---
 servers_v7.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index 931e0738ed..9dc9b9e811 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -242,8 +242,8 @@
     "address": ["play.3midustry.xyz:6001", "play.3midustry.xyz:6002", "play.3midustry.xyz:6003", "play.3midustry.xyz:6004", "play.3midustry.xyz:6005", "play.3midustry.xyz:6006", "play.3midustry.xyz:6007", "play.3midustry.xyz:6008", "play.3midustry.xyz:6009", "play.3midustry.xyz:6010"]
   },
   {
-    "name": "Siege Siege",
-    "address": ["157.90.4.54:25421"]
+    "name": "abcxyz remaster",
+    "address": ["157.90.4.54:25421", "144.76.57.59:21722", "51.81.166.66:29985", "144.76.57.59:24669"]
   },
   {
     "name": "CroCraft Network",

From 112a53c95b6e7096db020587ca999c7731f59d52 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 12 Apr 2024 19:41:09 -0400
Subject: [PATCH 360/369] Erekir turret range margin tweak

---
 core/src/mindustry/content/Blocks.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index e70394c328..36dfb1ee3d 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -4049,7 +4049,7 @@ public class Blocks{
             researchCostMultiplier = 0.05f;
 
             coolant = consume(new ConsumeLiquid(Liquids.water, 15f / 60f));
-            limitRange();
+            limitRange(12f);
         }};
 
         diffuse = new ItemTurret("diffuse"){{
@@ -4108,7 +4108,7 @@ public class Blocks{
             rotateSpeed = 3f;
 
             coolant = consume(new ConsumeLiquid(Liquids.water, 15f / 60f));
-            limitRange();
+            limitRange(16f);
         }};
 
         sublimate = new ContinuousLiquidTurret("sublimate"){{
@@ -4358,7 +4358,7 @@ public class Blocks{
             coolant = consume(new ConsumeLiquid(Liquids.water, 20f / 60f));
             coolantMultiplier = 2.5f;
 
-            limitRange(-5f);
+            limitRange(5f);
         }};
 
         afflict = new PowerTurret("afflict"){{

From 11d7e3c7532bb68a04020a68a9ac115ce408e731 Mon Sep 17 00:00:00 2001
From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com>
Date: Sat, 13 Apr 2024 20:21:42 +0700
Subject: [PATCH 361/369] add more ip for abcxyz server (#9741)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 9dc9b9e811..a6720c1c3e 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -243,7 +243,7 @@
   },
   {
     "name": "abcxyz remaster",
-    "address": ["157.90.4.54:25421", "144.76.57.59:21722", "51.81.166.66:29985", "144.76.57.59:24669"]
+    "address": ["157.90.4.54:25421", "144.76.57.59:21722", "51.81.166.66:29985", "144.76.57.59:24669", "23.88.73.88:15067", "23.88.73.88:15223", "144.76.57.59:25865", "23.88.73.88:15209"]
   },
   {
     "name": "CroCraft Network",

From 788de35f7f6e5ee00d05a908dec8574733f6d808 Mon Sep 17 00:00:00 2001
From: GaviTSRA <61122293+GaviTSRA@users.noreply.github.com>
Date: Sat, 13 Apr 2024 16:00:15 +0200
Subject: [PATCH 362/369] Update servers_v7.json - Add TSR PVP and TSR Anarchy
 (#9743)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index a6720c1c3e..4bf64d8b48 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -1,7 +1,7 @@
 [
   {
     "name": "TSR Network",
-    "address": ["de-prem-01.hosts.optikservers.com:35526", "de-prem-01.hosts.optikservers.com:35915", "de-prem-01.hosts.optikservers.com:35250"]
+    "address": ["de-prem-01.hosts.optikservers.com:35526", "de-prem-01.hosts.optikservers.com:35915", "de-prem-01.hosts.optikservers.com:35250", "de-prem-01.hosts.optikservers.com:27526", "de-prem-01.hosts.optikservers.com:35376"]
   },
   {
     "name": "Toast Mindustry",

From e80a523073c2f47cee2e0e135bded05f029b7c20 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 13 Apr 2024 19:56:56 -0400
Subject: [PATCH 363/369] Rule dialog fixes

---
 .../ui/dialogs/CustomRulesDialog.java         | 38 +++++++------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
index 40f7e1a642..191da9852e 100644
--- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java
@@ -3,7 +3,6 @@ package mindustry.ui.dialogs;
 import arc.*;
 import arc.func.*;
 import arc.graphics.*;
-import arc.input.KeyCode;
 import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.ImageButton.*;
@@ -193,9 +192,12 @@ public class CustomRulesDialog extends BaseDialog{
         cont.clear();
         cont.table(t -> {
             t.add("@search").padRight(10);
-            t.field(ruleSearch, text ->
-                ruleSearch = text.trim().replaceAll(" +", " ").toLowerCase()
-            ).grow().pad(8).get().keyDown(KeyCode.enter, this::setup);
+            var field = t.field(ruleSearch, text -> {
+                ruleSearch = text.trim().replaceAll(" +", " ").toLowerCase();
+                setup();
+            }).grow().pad(8).get();
+            field.setCursorPosition(ruleSearch.length());
+            Core.scene.setKeyboardFocus(field);
             t.button(Icon.cancel, Styles.emptyi, () -> {
                 ruleSearch = "";
                 setup();
@@ -234,7 +236,7 @@ public class CustomRulesDialog extends BaseDialog{
                 setup();
             }
         }, () -> rules.infiniteResources);
-        withInfo("@rules.onlydepositcore.info", () -> check("@rules.onlydepositcore", b -> rules.onlyDepositCore = b, () -> rules.onlyDepositCore));
+        check("@rules.onlydepositcore", b -> rules.onlyDepositCore = b, () -> rules.onlyDepositCore);
         check("@rules.derelictrepair", b -> rules.derelictRepair = b, () -> rules.derelictRepair);
         check("@rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions);
         check("@rules.schematic", b -> rules.schematicsAllowed = b, () -> rules.schematicsAllowed);
@@ -282,7 +284,7 @@ public class CustomRulesDialog extends BaseDialog{
         category("enemy");
         check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);
         check("@rules.corecapture", b -> rules.coreCapture = b, () -> rules.coreCapture);
-        withInfo("@rules.placerangecheck.info",() -> check("@rules.placerangecheck", b -> rules.placeRangeCheck = b, () -> rules.placeRangeCheck));
+        check("@rules.placerangecheck", b -> rules.placeRangeCheck = b, () -> rules.placeRangeCheck);
         check("@rules.polygoncoreprotection", b -> rules.polygonCoreProtection = b, () -> rules.polygonCoreProtection);
         number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200), () -> !rules.polygonCoreProtection);
 
@@ -490,25 +492,13 @@ public class CustomRulesDialog extends BaseDialog{
 
     public void check(String text, Boolc cons, Boolp prov, Boolp condition){
         if(!Core.bundle.get(text.substring(1)).toLowerCase().contains(ruleSearch)) return;
-        current.check(text, cons).checked(prov.get()).update(a -> a.setDisabled(!condition.get())).padRight(100f).get().left();
-        current.row();
-    }
-
-    public void withInfo(String info, Runnable add){
-        Table wasCurrent = current;
-        current = new Table();
-        current.left().defaults().fillX().left();
-
-        current.button(Icon.infoSmall, () -> ui.showInfo(info)).size(32f).padRight(10f);
-        add.run();
-
-        // rule does not match search pattern (runnable returned without adding anything)
-        if(current.getCells().size < 2){
-            current.clear();
-        }else{
-            wasCurrent.add(current).row();
+        String infoText = text.substring(1) + ".info";
+        var cell = current.check(text, cons).checked(prov.get()).update(a -> a.setDisabled(!condition.get())).padRight(100f);
+        if(Core.bundle.has(infoText)){
+            cell.tooltip(text + ".info");
         }
-        current = wasCurrent;
+        cell.get().left();
+        current.row();
     }
 
     Cell<TextField> field(Table table, float value, Floatc setter){

From 5c51d7dd5209c76de1b18fc0ed1576482748583d Mon Sep 17 00:00:00 2001
From: SITUVNgcd <44901211+SITUVNgcd@users.noreply.github.com>
Date: Sun, 14 Apr 2024 21:06:13 +0700
Subject: [PATCH 364/369] Completely checked and transtaled Vietnamese (#9744)

* Completely checked and transtaled Vietnamese

I spent 1 week (few hours/day) to check every single line in **bundle** and translate:
- Make `bundle_vi.properties` has same lines as original bundle file `bundle.properties`.
- Retranslate some old strings/words which:
  + From very old versions.
  + Mis-translated.
  + Multiple meanings in Vietnamese.
  + Some sentences were add/removed.
- Translate new strings from very last commit (https://github.com/Anuken/Mindustry/commit/7f30cd8703f500a619357872a87df1773819b97d)

* Small fix

First letter.
---
 core/assets/bundles/bundle_vi.properties | 818 ++++++++++++-----------
 1 file changed, 430 insertions(+), 388 deletions(-)

diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 6b641c3c0e..11550e1885 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -8,7 +8,7 @@ link.github.description = Mã nguồn trò chơi
 link.changelog.description = Danh sách các thay đổi.
 link.dev-builds.description = Các bản dựng phát triển không ổn định
 link.trello.description = Bảng Trello chính thức cho các tính năng được lên kế hoạch
-link.itch.io.description = itch.io page với bản tải xuống cho PC
+link.itch.io.description = Trang itch.io với bản tải xuống cho PC
 link.google-play.description = Xem trên Google Play store
 link.f-droid.description = Xem trên F-Droid
 link.wiki.description = Mindustry wiki chính thức
@@ -34,10 +34,10 @@ load.system = Hệ thống
 load.mod = Bản mod
 load.scripts = Ngữ lệnh
 
-be.update = Đã tìm thấy bản cập nhật mới:
+be.update = Đã tìm thấy bản dựng mới của Bleeding Edge.
 be.update.confirm = Tải xuống và khởi động lại ngay bây giờ?
 be.updating = Đang cập nhật...
-be.ignore = Bỏ qua
+be.ignore = Phớt lờ
 be.noupdates = Không tìm thấy bản cập nhật mới.
 be.check = Kiểm tra các bản cập nhật.
 
@@ -46,8 +46,8 @@ mods.browser.selected = Mod Đã chọn
 mods.browser.add = Cài đặt
 mods.browser.reinstall = Cài đặt lại
 mods.browser.view-releases = Xem các bản phát hành
-mods.browser.noreleases = [scarlet]Không Tìm Thấy Bản Phát Hành Nào\n[accent]Không thể tìm thấy bất cứ bản phát hành nào cho mod này. Hãy kiểm tra xem repository của mod đã có bản phát hành nào chưa.
-mods.browser.latest = <Mới nhất>
+mods.browser.noreleases = [scarlet]Không Tìm Thấy Bản Phát Hành Nào\n[accent]Không thể tìm thấy bất cứ bản phát hành nào cho mod này. Hãy kiểm tra xem kho lưu trữ (repo) của mod đã có bản phát hành nào chưa.
+mods.browser.latest = [lightgray] [Mới nhất]
 mods.browser.releases = Các bản phát hành
 mods.github.open = Repo
 mods.github.open-release = Trang phát hành
@@ -92,11 +92,11 @@ stats.destroyed = Số công trình bị phá hủy
 stats.deconstructed = Số công trình đã phá dỡ
 stats.playtime = Thời gian chơi
 
-globalitems = [accent]Toàn bộ vật phẩm
+globalitems = [accent]Vật phẩm của hành tinh
 map.delete = Bạn có chắc chắn muốn xóa bản đồ "[accent]{0}[]"?
 level.highscore = Điểm cao nhất: [accent]{0}
 level.select = Chọn cấp độ
-level.mode = Chế độ:
+level.mode = Chế độ chơi:
 coreattack = < Căn cứ đang bị tấn công! >
 nearpoint = [[ [scarlet]RỜI KHỎI KHU VỰC ĐÁP NGAY LẬP TỨC[] ]\nsự hủy diệt sắp xảy ra
 database = Cơ sở dữ liệu
@@ -104,9 +104,9 @@ database.button = Cơ sở dữ liệu
 savegame = Lưu trò chơi
 loadgame = Tải lại màn chơi
 joingame = Tham gia trò chơi
-customgame = Tùy chỉnh
+customgame = Trò chơi tùy chỉnh
 newgame = Trò chơi mới
-none = <trống>
+none = <không có>
 none.found = [lightgray]<không tìm thấy>
 none.inmap = [lightgray]<không có trong bản đồ>
 minimap = Bản đồ nhỏ
@@ -116,7 +116,7 @@ website = Trang web
 quit = Thoát
 save.quit = Lưu & Thoát
 maps = Bản đồ
-maps.browse = Chọn bản đồ
+maps.browse = Duyệt qua bản đồ
 continue = Tiếp tục
 maps.none = [lightgray]Không tìm thấy bản đồ!
 invalid = Không hợp lệ
@@ -130,7 +130,7 @@ done = Hoàn tất
 feature.unsupported = Thiết bị của bạn không hỗ trợ tính năng này.
 
 mods.initfailed = [red]⚠[] Mindustry không khởi chạy được. Điều này có thể do các mod bị lỗi.\n\nĐể tránh gặp sự cố liên tiếp, [red]tất cả các mod đã bị tắt.[]\n\nĐể tắt tính năng này, vào [accent]Cài đặt->Trò chơi->Tắt các mod khi gặp sự cố trong khởi động[].
-mods = Mods
+mods = Danh sách mod
 mods.none = [lightgray]Không tìm thấy mod!
 mods.guide = Hướng dẫn mod
 mods.report = Báo lỗi
@@ -141,18 +141,20 @@ mods.reloadexit = Trò chơi sẽ đóng để mod được tải.
 mod.installed = [[Đã cài đặt]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Đã Bật
-mod.disabled = [scarlet]Đã Tắt
+mod.disabled = [red]Đã Tắt
 mod.multiplayer.compatible = [gray]Tương thích với chế độ nhiều người chơi
 mod.disable = Tắt
 mod.content = Nội dung:
 mod.delete.error = Không thể xóa mod. Tệp có thể đang được sử dụng.
-mod.incompatiblegame = [red]Phiên bản trò chơi lỗi thời
+
+mod.incompatiblegame = [red]Trò chơi lỗi thời
 mod.incompatiblemod = [red]Không tương thích
-mod.blacklisted = [red]Không hổ trợ
+mod.blacklisted = [red]Không hỗ trợ
 mod.unmetdependencies = [red]Thiếu mod phụ thuộc
 mod.erroredcontent = [scarlet]Lỗi nội dung
 mod.circulardependencies = [red]Phụ thuộc tròn
 mod.incompletedependencies = [red]Thiếu mod phụ thuộc
+
 mod.requiresversion.details = Yêu cầu phiên bản trò chơi: [accent]{0}[]\nPhiên bản của bạn đã lỗi thời. Mod này yêu cầu phiên bản mới hơn của trò chơi (có thể là các bản phát hành beta/alpha) để hoạt động.
 mod.outdatedv7.details = Mod này không tương thích với phiên bản mới nhất của trò chơi. Tác giả cần phải cập nhật nó, và thêm [accent]minGameVersion: 136[] vào tệp [accent]mod.json[].
 mod.blacklisted.details = Mod này đã bị đưa vào danh sách đen do gây ra các sự cố đối với phiên bản trò chơi này. Đừng sử dụng nó.
@@ -161,10 +163,11 @@ mod.erroredcontent.details = Đã xãy ra lỗi khi tải trò chơi. Vui lòng
 mod.circulardependencies.details = Mod này có chứa các phụ thuộc mà chính nó cũng phụ thuộc vào các mod khác.
 mod.incompletedependencies.details = Mod này không thể tải được do bị lỗi từ bên trong hoặc thiếu các phụ thuộc: {0}.
 
-mod.requiresversion = Yêu cầu phiên bản game: [red]{0}
+mod.requiresversion = Yêu cầu phiên bản trò chơi: [red]{0}
+
 mod.errors = Đã xảy ra lỗi khi tải nội dung.
-mod.noerrorplay = [scarlet]Bạn có mod bị lỗi.[]Tắt các mod bị lỗi hoặc sửa các lỗi trước khi chơi.
-mod.nowdisabled = [scarlet]Mod '{0}' cần mod này để chạy:[accent] {1}\n[lightgray]Trước tiên bạn cần tải các mod này xuống.\nBản mod này sẽ tự động tắt.
+mod.noerrorplay = [red]Bạn có mod bị lỗi.[]Tắt các mod bị lỗi hoặc sửa các lỗi trước khi chơi.
+mod.nowdisabled = [red]Mod '{0}' cần mod này để chạy:[accent] {1}\n[lightgray]Trước tiên bạn cần tải các mod này xuống.\nBản mod này sẽ tự động tắt.
 mod.enable = Bật
 mod.requiresrestart = Trò chơi sẽ đóng để áp dụng các thay đổi của mod.
 mod.reloadrequired = [scarlet]Yêu cầu khởi động lại
@@ -172,13 +175,13 @@ mod.import = Thêm Mod
 mod.import.file = Thêm từ tệp
 mod.import.github = Thêm từ GitHub
 mod.jarwarn = [scarlet]Các JAR mod vốn dĩ không an toàn.[]\nĐảm bảo rằng bạn đang thêm mod này từ một nguồn đáng tin cậy!
-mod.item.remove = Mục này là một phần của[accent] '{0}'[] mod. Để xóa nó, hãy gỡ cài đặt mod này.
+mod.item.remove = Mục này là một phần của[accent] '{0}'[] mod. Để xóa nó, hãy gỡ cài đặt mod đó.
 mod.remove.confirm = Mod này sẽ bị xóa.
 mod.author = [lightgray]Tác giả:[] {0}
-mod.missing = Bản lưu này chứa các mod mà bạn đã cập nhật gần đây hoặc không được cài đặt. Có thể gây ra lỗi khi mở. Bạn có chắc muốn mở nó?\n[lightgray]Mods:\n{0}
+mod.missing = Bản lưu này chứa các mod mà bạn đã cập nhật gần đây hoặc không được cài đặt. Có thể gây ra lỗi khi mở. Bạn có chắc muốn mở nó?\n[lightgray]Các mod:\n{0}
 mod.preview.missing = Trước khi đăng bản mod này lên workshop, bạn phải thêm hình ảnh xem trước.\nĐặt một hình ảnh có tên[accent] preview.png[] vào thư mục của mod và thử lại.
 mod.folder.missing = Chỉ có thể đăng các mod ở dạng thư mục lên workshop.\nĐể chuyển đổi bất kỳ mod nào thành một thư mục, chỉ cần giải nén tệp của nó vào một thư mục và xóa tệp nén cũ, sau đó khởi động lại trò chơi của bạn hoặc tải lại các bản mod của bạn.
-mod.scripts.disable = Thiết bị của bạn không hổ trợ mod chứa scripts này. Bạn phải tắt các mod này để chơi trò chơi.
+mod.scripts.disable = Thiết bị của bạn không hỗ trợ mod chứa các ngữ lệnh này. Bạn phải tắt các mod này để chơi trò chơi.
 
 about.button = Thông tin
 name = Tên:
@@ -195,8 +198,8 @@ campaign.none = [lightgray]Chọn một hành tinh để bắt đầu.\nCó th
 campaign.erekir = Nội dung mới và được trau chuốt. Quá trình chơi liền mạch hơn.\n\nBản đồ chất lượng hơn và trải nghiệm tổng thể tốt hơn.
 campaign.serpulo = Nội dung cũ, trải nghiệm cơ bản. Tiến trình mở hơn.\n\nRất có thể vẫn còn bản đồ hoặc hệ thống bị mất cân bằng. Ít được trau chuốt.
 completed = [accent]Hoàn tất
-techtree = Tiến trình
-techtree.select = Chọn nhánh nghiên cứu
+techtree = Cây công nghệ
+techtree.select = Chọn nhánh công nghệ
 techtree.serpulo = Serpulo
 techtree.erekir = Erekir
 research.load = Tải
@@ -210,25 +213,25 @@ players.single = {0} người chơi
 players.search = tìm kiếm
 players.notfound = [gray]không tìm thấy người chơi
 server.closing = [accent]Đang đóng máy chủ...
-server.kicked.kick = Bạn đã bị kick khỏi máy chủ!
+server.kicked.kick = Bạn đã bị đá khỏi máy chủ!
 server.kicked.whitelist = Bạn không nằm trong danh sách được vào máy chủ này.
 server.kicked.serverClose = Máy chủ đã đóng.
 server.kicked.vote = Bạn đã bị bỏ phiếu buộc rời phòng. Tạm biệt.
-server.kicked.clientOutdated = Phiên bản máy chủ này mới hơn phiên bản trò chơi! Hãy cập nhật trò chơi của bạn!
+server.kicked.clientOutdated = Phiên bản máy khách đã cũ! Hãy cập nhật trò chơi của bạn!
 server.kicked.serverOutdated = Phiên bản máy chủ đã cũ! Hãy yêu cầu máy chủ đó cập nhật!
 server.kicked.banned = Bạn đã bị cấm trên máy chủ này.
-server.kicked.typeMismatch = Máy chủ này không tương thích với phiên bản của bạn.
+server.kicked.typeMismatch = Máy chủ này không tương thích với kiểu bản dựng của bạn.
 server.kicked.playerLimit = Máy chủ đã đầy. Hãy chờ một chỗ trống.
 server.kicked.recentKick = Bạn đã bị buộc rời gần đây.\nHãy chờ một lúc sau đó kết nối lại.
 server.kicked.nameInUse = Có ai đó với cái tên này\nđã ở trong máy chủ.
 server.kicked.nameEmpty = Tên bạn đã chọn không hợp lệ.
 server.kicked.idInUse = Bạn đã ở trên máy chủ này! Bạn không được phép kết nối với hai tài khoản.
-server.kicked.customClient = Máy chủ này không hổ trợ phiên bản tùy chỉnh. Hãy tải phiên bản chính thức.
+server.kicked.customClient = Máy chủ này không hỗ trợ bản dựng tùy chỉnh. Hãy tải phiên bản chính thức.
 server.kicked.gameover = Trò chơi kết thúc!
 server.kicked.serverRestarting = Máy chủ đang khởi động lại.
 server.versions = Phiên bản của bạn:[accent] {0}[]\nPhiên bản máy chủ:[accent] {1}[]
-host.info = Nút [accent]Mở máy chủ[] mở máy chủ trên cổng [scarlet]6567[]. \nBất kỳ ai trên cùng [lightgray]wifi hoặc mạng cục bộ[] sẽ có thể thấy máy chủ của bạn trong danh sách máy chủ của họ.\n\nNếu bạn muốn mọi người có thể kết nối từ mọi nơi bằng IP, [accent]port forwarding[] là bắt buộc.\n\n[lightgray]Lưu ý: Nếu ai đó đang gặp sự cố khi kết nối với máy chủ trong mạng LAN của bạn, đảm bảo rằng bạn đã cho phép Mindustry truy cập vào mạng cục bộ của mình trong cài đặt tường lửa. Lưu ý rằng các mạng công cộng đôi khi không cho phép khám phá máy chủ.
-join.info = Tại đây, bạn có thể nhập [accent]IP máy chủ[] kết nối , hoặc khám phá [accent]mạng cục bộ[] hay kết nối đến máy chủ [accent]toàn cầu[].\nCả mạng LAN và WAN đều được hỗ trợ.\n\n[lightgray]Nếu bạn muốn kết nối với ai đó bằng IP, bạn sẽ cần phải hỏi IP của họ, có thể được tìm thấy bằng cách kiểm tra IP thiết bị của họ.
+host.info = Nút [accent]Mở máy chủ[] mở máy chủ trên cổng [scarlet]6567[]. \nBất kỳ ai trên cùng [lightgray]wifi hoặc mạng cục bộ[] sẽ có thể thấy máy chủ của bạn trong danh sách máy chủ của họ.\n\nNếu bạn muốn mọi người có thể kết nối từ mọi nơi bằng IP, [accent]điều hướng cổng (port forwarding)[] là bắt buộc.\n\n[lightgray]Lưu ý: Nếu ai đó đang gặp sự cố khi kết nối với máy chủ trong mạng LAN của bạn, đảm bảo rằng bạn đã cho phép Mindustry truy cập vào mạng cục bộ của mình trong cài đặt tường lửa. Lưu ý rằng các mạng công cộng đôi khi không cho phép khám phá máy chủ.
+join.info = Tại đây, bạn có thể nhập [accent]IP máy chủ[] kết nối , hoặc khám phá [accent]mạng cục bộ[] hay kết nối đến máy chủ [accent]toàn cầu[].\nCả mạng LAN và WAN đều được hỗ trợ.\n\n[lightgray]Nếu bạn muốn kết nối với ai đó bằng IP, bạn sẽ cần phải hỏi IP của họ, có thể được tìm thấy bằng cách tra google với từ khóa "my ip" trên thiết bị của họ.
 hostserver = Mở máy chủ.
 invitefriends = Mời bạn bè
 hostserver.mobile = Mở máy chủ
@@ -250,12 +253,12 @@ servers.disclaimer = Nhà phát triển [accent]không[] sở hữu và kiểm s
 servers.showhidden = Hiển thị Máy chủ Ẩn
 server.shown = Hiện
 server.hidden = Ẩn
-viewplayer = Đang xem người chơi: [accent]{0}
 
-trace = Tìm người chơi
+viewplayer = Đang xem người chơi: [accent]{0}
+trace = Truy vết người chơi
 trace.playername = Tên người chơi: [accent]{0}
 trace.ip = IP: [accent]{0}
-trace.id = ID: [accent]{0}
+trace.id = Định danh (ID): [accent]{0}
 trace.language = Ngôn ngữ: [accent]{0}
 trace.mobile = Máy khách di động: [accent]{0}
 trace.modclient = Máy khách tùy chỉnh: [accent]{0}
@@ -264,11 +267,13 @@ trace.times.kicked = Số lần bị buộc rời: [accent]{0}
 trace.ips = Các IP:
 trace.names = Các tên:
 invalidid = Định danh máy khách không hợp lệ! Vui lòng gửi báo cáo lỗi.
+
 player.ban = Cấm
-player.kick = Đá
+player.kick = Buộc rời
 player.trace = Truy vết
 player.admin = Hoán đổi quản trị viên
 player.team = Đổi đội
+
 server.bans = Cấm
 server.bans.none = Không có người chơi nào bị cấm!
 server.admins = Quản trị viên
@@ -277,19 +282,19 @@ server.add = Thêm máy chủ
 server.delete = Bạn có chắc chắn muốn xóa máy chủ này không?
 server.edit = Chỉnh sửa máy chủ
 server.outdated = [scarlet]Máy chủ lỗi thời![]
-server.outdated.client = [scarlet]Trò chơi lỗi thời![]
+server.outdated.client = [scarlet]Máy khách lỗi thời![]
 server.version = [gray]v{0} {1}
 server.custombuild = [accent]Bản dựng tùy chỉnh
 confirmban = Bạn có chắc chắn muốn cấm "{0}[white]"?
-confirmkick = Bạn có chắc chắn muốn buộc "{0}[white]" rời?
+confirmkick = Bạn có chắc chắn muốn buộc "{0}[white]" rời đi?
 confirmunban = Bạn có chắc chắn muốn gỡ cấm người chơi này?
 confirmadmin = Bạn có chắc chắn muốn thêm "{0}[white]" làm quản trị viên?
 confirmunadmin = Bạn có chắc chắn muốn xóa quyền quản trị viên của "{0}[white]"?
-votekick.reason = Lý do bỏ phiếu đá
-votekick.reason.message = Bạn có chắc muốn bỏ phiếu đá "{0}[white]"?\nNếu có, xin hãy nhập lý do:
+votekick.reason = Lý do bỏ phiếu buộc rời
+votekick.reason.message = Bạn có chắc muốn bỏ phiếu buộc rời cho "{0}[white]"?\nNếu có, xin hãy nhập lý do:
 joingame.title = Tham gia trò chơi
 joingame.ip = Địa chỉ:
-disconnect = Ngắt kết nối.
+disconnect = Đã ngắt kết nối.
 disconnect.error = Lỗi kết nối.
 disconnect.closed = Kết nối đã bị đóng.
 disconnect.timeout = Hết thời gian chờ.
@@ -300,14 +305,14 @@ reconnecting = [accent]Đang kết nối lại...
 connecting.data = [accent]Đang tải dữ liệu thế giới...
 server.port = Cổng:
 server.addressinuse = Địa chỉ đang được sử dụng!
-server.invalidport = Cổng không hợp lệ!
+server.invalidport = Số cổng không hợp lệ!
 server.error = [scarlet]Lỗi máy chủ.
 save.new = Bản lưu mới
 save.overwrite = Bạn có chắc muốn ghi đè\nbản lưu này?
 save.nocampaign = Các tập tin đơn lẻ từ chiến dịch không thể được nhập.
 overwrite = Ghi đè
 save.none = Không có bản lưu nào được tìm thấy!
-savefail = Không thể lưu trò chơi này!
+savefail = Không thể lưu trò chơi!
 save.delete.confirm = Bạn có chắc chắn muốn xóa bản lưu này không?
 save.delete = Xóa
 save.export = Xuất bản lưu
@@ -329,7 +334,7 @@ save.search = Tìm kiếm màn chơi đã lưu...
 save.autosave = Tự động lưu: {0}
 save.map = Bản đồ: {0}
 save.wave = Đợt {0}
-save.mode = Chế độ: {0}
+save.mode = Chế độ chơi: {0}
 save.date = Lưu lần cuối: {0}
 save.playtime = Thời gian chơi: {0}
 warning = Cảnh báo.
@@ -339,24 +344,24 @@ view.workshop = Xem trong Workshop
 workshop.listing = Chỉnh sửa danh sách Workshop
 ok = Đồng ý
 open = Mở
-customize = Luật tùy chỉnh
+customize = Quy luật tùy chỉnh
 cancel = Hủy
 command = Mệnh lệnh
-command.queue = [lightgray][Đang lệnh tuần tự]
+command.queue = Lệnh tuần tự
 command.mine = Đào
-command.repair = Sửa Chữa
-command.rebuild = Xây Dựng
-command.assist = Hỗ Trợ Người Chơi
+command.repair = Sửa chữa
+command.rebuild = Xây lại
+command.assist = Hỗ trợ Người chơi
 command.move = Di Chuyển
 command.boost = Tăng Cường
-command.enterPayload = Nhập khối hàng vào công trình
-command.loadUnits = Nhận đơn vị
-command.loadBlocks = Nhận khối công trình
-command.unloadPayload = Dỡ khối hàng
-stance.stop = Hủy mệnh lệnh
+command.enterPayload = Nhập Khối hàng vào Công trình
+command.loadUnits = Nhận Đơn vị
+command.loadBlocks = Nhận Khối công trình
+command.unloadPayload = Dỡ Khối hàng
+stance.stop = Hủy Mệnh lệnh
 stance.shoot = Tư thế: Bắn
 stance.holdfire = Tư thế: Ngừng bắn
-stance.pursuetarget = Tư thế: Bám đuổi mục tiêu
+stance.pursuetarget = Tư thế: Bám đuổi Mục tiêu
 stance.patrol = Tư thế: Đường tuần tra
 stance.ram = Tư thế: Tông thẳng\n[lightgray]Đi theo đường thẳng, không tìm đường
 openlink = Mở liên kết
@@ -385,11 +390,11 @@ resumebuilding = [scarlet][[{0}][] để tiếp tục xây dựng
 enablebuilding = [scarlet][[{0}][] để bật xây dựng
 showui = Đã ẩn giao diện.\nNhấn [accent][[{0}][] để hiện lại giao diện.
 commandmode.name = [accent]Chế độ chỉ huy
-commandmode.nounits = [no units]
+commandmode.nounits = [không có đơn vị]
 wave = [accent]Đợt {0}
 wave.cap = [accent]Đợt {0}/{1}
 wave.waiting = [lightgray]Kẻ địch xuất hiện sau {0}
-wave.waveInProgress = [lightgray]Địch đang xuất hiện.
+wave.waveInProgress = [lightgray]Đợt đang tấn công
 waiting = [lightgray]Đang chờ...
 waiting.players = Đang chờ thêm người chơi...
 wave.enemies = [lightgray]{0} Kẻ địch còn lại
@@ -402,7 +407,7 @@ loadimage = Tải hình ảnh
 saveimage = Lưu hình ảnh
 unknown = Không xác định
 custom = Tùy chỉnh
-builtin = Xây trong
+builtin = Có sẵn
 map.delete.confirm = Bạn có chắc chắn muốn xóa bản đồ này không? Hành động này không thể hoàn tác!
 map.random = [accent]Bản đồ ngẫu nhiên
 map.nospawn = Bản đồ này không có bất kỳ căn cứ nào để người chơi hồi sinh! Thêm một căn cứ {0} vào bản đồ ở trình chỉnh sửa.
@@ -411,33 +416,33 @@ map.nospawn.attack = Bản đồ này không có bất kỳ căn cứ kẻ thù
 map.invalid = Lỗi khi tải bản đồ: tệp bản đồ bị hỏng hoặc không hợp lệ.
 workshop.update = Cập nhật mục
 workshop.error = Lỗi khi tìm nạp thông tin chi tiết ở workshop: {0}
-map.publish.confirm = Bạn có chắc chắn muốn xuất bản bản đồ này không?\n\n[lightgray]Đảm bảo rằng bạn đồng ý với Workshop EULA trước, hoặc bản đồ của bạn sẽ không hiển thị!
+map.publish.confirm = Bạn có chắc chắn muốn xuất bản bản đồ này không?\n\n[lightgray]Đảm bảo rằng bạn đồng ý với Thỏa thuận cấp phép người dùng cuối (EULA) của Workshop trước, hoặc bản đồ của bạn sẽ không hiển thị!
 workshop.menu = Chọn những gì bạn muốn làm với mục này.
 workshop.info = Thông tin mục
 changelog = Danh sách các thay đổi (không bắt buộc):
 updatedesc = Ghi đè Tiêu đề & Mô tả
-eula = Steam EULA
+eula = Thỏa thuận cấp phép người dùng cuối (EULA) của Steam
 missing = Mục này đã bị xóa hoặc di chuyển.\n[lightgray]Danh sách workshop hiện đã được tự động hủy liên kết.
 publishing = [accent]Đang xuất bản...
-publish.confirm = Bạn có chắc chắn muốn xuất bản không?\n\n[lightgray]Đảm bảo rằng bạn đồng ý với Workshop EULA trước, hoặc mục của bạn sẽ không hiển thị!
+publish.confirm = Bạn có chắc chắn muốn xuất bản không?\n\n[lightgray]Đảm bảo rằng bạn đồng ý với Thỏa thuận cấp phép người dùng cuối (EULA) của Workshop trước, hoặc mục của bạn sẽ không hiển thị!
 publish.error = Lỗi khi xuất bản: {0}
 steam.error = Không thể khởi chạy dịch vụ Steam.\nLỗi: {0}
+
 editor.planet = Hành tinh:
 editor.sector = Khu vực:
 editor.seed = Hạt giống:
-
 editor.cliffs = Chuyển tường thành vách đá
 editor.brush = Kích thước
 editor.openin = Mở trong trình chỉnh sửa
-editor.oregen = Cấu trúc quặng
-editor.oregen.info = Cấu trúc quặng:
+editor.oregen = Tạo quặng
+editor.oregen.info = Tạo quặng:
 editor.mapinfo = Thông tin bản đồ
 editor.author = Tác giả:
 editor.description = Mô tả:
 editor.nodescription = Bản đồ phải có mô tả ít nhất 4 ký tự trước khi được xuất bản.
-editor.waves = Lượt:
-editor.rules = Luật:
-editor.generation = Cấu trúc:
+editor.waves = Lượt
+editor.rules = Quy luật
+editor.generation = Tạo ra
 editor.objectives = Mục tiêu
 editor.locales = Gói ngôn ngữ
 editor.ingame = Chỉnh sửa trong trò chơi
@@ -447,11 +452,11 @@ editor.newmap = Bản đồ mới
 editor.center = Trung tâm
 editor.search = Tìm kiếm bản đồ...
 editor.filters = Lọc bản đồ
-editor.filters.mode = Chế độ:
+editor.filters.mode = Chế độ chơi:
 editor.filters.type = Kiểu bản đồ:
 editor.filters.search = Tìm kiếm trong:
 editor.filters.author = Tác giả
-editor.filters.description = Miêu tả
+editor.filters.description = Mô tả
 editor.shiftx = Dịch theo X
 editor.shifty = Dịch theo Y
 workshop = Workshop
@@ -463,11 +468,11 @@ waves.health = độ bền: {0}%
 waves.perspawn = mỗi lần xuất hiện
 waves.shields = khiên/đợt
 waves.to = đến
-waves.spawn = sinh ra:
+waves.spawn = xuất hiện từ:
 waves.spawn.all = <tất cả>
 waves.spawn.select = Chọn điểm xuất hiện
 waves.spawn.none = [scarlet]không tìm thấy điểm xuất hiện nào trên bản đồ
-waves.max = Số lượng đơn vị tối đa
+waves.max = đơn vị tối đa
 waves.guardian = Trùm
 waves.preview = Xem trước
 waves.edit = Chỉnh sửa...
@@ -481,7 +486,7 @@ waves.sort = Sắp xếp theo
 waves.sort.reverse = Đảo ngược sắp xếp
 waves.sort.begin = Bắt đầu
 waves.sort.health = Độ bền
-waves.sort.type = Thể loại
+waves.sort.type = Kiểu loại
 waves.search = Tìm kiếm các lượt...
 waves.filter = Bộ lọc đơn vị
 waves.units.hide = Ẩn tất cả
@@ -494,12 +499,12 @@ wavemode.health = độ bền
 
 editor.default = [lightgray]<Mặc định>
 details = Chi tiết...
-edit = Chỉnh sửa...
+edit = Chỉnh sửa
 variables = Thông số
 logic.globals = Thông số sẵn có
 editor.name = Tên:
-editor.spawn = Thêm kẻ địch
-editor.removeunit = Xóa kẻ địch
+editor.spawn = Đơn vị xuất hiện
+editor.removeunit = Loại bỏ đơn vị
 editor.teams = Đội
 editor.errorload = Lỗi khi tải tệp.
 editor.errorsave = Lỗi khi lưu tệp.
@@ -563,6 +568,7 @@ toolmode.fillerase = Điền xóa
 toolmode.fillerase.description = Xóa các khối cùng kiểu.
 toolmode.drawteams = Vẽ đội
 toolmode.drawteams.description = Vẽ các đội thay cho các khối.
+#unused
 toolmode.underliquid = Dưới chất lỏng
 toolmode.underliquid.description = Vẽ nền dưới các ô chất lỏng.
 
@@ -570,9 +576,9 @@ filters.empty = [lightgray]Không có bộ lọc! Thêm một cái bằng nút b
 
 filter.distort = Cong vẹo
 filter.noise = Nhiễu
-filter.enemyspawn = Khu vực xuất hiện của kẻ thù
-filter.spawnpath = Khu tạo ra
-filter.corespawn = Chọn Căn cứ
+filter.enemyspawn = Chọn điểm xuất hiện của kẻ thù
+filter.spawnpath = Đường đến điểm xuất hiện
+filter.corespawn = Chọn Lõi
 filter.median = Trung bình
 filter.oremedian = Quặng Trung bình
 filter.blend = Trộn
@@ -581,7 +587,7 @@ filter.ore = Quặng
 filter.rivernoise = Nhiễu sông
 filter.mirror = Đối xứng
 filter.clear = Xóa
-filter.option.ignore = Bỏ qua
+filter.option.ignore = Phớt lờ
 filter.scatter = Phân tán
 filter.terrain = Địa hình
 
@@ -590,8 +596,8 @@ filter.option.chance = Tỷ lệ
 filter.option.mag = Độ lớn
 filter.option.threshold = Ngưỡng
 filter.option.circle-scale = Độ lớn vòng tròn
-filter.option.octaves = Octaves
-filter.option.falloff = Falloff
+filter.option.octaves = Rời rạc
+filter.option.falloff = Phân tán
 filter.option.angle = Góc
 filter.option.tilt = Nghiêng
 filter.option.rotate = Quay
@@ -607,7 +613,8 @@ filter.option.floor2 = Nền phụ
 filter.option.threshold2 = Ngưỡng phụ
 filter.option.radius = Bán kính
 filter.option.percentile = Phần trăm
-locales.info = Tại đây, bạn có thể thêm gói ngôn ngữ cho ngôn ngữ cụ thể vào bản đồ của bạn. Trong gói ngôn ngữ, mỗi thuộc tính có tên và giá trị. Những thuộc tính này có thể được sử dụng bởi Bộ xử lý thế giới và Mục tiêu nhiệm vụ bằng tên của chúng. Chúng hỗ trợ định dạng văn bản (thay thế kí tự giữ chỗ bằng giá trị thực tế).\n\n[cyan]Ví dụ thuộc tính:\n[]tên: [accent]timer[]\nvalue: [accent]Bộ đếm thời gian ví dụ, thời gian còn lại: {0}[]\n\n[cyan]Cách dùng:\n[]Đặt làm văn bản cho Mục tiêu nhiệm vụ: [accent]@timer\n\n[]In nó trong Bộ xử lý thế giới:\n[accent]localeprint "timer"\nformat time\n[gray](với time là biến được tính toán riêng biệt)
+
+locales.info = Tại đây, bạn có thể thêm gói ngôn ngữ cho ngôn ngữ cụ thể vào bản đồ của bạn. Trong gói ngôn ngữ, mỗi thuộc tính có tên và giá trị. Những thuộc tính này có thể được sử dụng bởi Bộ xử lý thế giới và Mục tiêu nhiệm vụ bằng tên của chúng. Chúng hỗ trợ định dạng văn bản (thay thế kí tự giữ chỗ bằng giá trị thực tế).\n\n[cyan]Ví dụ thuộc tính:\n[]tên: [accent]timer[]\nvalue: [accent]Bộ đếm thời gian ví dụ, thời gian còn lại: @[]\n\n[cyan]Cách dùng:\n[]Đặt làm văn bản cho Mục tiêu nhiệm vụ: [accent]@timer\n\n[]In nó trong Bộ xử lý thế giới:\n[accent]localeprint "timer"\nformat time\n[gray](với time là biến được tính toán riêng biệt)
 locales.deletelocale = Bạn có chắc muốn xóa gói ngôn ngữ này?
 locales.applytoall = Áp dụng thay đổi cho tất cả gói ngôn ngữ
 locales.addtoother = Thêm vào các gói ngôn ngữ khác
@@ -641,17 +648,17 @@ language.restart = Khởi động lại trò chơi của bạn để cài đặt
 settings = Cài đặt
 tutorial = Hướng dẫn
 tutorial.retake = Thực hiện lại Hướng dẫn
-editor = Chỉnh sửa
+editor = Trình chỉnh sửa
 mapeditor = Trình chỉnh sửa bản đồ
 
-abandon = Bỏ
+abandon = Từ bỏ
 abandon.text = Khu vực này và tất cả tài nguyên của nó sẽ bị mất vào tay kẻ địch.
 locked = Đã khóa
 complete = [lightgray]Hoàn thành:
 requirement.wave = Đạt đến đợt {0} ở {1}
 requirement.core = Phá hủy căn cứ địch ở {0}
 requirement.research = Nghiên cứu {0}
-requirement.produce = Sản lượng {0}
+requirement.produce = Sản xuất {0}
 requirement.capture = Chiếm {0}
 requirement.onplanet = Kiểm Soát Khu Vực {0}
 requirement.onsector = Đáp Xuống Khu Vực: {0}
@@ -659,7 +666,8 @@ launch.text = Phóng
 research.multiplayer = Chỉ máy chủ mới có thể nghiên cứu các mục.
 map.multiplayer = Chỉ máy chủ mới có thể xem các khu vực.
 uncover = Khám phá
-configure = Tùy chỉnh vật phẩm
+configure = Cấu hình vật phẩm khởi đầu
+
 objective.research.name = Nghiên cứu
 objective.produce.name = Nhận
 objective.item.name = Nhận vật phẩm
@@ -671,17 +679,20 @@ objective.timer.name = Hẹn giờ
 objective.destroyblock.name = Phá huỷ khối
 objective.destroyblocks.name = Phá huỷ khối
 objective.destroycore.name = Phá huỷ căn cứ
-objective.commandmode.name = Chế độ ra lệnh
+objective.commandmode.name = Chế độ mệnh lệnh
 objective.flag.name = Cờ
+
 marker.shapetext.name = Hình dạng văn bản
 marker.point.name = Điểm
 marker.shape.name = Hình dạng
 marker.text.name = Văn bản
 marker.line.name = Đường kẻ
 marker.quad.name = Bốn điểm
-marker.texture.name = Texture
+marker.texture.name = Kết cấu
+
 marker.background = Nền
 marker.outline = Đường viền
+
 objective.research = [accent]Nghiên cứu:\n[]{0}[lightgray]{1}
 objective.produce = [accent]Nhận:\n[]{0}[lightgray]{1}
 objective.destroyblock = [accent]Phá huỷ:\n[]{0}[lightgray]{1}
@@ -695,11 +706,12 @@ objective.enemiesapproaching = [accent]Kẻ địch sẽ xuất hiện sau [ligh
 objective.enemyescelating = [accent]Kẻ địch sẽ bắt đầu sản xuất sau [lightgray]{0}[]
 objective.enemyairunits = [accent]Kẻ địch sẽ bắt đầu tạo đơn vị bay sau [lightgray]{0}[]
 objective.destroycore = [accent]Phá huỷ căn cứ đối phương
-objective.command = [accent]Ra lệnh
+objective.command = [accent]Mệnh lệnh đơn vị
 objective.nuclearlaunch = [accent]⚠ Phát hiện tên lửa hạt nhân sắp phóng: [lightgray]{0}
-announce.nuclearstrike = [red]⚠ TÊN LỬA HẠT NHÂN SẮP VA CHẠM ⚠
 
-loadout = Vật phẩm
+announce.nuclearstrike = [red]⚠ TÊN LỬA HẠT NHÂN SẮP VA CHẠM ⚠\nxây lõi dự phòng ngay
+
+loadout = Vật phẩm khởi đầu
 resources = Tài nguyên
 resources.max = Tối đa
 bannedblocks = Khối bị cấm
@@ -719,10 +731,10 @@ connectfail = [scarlet]Lỗi kết nối:\n\n[accent]{0}
 error.unreachable = Không thể truy cập máy chủ.\nKiểm tra lại xem địa chỉ có đúng không?
 error.invalidaddress = Địa chỉ không hợp lệ.
 error.timedout = Hết thời gian chờ!\nĐảm bảo máy chủ đã thiết lập điều hướng cổng, và địa chỉ đó là chính xác!
-error.mismatch = Lỗi packet:\nphiên bản máy khách / máy chủ có thể không khớp.\nĐảm bảo bạn và máy chủ có phiên bản Mindustry mới nhất!
+error.mismatch = Lỗi gói tin:\nphiên bản máy khách / máy chủ có thể không khớp.\nĐảm bảo bạn và máy chủ có phiên bản Mindustry mới nhất!
 error.alreadyconnected = Đã kết nối.
 error.mapnotfound = Không tìm thấy tệp bản đồ!
-error.io = Lỗi Network I/O.
+error.io = Lỗi mạng đầu vào/ra.
 error.any = Lỗi mạng không xác định.
 error.bloom = Không khởi tạo được hiệu ứng phát sáng.\nThiết bị của bạn có thể không hỗ trợ.
 
@@ -731,6 +743,7 @@ weather.snowing.name = Tuyết
 weather.sandstorm.name = Bão cát
 weather.sporestorm.name = Bão bào tử
 weather.fog.name = Sương mù
+
 campaign.playtime = \uf129 [lightgray]Thời gian chơi trên khu vực: {0}
 campaign.complete = [accent]Chúc mừng.\n\nKẻ địch trên {0} đã bị đánh bại.\n[lightgray]Khu vực cuối cùng đã được chinh phục.
 
@@ -757,10 +770,10 @@ sectors.underattack.nodamage = [scarlet]Chưa được chiếm
 sectors.survives = [accent]Vượt qua {0} đợt
 sectors.go = Đi
 sector.abandon = Rời bỏ
-sector.abandon.confirm = Những căn cứ ở đây sẽ tự huỷ.\nTiếp tục chứ?
+sector.abandon.confirm = Những lõi ở đây sẽ tự huỷ.\nTiếp tục chứ?
 sector.curcapture = Khu vực đã chiếm
 sector.curlost = Khu vực đã mất
-sector.missingresources = [scarlet]Không đủ tài nguyên căn cứ
+sector.missingresources = [scarlet]Không đủ tài nguyên lõi
 sector.attacked = Khu vực [accent]{0}[white] đang bị tấn công!
 sector.lost = Khu vực [accent]{0}[white] đã mất!
 sector.capture = Khu vực [accent]{0}[white] đã chiếm!
@@ -802,23 +815,24 @@ sector.coastline.name = Coastline
 sector.navalFortress.name = Naval Fortress
 
 sector.groundZero.description = Vị trí tối ưu để bắt đầu một lần nữa. Mối đe dọa của kẻ thù thấp nhưng ít tài nguyên.\nThu thập càng nhiều đồng và chì càng tốt.\nTiến lên.
-sector.frozenForest.description = Dù ở gần núi cao, các bào tử vẫn bắt đầu phát tán. Nhiệt độ lạnh giá không thể giữ chúng lại mãi.\n\nBắt đầu tạo năng lượng. Hãy chế tạo máy phát điện đốt và học cách sử dụng Máy sửa chữa.
-sector.saltFlats.description = Ở vùng rìa sa mạc chính là Salt Flats, có thể tìm thấy một ít tài nguyên ở khu vực này.\n\nKẻ thù đã dựng lên một khu phức hợp lưu trữ tài nguyên ở đây. Hãy loại bỏ hoàn toàn căn cứ này.
-sector.craters.description = Nước đã tích tụ trong miệng núi lửa ở đây, vốn là dấu tích của các cuộc chiến tranh cũ. Hãy chiếm lại khu vực. Thu gom cát, metaglass . Bơm nước để làm mát súng và mũi khoan.
+sector.frozenForest.description = Dù ở gần núi cao, các bào tử vẫn bắt đầu phát tán. Nhiệt độ lạnh giá không thể giữ chúng lại mãi.\n\nBắt đầu tạo năng lượng. Hãy xây dựng máy phát điện đốt. Học cách sử dụng Máy sửa chữa.
+sector.saltFlats.description = Ở vùng rìa sa mạc chính là Salt Flats. Có thể tìm thấy một ít tài nguyên ở khu vực này.\n\nKẻ thù đã dựng lên một khu phức hợp lưu trữ tài nguyên ở đây. Hãy loại bỏ hoàn toàn căn cứ này.
+sector.craters.description = Nước đã tích tụ trong miệng núi lửa ở đây, vốn là dấu tích của các cuộc chiến tranh cũ. Hãy chiếm lại khu vực. Thu gom cát. Nung thủy tinh. Bơm nước để làm mát súng và mũi khoan.
 sector.ruinousShores.description = Vượt qua những địa hình mấp mô, là bờ biển. Vị trí này từng là nơi đặt một hệ thống phòng thủ ven biển. Không còn lại gì nhiều, chỉ những công trình phòng thủ cơ bản nhất vẫn không bị tổn thương, mọi thứ khác đều trở thành đống sắt vụn.\nTiếp tục mở rộng ra bên ngoài. Khám phá công nghệ có ở đây.
 sector.stainedMountains.description = Xa hơn trong đất liền là những ngọn núi, chưa bị bào tử xâm lấn.\nKhai thác titan dồi dào trong khu vực này. Tìm hiểu làm thế nào để sử dụng nó.\n\nSự hiện diện của kẻ thù ở đây lớn hơn. Đừng cho họ thời gian để có đơn vị mạnh nhất của họ.
-sector.overgrowth.description = Khu vực này cây cối mọc um tùm, gần nguồn bào tử hơn.\nĐịch đã lập tiền đồn ở đây. Chế tạo Mace. Phá hủy căn cứu địch và đòi lại thứ đã mất.
+sector.overgrowth.description = Khu vực này cây cối mọc um tùm, gần nguồn bào tử hơn.\nĐịch đã lập tiền đồn ở đây. Chế tạo Mace. Phá hủy căn cứu địch.
 sector.tarFields.description = Vùng ngoại ô của khu sản xuất dầu, nằm giữa núi và sa mạc. Một trong số ít khu vực có trữ lượng dầu có thể sử dụng được.\nMặc dù bị bỏ hoang, khu vực này có một số lực lượng địch nguy hiểm gần đó. Đừng đánh giá thấp chúng.\n\n[lightgray]Nghiên cứu công nghệ chế biến dầu nếu có thể.
-sector.desolateRift.description = Một vùng cực kỳ nguy hiểm. Tài nguyên dồi dào, nhưng ít không gian. Nguy cơ thất thủ cao. Hãy rời đi càng sớm càng tốt. Đừng để bị lừa bởi khoảng cách dài giữa các cuộc tấn công của kẻ thù.
+sector.desolateRift.description = Một vùng cực kỳ nguy hiểm. Tài nguyên dồi dào, nhưng ít không gian. Nguy cơ thất thủ cao. Xây dựng phòng thủ trên không và mặt đất sớm nhất có thể. Đừng để bị lừa bởi khoảng cách dài giữa các cuộc tấn công của kẻ thù.
 sector.nuclearComplex.description = Một cơ sở trước đây để sản xuất và chế biến thorium, đã biến thành đống đổ nát.\n[lightgray]Nghiên cứu thorium và nhiều công dụng của nó.\n\nKẻ thù có mặt ở đây với số lượng rất lớn, liên tục lùng sục những kẻ tấn công.
-sector.fungalPass.description = Khu vực chuyển tiếp giữa vùng núi cao và vùng đất thấp hơn, đầy bào tử. Một căn cứ trinh sát nhỏ của địch được đặt tại đây.\nPhá hủy nó.\nSử dụng đơn vị Dagger và Crawler. Phá hủy hai căn cứ của địch.
+sector.fungalPass.description = Khu vực chuyển tiếp giữa vùng núi cao và vùng đất thấp hơn, đầy bào tử. Một căn cứ trinh sát nhỏ của địch được đặt tại đây.\nPhá hủy nó.\nSử dụng đơn vị Dagger và Crawler. Phá hủy hai lõi của địch.
 sector.biomassFacility.description = Nguồn gốc của bào tử. Đây là cơ sở mà chúng được nghiên cứu và sản xuất ban đầu.\nNghiên cứu công nghệ có ở đây. Nuôi cấy bào tử để sản xuất nhiên liệu và chất dẻo.\n\n[lightgray]Khi cơ sở này sụp đổ, các bào tử đã được giải phóng. Không có gì trong hệ sinh thái địa phương có thể cạnh tranh với một dạng sống xâm lấn mạnh như vậy.
-sector.windsweptIslands.description = Xa hơn đường bờ biển là chuỗi đảo xa xôi này. Hồ sơ cho thấy họ đã từng có công trình sản xuất [accent]Nhựa[] .\n\nChống lại các lực lượng hải quân của kẻ thù. Thiết lập căn cứ trên quần đảo. Nghiên cứu các nhà máy này.
+sector.windsweptIslands.description = Xa hơn đường bờ biển là chuỗi đảo xa xôi này. Hồ sơ cho thấy họ đã từng có công trình sản xuất [accent]Nhựa[].\n\nChống lại các lực lượng hải quân của kẻ thù. Thiết lập căn cứ trên quần đảo. Nghiên cứu các nhà máy này.
 sector.extractionOutpost.description = Một tiền đồn xa, được kẻ thù xây dựng với mục đích phóng nguồn lực sang các khu vực khác.\n\nCông nghệ vận tải qua lại giữa các khu vực rất cần thiết để mở rộng hơn nữa. Phá hủy căn cứ và nghiên cứu bệ phóng của họ.
 sector.impact0078.description = Đây là tàn tích của tàu vận chuyển giữa các vì sao đã từng đến được hệ sao này.\n\nLấy càng nhiều càng tốt từ đống đổ nát. Nghiên cứu bất kỳ công nghệ nguyên vẹn nào.
-sector.planetaryTerminal.description = Mục tiêu cuối cùng.\n\nCăn cứ ven biển này chứa một cấu trúc có khả năng phóng căn cứ tới các hành tinh lân cận. Nó được bảo vệ cực kỳ cẩn thận.\n\nSản xuất đơn vị hải quân. Loại bỏ kẻ thù càng nhanh càng tốt. Nghiên cứu cấu trúc phóng.
+sector.planetaryTerminal.description = Mục tiêu cuối cùng.\n\nCăn cứ ven biển này chứa một cấu trúc có khả năng phóng các lõi tới các hành tinh lân cận. Nó được bảo vệ cực kỳ cẩn thận.\n\nSản xuất đơn vị hải quân. Loại bỏ kẻ thù càng nhanh càng tốt. Nghiên cứu cấu trúc phóng.
 sector.coastline.description = Phát hiện tàn dư công nghệ của các đơn vị hải quân tại địa điểm này. Chặn các cuộc tấn công của kẻ địch, chiếm khu vực này, và lấy được công nghệ.
 sector.navalFortress.description = Kẻ địch đã thiết lập một căn cứ điều kiển từ xa, trên đảo tự nhiên. Phá hủy tiền đồn này. Chiếm công nghệ chế tạo đơn vị hải quân tiên tiến của địch và nghiên cứu nó.
+
 sector.onset.name = The Onset
 sector.aegis.name = Aegis
 sector.lake.name = Lake
@@ -836,35 +850,33 @@ sector.siege.name = Siege
 sector.crossroads.name = Crossroads
 sector.karst.name = Karst
 sector.origin.name = Origin
-sector.onset.description = Bắt đầu hành trình chinh phục Erekir. Thu thập nguồn lực, sản xuất đơn vị, và bắt đầu nghiên cứu công nghệ.
 
+sector.onset.description = Bắt đầu hành trình chinh phục Erekir. Thu thập nguồn lực, sản xuất đơn vị, và bắt đầu nghiên cứu công nghệ.
 sector.aegis.description = Khu vực này chứa các kho lưu trữ của tungsten.\nNghiên cứu [accent]Máy khoan động lực[] để khai thác tài nguyên này này, và phá hủy căn cứ của địch ở khu vực này.
-sector.lake.description = Hồ xỉ nóng chảy của khu vực này giới hạn rất nhiều các loại đơn vị. Một loại đơn vị có thể bay được là sự lựa chọn duy nhất.\nNghiên cứu [accent]Máy chế tạo phi thuyền[] và sản xuất một đơn vị [accent]elude[] nhanh nhất có thể.
-sector.intersect.description = Các thông tin cho thấy khu vực này sẽ bị tấn công từ nhiều hướng ngay sau khi đáp.\nThiết lập các lớp phòng thủ nhanh chóng và mở rộng nhanh nhất có thể.\n[accent]Lính cơ động[] sẽ là sự lựa chọn tốt nhất cho địa hình khó khăn của khu vực này.
+sector.lake.description = Hồ xỉ nóng chảy của khu vực này giới hạn rất nhiều các loại đơn vị. Một loại đơn vị có thể lướt được là sự lựa chọn duy nhất.\nNghiên cứu [accent]Máy chế tạo phi thuyền[] và sản xuất một đơn vị [accent]elude[] nhanh nhất có thể.
+sector.intersect.description = Các thông tin cho thấy khu vực này sẽ bị tấn công từ nhiều hướng ngay sau khi đáp.\nThiết lập các lớp phòng thủ nhanh chóng và mở rộng nhanh nhất có thể.\n[accent]Đơn vị cơ động[] sẽ là sự lựa chọn tốt nhất cho địa hình khó khăn của khu vực này.
 sector.atlas.description = Khu vực này có địa hình phong phú và sẽ cần một loạt các loại đơn vị để tấn công hiệu quả.\nCác loại đơn vị được nâng cấp cũng có thể cần thiết để vượt qua một số căn cứ của địch ở đây.\nNghiên cứu [accent]Máy điện phân[] và [accent]Máy chế tạo xe tăng[].
 sector.split.description = Sự hiện diện của kẻ địch ở khu vực này rất ít, nên nó là một khu vực tốt để thử nghiệm các công nghệ vận chuyển mới.
-sector.basin.description = Sự hiện diện của kẻ địch ở khu vực này rất lớn.\nSản xuất đơn vị nhanh chóng và chiếm được các căn cứ của địch để có được một vị trí ổn định.
+sector.basin.description = Sự hiện diện của kẻ địch ở khu vực này rất lớn.\nSản xuất đơn vị nhanh chóng và chiếm được các lõi của địch để có được một vị trí ổn định.
 sector.marsh.description = Khu vực này có trữ lượng lớn arkycite, nhưng có rất ít các lỗ hơi nước.\nXây dựng [accent]Bể điện hóa[] để tạo năng lượng.
 sector.peaks.description = Địa hình đồi núi của khu vực này khiến hầu hết các loại đơn vị vô dụng. Cần phải có các loại phi thuyền.\nHãy cẩn thận với các công trình phòng thủ trên không của địch. Có thể bị vô hiệu hóa bằng cách tấn công các công trình hỗ trợ.
-sector.ravine.description = Không có căn cứ nào của địch được phát hiện ở khu vực này, nhưng nó là một đường vận chuyển quan trọng cho địch. Có thể sẽ có rất nhiều đơn vị của địch.\nSản xuất [accent]hợp kim[]. Xây dựng [accent]Afflict[].
-
+sector.ravine.description = Không có căn cứ nào của địch được phát hiện ở khu vực này, nhưng nó là một đường vận chuyển quan trọng cho địch. Có thể sẽ có rất nhiều đơn vị của địch.\nSản xuất [accent]hợp kim[]. Xây dựng bệ súng [accent]Afflict[].
 sector.caldera-erekir.description = Các tài nguyên được phát hiện ở khu vực này được phân bố trên nhiều đảo.\nNghiên cứu và triển khai vận chuyển dựa trên máy bay không người lái.
 sector.stronghold.description = Các căn cứ của địch ở khu vực này đang bảo vệ một lượng lớn [accent]thorium[].\nSử dụng nó để phát triển các loại đơn vị và công trình tốt hơn.
-
 sector.crevice.description = Địch sẽ gửi các đơn vị tấn công mạnh mẽ để tiêu diệt căn cứ của bạn ở khu vực này.\nPhát triển [accent]carbide[] và [accent]Máy nhiệt phân[] là điều cần thiết để sống sót.
-sector.siege.description = Khu vực này có hai hẻm núi song song với nhau, kẻ địch sẽ tấn công từ hai phía.\nNghiên cứu [accent]cyanogen[] để có thể chế tạo những xe tank mạnh hơn.\nChú ý: Phát hiện kẻ địch được trang bị tên lửa tầm xa. Các tên lửa có thể bị bắn hạ trước khi va chạm.
+sector.siege.description = Khu vực này có hai hẻm núi song song với nhau, kẻ địch sẽ tấn công từ hai phía.\nNghiên cứu [accent]cyanogen[] để có thể chế tạo những đơn vị xe tăng mạnh hơn.\nChú ý: Phát hiện kẻ địch được trang bị tên lửa tầm xa. Các tên lửa có thể bị bắn hạ trước khi va chạm.
 sector.crossroads.description = Các căn cứ của địch ở khu vực này được xây dựng trên các địa hình khác nhau. Nghiên cứu các loại đơn vị khác nhau sao cho phù hợp.\nNgoài ra, một số căn cứ được bảo vệ bởi các máy chiếu khiên chắn. Tìm hiểu cách chúng được cung cấp năng lượng.
 sector.karst.description = Khu vực này có rất nhiều tài nguyên, nhưng sẽ bị địch tấn công khi một căn cứ mới đáp.\nTận dụng các tài nguyên và nghiên cứu [accent]sợi lượng tử[].
 sector.origin.description = Khu vực cuối cùng với sự hiện diện của địch rất lớn.\nKhông còn bất cứ thứ gì cần nghiên cứu - tập trung hoàn toàn vào việc tiêu diệt tất cả các căn cứ của địch.
 
 status.burning.name = Cháy
 status.freezing.name = Đóng băng
-status.wet.name = Ẩm
+status.wet.name = Ẩm ướt
 status.muddy.name = Sa lầy
 status.melting.name = Tan chảy
 status.sapped.name = Ăn mòn
 status.electrified.name = Nhiễm điện
-status.spore-slowed.name = Nhiễm bào tử
+status.spore-slowed.name = Nhiễm bào tử chậm
 status.tarred.name = Nhiễm dầu
 status.overdrive.name = Tăng cường
 status.overclock.name = Gia tốc
@@ -876,7 +888,7 @@ status.boss.name = Trùm
 settings.language = Ngôn ngữ
 settings.data = Dữ liệu trò chơi
 settings.reset = Khôi phục về mặc định
-settings.rebind = Sửa
+settings.rebind = Gán lại
 settings.resetKey = Đặt lại
 settings.controls = Điều khiển
 settings.game = Trò chơi
@@ -884,7 +896,7 @@ settings.sound = Âm thanh
 settings.graphics = Đồ họa
 settings.cleardata = Xóa dữ liệu trò chơi...
 settings.clear.confirm = Bạn có chắc chắn muốn xóa dữ liệu này không?\nHành động này không thể hoàn tác!
-settings.clearall.confirm = [scarlet]CẢNH BÁO![]\nThao tác này sẽ xóa tất cả dữ liệu, bao gồm bản đồ và các cài đặt.\nSau khi bạn nhấn vào 'ok' trò chơi sẽ xóa tất cả dữ liệu và tự động thoát.
+settings.clearall.confirm = [scarlet]CẢNH BÁO![]\nThao tác này sẽ xóa tất cả dữ liệu, bao gồm bản đồ và các cài đặt.\nSau khi bạn nhấn vào 'Đồng ý' trò chơi sẽ xóa tất cả dữ liệu và tự động thoát.
 settings.clearsaves.confirm = Bạn có chắc muốn xóa tất cả bản lưu?
 settings.clearsaves = Xóa bản lưu
 settings.clearresearch = Xóa dữ liệu nghiên cứu
@@ -893,7 +905,7 @@ settings.clearcampaignsaves = Xóa dữ liệu Chiến dịch
 settings.clearcampaignsaves.confirm = Bạn có chắc muốn xóa toàn bộ dữ liệu Chiến dịch?
 paused = [accent]< Tạm dừng >
 clear = Xóa
-banned = [scarlet]Cấm
+banned = [scarlet]Bị cấm
 unsupported.environment = [scarlet]Môi trường không phù hợp
 yes = Có
 no = Không
@@ -905,15 +917,15 @@ lastaccessed = [lightgray]Truy cập lần cuối: {0}
 lastcommanded = [lightgray]Được điều khiển lần cuối: {0}
 block.unknown = [lightgray]???
 
-stat.showinmap = <Mở bản đồ để hiện thị>
-stat.description = Mô tả
+stat.showinmap = <mở bản đồ để hiện thị>
+stat.description = Mục đích
 stat.input = Đầu vào
 stat.output = Sản phẩm
 stat.maxefficiency = Hiệu suất tối đa
 stat.booster = Tăng cường
-stat.tiles = Yêu cầu khu vực
+stat.tiles = Yêu cầu ô nền
 stat.affinities = Phù hợp
-stat.opposites = Đối diện
+stat.opposites = Đối nghịch
 stat.powercapacity = Dung lượng pin
 stat.powershot = Năng lượng/Phát bắn
 stat.damage = Sát thương
@@ -926,21 +938,21 @@ stat.size = Kích thước
 stat.displaysize = Kích thước màn hình
 stat.liquidcapacity = Dung tích chất lỏng
 stat.powerrange = Phạm vi năng lượng
-stat.linkrange = Phạm vi kết nối
+stat.linkrange = Phạm vi liên kết
 stat.instructions = Hướng dẫn
 stat.powerconnections = Số lượng kết nối tối đa
 stat.poweruse = Năng lượng sử dụng
 stat.powerdamage = Năng lượng/Sát thương
 stat.itemcapacity = Sức chứa vật phẩm
 stat.memorycapacity = Dung lượng bộ nhớ
-stat.basepowergeneration = Năng lượng tạo ra (cơ bản)
+stat.basepowergeneration = Năng lượng tạo ra cơ bản
 stat.productiontime = Thời gian sản xuất
 stat.repairtime = Thời gian sửa
 stat.repairspeed = Tốc độ sửa
 stat.weapons = Vũ khí
 stat.bullet = Đạn
 stat.moduletier = Cấp Module
-stat.unittype = Unit Type
+stat.unittype = Kiểu đơn vị
 stat.speedincrease = Tăng tốc
 stat.range = Phạm vi
 stat.drilltier = Khoan được
@@ -951,13 +963,13 @@ stat.health = Độ bền
 stat.armor = Giáp
 stat.buildtime = Thời gian xây
 stat.maxconsecutive = Đầu ra tối đa
-stat.buildcost = Yêu cầu
+stat.buildcost = Chi phi xây
 stat.inaccuracy = Độ lệch
 stat.shots = Phát bắn
-stat.reload = Phát bắn/Giây
+stat.reload = Tốc độ bắn
 stat.ammo = Đạn
 stat.shieldhealth = Độ bền khiên
-stat.cooldowntime = Thời gian chờ
+stat.cooldowntime = Thời gian hồi phục
 stat.explosiveness = Gây nổ
 stat.basedeflectchance = Tỷ lệ phản đạn
 stat.lightningchance = Tỷ lệ phóng điện
@@ -974,23 +986,23 @@ stat.minespeed = Tốc độ đào
 stat.minetier = Cấp độ đào
 stat.payloadcapacity = Sức chứa khối hàng
 stat.abilities = Khả năng
-stat.canboost = Nâng cấp
+stat.canboost = Có thê tăng cường
 stat.flying = Bay
 stat.ammouse = Sử dụng đạn
 stat.damagemultiplier = Hệ số sát thương
 stat.healthmultiplier = Hệ số độ bền
 stat.speedmultiplier = Hệ số tốc độ
-stat.reloadmultiplier = Hệ số tốc độ tấn công
+stat.reloadmultiplier = Hệ số hồi đạn
 stat.buildspeedmultiplier = Hệ số tốc độ xây dựng
 stat.reactive = Phản ứng
 stat.immunities = Miễn nhiễm
-stat.healing = Sửa chữa
+stat.healing = Hồi phục
 
 ability.forcefield = Tạo khiên
 ability.forcefield.description = Phát một khiên trường lực hấp thụ các loại đạn
 ability.repairfield = Sửa chữa/Xây dựng
 ability.repairfield.description = Sửa chữa các đơn vị gần đó
-ability.statusfield = Vùng gia tốc
+ability.statusfield = Vùng trạng thái
 ability.statusfield.description = Áp dụng hiệu ứng trạng thái vào các đơn vị gần đó
 ability.unitspawn = Sản xuất
 ability.unitspawn.description = Sản xuất đơn vị
@@ -1007,15 +1019,16 @@ ability.suppressionfield.description = Ngăn chặn các công trình sửa ch
 ability.energyfield = Trường điện từ
 ability.energyfield.description = Giật điện các kẻ thù gần đó
 ability.energyfield.healdescription = Giật điện các kẻ thù gần đó và hồi phục đồng minh
-ability.regen = Hồi phục
-ability.regen.description = Tự hồi phục theo thời gian
+ability.regen = Tự hồi phục
+ability.regen.description = Tự hồi phục độ bền theo thời gian
 ability.liquidregen = Hấp thụ chất lỏng
 ability.liquidregen.description = Hấp thụ chất lỏng để tự hồi phục
 ability.spawndeath = Chết sản sinh
 ability.spawndeath.description = Sinh ra đơn vị khi chết
 ability.liquidexplode = Chết tràn dịch
 ability.liquidexplode.description = Tràn chất lỏng khi chết
-ability.stat.firingrate = tốc bắn [stat]{0}/giây[lightgray]
+
+ability.stat.firingrate = tốc độ bắn [stat]{0}/giây[lightgray]
 ability.stat.regen = [stat]{0}[lightgray] độ bền/giây
 ability.stat.shield = [stat]{0}[lightgray] khiên
 ability.stat.repairspeed = [stat]{0}/giây[lightgray] tốc độ sửa chữa
@@ -1027,12 +1040,12 @@ ability.stat.damagereduction = [stat]{0}%[lightgray] giảm sát thương
 ability.stat.minspeed = tốc độ tối thiểu [stat]{0} ô/giây[lightgray]
 ability.stat.duration = thời hạn [stat]{0} giây[lightgray]
 ability.stat.buildtime = thời gian xây [stat]{0} giây[lightgray]
-bar.onlycoredeposit = Chỉ có thể đưa vào căn cứ
 
+bar.onlycoredeposit = Chỉ có thể đưa vào lõi
 bar.drilltierreq = Cần máy khoan tốt hơn
 bar.noresources = Thiếu tài nguyên
-bar.corereq = Yêu cầu căn cứ
-bar.corefloor = Cần vùng thích hợp xây căn cứ
+bar.corereq = Yêu cầu lõi
+bar.corefloor = Cần vùng thích hợp xây lõi
 bar.cargounitcap = Đã đạt sức chứa khối hàng tối đa
 bar.drillspeed = Tốc độ khoan: {0}/giây
 bar.pumpspeed = Tốc độ bơm: {0}/giây
@@ -1048,15 +1061,15 @@ bar.capacity = Sức chứa: {0}
 bar.unitcap = {0} {1}/{2}
 bar.liquid = Chất lỏng
 bar.heat = Nhiệt độ
-bar.instability = Mức ổn định
+bar.instability = Độ ổn định
 bar.heatamount = Lượng nhiệt: {0}
 bar.heatpercent = Lượng nhiệt: {0} ({1}%)
 bar.power = Năng lượng
 bar.progress = Đang xây dựng
 bar.loadprogress = Tiến trình
-bar.launchcooldown = Chờ phóng
+bar.launchcooldown = Hồi phóng
 bar.input = Đầu vào
-bar.output = Sản phẩm
+bar.output = Đầu ra
 bar.strength = [stat]{0}[lightgray]x Sức mạnh
 
 units.processorcontrol = [lightgray]Điều khiển bởi bộ xử lý
@@ -1068,28 +1081,28 @@ bullet.homing = [stat]truy đuổi
 bullet.armorpierce = [stat]xuyên giáp
 bullet.maxdamagefraction = [stat]{0}%[lightgray] giới hạn sát thương
 bullet.suppression = [stat]{0} giây[lightgray] ngăn sửa chữa ~ [stat]{1}[lightgray] ô
-bullet.interval = [stat]{0}/giây[lightgray] interval bullets:
+bullet.interval = [stat]{0}/giây[lightgray] đạn ngắt quãng:
 bullet.frags = [stat]phá mảnh
 bullet.lightning = [stat]{0}[lightgray]x tia chớp ~ [stat]{1}[lightgray] sát thương
-bullet.buildingdamage = [stat]{0}%[lightgray] sát thương khối
-bullet.knockback = [stat]{0}[lightgray] bật lùi
-bullet.pierce = [stat]{0}[lightgray]x xuyên mục tiêu
+bullet.buildingdamage = [stat]{0}%[lightgray] sát thương công trình
+bullet.knockback = [stat]{0}[lightgray] đẩy lùi
+bullet.pierce = [stat]{0}[lightgray]x xuyên thấu
 bullet.infinitepierce = [stat]xuyên thấu
 bullet.healpercent = [stat]{0}[lightgray]% sửa chữa
-bullet.healamount = [stat]{0}[lightgray] Sửa chữa trực tiếp
+bullet.healamount = [stat]{0}[lightgray] sửa chữa trực tiếp
 bullet.multiplier = [stat]{0}[lightgray]x lượng đạn
 bullet.reload = [stat]{0}%[lightgray] tốc độ bắn
-bullet.range = [stat]{0}[lightgray] Phạm vi
+bullet.range = [stat]{0}[lightgray] ô phạm vi
 
-unit.blocks = Khối
-unit.blockssquared = Khối²
+unit.blocks = khối
+unit.blockssquared = khối²
 unit.powersecond = đơn vị năng lượng/giây
 unit.tilessecond = ô/giây
 unit.liquidsecond = đơn vị chất lỏng/giây
 unit.itemssecond = vật phẩm/giây
 unit.liquidunits = đơn vị chất lỏng
 unit.powerunits = đơn vị năng lượng
-unit.heatunits = Đơn vị nhiệt
+unit.heatunits = đơn vị nhiệt
 unit.degrees = độ
 unit.seconds = giây
 unit.minutes = phút
@@ -1103,15 +1116,15 @@ unit.thousands = ng
 unit.millions = tr
 unit.billions = tỷ
 unit.pershot = /phát bắn
-category.purpose = Mô tả
+category.purpose = Mục đích
 category.general = Chung
 category.power = Năng lượng
 category.liquids = Chất lỏng
 category.items = Vật phẩm
-category.crafting = Vào/Sản phẩm
+category.crafting = Đầu vào/ra
 category.function = Chức năng
-category.optional = Cải tiến
-setting.skipcoreanimation.name = Bỏ qua hiệu ứng phóng/đáp căn cứ
+category.optional = Cải tiến tùy chọn
+setting.skipcoreanimation.name = Bỏ qua hiệu ứng phóng/đáp lõi
 setting.landscape.name = Khóa ngang
 setting.shadows.name = Bóng đổ
 setting.blockreplace.name = Tự động đề xuất khối
@@ -1124,28 +1137,28 @@ setting.doubletapmine.name = Nhấn đúp để Đào
 setting.commandmodehold.name = Nhấn giữ để vào chế độ khiển đơn vị
 setting.distinctcontrolgroups.name = Giới hạn một nhóm điều khiển cho mỗi đơn vị
 setting.modcrashdisable.name = Tắt các mod khi gặp sự cố trong khởi động
-setting.animatedwater.name = Hiệu ứng nước
-setting.animatedshields.name = Hiệu ứng khiên
-setting.playerindicators.name = Hướng người chơi
-setting.indicators.name = Hướng kẻ địch
+setting.animatedwater.name = Chuyển động bề mặt
+setting.animatedshields.name = Chuyển động khiên
+setting.playerindicators.name = Chỉ hướng người chơi
+setting.indicators.name = Chỉ hướng kẻ địch
 setting.autotarget.name = Tự động nhắm mục tiêu
 setting.keyboard.name = Điều khiển bằng chuột + bàn phím
 setting.touchscreen.name = Điều khiển bằng màn hình cảm ứng
 setting.fpscap.name = FPS tối đa
 setting.fpscap.none = Không giới hạn
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = Kích thước giao diện
+setting.uiscale.name = Tỉ lệ giao diện
 setting.uiscale.description = Trò chơi sẽ khởi động lại để áp dụng các thay đổi.
 setting.swapdiagonal.name = Đặt luôn theo đường chéo
 setting.difficulty.training = Luyện tập
 setting.difficulty.easy = Dễ
 setting.difficulty.normal = Vừa
 setting.difficulty.hard = Khó
-setting.difficulty.insane = Rất khó
+setting.difficulty.insane = Điên loạn
 setting.difficulty.name = Độ khó:
 setting.screenshake.name = Rung chuyển khung hình
-setting.bloomintensity.name = Mức độ vụ nổ
-setting.bloomblur.name = Xoá mờ vụ nổ
+setting.bloomintensity.name = Mức độ phát sáng
+setting.bloomblur.name = Xoá mờ phát sang
 setting.effects.name = Hiển thị hiệu ứng
 setting.destroyedblocks.name = Hiển thị khối bị phá
 setting.blockstatus.name = Hiển thị trạng thái khối
@@ -1155,16 +1168,16 @@ setting.saveinterval.name = Khoảng thời gian lưu
 setting.seconds = {0} giây
 setting.milliseconds = {0} mili-giây
 setting.fullscreen.name = Toàn màn hình
-setting.borderlesswindow.name = Không viền
-setting.borderlesswindow.name.windows = Toàn màn hình (không viền)
+setting.borderlesswindow.name = Cửa sổ không viền
+setting.borderlesswindow.name.windows = Toàn màn hình không viền
 setting.borderlesswindow.description = Trò chơi có thể sẽ khởi động lại để áp dụng các thay đổi
 setting.fps.name = Hiển thị FPS & Ping
 setting.console.name = Bật Bảng điều khiển
-setting.smoothcamera.name = Chế độ mượt mà
+setting.smoothcamera.name = Khung quay mượt mà
 setting.vsync.name = Đồng bộ dọc (VSync)
 setting.pixelate.name = Đồ họa pixel
-setting.minimap.name = Hiển thị bản đồ mini
-setting.coreitems.name = Hiển thị vật phẩm trong căn cứ
+setting.minimap.name = Hiển thị bản đồ nhỏ
+setting.coreitems.name = Hiển thị vật phẩm trong lõi
 setting.position.name = Hiển thị vị trí người chơi
 setting.mouseposition.name = Hiện vị trí trỏ chuột
 setting.musicvol.name = Âm lượng nhạc
@@ -1172,10 +1185,10 @@ setting.atmosphere.name = Hiển thị bầu khí quyển hành tinh
 setting.drawlight.name = Vẽ Bóng tối/Ánh sáng
 setting.ambientvol.name = Âm lượng tổng
 setting.mutemusic.name = Tắt nhạc
-setting.sfxvol.name = Âm lượng SFX
+setting.sfxvol.name = Âm lượng hiệu ứng âm thanh (SFX)
 setting.mutesound.name = Tắt tiếng
-setting.crashreport.name = Gửi báo cáo sự cố
-setting.savecreate.name = Tự động lưu
+setting.crashreport.name = Gửi báo cáo sự cố ẩn danh
+setting.savecreate.name = Tự động tạo bản lưu
 setting.steampublichost.name = Hiển thị trò chơi công khai
 setting.playerlimit.name = Giới hạn người chơi
 setting.chatopacity.name = Độ mờ trò chuyện
@@ -1189,10 +1202,10 @@ setting.macnotch.description = Trò chơi sẽ khởi động lại để áp d
 steam.friendsonly = Chỉ bạn bè
 steam.friendsonly.tooltip = Liệu chỉ bạn bè trên Steam mới có thể tham gia trò chơi của bạn hay không.\nBỏ chọn ô này sẽ làm trò chơi của bạn công khai - mọi có thể tham gia.
 public.beta = Lưu ý rằng phiên bản beta của trò chơi không thể tạo sảnh công khai.
-uiscale.reset = Kích thước giao diện đã được thay đổi.\nNhấn "OK" để xác nhận.\n[scarlet]Hoàn lại và thoát trong[accent] {0}[] giây...
+uiscale.reset = Tỉ lệ giao diện đã được thay đổi.\nNhấn "Đồng ý" để xác nhận.\n[scarlet]Hoàn lại và thoát trong[accent] {0}[] giây...
 uiscale.cancel = Hủy & Thoát
 setting.bloom.name = Hiệu ứng phát sáng
-keybind.title = Sửa phím
+keybind.title = Gán lại phím
 keybinds.mobile = [scarlet]Hầu hết phím ở đây không hoạt động trên thiết bị di động. Chỉ hỗ trợ di chuyển cơ bản.
 category.general.name = Chung
 category.view.name = Xem
@@ -1204,7 +1217,7 @@ keybind.respawn.name = Hồi sinh
 keybind.control.name = Điều khiển đơn vị
 keybind.clear_building.name = Xóa công trình
 keybind.press = Nhấn một phím...
-keybind.press.axis = Nhấn một tổ hợp phím hoặc một phím...
+keybind.press.axis = Nhấn một trục xoay hoặc một phím...
 keybind.screenshot.name = Chụp ảnh bản đồ
 keybind.toggle_power_lines.name = Ẩn/Hiện đường truyền năng lượng
 keybind.toggle_block_status.name = Ẩn/Hiện trạng thái khối
@@ -1217,24 +1230,27 @@ keybind.command_mode.name = Chế độ mệnh lệnh
 keybind.command_queue.name = Lệnh tuần tự đơn vị
 keybind.create_control_group.name = Tạo nhóm điều khiển
 keybind.cancel_orders.name = Hủy lệnh
+
 keybind.unit_stance_shoot.name = Tư thế đơn vị: Bắn
 keybind.unit_stance_hold_fire.name = Tư thế đơn vị: Ngừng bắn
 keybind.unit_stance_pursue_target.name = Tư thế đơn vị: Bám đuổi mục tiêu
 keybind.unit_stance_patrol.name = Tư thế đơn vị: Tuần tra
 keybind.unit_stance_ram.name = Tư thế đơn vị: Tông thẳng
-keybind.unit_command_move.name = Unit Command: Move
-keybind.unit_command_repair.name = Unit Command: Repair
-keybind.unit_command_rebuild.name = Unit Command: Rebuild
-keybind.unit_command_assist.name = Unit Command: Assist
-keybind.unit_command_mine.name = Unit Command: Mine
-keybind.unit_command_boost.name = Unit Command: Boost
-keybind.unit_command_load_units.name = Unit Command: Load Units
-keybind.unit_command_load_blocks.name = Unit Command: Load Blocks
-keybind.unit_command_unload_payload.name = Unit Command: Unload Payload
-keybind.unit_command_enter_payload.name = Unit Command: Enter Payload
+
+keybind.unit_command_move.name = Mệnh lệnh đơn vị: Di chuyển
+keybind.unit_command_repair.name = Mệnh lệnh đơn vị: Sửa chữa
+keybind.unit_command_rebuild.name = Mệnh lệnh đơn vị: Xây lại
+keybind.unit_command_assist.name = Mệnh lệnh đơn vị: Hỗ trợ
+keybind.unit_command_mine.name = Mệnh lệnh đơn vị: Khai thác
+keybind.unit_command_boost.name = Mệnh lệnh đơn vị: Tăng cường
+keybind.unit_command_load_units.name = Mệnh lệnh đơn vị: Nhập đơn vị
+keybind.unit_command_load_blocks.name = Mệnh lệnh đơn vị: Nhập khối công trình
+keybind.unit_command_unload_payload.name = Mệnh lệnh đơn vị: Dỡ khối hàng
+keybind.unit_command_enter_payload.name = Mệnh lệnh đơn vị: Vào khối hàng
+
 keybind.rebuild_select.name = Chọn khu vực xây dựng lại
 keybind.schematic_select.name = Chọn khu vực
-keybind.schematic_menu.name = Menu bản thiết kế
+keybind.schematic_menu.name = Trình đơn bản thiết kế
 keybind.schematic_flip_x.name = Lật bản thiết kế X
 keybind.schematic_flip_y.name = Lật bản thiết kế Y
 keybind.category_prev.name = Danh mục trước
@@ -1253,7 +1269,7 @@ keybind.block_select_07.name = Danh mục/Khối 7
 keybind.block_select_08.name = Danh mục/Khối 8
 keybind.block_select_09.name = Danh mục/Khối 9
 keybind.block_select_10.name = Danh mục/Khối 10
-keybind.fullscreen.name = Chế độ toàn màn hình
+keybind.fullscreen.name = Hoán chuyển toàn màn hình
 keybind.select.name = Chọn/Bắn
 keybind.diagonal_placement.name = Đặt chéo
 keybind.pick.name = Chọn khối
@@ -1265,10 +1281,10 @@ keybind.pickupCargo.name = Nhặt hàng
 keybind.dropCargo.name = Thả hàng
 keybind.shoot.name = Bắn
 keybind.zoom.name = Thu phóng
-keybind.menu.name = Menu
+keybind.menu.name = Trình đơn
 keybind.pause.name = Tạm dừng
 keybind.pause_building.name = Tạm dừng/Tiếp tục Xây
-keybind.minimap.name = Bản đồ mini
+keybind.minimap.name = Bản đồ nhỏ
 keybind.planet_map.name = Bản đồ hành tinh
 keybind.research.name = Nghiên cứu
 keybind.block_info.name = Thông tin khối
@@ -1277,13 +1293,13 @@ keybind.player_list.name = Danh sách người chơi
 keybind.console.name = Bảng điều khiển
 keybind.rotate.name = Xoay
 keybind.rotateplaced.name = Xoay khối (Giữ)
-keybind.toggle_menus.name = Ẩn/Hiện Menu
+keybind.toggle_menus.name = Ẩn/Hiện Trình đơn
 keybind.chat_history_prev.name = Lịch sử trò chuyện trước
 keybind.chat_history_next.name = Lịch sử trò chuyện sau
 keybind.chat_scroll.name = Cuộn trò chuyện
 keybind.chat_mode.name = Thay đổi chế độ trò chuyện
-keybind.drop_unit.name = Thả quân
-keybind.zoom_minimap.name = Thu phóng bản đồ mini
+keybind.drop_unit.name = Thả đơn vị
+keybind.zoom_minimap.name = Thu phóng bản đồ nhỏ
 mode.help.title = Mô tả chế độ
 mode.survival.name = Sinh tồn
 mode.survival.description = Chế độ bình thường. Tài nguyên hạn chế và lượt đến tự động.\n[gray]Yêu cầu nơi xuất hiện kẻ địch trong bản đồ để chơi.
@@ -1295,14 +1311,14 @@ mode.pvp.description = Chiến đấu với những người chơi khác trên c
 mode.attack.name = Tấn công
 mode.attack.description = Phá hủy căn cứ của kẻ địch. \n[gray]Cần căn cứ màu đỏ trong bản đồ để chơi.
 mode.custom = Tùy chỉnh luật
+
 rules.invaliddata = Dữ liệu bộ nhớ tạm không hợp lệ.
 rules.hidebannedblocks = Ẩn các khối bị cấm
-
 rules.infiniteresources = Tài nguyên vô hạn
-rules.onlydepositcore = Chỉ cho phép đưa tài nguyên vào căn cứ
+rules.onlydepositcore = Chỉ cho phép đưa tài nguyên vào lõi
 rules.derelictrepair = Cho phép sửa khối bỏ hoang
 rules.reactorexplosions = Nổ lò phản ứng
-rules.coreincinerates = Hủy vật phẩm khi căn cứ đầy
+rules.coreincinerates = Hủy vật phẩm khi lõi đầy
 rules.disableworldprocessors = Vô hiệu hoá bộ xử lý thế giới
 rules.schematic = Cho phép dùng bản thiết kế
 rules.wavetimer = Đếm ngược đợt
@@ -1311,33 +1327,33 @@ rules.waves = Đợt
 rules.attack = Chế độ tấn công
 rules.buildai = AI Xây dựng căn cứ
 rules.buildaitier = Cấp độ AI xây dựng
-rules.rtsai = AI Chiến thuật
+rules.rtsai = AI Chiến thuật (WIP - Đang thực hiện)
 rules.rtsminsquadsize = Kích thước đội hình tối thiểu
 rules.rtsmaxsquadsize = Kích thước đội hình tối đa
 rules.rtsminattackweight = Sức tấn công tối thiểu
 rules.cleanupdeadteams = Xóa công trình của đội bị đánh bại (PvP)
-rules.corecapture = Chiếm căn cứ khi phá hủy
+rules.corecapture = Chiếm lõi khi phá hủy
 rules.polygoncoreprotection = Bảo vệ lõi kiểu đa giác.
 rules.placerangecheck = Kiểm tra phạm vi xây dựng
-rules.enemyCheat = Tài nguyên vô hạn (kẻ địch)
+rules.enemyCheat = Tài nguyên kẻ địch vô hạn
 rules.blockhealthmultiplier = Hệ số độ bền khối
 rules.blockdamagemultiplier = Hệ số sát thương của khối
-rules.unitbuildspeedmultiplier = Hệ số tốc độ sản xuất lính
+rules.unitbuildspeedmultiplier = Hệ số tốc độ sản xuất đơn vị
 rules.unitcostmultiplier = Hệ số yêu cầu tài nguyên sản xuất đơn vị
 rules.unithealthmultiplier = Hệ số độ bền của đơn vị
 rules.unitdamagemultiplier = Hệ số sát thương của đơn vị
 rules.unitcrashdamagemultiplier = Hệ số sát thương của đơn vị khi bị bắn rơi
 rules.solarmultiplier = Hệ số năng lượng mặt trời
-rules.unitcapvariable = Căn cứ tăng giới hạn đơn vị
+rules.unitcapvariable = Lõi tăng giới hạn đơn vị
 rules.unitpayloadsexplode = Khối hàng mang theo phát nổ cùng đơn vị
-rules.unitcap = Giới hạn đơn vị
+rules.unitcap = Giới hạn đơn vị ban đầu
 rules.limitarea = Giới hạn kích thước bản đồ
-rules.enemycorebuildradius = Bán kính không xây dựng trong căn cứ của kẻ địch:[lightgray] (ô)
+rules.enemycorebuildradius = Bán kính không xây dựng từ lõi của kẻ địch:[lightgray] (ô)
 rules.wavespacing = Thời gian giữa các đợt:[lightgray] (giây)
-rules.initialwavespacing = Thời gian giữa các đợt ban đầu:[lightgray] (sec)
+rules.initialwavespacing = Thời gian giữa các đợt ban đầu:[lightgray] (giây)
 rules.buildcostmultiplier = Hệ số chi phí xây dựng
 rules.buildspeedmultiplier = Hệ số tốc độ xây dựng
-rules.deconstructrefundmultiplier = Hệ số số vật phẩm hoàn lại khi phá công trình
+rules.deconstructrefundmultiplier = Hệ số số vật phẩm hoàn lại khi phá dỡ công trình
 rules.waitForWaveToEnd = Đợt chờ hết kẻ địch
 rules.wavelimit = Bản đồ kết thúc sau lượt
 rules.dropzoneradius = Bán kính vùng thả:[lightgray] (ô)
@@ -1353,17 +1369,18 @@ rules.title.environment = Môi trường
 rules.title.teams = Đội
 rules.title.planet = Hành tinh
 rules.lighting = Ánh sáng
-rules.fog = Hạn chế tầm nhìn
+rules.fog = Sương mù chiến tranb
 rules.fire = Lửa
-rules.anyenv = <Any>
+rules.anyenv = <Bất kỳ>
 rules.explosions = Sát thương nổ của Khối/Đơn vị
 rules.ambientlight = Ánh sáng môi trường
 rules.weather = Thời tiết
 rules.weather.frequency = Tần suất:
 rules.weather.always = Luôn luôn
 rules.weather.duration = Thời gian:
-rules.placerangecheck.info = Prevents players from placing anything near enemy buildings. When trying to place a turret, the range is increased, so the turret will not be able to reach the enemy.
-rules.onlydepositcore.info = Prevents units from depositing items into any buildings except cores.
+
+rules.placerangecheck.info = Ngăn chặn người chơi khỏi việc đặt bất kỳ thứ gì gần công trình kẻ thù. Khi cố đặt một bệ súng, phạm vi sẽ bị tăng lên, để bệ súng không thể bắn tới kẻ địch.
+rules.onlydepositcore.info = Ngăn chặn các đơn vị khỏi việc thả vật phẩm vào bất kỳ công trình nào ngoài lõi.
 
 content.item.name = Vật phẩm
 content.liquid.name = Chất lỏng
@@ -1372,6 +1389,7 @@ content.block.name = Khối
 content.status.name = Trạng thái hiệu ứng
 content.sector.name = Khu vực
 content.team.name = Phe
+
 wallore = (Tường)
 
 item.copper.name = Đồng
@@ -1447,6 +1465,7 @@ unit.scepter.name = Scepter
 unit.reign.name = Reign
 unit.vela.name = Vela
 unit.corvus.name = Corvus
+
 unit.stell.name = Stell
 unit.locus.name = Locus
 unit.precept.name = Precept
@@ -1498,7 +1517,7 @@ block.scrap-wall.name = Tường phế liệu
 block.scrap-wall-large.name = Tường phế liệu lớn
 block.scrap-wall-huge.name = Tường phế liệu khổng lồ
 block.scrap-wall-gigantic.name = Tường phế liệu siêu khổng lồ
-block.thruster.name = Thruster
+block.thruster.name = Máy đẩy
 block.kiln.name = Lò nung
 block.graphite-press.name = Máy nén than chì
 block.multi-press.name = Máy nén than chì lớn
@@ -1521,7 +1540,7 @@ block.snow.name = Tuyết
 block.crater-stone.name = Đá miệng núi lửa
 block.sand-water.name = Nước cát
 block.darksand-water.name = Nước cát đen
-block.char.name = Char
+block.char.name = Than
 block.dacite.name = Đá Dacit
 block.rhyolite.name = Đá Ryolit
 block.dacite-wall.name = Tường Dacit
@@ -1620,9 +1639,9 @@ block.liquid-void.name = Hủy chất lỏng
 block.power-void.name = Hủy năng lượng
 block.power-source.name = Nguồn năng lượng
 block.unloader.name = Điểm dỡ hàng
-block.vault.name = Nhà kho
+block.vault.name = Kho chứa
 block.wave.name = Wave
-block.tsunami.name = Sóng thần
+block.tsunami.name = Tsunami
 block.swarmer.name = Swarmer
 block.salvo.name = Salvo
 block.ripple.name = Ripple
@@ -1640,8 +1659,8 @@ block.pulse-conduit.name = Ống dẫn titan
 block.plated-conduit.name = Ống dẫn bọc giáp
 block.phase-conduit.name = Ống dẫn lượng tử
 block.liquid-router.name = Bộ phân phát chất lỏng
-block.liquid-tank.name = Thùng chất lỏng
-block.liquid-container.name = Bình chất lỏng
+block.liquid-tank.name = Bể chứa chất lỏng
+block.liquid-container.name = Thùng chứa chất lỏng
 block.liquid-junction.name = Giao điểm chất lỏng
 block.bridge-conduit.name = Cầu dẫn chất lỏng
 block.rotary-pump.name = Bơm điện
@@ -1665,16 +1684,16 @@ block.rtg-generator.name = Máy phát điện RTG
 block.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.foreshadow.name = Foreshadow
-block.container.name = Kho chứa
+block.container.name = Thùng chứa
 block.launch-pad.name = Bệ phóng
 block.segment.name = Segment
 block.ground-factory.name = Nhà máy Bộ binh
 block.air-factory.name = Nhà máy Không quân
 block.naval-factory.name = Nhà máy Hải quân
-block.additive-reconstructor.name = Máy nâng cấp đơn vị cấp 2
-block.multiplicative-reconstructor.name = Máy nâng cấp đơn vị cấp 3
-block.exponential-reconstructor.name = Máy nâng cấp đơn vị cấp 4
-block.tetrative-reconstructor.name = Máy nâng cấp đơn vị cấp 5
+block.additive-reconstructor.name = Máy tái thiết cấp cộng
+block.multiplicative-reconstructor.name = Máy tái thiết cấp nhân
+block.exponential-reconstructor.name = Máy tái thiết cấp mũ
+block.tetrative-reconstructor.name = Máy tái thiết cấp lũy thừa lặp
 block.payload-conveyor.name = Băng chuyền khối hàng
 block.payload-router.name = Bộ định tuyến khối hàng
 block.duct.name = Ống chân không
@@ -1699,6 +1718,8 @@ block.payload-unloader.name = Máy dỡ vật phẩm
 block.payload-unloader.description = Lấy chất lỏng và vật phẩm từ khối.
 block.heat-source.name = Nguồn nhiệt
 block.heat-source.description = Khối này cho bạn vô hạn nhiệt.
+
+#Erekir
 block.empty.name = Trống
 block.rhyolite-crater.name = Miệng Núi Lửa Rhyolit
 block.rough-rhyolite.name = Rhyolite Thô
@@ -1722,8 +1743,8 @@ block.arkyic-vent.name = Lỗ Thông Hơi Arkyic
 block.yellow-stone-vent.name = Lỗ Thông Hơi Đá Vàng
 block.red-stone-vent.name = Lỗ Thông Hơi Đá Đỏ
 block.crystalline-vent.name = Lỗ thông hơi Pha Lê
-block.redmat.name = Redmat
-block.bluemat.name = Bluemat
+block.redmat.name = Thảm đỏ
+block.bluemat.name = Thảm xanh
 block.core-zone.name = Khu Vực Căn Cứ
 block.regolith-wall.name = Tường Regolith
 block.yellow-stone-wall.name = Tường Đá Vàng
@@ -1737,8 +1758,8 @@ block.red-ice-wall.name = Tường Băng Đỏ
 block.red-stone-wall.name = Tường Đá Đỏ
 block.red-diamond-wall.name = Tường Kim Cương Đỏ
 block.redweed.name = Rêu Đỏ
-block.pur-bush.name = Pur Bush
-block.yellowcoral.name = Yellowcoral
+block.pur-bush.name = Bụi cây tím
+block.yellowcoral.name = San hô vàng
 block.carbon-boulder.name = Tảng Đá Carbon
 block.ferric-boulder.name = Tảng Đá Ferric
 block.beryllic-boulder.name = Tảng Đá Beryllic
@@ -1798,7 +1819,7 @@ block.reinforced-conduit.name = Ống dẫn cứng
 block.reinforced-liquid-junction.name = Điểm giao ống dẫn cứng
 block.reinforced-bridge-conduit.name = Cầu ống dẫn cứng
 block.reinforced-liquid-router.name = Bộ phân phát chất lỏng cứng
-block.reinforced-liquid-container.name = Container chất lỏng gia cố
+block.reinforced-liquid-container.name = Thùng chứa chất lỏng gia cố
 block.reinforced-liquid-tank.name = Bể chứa chất lỏng gia cố
 block.beam-node.name = Chốt tia điện
 block.beam-tower.name = Chốt tia điện lớn
@@ -1815,8 +1836,8 @@ block.eruption-drill.name = Máy khoan siêu động lực
 block.core-bastion.name = Căn cứ: Pháo đài
 block.core-citadel.name = Căn cứ: Thủ phủ
 block.core-acropolis.name = Căn cứ: Đại đô
-block.reinforced-container.name = Container gia cố
-block.reinforced-vault.name = Kho gia cố
+block.reinforced-container.name = Thùng chứa gia cố
+block.reinforced-vault.name = Kho chứa gia cố
 block.breach.name = Breach
 block.sublimate.name = Sublimate
 block.titan.name = Titan
@@ -1846,8 +1867,9 @@ block.diffuse.name = Diffuse
 block.basic-assembler-module.name = Module lắp ráp đơn vị
 block.smite.name = Smite
 block.malign.name = Malign
-block.flux-reactor.name = Lò phản ứng bốc hơi
+block.flux-reactor.name = Lò phản ứng thông lượng
 block.neoplasia-reactor.name = Lò phản ứng siêu tân sinh
+
 block.switch.name = Công tắc
 block.micro-processor.name = Bộ xử lý nhỏ
 block.logic-processor.name = Bộ xử lý
@@ -1868,14 +1890,14 @@ hint.skip = Bỏ qua
 hint.desktopMove = Sử dụng [accent][[WASD][] để di chuyển.
 hint.zoom = [accent]Cuộn[] để phóng to hoặc thu nhỏ.
 hint.desktopShoot = [accent][[chuột trái][] để bắn.
-hint.depositItems = Để di chuyển các vật phẩm, hãy kéo từ tàu của bạn đến căn cứ.
+hint.depositItems = Để di chuyển các vật phẩm, hãy kéo từ tàu của bạn đến lõi.
 hint.respawn = Để hồi sinh như tàu của bạn, nhấn [accent][[V][].
 hint.respawn.mobile = Bạn đã chuyển điều khiển một đơn vị/công trình. Để hồi sinh như một con tàu, [accent]nhấn vào hình đại diện ở phía trên cùng bên trái.[]
 hint.desktopPause = Nhấn [accent][[Space][] để tạm dừng và tiếp tục trò chơi.
 hint.breaking = [accent]Chuột phải[] và kéo để phá vỡ các khối.
 hint.breaking.mobile = Kích hoạt \ue817 [accent]Cây búa[] ở phía dưới cùng bên phải và nhấn để phá vỡ các khối.\n\nGiữ ngón tay của bạn trong một giây và kéo để phá khối trong vùng được chọn.
 hint.blockInfo = Xem thông tin của một khối bằng cách chọn nó trong [accent]menu xây dựng[], Sau đó chọn nút [accent][[?][] ở bên phải.
-hint.derelict = [accent]Bỏ hoang[] là các công trình bị hỏng của các căn cứ cũ mà không còn hoạt động.\n\nCác công trình này có thể [accent]được tháo dỡ[] để nhận được nguyên liệu.
+hint.derelict = [accent]Bỏ hoang[] là các công trình bị hỏng của các căn cứ cũ mà không còn hoạt động.\n\nCác công trình này có thể [accent]được tháo dỡ[] để nhận được tài nguyên hoặc sửa chữa.
 hint.research = Sử dụng nút \ue875 [accent]Nghiên cứu[] để nghiên cứu công nghệ mới.
 hint.research.mobile = Sử dụng nút \ue875 [accent]Nghiên cứu[] trong \ue88c [accent]Trình đơn[] để nghiên cứu công nghệ mới.
 hint.unitControl = Giữ [accent][[L-ctrl][] và [accent]nhấp chuột[] để điều khiển đơn vị của bạn hoặc súng.
@@ -1883,8 +1905,8 @@ hint.unitControl.mobile = [accent]Nhấp đúp[] để điều khiển đơn v
 hint.unitSelectControl = Để điều khiển đơn vị, hãy nhấn [accent]chế độ ra lệnh[] bằng cách giữ [accent]L-shift.[]\nKhi ở chế độ lệnh, hãy nhấn và kéo để chọn đơn vị. [accent]Nhấn chuột phải[] vào một vị trí hoặc mục tiêu để ra lệnh đơn vị đó.
 hint.unitSelectControl.mobile = Để điều khiển đơn vị, hãy nhấn [accent]chế độ ra lệnh[] bằng cách nhấn nút [accent]lệnh[] ở phía dưới cùng bên trái.\nKhi ở chế độ ra lệnh, hãy nhấn và kéo để chọn đơn vị. Tap vào một vị trí hoặc mục tiêu để ra lệnh đơn vị đó.
 hint.launch = Sau khi thu thập đủ tài nguyên, bạn có thể [accent]Phóng[] bằng cách chọn các khu vực lân cận từ \ue827 [accent]Bản đồ[] ở phía dưới cùng bên phải.
-hint.launch.mobile = Sau khi thu thập đủ tài nguyên, bạn có thể [accent]Phóng[] bằng cách chọn các khu vực lân cận từ \ue827 [accent]Bản đồ[] trong \ue88c [accent]Menu[].
-hint.schematicSelect = Giữ [accent][[F][] và kéo để chọn các khối để sao chép và dán.\n\n[accent][[Middle Click][] để sao chép một khối.
+hint.launch.mobile = Sau khi thu thập đủ tài nguyên, bạn có thể [accent]Phóng[] bằng cách chọn các khu vực lân cận từ \ue827 [accent]Bản đồ[] trong \ue88c [accent]Trình đơn[].
+hint.schematicSelect = Giữ [accent][[F][] và kéo để chọn các khối để sao chép và dán.\n\n[accent][[Nhấp chuột giữa][] để sao chép một khối.
 hint.rebuildSelect = Giữ [accent][[B][] và kéo để chọn các khối bị hỏng.\nChúng sẽ được tự động được xây lại.
 hint.rebuildSelect.mobile = Chọn nút \ue874 sao chép, sau đó nhấp nút \ue80f xây lại và kéo để chọn khu vực của các khối đã bị phá hủy.\nViệc này sẽ giúp xây lại chúng một cách tự động.
 hint.conveyorPathfind = Giữ [accent][[L-Ctrl][] trong khi kéo băng chuyền để tự động tạo đường dẫn.
@@ -1901,16 +1923,17 @@ hint.coreUpgrade = Các căn cứ có thể được nâng cấp bằng cách [a
 hint.presetLaunch = Khác khu vực đáp [accent] xám[], như [accent]Frozen Forest[], có thể được phóng đến từ bất cứ đâu. Nó không yêu cầu chiếm các khu vực lân cận.\n\n[accent]Các khu vực được đánh số[], chẳng hạn như cái này, là [accent]không bắt buộc[].
 hint.presetDifficulty = Khu vực này có [scarlet]mối đe dọa cao[].\nPhóng đến khu vực như vậy [accent]không được khuyến khích[] nếu không có công nghệ và chuẩn bị phù hợp.
 hint.coreIncinerate = Sau khi căn cứ đầy vật phẩm, bất kì vật phẩm vào thuộc loại đó nhận được sẽ bị [accent]tiêu hủy[].
-hint.factoryControl = Để đặt [accent]hướng đầu ra[] của một nhà máy, nhấp vào một khối nhà máy trong chế độ ra lệnh, sau đó nhấp chuột phải vào một vị trí.\nCác đơn vị sản xuất bởi nó sẽ tự động di chuyển đến đó.
-hint.factoryControl.mobile = Để đặt [accent]hướng đầu ra[] của một nhà máy, tap vào một khối nhà máy trong chế độ ra lệnh, sau đó tap vào một vị trí.\nCác đơn vị sản xuất bởi nó sẽ tự động di chuyển đến đó.
-gz.mine = Di chuyển gần \uf8c4 [accent]quặng đồng[] trên đất và click vào nó để bắt đầu khai thác.
+hint.factoryControl = Để đặt [accent]điểm đầu ra[] của một nhà máy, nhấp vào một khối nhà máy trong chế độ ra lệnh, sau đó nhấp chuột phải vào một vị trí.\nCác đơn vị sản xuất bởi nó sẽ tự động di chuyển đến đó.
+hint.factoryControl.mobile = Để đặt [accent]điểm đầu ra[] của một nhà máy, nhấp vào một khối nhà máy trong chế độ ra lệnh, sau đó nhấp vào một vị trí.\nCác đơn vị sản xuất bởi nó sẽ tự động di chuyển đến đó.
+
+gz.mine = Di chuyển gần \uf8c4 [accent]quặng đồng[] trên đất và nhấp vào nó để bắt đầu khai thác.
 gz.mine.mobile = Di chuyển gần \uf8c4 [accent]quặng đồng[] trên đất và nhấp vào nó để bắt đầu khai thác.
-gz.research = Mở \ue875 tiến trình.\nNghiên cứu \uf870 [accent]Máy khoan cơ khí[], sau đó chọn nó từ menu ở góc dưới bên phải.\nNhấp vào một quặng đồng để đặt nó.
-gz.research.mobile = Mở \ue875 tiến trình.\nNghiên cứu \uf870 [accent]Máy khoan cơ khí[], sau đó chọn nó từ menu ở góc dưới bên phải.\nNhấp vào một quặng đồng để đặt nó.\n\nNhấp vào \ue800 [accent]dấu tích[] ở góc dưới bên phải để xác nhận.
+gz.research = Mở \ue875 tiến trình.\nNghiên cứu \uf870 [accent]Máy khoan cơ khí[], sau đó chọn nó từ trình đơn ở góc dưới bên phải.\nNhấp vào một quặng đồng để đặt nó.
+gz.research.mobile = Mở \ue875 tiến trình.\nNghiên cứu \uf870 [accent]Máy khoan cơ khí[], sau đó chọn nó từ trình đơn ở góc dưới bên phải.\nNhấp vào một quặng đồng để đặt nó.\n\nNhấp vào \ue800 [accent]dấu tích[] ở góc dưới bên phải để xác nhận.
 gz.conveyors = Nghiên cứu và đặt \uf896 [accent]băng chuyền[] để di chuyển các nguyên liệu được khai thác\n từ các máy khoan đến căn cứ.\n\nNhấp và kéo để đặt nhiều băng chuyền.\n[accent]Cuộn[] để xoay.
 gz.conveyors.mobile = Nghiên cứu và đặt \uf896 [accent]băng chuyền[] để di chuyển các nguyên liệu được khai thác\n từ các máy khoan đến căn cứ.\n\nGiữ ngón tay một chút và kéo để đặt nhiều băng chuyền.
 gz.drills = Mở rộng hoạt động khai thác.\nĐặt thêm Máy khoan cơ khí.\nKhai thác 100 đồng.
-gz.lead = \uf837 [accent]Chì[] là một nguyên liệu được sử dụng phổ biến.\nHãy đặt các máy khoan để khai thác chì.
+gz.lead = \uf837 [accent]Chì[] là một tài nguyên được sử dụng phổ biến.\nHãy đặt các máy khoan để khai thác chì.
 gz.moveup = \ue804 Di chuyển lên để xem các nhiệm vụ tiếp theo.
 gz.turrets = Nghiên cứu và đặt 2 súng \uf861 [accent]Duo[] để bảo vệ căn cứ. Súng Duo cần \uf838 [accent]đạn[] từ băng chuyền.
 gz.duoammo = Tiếp đạn cho súng Duo bằng [accent]đồng[], sử dụng băng chuyền.
@@ -1918,18 +1941,19 @@ gz.walls = [accent]Tường[] có thể ngăn chặn sát thương đến các c
 gz.defend = Quân địch đang đến, chuẩn bị bảo vệ.
 gz.aa = Các đơn vị bay không thể dễ dàng bị bắn hạ với các súng tiêu chuẩn.\n\uf860 [accent]Scatter[] cung cấp tốt khả năng phòng không, nhưng cần \uf837 [accent]chì[] là đạn.
 gz.scatterammo = Tiếp đạn cho súng Scatter bằng [accent]chì[], sử dụng băng chuyền.
-gz.supplyturret = [accent]Súng cung cấp
+gz.supplyturret = [accent]Cấp đạn cho súng
 gz.zone1 = Đây là khu vực quân địch đáp xuống.
 gz.zone2 = Bất kỳ thứ gì được xây dựng trong bán kính này sẽ bị phá hủy khi một đợt mới bắt đầu.
 gz.zone3 = Đợt tiếp theo sẽ bắt đầu ngay bây giờ.\nHãy chuẩn bị.
 gz.finish = Đặt thêm các súng, khai thác thêm nguyên liệu,\nvà vừa bảo vệ căn cứ, vượt qua tất cả các đợt để [accent]chiếm khu vực[].
+
 onset.mine = Nhấp để khai thác \uf748 [accent]beryllium[] từ tường.\n\nSử dụng [accent][[WASD] để di chuyển.
 onset.mine.mobile = Nhấp để khai thác \uf748 [accent]beryllium[] từ tường.
 onset.research = Mở \ue875 tiến trình.\nNghiên cứu, sau đó đặt \uf73e [accent]Turbine điện hơi nước[] trên lỗ thông hơi.\nĐiều này sẽ tạo ra [accent]điện[].
 onset.bore = Nghiên cứu và đặt \uf741 [accent]Khoan plasma[].\nĐiều này sẽ tự động khai thác nguyên liệu từ tường.
 onset.power = Để nối [accent]điện[] cho khoan plasma, nghiên cứu và đặt \uf73d [accent]Chốt tia điện[].\nKết nối Turbine điện hơi nước với khoan plasma.
-onset.ducts = Nghiên cứu và đặt \uf799 [accent]ống chân không[] để di chuyển các nguyên liệu được khai thác từ các máy khoan đến căn cứ.\nNhấp và kéo để đặt nhiều ống chân không.\n[accent]Cuộn[] để xoay.
-onset.ducts.mobile = Nghiên cứu và đặt \uf799 [accent]ống chân không[] để di chuyển các nguyên liệu được khai thác từ các máy khoan đến căn cứ.\n\nGiữ ngón tay một chút và kéo để đặt nhiều ống chân không.
+onset.ducts = Nghiên cứu và đặt \uf799 [accent]ống chân không[] để di chuyển các nguyên liệu được khai thác từ các máy khoan đến lõi.\nNhấp và kéo để đặt nhiều ống chân không.\n[accent]Cuộn[] để xoay.
+onset.ducts.mobile = Nghiên cứu và đặt \uf799 [accent]ống chân không[] để di chuyển các nguyên liệu được khai thác từ các máy khoan đến lõi.\n\nGiữ ngón tay một chút và kéo để đặt nhiều ống chân không.
 onset.moremine = Mở rộng hoạt động khai thác.\nĐặt thêm Máy khoan plasma và sử dụng chốt tia điện và ống chân không để kết nối và vận chuyển.\nKhai thác 200 beryllium.
 onset.graphite = Các khối phức tạp hơn cần \uf835 [accent]than chì[].\nĐặt khoan plasma để khai thác than chì.
 onset.research2 = Bắt đầu nghiên cứu [accent]nhà máy[].\nNghiên cứu \uf74d [accent]máy phá đá[] và \uf779 [accent]lò tinh luyện silicon[].
@@ -1938,21 +1962,22 @@ onset.crusher = Sử dụng \uf74d [accent]máy phá đá[] để khai thác cá
 onset.fabricator = Sử dụng [accent]đơn vị[] để khám phá bản đồ, bảo vệ các công trình và tấn công quân địch.\nNghiên cứu và đặt \uf6a2 [accent]máy chế tạo xe tăng[].
 onset.makeunit = Sản xuất một đơn vị.\nSử dụng nút "?" để xem các yêu cầu của máy đã chọn.
 onset.turrets = Các đơn vị rất tốt, nhưng [accent]súng[] cung cấp khả năng phòng thủ tốt hơn nếu được sử dụng hiệu quả.\nĐặt một \uf6eb [accent]Breach[].\nSúng cần \uf748 [accent]đạn[].
-onset.turretammo = Tiếp đạn cho súng bằng [accent]beryllium[].
+onset.turretammo = Tiếp đạn cho súng bằng [accent]beryllium[] dùng ống chân không.
 onset.walls = [accent]Tường[] có thể ngăn chặn sát thương đến các công trình.\nĐặt một số \uf6ee [accent]tường beryllium[] xung quanh súng.
 onset.enemies = Quân địch đang đến, hãy chuẩn bị phòng thủ.
 onset.defenses = [accent]Thiết lập phòng thủ:[lightgray] {0}
 onset.attack = Quân địch đã suy yếu.\nHãy phản công.
-onset.cores = Các căn cứ có thể được đặt trên [accent]ô căn cứ[].\nCác căn cứ mới có thể được đặt ở bất kỳ đâu trên bản đồ.\nĐặt một \uf725 căn cứ.
+onset.cores = Các lõi mới có thể được đặt trên [accent]ô đặt lõi[].\nCác lõi mới hoạt động như một tiền cứ và chia sẻ kho tài nguyên với các lõi khác.\nĐặt một \uf725 lõi.
 onset.detect = Quân địch sẽ phát hiện bạn trong vòng 2 phút.\nHãy chuẩn bị phòng thủ, khai thác và sản xuất.
-onset.commandmode = Giữ [accent]Shift[] để vào [accent]chế độ điều khiển quân[].\n[accent]Nhấp chuột trái và kéo[] để chọn các đơn vị.\n[accent]Chuộc phải[] để điều khiển các đơn vị di chuyển hoặc tấn công.
-onset.commandmode.mobile = Nhấn vào [accent]nút điều khiển[] để vào [accent]chế độ điều khiển quân[].\nGiữ một ngón tay, sau đó [accent]kéo[] để chọn các đơn vị.\n[accent]Nhấp[] để điều khiển các đơn vị di chuyển hoặc tấn công.
-aegis.tungsten = Tungsten có thể khai thác bằng [accent]khoan thủy lực[].\nCông trình này cần có [accent]nước[] và [accent]năng lượng[].
-split.pickup = Một số khối có thể được mang bởi đơn vị.\nNhấp vào [accent]container[] và đặt nó lên [accent]máy nạp vật phẩm[].\n(Phím mặc định là [ và ] để mang và thả)
-split.pickup.mobile = Một số khối có thể được mang bởi đơn vị.\nNhấp vào [accent]container[] và đặt nó lên [accent]máy nạp vật phẩm[].\n(Để mang hoặc thả một khối, ấn giữ nó một chút.)
+onset.commandmode = Giữ [accent]Shift[] để vào [accent]chế độ điều khiển đơn vị[].\n[accent]Nhấp chuột trái và kéo[] để chọn các đơn vị.\n[accent]Chuột phải[] để điều khiển các đơn vị di chuyển hoặc tấn công.
+onset.commandmode.mobile = Nhấn vào [accent]nút mệnh lệnh[] để vào [accent]chế độ điều khiển đơn vị[].\nGiữ một ngón tay, sau đó [accent]kéo[] để chọn các đơn vị.\n[accent]Nhấp[] để điều khiển các đơn vị di chuyển hoặc tấn công.
+aegis.tungsten = Tungsten có thể khai thác bằng [accent]khoan thủy lực[].\nCông trình này cần có [accent]nước[] và [accent]điện[].
+
+split.pickup = Một số khối có thể được mang theo bởi đơn vị.\nNhấp vào [accent]thùng chứa[] và đặt nó lên [accent]máy nạp vật phẩm[].\n(Phím mặc định là [ và ] để mang theo và thả)
+split.pickup.mobile = Một số khối có thể được mang theo bởi đơn vị.\nNhấp vào [accent]thùng chứa[] và đặt nó lên [accent]máy nạp vật phẩm[].\n(Để mang theo hoặc thả một khối, ấn giữ nó một chút.)
 split.acquire = Bạn cần một số tungsten để sản xuất đơn vị.
 split.build = Đơn vị phải được vận chuyển đến phía bên kia của tường.\nĐặt hai [accent]Máy phóng từ trường[], một ở mỗi bên của tường.\nĐặt liên kết bằng cách nhấp vào một trong số chúng, sau đó chọn cái còn lại.
-split.container = Tương tự như container, đơn vị cũng có thể được vận chuyển bằng [accent]Máy phóng từ trường[].\nĐặt một máy chế tạo đơn vị cạnh máy phóng từ trường để nạp chúng, sau đó gửi chúng qua tường để tấn công căn cứ địch.
+split.container = Tương tự như thùng chứa, đơn vị cũng có thể được vận chuyển bằng [accent]Máy phóng từ trường[].\nĐặt một máy chế tạo đơn vị cạnh máy phóng từ trường để nạp chúng, sau đó gửi chúng qua tường để tấn công căn cứ địch.
 
 item.copper.description = Dùng trong tất cả các khu xây dựng và các loại đạn dược.
 item.copper.details = Đồng, là kim loại phổ biến trên Serpulo. Có cấu trúc yếu trừ khi được tôi luyện.
@@ -1966,38 +1991,42 @@ item.coal.details = Có vẻ là vật chất hóa thạch của thực vật, h
 item.titanium.description = Dùng trong cấu trúc vận chuyển chất lỏng, máy khoan và các công trình.
 item.thorium.description = Dùng trong các công trình bền vững và có thể dùng làm nhiên liệu hạt nhân.
 item.scrap.description = Dùng làm nguyên liệu cho Máy nung phế liệu và Máy nghiền để tinh luyện thành các vật liệu khác.
-item.scrap.details = Tàn tích còn lại của các công trình và robot cũ.
-item.silicon.description = Dùng trong các tấm pin mặt trời, thiết bị điện tử phức tạp và một số loại đạn dược.
-item.plastanium.description = Dùng trong các robot tiên tiến, các cấu trúc cách điện và đạn tự phân mảnh.
+item.scrap.details = Tàn tích còn lại của các công trình và đơn vị cũ.
+item.silicon.description = Dùng trong các tấm pin mặt trời, thiết bị điện tử phức tạp và một số loại đạn dược truy đuổi.
+item.plastanium.description = Dùng trong các đơn vị tiên tiến, các cấu trúc cách điện và đạn tự phân mảnh.
 item.phase-fabric.description = Dùng trong các thiết bị điện tử tiên tiến và các cấu trúc tự sửa chữa.
 item.surge-alloy.description = Dùng trong các vũ khí tiên tiến và các cấu trúc phòng thủ phản ứng.
 item.spore-pod.description = Dùng để chuyển đổi thành dầu, chất nổ và nhiên liệu.
 item.spore-pod.details = Bào tử. Có thể là một dạng sống tổng hợp. Phát thải khí độc đối với sinh vật khác. Cực kỳ xâm lấn. Rất dễ cháy trong một số trường hợp nhất định.
 item.blast-compound.description = Dùng trong bom hoặc đạn nổ.
 item.pyratite.description = Dùng trong vũ khí gây cháy và máy phát điện chạy bằng nhiên liệu đốt.
+
+#Erekir
 item.beryllium.description = Được sử dụng trong nhiều loại công trình và đạn dược trên Erekir.
 item.tungsten.description = Được sử dụng trong các máy khoan, áo giáp và đạn dược. Yêu cầu trong việc xây dựng các công trình cao cấp hơn.
 item.oxide.description = Dùng làm chất dẫn nhiệt và cách điện cho nguồn điện.
-item.carbide.description = Được sử dụng trong các công trình tiên tiến, các đơn vị mạnh và đạn dược.
+item.carbide.description = Được sử dụng trong các công trình tiên tiến, các đơn vị hạng nặng và đạn dược.
 
 liquid.water.description = Dùng để làm mát máy móc và xử lý chất thải.
-liquid.slag.description = Dùng để tách các kim loại, hoặc phun vào kẻ thù như một loại vũ khí.
+liquid.slag.description = Dùng để tách các kim loại. Dùng trong các loại súng chất lỏng nhưng một loại đạn.
 liquid.oil.description = Dùng trong sản xuất vật liệu tiên tiến và làm đạn gây cháy.
 liquid.cryofluid.description = Dùng làm chất làm mát trong lò phản ứng, súng và nhà máy.
+
+#Erekir
 liquid.arkycite.description = Được sử dụng trong các phản ứng hóa học để phát điện và tổng hợp vật liệu.
 liquid.ozone.description = Được sử dụng như một chất oxy hóa trong sản xuất vật liệu và làm nhiên liệu. Gây nổ vừa phải.
 liquid.hydrogen.description = Được sử dụng trong khai thác tài nguyên, sản xuất đơn vị và sửa chữa công trình. Dễ cháy.
 liquid.cyanogen.description = Được sử dụng cho đạn dược, xây dựng các đơn vị tiên tiến và các phản ứng khác nhau trong các khối tiên tiến. Rất dễ cháy.
 liquid.nitrogen.description = Được sử dụng trong khai thác tài nguyên, tạo khí và sản xuất đơn vị. Trơ.
 liquid.neoplasm.description = Một sản phẩm phụ sinh học nguy hiểm của lò phản ứng Neoplasia. Lan nhanh sang bất kì khối chứa nước nào mà nó chạm vào và gây hư hại chúng. Nhớt.
-liquid.neoplasm.details = Neoplasm. Một khối lượng các tế bào tổng hợp phân chia nhanh chóng không kiểm soát với độ đặc giống như bùn. Kháng nhiệt. Cực kì nguy hiểm cho bất cứ khối nào có liên quan đến nước.\n\nQuá phức tạp và không ổn định để được phân tích. Chưa rõ được tiềm năng và ứng dụng của nó. Khuyến nghị đốt chúng trong xỉ nóng chảy
+liquid.neoplasm.details = Tế bào tân sinh. Một khối lượng các tế bào tổng hợp phân chia nhanh chóng không kiểm soát với độ đặc giống như bùn. Kháng nhiệt. Cực kì nguy hiểm cho bất cứ khối nào có liên quan đến nước.\n\nQuá phức tạp và không ổn định để được phân tích. Chưa rõ được tiềm năng và ứng dụng của nó. Khuyến nghị đốt chúng trong xỉ nóng chảy.
 
 block.derelict = \uf77e [lightgray]Bỏ hoang
-block.armored-conveyor.description = Vận chuyển vật phẩm về phía trước. Không nhận đầu vào từ phía bên cạnh.
+block.armored-conveyor.description = Vận chuyển vật phẩm về phía trước. Không nhận đầu vào không phải băng chuyền từ phía bên cạnh.
 block.illuminator.description = Phát sáng.
 block.message.description = Lưu trữ tin nhắn giao tiếp giữa đồng đội.
-block.reinforced-message.description = Lưu trữ một thông điệp để liên lạc giữa các đồng minh.
-block.world-message.description = Một khối thông điệp đùng để sử dụng trong việc làm bản đồ. Không thể bị phá hủy.
+block.reinforced-message.description = Lưu trữ tin nhắn giao tiếp giữa đồng đội.
+block.world-message.description = Một khối tin nhắn đùng để sử dụng trong việc tạo bản đồ. Không thể bị phá hủy.
 block.graphite-press.description = Nén than thành than chì.
 block.multi-press.description = Nén than thành than chì. Cần nước làm mát.
 block.silicon-smelter.description = Tinh chế silicon từ cát và than.
@@ -2011,14 +2040,14 @@ block.pyratite-mixer.description = Trộn than, chì và cát thành nhiệt th
 block.melter.description = Nung phế liệu thành xỉ.
 block.separator.description = Tách xỉ thành các thành phần khoáng của nó.
 block.spore-press.description = Nén vỏ bào tử thành dầu.
-block.pulverizer.description = Nghiền phế liệu thành cát.
-block.coal-centrifuge.description = Biến dầu thành than.
+block.pulverizer.description = Nghiền phế liệu thành cát mịn.
+block.coal-centrifuge.description = Biến đổi dầu thành than.
 block.incinerator.description = Tiêu hủy bất kỳ vật phẩm hoặc chất lỏng nào mà nó nhận được.
 block.power-void.description = Hủy tất cả năng lượng nhận được. Chỉ có trong chế độ tự do.
-block.power-source.description = Tạo ra năng lượng mãi mãi. Chỉ có trong chế độ tự do.
-block.item-source.description = Tạo ra vật phẩm mãi mãi. Chỉ có trong chế độ tự do.
+block.power-source.description = Tạo ra năng lượng vô hạn. Chỉ có trong chế độ tự do.
+block.item-source.description = Tạo ra vật phẩm vô hạn. Chỉ có trong chế độ tự do.
 block.item-void.description = Hủy mọi vật phẩm. Chỉ có trong chế độ tự do.
-block.liquid-source.description = Tạo ra chất lỏng mãi mãi. Chỉ có trong chế độ tự do.
+block.liquid-source.description = Tạo ra chất lỏng vô hạn. Chỉ có trong chế độ tự do.
 block.liquid-void.description = Loại bỏ mọi chất lỏng. Chỉ có trong chế độ tự do.
 block.payload-source.description = Tạo ra bất kì khối hàng nào. Chỉ có trong chế độ tự do.
 block.payload-void.description = Phá hủy bất kì khối hàng nào. Chỉ có trong chế độ tự do.
@@ -2032,19 +2061,19 @@ block.thorium-wall.description = Bảo vệ công trình khỏi đạn của k
 block.thorium-wall-large.description = Bảo vệ nhiều công trình khỏi đạn của kẻ thù.
 block.phase-wall.description = Bảo vệ công trình khỏi đạn của kẻ thù, phản hầu hết đạn khi va chạm.
 block.phase-wall-large.description = Bảo vệ nhiều công trình khỏi đạn của kẻ thù, phản hầu hết đạn khi va chạm.
-block.surge-wall.description = Bảo vệ công trình khỏi đạn của kẻ thù, đôi khi tạo ra tia điện khi bị bắn.
-block.surge-wall-large.description = Bảo vệ nhiều công trình khỏi đạn của kẻ thù, đôi khi tạo ra tia điện khi bị bắn.
+block.surge-wall.description = Bảo vệ công trình khỏi đạn của kẻ thù, đôi khi tạo ra tia điện khi đạn va chạm.
+block.surge-wall-large.description = Bảo vệ nhiều công trình khỏi đạn của kẻ thù, đôi khi tạo ra tia điện khi đạn va chạm.
 block.door.description = Một bức tường có thể đóng mở.
 block.door-large.description = Một bức tường có thể đóng mở.
 block.mender.description = Sửa chữa định kỳ các khối trong vùng lân cận.\nSử dụng Sợi lượng tử để tăng phạm vi và hiệu quả.
 block.mend-projector.description = Sửa chữa các khối lân cận.\nSử dụng Sợi lượng tử để tăng phạm vi và hiệu quả.
-block.overdrive-projector.description = Tăng tốc độ làm việc của các công trình lân cận.\nSử dụng Sợi lượng tử để tăng phạm vi và hiệu quả.
-block.force-projector.description = Tạo ra một trường lực lục giác xung quanh nó, bảo vệ các công trình và đơn vị bên trong khỏi bị hư hại.\nQuá nóng nếu chịu quá nhiều sát thương. Sử dụng chất làm mát để giảm nhiệt độ. Sử dụng Sợi lượng tử để tăng kích thước lá chắn.
+block.overdrive-projector.description = Tăng tốc độ làm việc của các công trình gần đó.\nSử dụng Sợi lượng tử để tăng phạm vi và hiệu quả.
+block.force-projector.description = Tạo ra một trường lực lục giác xung quanh nó, bảo vệ các công trình và đơn vị bên trong khỏi bị hư hại.\nQuá nóng nếu chịu quá nhiều sát thương. Tùy chọn sử dụng chất làm mát để chống quá nhiệt. Sử dụng Sợi lượng tử để tăng kích thước lá chắn.
 block.shock-mine.description = Giải phóng tia điện khi tiếp xúc với đơn vị đối phương.
 block.conveyor.description = Vận chuyển vật phẩm về phía trước.
 block.titanium-conveyor.description = Vận chuyển vật phẩm về phía trước. Nhanh hơn băng chuyền tiêu chuẩn.
 block.plastanium-conveyor.description = Vận chuyển vật phẩm về phía trước theo lô. Nhận các vật phẩm ở phía sau và dỡ chúng theo ba hướng ở phía trước. Yêu cầu nhiều điểm tải và dỡ hàng để có hiệu quả cao nhất.
-block.junction.description = Hoạt động như một cầu nối cho hai băng chuyền băng qua.
+block.junction.description = Hoạt động như một cầu nối cho hai băng chuyền băng qua nhau.
 block.bridge-conveyor.description = Vận chuyển vật phẩm qua nhiều loại địa hình hoặc công trình.
 block.phase-conveyor.description = Vận chuyển tức thời vật phẩm qua địa hình hoặc công trình. Phạm vi dài hơn cầu nối, nhưng cần năng lượng.
 block.sorter.description = Nếu vật phẩm giống vật phẩm được chọn sẽ được chuyển đến trước, nếu không sẽ được chuyển qua trái hoặc phải.
@@ -2064,7 +2093,7 @@ block.plated-conduit.description = Đẩy chất lỏng đến trước, không
 block.liquid-router.description = Nhận chất lỏng từ một phía và đưa đều ra ba phía còn lại. Có thể trữ một lượng chất lỏng nhất định.
 block.liquid-container.description = Lưu trữ một lượng vừa phải chất lỏng. Đưa đều ra mọi phía như bộ phân phát chất lỏng.
 block.liquid-tank.description = Trữ được một lượng lớn chất lỏng. Đưa đều ra mọi phía như bộ phân phát chất lỏng.
-block.liquid-junction.description = Chức năng như cầu cho hai ống nước băng chéo nhau.
+block.liquid-junction.description = Chức năng như cầu cho hai ống nước băng qua nhau.
 block.bridge-conduit.description = Vận chuyển chất lỏng qua nhiều loại địa hình hoặc công trình.
 block.phase-conduit.description = Vận chuyển chất lỏng qua địa hình hoặc công trình. Phạm vi dài hơn cầu nối, nhưng cần năng lượng.
 block.power-node.description = Truyền năng lượng cho các chốt được kết nối. Chốt sẽ nhận năng lượng hoặc cấp năng lượng cho bất kỳ khối nào liền kề.
@@ -2082,76 +2111,78 @@ block.solar-panel.description = Cung cấp một lượng nhỏ năng lượng t
 block.solar-panel-large.description = Cung cấp một lượng nhỏ năng lượng từ mặt trời. Hiệu quả hơn pin mặt trời tiêu chuẩn.
 block.thorium-reactor.description = Tạo ra lượng năng lượng lớn từ thorium. Yêu cầu làm mát liên tục. Sẽ phát nổ dữ dội nếu không cung cấp đủ chất làm mát.
 block.impact-reactor.description = Tạo ra lượng năng lượng khổng lồ khi đạt hiệu quả cao nhất. Yêu cầu nguồn năng lượng lớn để bắt đầu quá trình.
-block.mechanical-drill.description = Khi đặt trên quặng, xuất các vật phẩm với tốc độ chậm. Chỉ có khả năng khai thác các tài nguyên cơ bản.
+block.mechanical-drill.description = Khi đặt trên quặng, xuất vô hạn các vật phẩm với tốc độ chậm. Chỉ có khả năng khai thác các tài nguyên cơ bản.
 block.pneumatic-drill.description = Máy khoan cải tiến, có khả năng khai thác titan. Khai thác với tốc độ nhanh hơn máy khoan cơ khí.
 block.laser-drill.description = Cho phép khoan nhanh hơn nhờ công nghệ laser, nhưng đòi hỏi năng lượng. Có khả năng khai thác thorium.
 block.blast-drill.description = Máy khoan siêu cấp. Yêu cầu lượng năng lượng lớn.
-block.water-extractor.description = Khai thác nước ngầm. Được sử dụng ở những nơi không có sẵn nước.
+block.water-extractor.description = Khai thác nước ngầm. Được sử dụng ở những nơi bề mặt không có sẵn nước.
 block.cultivator.description = Lọc bào tử có trong không khí và nuôi cấy thành vỏ bào tử.
 block.cultivator.details = Công nghệ được phục hồi. Được sử dụng để sản xuất một lượng lớn bào tử. Có thể là nơi ủ ban đầu của các bào tử hiện đang bao phủ Serpulo.
 block.oil-extractor.description = Sử dụng lượng năng lượng năng lớn, sử dụng cát và nước để khoan dầu.
 block.core-shard.description = Trung tâm của căn cứ. Sau khi bị phá hủy, khu vực này sẽ bị mất.
-block.core-shard.details = Căn cứ cấp 1. Gọn nhẹ. Tự thay thế. Được trang bị tên lửa đẩy dùng một lần. Không được thiết kế để di chuyển giữa các hành tinh.
-block.core-foundation.description = Trung tâm của căn cứ. Được bọc giáp. Chứa được nhiều tài nguyên hơn Căn cứ: Cơ sỏ.
-block.core-foundation.details = Căn cứ cấp 2.
+block.core-shard.details = Lõi cấp 1. Gọn nhẹ. Tự thay thế. Được trang bị tên lửa đẩy dùng một lần. Không được thiết kế để di chuyển giữa các hành tinh.
+block.core-foundation.description = Trung tâm của căn cứ. Được bọc giáp. Chứa được nhiều tài nguyên hơn Căn cứ: Cơ sở.
+block.core-foundation.details = Lõi cấp 2.
 block.core-nucleus.description = Lõi của căn cứ. Bọc giáp chắc chắn. Lưu trữ lượng lớn tài nguyên.
-block.core-nucleus.details = Căn cứ cấp 3 và cũng là cấp cao nhất.
+block.core-nucleus.details = Lõi cấp 3 và cũng là cấp cao nhất.
 block.vault.description = Lưu trữ lượng lớn vật phẩm mỗi loại. Nội dung có thể được lấy ra với điểm dỡ hàng.
-block.container.description = Lưu trữ lượng lớn vật phẩm mỗi loại. Nội dung có thể được lấy ra với điểm dỡ hàng.
+block.container.description = Lưu trữ lượng nhỏ vật phẩm mỗi loại. Mở rộng kho lưu trữ khi đặt kế bên một lõi. Nội dung có thể được lấy ra với điểm dỡ hàng.
 block.unloader.description = Lấy các vật phẩm được chọn từ các ô gần đó.
-block.launch-pad.description = Phóng lô vật phẩm vào phân vùng.
+block.launch-pad.description = Phóng lô vật phẩm vào khu vực.
 block.launch-pad.details = Hệ thống quỹ đạo phụ để vận chuyển tài nguyên từ điểm này sang điểm khác. Các nhóm tải trọng rất dễ vỡ và không có khả năng tồn tại khi tái nhập.
 block.duo.description = Bắn xen kẽ đạn vào kẻ địch.
-block.scatter.description = Bắn chì, phế liệu hoặc thuỷ tinh vào kẻ địch trên không.
-block.scorch.description = Đốt mọi kẻ địch trên mặt đất. Hiệu quả cao ở tầm gần.
-block.hail.description = Phóng đạn nhỏ vào kẻ địch trên mặt đất ở tầm xa.
-block.wave.description = Phóng một tia chất lỏng vào kẻ địch. Tự chữa cháy nếu được cung cấp nước.
-block.lancer.description = Tích tụ và phóng tia năng lượng mạnh vào kẻ địch trên mặt đất.
-block.arc.description = Phóng tia điện vào kẻ địch trên mặt đất.
+block.scatter.description = Bắn khối chì, phế liệu hoặc thuỷ tinh vào kẻ địch trên không.
+block.scorch.description = Đốt mọi kẻ địch trên mặt đất ở gần. Hiệu quả cao ở tầm gần.
+block.hail.description = Bắn đạn nhỏ vào kẻ địch trên mặt đất ở tầm xa.
+block.wave.description = Bắn một tia chất lỏng vào kẻ địch. Tự chữa cháy nếu được cung cấp nước.
+block.lancer.description = Tích tụ và bắn tia năng lượng mạnh vào kẻ địch trên mặt đất.
+block.arc.description = Bắn tia điện vào kẻ địch trên mặt đất.
 block.swarmer.description = Bắn tên lửa truy đuổi vào kẻ địch.
 block.salvo.description = Bắn loạt đạn vào kẻ địch.
-block.fuse.description = Bắn ba đạn xuyên giáp tầm gần vào kẻ địch.
+block.fuse.description = Bắn ba tia đạn xuyên giáp tầm gần vào kẻ địch.
 block.ripple.description = Bắn cụm đạn vào kẻ địch trên mặt đất ở tầm xa.
-block.cyclone.description = Bắn đạn nổ vào kẻ địch ở gần.
-block.spectre.description = Bắn đạn xuyên giáp lớn ở kẻ địch trên không và trên mặt đất.
-block.meltdown.description = Nạp và bắn một tia laser liên tục vào kẻ địch ở gần. Cần có chất làm mát để hoạt động.
+block.cyclone.description = Bắn cụm đạn nổ vào kẻ địch ở gần.
+block.spectre.description = Bắn đạn lớn ở kẻ địch trên không và trên mặt đất.
+block.meltdown.description = Tích tụ và bắn một tia laser liên tục vào kẻ địch ở gần. Cần có chất làm mát để hoạt động.
 block.foreshadow.description = Bắn viên một viên đạn tỉa lớn ở tầm xa. Ưu tiên kẻ địch có độ bền tối đa cao nhất.
-block.repair-point.description = Liên tục sửa chữa robot ở trong phạm vi hoạt động.
+block.repair-point.description = Liên tục sửa chữa đơn vị ở trong phạm vi hoạt động.
 block.segment.description = Gây hư hại và phá hủy đạn đến. Ngoại trừ tia laser.
-block.parallax.description = Bắn một tia kéo máy bay địch và làm hư hỏng nó trong quá trình kéo.
+block.parallax.description = Bắn một tia kéo mục tiêu trên không và làm hư hỏng nó trong quá trình kéo.
 block.tsunami.description = Phóng một tia chất lỏng mạnh vào kẻ địch. Tự chữa cháy nếu được cung cấp nước hoặc chất làm mát.
 block.silicon-crucible.description = Tinh chế silicon từ cát và than, sử dụng nhiệt thạch làm nguồn nhiệt phụ. Có hiệu quả cao hơn khi ở nơi nóng.
 block.disassembler.description = Tách xỉ thành các kim loại khác nhau với hiệu suất thấp. Có thể sản xuất thorium.
 block.overdrive-dome.description = Tăng tốc độ làm việc của các công trình lân cận. Sử dụng sợi lượng tử and silicon để hoạt động.
-block.payload-conveyor.description = Di chuyển những khối hàng lớn, chẳng hạn như các đơn vị từ nhà máy.
+block.payload-conveyor.description = Di chuyển những khối hàng lớn, chẳng hạn như các đơn vị từ nhà máy. Từ tính. Sử dụng ở những môi trường không trọng lực.
 block.payload-router.description = Tách những khối hàng đầu vào thành 3 hướng đầu ra.
-block.ground-factory.description = Sản xuất binh lính bộ binh. Các đơn vị đầu ra có thể được sử dụng trực tiếp, hoặc đem nâng cấp.
-block.air-factory.description = Sản xuất binh lính không quân. Các đơn vị đầu ra có thể được sử dụng trực tiếp, hoặc đem nâng cấp.
-block.naval-factory.description = Sản xuất binh lính hải quân. Các đơn vị đầu ra có thể được sử dụng trực tiếp, hoặc đem nâng cấp.
+block.ground-factory.description = Sản xuất đơn vị bộ binh. Các đơn vị đầu ra có thể được sử dụng trực tiếp, hoặc đưa vào máy tái thiết để nâng cấp.
+block.air-factory.description = Sản xuất đơn vị không quân. Các đơn vị đầu ra có thể được sử dụng trực tiếp, hoặc đưa vào máy tái thiết để nâng cấp.
+block.naval-factory.description = Sản xuất đơn vị hải quân. Các đơn vị đầu ra có thể được sử dụng trực tiếp, hoặc đưa vào máy tái thiết để nâng cấp.
 block.additive-reconstructor.description = Nâng cấp quân của bạn lên cấp hai.
 block.multiplicative-reconstructor.description = Nâng cấp quân của bạn lên cấp ba.
 block.exponential-reconstructor.description = Nâng cấp quân của bạn lên cấp bốn.
-block.tetrative-reconstructor.description = Nâng cấp quân của bạn lên cấp năm (cuối cùng).
-block.switch.description = Công tắc, trạng thái có thể được đọc và điều khiển với xử lý logic.
-block.micro-processor.description = Chạy tập hợp các chỉ dẫn trong một vòng lặp, có thể dùng để điều khiển robot và công trình.
-block.logic-processor.description = Chạy tập hợp các chỉ dẫn trong một vòng lặp, có thể dùng để điều khiển robot và công trình. Nhanh hơn bộ xử lý nhỏ.
-block.hyper-processor.description = Chạy tập hợp các chỉ dẫn trong một vòng lặp, có thể dùng để điều khiển robot và công trình. Nhanh hơn bộ xử lý.
+block.tetrative-reconstructor.description = Nâng cấp quân của bạn lên cấp năm và là cấp cuối cùng.
+block.switch.description = Công tắc bật/tắt, trạng thái có thể được đọc và điều khiển với xử lý logic.
+block.micro-processor.description = Chạy tập hợp các chỉ lệnh trong một vòng lặp, có thể dùng để điều khiển đơn vị và công trình.
+block.logic-processor.description = Chạy tập hợp các chỉ lệnh trong một vòng lặp, có thể dùng để điều khiển đơn vị và công trình. Nhanh hơn bộ xử lý nhỏ.
+block.hyper-processor.description = Chạy tập hợp các chỉ lệnh trong một vòng lặp, có thể dùng để điều khiển đơn vị và công trình. Nhanh hơn bộ xử lý.
 block.memory-cell.description = Lưu trữ thông tin cho bộ xử lý.
 block.memory-bank.description = Lưu trữ thông tin cho bộ xử lý. Dung lượng cao.
 block.logic-display.description = Hiển thị đồ họa tùy ý từ bộ xử lý.
 block.large-logic-display.description = Hiển thị đồ họa tùy ý từ bộ xử lý.
 block.interplanetary-accelerator.description = Tòa súng từ trường cỡ lớn. Tăng tốc vật phóng đến vận tốc thoát để di chuyển giữa các hành tinh.
 block.repair-turret.description = Sửa chữa những đơn vị bị hư hỏng trong khu vực nhất định. Có thể làm mát để tăng hiệu quả.
+
+#Erekir
 block.core-bastion.description = Trung tâm của căn cứ. Bọc giáp. Khu vực sẽ mất khi bị phá hủy.
 block.core-citadel.description = Trung tâm của căn cứ. Bọc giáp tốt hơn. Lưu trữ nhiều vật phẩm hơn căn cứ Pháo đài.
 block.core-acropolis.description = Trung tâm của căn cứ. Được bọc giáp rất tốt. Lưu trữ nhiều vật phẩm hơn căn cứ Thủ Phủ.
-block.breach.description = Bắn đạn beryllium hoặc tungsten gây cháy vào kẻ địch.
-block.diffuse.description = Bắn một loạt đạn gây cháy theo hình nón. Đồng thời đẩy kẻ địch về phía sau.
-block.sublimate.description = Thổi tia lửa vào kẻ thù. Có khả năng xuyên giáp.
+block.breach.description = Bắn đạn beryllium hoặc tungsten xuyên thấu vào kẻ địch.
+block.diffuse.description = Bắn một loạt đạn mảnh theo hình nón. Đồng thời đẩy kẻ địch về phía sau.
+block.sublimate.description = Thổi tia lửa vào kẻ thù. Xuyên giáp.
 block.titan.description = Bắn đạn pháo khổng lồ vào các mục tiêu trên mặt đất. Yêu cầu hydrogen.
-block.afflict.description = Bắn ra các mảnh vỡ của một quả cầu tích điện khổng lồ. Yêu cầu được làm nóng.
+block.afflict.description = Bắn ra các mảnh vỡ của một quả cầu tích điện khổng lồ. Yêu cầu nhiệt.
 block.disperse.description = Bắng các mảnh gây nổ vào các mục tiêu trên không.
-block.lustre.description = Bắn một tia laser vào các mục tiêu của địch.
+block.lustre.description = Bắn một tia laser di chuyển chậm một mục tiêu vào các mục tiêu của địch.
 block.scathe.description = Phóng một tên lửa mạnh vào các mục tiêu trên mặt đất ở khoảng cách lớn.
 block.smite.description = Bắn viên đạn phát sáng nổ xuyên thấu.
 block.malign.description = Bắn chùm hàng loạt những tia laser dẫn đường nhắm thẳng mục tiêu kẻ địch. Yêu cầu lượng nhệt lớn.
@@ -2162,7 +2193,7 @@ block.slag-heater.description = Làm nóng khối đối diện. Yêu cầu xỉ
 block.phase-heater.description = Làm nóng khối đối diện. Yêu cầu sợi lượng tử.
 block.heat-redirector.description = Chuyển lượng nhiệt nhận được sang các khối khác.
 block.heat-router.description = Chuyển lượng nhiệt nhận được sang ba hướng còn lại.
-block.electrolyzer.description = Chuyển đổi nước thành hydrogen và ozone.
+block.electrolyzer.description = Chuyển đổi nước thành hydrogen và ozone. Các khi hóa lỏng được xuất hai hướng đối nhau, được đánh dấu bằng các màu tương ứng.
 block.atmospheric-concentrator.description = Cô đặc nitơ từ khí quyển. Yêu cầu nhiệt.
 block.surge-crucible.description = Tinh chế hợp kim từ xỉ và silicon. Yêu cầu nhiệt.
 block.phase-synthesizer.description = Tổng hợp sợi lượng tử từ thorium, cát, và ozone. Yêu cầu nhiệt.
@@ -2170,12 +2201,12 @@ block.carbide-crucible.description = Kết hợp than chì và tungsten để t
 block.cyanogen-synthesizer.description = Tổng hợp cyanogen từ arkycite và than chì. Yêu cầu nhiệt.
 block.slag-incinerator.description = Đốt các vật phẩm hoặc chất lỏng không bay hơi. Yêu cầu xỉ.
 block.vent-condenser.description = Ngưng tụ khí từ lỗ thông hơi để tạo ra nước. Tiêu thụ điện.
-block.plasma-bore.description = Khi được đặt đối diện với một bức tường quặng, sản xuất vô hạn vật phẩm. Yêu cầu một lượng điện nhỏ.
-block.large-plasma-bore.description = Một máy khoan plasma lớn hơn. Có thể khoan tungsten và thorium. Yêu cầu hydrogen và điện.
+block.plasma-bore.description = Khi được đặt đối diện với một bức tường quặng, sản xuất vô hạn vật phẩm. Yêu cầu một lượng điện nhỏ.\nTùy chọn sử dụng hydrogen để tăng hiệu suất.
+block.large-plasma-bore.description = Một máy khoan plasma lớn hơn. Có thể khoan tungsten và thorium. Yêu cầu hydrogen và điện.\nTùy chọn sử dụng nitrogen để tăng hiệu suất.
 block.cliff-crusher.description = Nghiền vách đá, xuất ra cát vô hạn. Yêu cầu năng lượng. Hiệu quả thay đổi dựa theo loại vách đá.
 block.impact-drill.description = Khi được đặt lên một loại quặng, sản xuất vô hạn vật phẩm. Yêu cầu điện và nước.
 block.eruption-drill.description = Phiên bản cải tiến củ máy khoan động lực. Có thể khoan thorium. Yêu cầu hydrogen.
-block.reinforced-conduit.description = Di chuyển chất lỏng về phía trước. Không nhận đầu vào từ các bên.
+block.reinforced-conduit.description = Di chuyển chất lỏng về phía trước. Không nhận đầu vào nếu không phải ống dẫn từ các bên.
 block.reinforced-liquid-router.description = Phân chia chất lỏng đều cho tất cả các bên.
 block.reinforced-liquid-tank.description = Lưu trữ một lượng chất lỏng lớn.
 block.reinforced-liquid-container.description = Lưu trữ một lượng chất lỏng vừa phải.
@@ -2187,16 +2218,16 @@ block.tungsten-wall.description = Bảo vệ các công trình khỏi đạn c
 block.tungsten-wall-large.description = Bảo vệ các công trình khỏi đạn của kẻ thù.
 block.carbide-wall.description = Bảo vệ các công trình khỏi đạn của kẻ thù.
 block.carbide-wall-large.description = Bảo vệ các công trình khỏi đạn của kẻ thù.
-block.reinforced-surge-wall.description = Bảo vệ các công trình khỏi đạn của kẻ thù, phóng ra các tia điện khi gặp đạn đối phương.
-block.reinforced-surge-wall-large.description = Bảo vệ các công trình khỏi đạn của kẻ thù, phóng ra các tia điện khi gặp đạn đối phương..
-block.shielded-wall.description = Bảo vệ các công trình khỏi đạn của kẻ thù. Triển khai một cái khiên chống đạn khi được cung cấp điện. Dẫn điện.
-block.blast-door.description = Một loại tường tự động mở ra khi đơn vị đang ở gần. Không thể điều khiển bằng tay.
+block.reinforced-surge-wall.description = Bảo vệ các công trình khỏi đạn của kẻ thù, phóng ra các tia điện khi đạn va chạm.
+block.reinforced-surge-wall-large.description = Bảo vệ các công trình khỏi đạn của kẻ thù, phóng ra các tia điện khi đạn va chạm.
+block.shielded-wall.description = Bảo vệ các công trình khỏi đạn của kẻ thù. Phản hầu hết các loại đạn khi va chạm. Triển khai một lá chắn chống đạn khi được cung cấp điện. Dẫn điện.
+block.blast-door.description = Một loại tường tự động mở ra khi đơn vị mặt đất đang ở gần. Không thể điều khiển một cách thủ công.
 block.duct.description = Di chuyển vật phẩm về phía trước. Chỉ có thể lưu trữ một vật phẩm.
-block.armored-duct.description = Di chuyển vật phẩm về phía trước. Không nhận đầu vào từ các bên.
+block.armored-duct.description = Di chuyển vật phẩm về phía trước. Không nhận đầu vào nếu không phải ống chân không từ các bên.
 block.duct-router.description = Phân chia vật phẩm đều cho tất cả các bên. Chỉ nhận đầu vào từ phía sau. Có thể được cấu hình thành một bộ sắp xếp vật phẩm.
 block.overflow-duct.description = Chỉ xuất vật phẩm ra các bên nếu đường dẫn phía trước bị chặn.
 block.duct-bridge.description = Vận chuyển vật phẩm qua các công trình và địa hình.
-block.duct-unloader.description = Lấy ra vật phẩm đã chọn từ khối phía sau nó. Không thể lấy ra từ các căn cứ.
+block.duct-unloader.description = Lấy ra vật phẩm đã chọn từ khối phía sau nó. Không thể lấy ra từ các lõi.
 block.underflow-duct.description = Ngược lại với một ống tràn chân không. Xuất ra phía trước nếu các đường dẫn bên trái và phải bị chặn.
 block.reinforced-liquid-junction.description = Làm cầu nối cho hai ống dẫn chất lỏng giao nhau.
 block.surge-conveyor.description = Di chuyển vật phẩm theo lô. Có thể được tăng tốc bằng điện. Dẫn điện.
@@ -2209,21 +2240,21 @@ block.turbine-condenser.description = Tạo ra điện khi được đặt trên
 block.chemical-combustion-chamber.description = Tạo ra điện từ arkycite và ozone.
 block.pyrolysis-generator.description = Tạo ra một lượng điện lớn từ arkycite và xỉ nóng chảy. Tạo ra nước như một sản phẩm phụ.
 block.flux-reactor.description = Tạo ra một lượng điện lớn khi được làm nóng. Yêu cầu sử dụng cyanogen như một chất làm ổn định. Lượng điện tạo ra và lượng tiêu thụ cyanogen tỷ lệ thuận với lượng nhiệt nhận được.\nPhát nổ nếu không cung cấp đủ cyanogen.
-block.neoplasia-reactor.description = Sử dụng arkycite, nước và sợi lượng tử để tạo ra lượng điện khổng lồ. Tạo ra nhiệt và neoplasm như sản phẩm phụ trong quá trình hoạt động.\nPhát nổ dữ dội nếu không được loại bỏ khỏi lò phản ứng.
+block.neoplasia-reactor.description = Sử dụng arkycite, nước và sợi lượng tử để tạo ra lượng điện khổng lồ. Tạo ra nhiệt và lượng tế bào tân sinh nguy hiểm như sản phẩm phụ trong quá trình hoạt động.\nPhát nổ dữ dội nếu tế bào tân sinh không được loại bỏ khỏi lò phản ứng.
 block.build-tower.description = Tự động xây dựng lại các công trình trong phạm vi và hỗ trợ các đơn vị khác trong quá trình xây dựng.
-block.regen-projector.description = Sửa chữa các công trình một cách chậm rãi trong phạm vi hình vuông. Yêu cầu hidrogen.
-block.reinforced-container.description = Lưu trữ một lượng nhỏ vật phẩm. Vật phẩm có thể được lấy ra thông qua các điểm dỡ hàng. Không làm tăng khả năng lưu trữ của căn cứ.
-block.reinforced-vault.description = Lưu trữ một lượng lớn vật phẩm. Vật phẩm có thể được lấy ra thông qua các điểm dỡ hàng. Không làm tăng khả năng lưu trữ của căn cứ.
-block.tank-fabricator.description = Chế tạo đơn vị Stell. Các đơn vị được chế tạo có thể được sử dụng trực tiếp hoặc được chuyển vào các máy chế tạo khác để được nâng cấp.
-block.ship-fabricator.description = Chế tạo đơn vị Elude. Các đơn vị được chế tạo có thể được sử dụng trực tiếp hoặc được chuyển vào các máy chế tạo khác để được nâng cấp.
-block.mech-fabricator.description = Chế tạo đơn vị Merui. Các đơn vị được chế tạo có thể được sử dụng trực tiếp hoặc được chuyển vào các máy chế tạo khác để được nâng cấp.
+block.regen-projector.description = Sửa chữa các công trình một cách chậm rãi trong phạm vi hình vuông. Yêu cầu hydrogen.\nTùy chọn sử dụng sợi lượng tử để tăng hiệu suất.
+block.reinforced-container.description = Lưu trữ một lượng nhỏ vật phẩm. Vật phẩm có thể được lấy ra thông qua các điểm dỡ hàng. Không làm tăng khả năng lưu trữ của lõi.
+block.reinforced-vault.description = Lưu trữ một lượng lớn vật phẩm. Vật phẩm có thể được lấy ra thông qua các điểm dỡ hàng. Không làm tăng khả năng lưu trữ của lõi.
+block.tank-fabricator.description = Chế tạo đơn vị Stell. Các đơn vị được chế tạo có thể được sử dụng trực tiếp hoặc được chuyển vào các máy tái chế tạo khác để được nâng cấp.
+block.ship-fabricator.description = Chế tạo đơn vị Elude. Các đơn vị được chế tạo có thể được sử dụng trực tiếp hoặc được chuyển vào các máy tái chế tạo khác để được nâng cấp.
+block.mech-fabricator.description = Chế tạo đơn vị Merui. Các đơn vị được chế tạo có thể được sử dụng trực tiếp hoặc được chuyển vào các máy tái chế tạo khác để được nâng cấp.
 block.tank-assembler.description = Lắp ráp các xe tăng lớn từ các khối và đơn vị. Cấp độ đầu ra có thể được tăng bằng cách thêm các module.
 block.ship-assembler.description = Lắp ráp các phi thuyền lớn từ các khối và đơn vị. Cấp độ đầu ra có thể được tăng bằng cách thêm các module.
-block.mech-assembler.description = Lắp ráp các lính cơ động lớn từ các khối và đơn vị. Cấp độ đầu ra có thể được tăng bằng cách thêm các module.
-block.tank-refabricator.description = Nâng cấp các xe tăng lên cấp hai.
-block.ship-refabricator.description = Nâng cấp các phi thuyền lên cấp hai.
-block.mech-refabricator.description = Nâng cấp các đơn vị cơ động lên cấp hai.
-block.prime-refabricator.description = Nâng cấp các đơn vị lên cấp ba.
+block.mech-assembler.description = Lắp ráp các đơn vị cơ động lớn từ các khối và đơn vị. Cấp độ đầu ra có thể được tăng bằng cách thêm các module.
+block.tank-refabricator.description = Nâng cấp các xe tăng đầu vào lên cấp hai.
+block.ship-refabricator.description = Nâng cấp các phi thuyền đầu vào lên cấp hai.
+block.mech-refabricator.description = Nâng cấp các đơn vị cơ động đầu vào lên cấp hai.
+block.prime-refabricator.description = Nâng cấp các đơn vị đầu vào lên cấp ba.
 block.basic-assembler-module.description = Tăng cấp lắp ráp khi đặt cạnh một hệ thống lắp ráp. Yêu cầu điện. Có thể sử dụng như nơi nhập các khối hàng.
 block.small-deconstructor.description = Tháo dỡ các công trình và đơn vị đầu vào. Trả lại 100% chi phí tạo ra.
 block.reinforced-payload-conveyor.description = Di chuyển khối hàng tiến về phía trước.
@@ -2238,41 +2269,43 @@ block.canvas.description = Hiển thị một hình ảnh đơn giản với m
 unit.dagger.description = Bắn đạn tiêu chuẩn vào tất cả kẻ địch xung quanh.
 unit.mace.description = Phun lửa vào tất cả kẻ địch xung quanh.
 unit.fortress.description = Bắn pháo tầm xa lên kẻ địch trên mặt đất.
-unit.scepter.description = Bắn một chùm đạn vào kẻ địch ở gần.
-unit.reign.description = Bắn một chùm đạn xuyên giáp vào kẻ địch ở gần.
-unit.nova.description = Bắn tia laser làm tổn hại kẻ địch và sửa chữa các tòa nhà. Có khả năng bay.
-unit.pulsar.description = Bắn tia điện làm tổn hại kẻ địch và sửa chữa các tòa nhà. Có khả năng bay.
-unit.quasar.description = Bắn tia laser xuyên giáp làm tổn hại kẻ địch và sửa chữa các tòa nhà. Có khả năng bay. Được bọc giáp.
-unit.vela.description = Bắn tia laser liên tục xuyên giáp làm tổn hại kẻ địch, gây cháy và sửa chữa các tòa nhà. Có khả năng bay.
-unit.corvus.description = Bắn đia laser đánh bật kẻ địch và sửa chữa các tòa nhà. Có thể đi qua đa số địa hình.
-unit.crawler.description = Chạy đến kẻ địch và nổ.
-unit.atrax.description = Phun xỉ nóng chảy vào kẻ địch trên mặt đất. Có thể đi qua đa số địa hình.
-unit.spiroct.description = Bắn tia laser vào kẻ địch trên mặt đất và tự sửa chữa nó. Có thể đi qua đa số địa hình.
-unit.arkyid.description = Bắn tia laser lớn vào kẻ địch trên mặt đất và tự sửa chữa chính nó. Có thể đi qua đa số địa hình.
-unit.toxopid.description = Bắn chùm đạn điện và tia laser xuyên giáp vào kẻ địch trên mặt đất và tự sửa chữa chính nó. Có thể đi qua đa số địa hình.
-unit.flare.description = Bắn đạn thường vào kẻ địch tầm gần trên mặt đất.
+unit.scepter.description = Bắn một chùm đạn tích tụ vào kẻ địch ở gần.
+unit.reign.description = Bắn một chùm đạn xuyên giáp mạnh vào kẻ địch ở gần.
+unit.nova.description = Bắn tia laser gây sát thương kẻ địch và sửa chữa các công trình đồng minh. Có khả năng bay.
+unit.pulsar.description = Bắn tia điện gây sát thương kẻ địch và sửa chữa các công trình đồng minh. Có khả năng bay.
+unit.quasar.description = Bắn tia laser xuyên giáp gây sát thương kẻ địch và sửa chữa các công trình đồng minh. Có khả năng bay. Có lá chắn.
+unit.vela.description = Bắn tia laser liên tục xuyên giáp gây sát thương kẻ địch, gây cháy và sửa chữa các công trình đồng minh. Có khả năng bay.
+unit.corvus.description = Bắn đia laser cực mạnh gây sát thương kẻ địch và sửa chữa các công trình đồng minh. Có thể đi qua đa số địa hình.
+unit.crawler.description = Chạy thẳng đến kẻ địch và tự hủy, gây ra vụ nổ lớn.
+unit.atrax.description = Phun tia xỉ nóng chảy gây suy nhược vào kẻ địch trên mặt đất. Có thể đi qua đa số địa hình.
+unit.spiroct.description = Bắn tia laser lớn gây ăn mòn vào kẻ địch trên mặt đất và tự sửa chữa nó. Có thể đi qua đa số địa hình.
+unit.arkyid.description = Bắn tia laser lớn gây ăn mòn vào kẻ địch trên mặt đất và tự sửa chữa chính nó. Có thể đi qua đa số địa hình.
+unit.toxopid.description = Bắn chùm đạn điện và tia laser xuyên giáp vào kẻ địch trên mặt đất. Có thể đi qua đa số địa hình.
+unit.flare.description = Bắn đạn tiêu chuẩn vào kẻ địch trên mặt đất.
 unit.horizon.description = Thả chùm bom lên kẻ địch trên mặt đất.
-unit.zenith.description = Bắn chùm tên lửa vào mọi kẻ địch tầm gần.
-unit.antumbra.description = Bắn chùm đạn vào mọi kẻ địch tầm gần.
-unit.eclipse.description = Bắn hai tia laser xuyên giáp và chùm flak vào mọi kẻ địch tầm gần.
-unit.mono.description = Tự động khai thác đồng và chì, và vận chuyển vào căn cứ.
+unit.zenith.description = Bắn chùm tên lửa vào mọi kẻ địch.
+unit.antumbra.description = Bắn chùm đạn vào mọi kẻ địch.
+unit.eclipse.description = Bắn hai tia laser xuyên giáp và pháo chùm vào mọi kẻ địch.
+unit.mono.description = Tự động khai thác đồng và chì, và vận chuyển vào lõi.
 unit.poly.description = Tự động xây dựng lại các công trình bị hỏng và hỗ trợ các đơn vị khác thi công.
-unit.mega.description = Tự động sửa chữa các công trình bị hỏng. Có khả năng mang bộ binh nhỏ.
-unit.quad.description = Thả bom to lên kẻ địch, sửa chữa các tòa nhà và tổn hại kẻ địch. Có khả năng mang bộ binh vừa.
+unit.mega.description = Tự động sửa chữa các công trình bị hỏng. Có khả năng mang một số khối và bộ binh nhỏ.
+unit.quad.description = Thả bom plasma to lên kẻ địch, sửa chữa các công trình và sát thương kẻ địch. Có khả năng mang bộ binh vừa.
 unit.oct.description = Bảo vệ đồng minh với giáp. Có khả năng mang đa số bộ binh.
-unit.risso.description = Bắn chùm tên lửa và đạn lên kẻ địch tầm gần.
-unit.minke.description = Bắn đạn và đạn thường lên kẻ địch tầm gần trên mặt đất.
+unit.risso.description = Bắn chùm tên lửa và đạn lên kẻ địch.
+unit.minke.description = Bắn chùm đạn và đạn tiêu chuẩn lên kẻ địch trên mặt đất.
 unit.bryde.description = Bắn đạn tầm xa và tên lửa vào kẻ địch.
 unit.sei.description = Bắn chùm tên lửa và đạn xuyên giáp vào kẻ địch.
-unit.omura.description = Bắn đạn từ trường xuyên giáp tầm xa vào kẻ địch. Tạo nên Flare.
-unit.alpha.description = Bảo vệ căn cứ cơ sở khỏi kẻ thù. Có thể xây dựng.
-unit.beta.description = Bảo vệ căn cứ trụ sở khỏi kẻ thù. Có thể xây dựng.
-unit.gamma.description = Bảo vệ căn cứ trung tâm khỏi kẻ thù. Có thể xây dựng.
+unit.omura.description = Bắn đạn từ trường xuyên giáp tầm xa vào kẻ địch. Tạo ra Flare.
+unit.alpha.description = Bảo vệ lõi Cơ sở khỏi kẻ thù. Có thể xây dựng.
+unit.beta.description = Bảo vệ lõi Trụ sở khỏi kẻ thù. Có thể xây dựng.
+unit.gamma.description = Bảo vệ lõi Trung tâm khỏi kẻ thù. Có thể xây dựng.
 unit.retusa.description = Bắn ngư lôi dẫn đường vào kẻ thù gần đó. Sửa đơn vị đồng minh.
 unit.oxynoe.description = Bắn luồng tia lửa sửa công trình vào kẻ địch gần đó. Nhắm vào viên đạn kẻ địch với các bệ súng phòng thủ mũi nhọn.
 unit.cyerce.description = Bắn chùm tên lửa dẫn đường lên kẻ thù. Sửa đơn vị đồng minh.
 unit.aegires.description = Gây sốc lên tất cả đơn vị và công trình bên trong trường năng lượng của nó. Sửa chữa tất cả đồng minh.
 unit.navanax.description = Bắn tia xung điện từ (EMP) nổ, gây thiệt hại đáng kể lên mạng lưới năng lượng và sửa chữa công trình đồng minh. Nung chảy kẻ địch ở gần với 4 bệ súng laser tự hành.
+
+#Erekir
 unit.stell.description = Bắn các viên đạn tiêu chuẩn vào mục tiêu kẻ thù.
 unit.locus.description = Bắn các viên đạn xen kẽ vào mục tiêu kẻ thù.
 unit.precept.description = Bắn các viên đạn phân cụm xuyêm thấu vào mục tiêu kẻ thù.
@@ -2286,56 +2319,57 @@ unit.collaris.description = Bắn pháo phân mảnh tầm xa vào mục tiêu k
 unit.elude.description = Bắn một cặp viên đạn dẫn đường vào mục tiêu kẻ thù. Có thể lướt trên mặt chất lỏng.
 unit.avert.description = Bắn một cặp viên đạn xoắn vào mục tiêu kẻ thù.
 unit.obviate.description = Bắn một cặp cầu điện xoắn vào mục tiêu kẻ thù.
-unit.quell.description = Bắn tên lửa tầm xa vào mục tiêu kẻ thù. Ngăn chặn khối công trình sửa chữa kẻ địch.
-unit.disrupt.description = Bắn tên lửa oanh tạc tầm xa vào mục tiêu kẻ thù. Ngăn chặn khối công trình sửa chữa kẻ địch.
-unit.evoke.description = Xây công trình để phòng thủ lõi Bastion. Sửa các công trình với chùm tia sáng.
-unit.incite.description = Xây công trình để phòng thủ lõi Citadel. Sửa các công trình với chùm tia sáng.
-unit.emanate.description = Xây công trình để phòng thủ lõi Acropolis. Sửa các công trình với chùm tia sáng.
+unit.quell.description = Bắn tên lửa dẫn đường tầm xa vào mục tiêu kẻ thù. Ngăn chặn khối công trình sửa chữa kẻ địch.
+unit.disrupt.description = Bắn tên lửa oanh tạc dẫn đường tầm xa vào mục tiêu kẻ thù. Ngăn chặn khối công trình sửa chữa kẻ địch.
+unit.evoke.description = Xây công trình để phòng thủ lõi Pháo đài. Sửa các công trình với chùm tia sáng. Có khả năng nâng khối công trình 2x2.
+unit.incite.description = Xây công trình để phòng thủ lõi Thủ phủ. Sửa các công trình với chùm tia sáng. Có khả năng nâng khối công trình 2x2.
+unit.emanate.description = Xây công trình để phòng thủ lõi Đại đô. Sửa các công trình với chùm tia sáng. Có khả năng nâng khối công trình 2x2.
 
 lst.read = Đọc một số từ bộ nhớ được liên kết.
 lst.write = Ghi một số vào bộ nhớ được liên kết.
-lst.print = Thêm văn bản vào bộ nhớ in.\nKhông hiển thị gì cho đến khi sử dụng [accent]Print Flush[].
-lst.format = Thay thế kí tự giữ chỗ tiếp theo ("[accent]@[]") trong bộ đệm văn bản bằng giá trị.\nVí dụ:\n[accent]print "test @"\nformat "example"
-lst.draw = Thêm một thao tác vào bộ nhớ vẽ.\nKhông hiển thị gì cho đến khi sử dụng [accent]Draw Flush[].
+lst.print = Thêm văn bản vào bộ đệm in.\nKhông hiển thị gì cho đến khi sử dụng [accent]Print Flush[].
+lst.format = Thay thế từ giữ chỗ tiếp theo trong bộ đệm văn bản bằng giá trị.\nKhông làm gì nếu khuôn mẫu từ giữ chỗ không hợp lệ.\nKhuôn mẫu từ giữ chỗ: "{[accent] số 0-9[]}"\nVí dụ:\n[accent]print "test {0}"\nformat "example"
+lst.draw = Thêm một thao tác vào bộ đệm vẽ.\nKhông hiển thị gì cho đến khi sử dụng [accent]Draw Flush[].
 lst.drawflush = Chuyển các thao tác [accent]Draw[] đến màn hình.
 lst.printflush = Chuyển các thao tác [accent]Print[] đến khối tin nhắn.
-lst.getlink = Nhận liên kết bộ xử lý theo thứ tự. Bắt đầu từ 0.
-lst.control = Điều khiển một khối.
+lst.getlink = Nhận liên kết bộ xử lý theo chỉ số. Bắt đầu từ 0.
+lst.control = Điều khiển một công trình.
 lst.radar = Định vị các đơn vị trong phạm vi xung quanh một khối.
 lst.sensor = Lấy dữ liệu từ một khối hoặc đơn vị.
 lst.set = Đặt một biến.
 lst.operation = Thực hiện thao tác trên 1-2 biến.
 lst.end = Chuyển đến lệnh đầu tiên.
-lst.wait = Chờ trong khoảng thời gian nhất định.
+lst.wait = Chờ trong số giây nhất định.
 lst.stop = Ngừng thực thi khối xử lý này.
-lst.lookup = Tra cứu một kiểu món đồ/chất lỏng/khối bởi định danh (ID).\nTổng số đếm của mỗi kiểu có thể truy xuất qua:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.lookup = Tra cứu một kiểu món đồ/chất lỏng/khối bởi định danh (ID).\nTổng số đếm của mỗi kiểu có thể truy xuất qua:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\nĐể thao tác ngược lại, dùng sense [accent]@id[] của vật thể đó.
 lst.jump = Chuyển qua lệnh khác nếu điều kiện đúng.
-lst.unitbind = Ràng buộc đơn vị tiếp theo của một kiểu, và lưu nó trong [accent]@unit[].
-lst.unitcontrol = Điều khiển đơn vị đang ràng buộc.
-lst.unitradar = Xác định đơn vị xung quanh đơn bị đang ràng buộc.
-lst.unitlocate = Xác định một kiểu cố định của vị trí/công trình bất kì đâu trên bản đồ.\nYêu cầu một đơn vị đang ràng buộc.
-lst.getblock = Lấy dữ liệu từ ô từ vị trí bất kì.
-lst.setblock = Chỉnh sửa dữ liệu từ ô từ vị trí bất kì.
-lst.spawnunit = Tạo ra quân từ vị trí.
+lst.unitbind = Gắn kết đơn vị tiếp theo của một kiểu, và lưu nó trong [accent]@unit[].
+lst.unitcontrol = Điều khiển đơn vị đang gắn kết.
+lst.unitradar = Xác định đơn vị xung quanh đơn bị đang gắn kết.
+lst.unitlocate = Xác định một kiểu cố định của vị trí/công trình bất kì đâu trên bản đồ.\nYêu cầu một đơn vị đang gắn kết.
+lst.getblock = Lấy dữ liệu của ô tại vị trí bất kì.
+lst.setblock = Chỉnh sửa dữ liệu của ô tại vị trí bất kì.
+lst.spawnunit = Tạo ra quân tại một vị trí.
 lst.applystatus = Áp dụng hoặc loại bỏ một hiệu ứng trạng thái cho một đơn vị.
 lst.weathersense = Kiểm tra kiểu thời tiết đang hoạt động.
 lst.weatherset = Thiết lập trạng thái hiện tại của kiểu thời tiết.
-lst.spawnwave = Mô phỏng một lượt xuất hiện ở vị trí tùy ý.\nSẽ không tăng số đếm lượt.
+lst.spawnwave = Làm xuất hiện lượt tấn công.
 lst.explosion = Tạo ra một vụ nổ tại vị trí đó.
-lst.setrate = Đặt tốc độ thực thi khối xử lý theo chỉ thị/tíc-tắc.
+lst.setrate = Đặt tốc độ thực thi khối xử lý theo chỉ lệnh/tích-tắc.
 lst.fetch = Tra cứu các đơn vị, lõi, người chơi hoặc công trình bởi chỉ số.\nCác chỉ số bắt đầu từ 0 và kết thúc tại số lượng đếm của chúng.
 lst.packcolor = Đóng gói màu thành phần RGBA [0, 1] thành một số đơn dùng cho vẽ hoặc thiết lập quy tắc.
 lst.setrule = Đặt một quy tắc của trò chơi.
-lst.flushmessage = Hiển thị một tin nhắn trên màn hình từ bộ đệm văn bản.\nSẽ đợt cho đến khi tin nhắn trước đó hoàn tất.
+lst.flushmessage = Hiển thị một tin nhắn trên màn hình từ bộ đệm văn bản.\nSẽ đợi cho đến khi tin nhắn trước đó hoàn tất.
 lst.cutscene = Điều khiển góc máy quay của người chơi.
 lst.setflag = Đặt một cờ toàn cục mà có thể đọc được bởi tất cả khối xử lý.
 lst.getflag = Kiểm tra nếu cờ toàn cục được đặt.
 lst.setprop = Đặt một thuộc tính của đơn vị hoặc công trình.
 lst.effect = Tạo một phần hiệu ứng nhỏ.
-lst.sync = Đồng bộ giá trị biến qua mạng.\nChỉ gọi tối đa 10 lần mỗi giây.
-lst.makemarker = Tạo mới điểm đánh dấu lô-gic trên thế giới.\n Một định danh cho điểm đánh dấu này phải được cung cấp.\nĐiểm đánh dấu hiện tại bị giới hạn 20,000 trên mỗi thế giới.
-lst.setmarker = Lập một thuộc tính cho một điểm đánh dấu.\n Định danh phải giống như định danh ở chỉ dẫn lệnh Tạo Điểm đánh dấu (Make Marker).\nGiá trị [accent]null [] sẽ bị phớt lờ thay vì chuyển thành 0.
+lst.sync = Đồng bộ giá trị biến qua mạng.\nChỉ gọi tối đa 20 lần mỗi giây cho mỗi biến.
+lst.makemarker = Tạo mới điểm đánh dấu logic trên thế giới.\n Một định danh cho điểm đánh dấu này phải được cung cấp.\nĐiểm đánh dấu hiện tại bị giới hạn 20,000 trên mỗi thế giới.
+lst.setmarker = Lập một thuộc tính cho một điểm đánh dấu.\n Định danh phải giống như định danh ở chỉ lệnh Tạo Điểm đánh dấu (Make Marker).\nGiá trị [accent]null [] sẽ bị phớt lờ.
 lst.localeprint = Thêm một giá trị thuộc tính ngôn ngữ của bản đồ vào bộ đệm văn bản.\nĐể thiết đặt gói ngôn ngữ trong trình chỉnh sửa bản đồ, xem qua [accent]Thông tin bản đồ > Gói ngôn ngữ[].\nNếu máy khách là một thiết bị di động, sẽ cố in thuộc tính kết thúc bằng ".mobile" trước tiên.
+
 lglobal.false = 0
 lglobal.true = 1
 lglobal.null = null
@@ -2343,6 +2377,7 @@ lglobal.@pi = Hằng số toán học pi (3.141...)
 lglobal.@e = Hằng số toán học e (2.718...)
 lglobal.@degToRad = Nhân với số này để chuyển từ độ (deg) sang radian (rad)
 lglobal.@radToDeg = Nhân với số này để chuyển từ radian (rad) sang độ (deg)
+
 lglobal.@time = Thời gian chơi của bản lưu hiện tại, tính bằng mili-giây
 lglobal.@tick = Thời gian chơi của bản lưu hiện tại, tính bằng tích-tắc (1 giây = 60 tích-tắc)
 lglobal.@second = Thời gian chơi của bản lưu hiện tại, tính bằng giây
@@ -2351,51 +2386,57 @@ lglobal.@waveNumber = Số lượt hiện tại, nếu chế độ lượt đư
 lglobal.@waveTime = Thời gian đếm ngược của lượt, tính bằng giây
 lglobal.@mapw = Độ rộng bản đồ, tính bằng ô
 lglobal.@maph = Độ cao bản đồ, tính bằng ô
+
 lglobal.sectionMap = Bản đồ
 lglobal.sectionGeneral = Chung
 lglobal.sectionNetwork = Mạng/Máy khách [Chỉ Bộ xử lý thế giới]
 lglobal.sectionProcessor = Bộ xử lý
 lglobal.sectionLookup = Tra cứu
-lglobal.@this = Khối lô-gíc đang thực thi đoạn mã
+
+lglobal.@this = Khối logic đang thực thi đoạn mã
 lglobal.@thisx = Tọa độ x của khối đang thực thi đoạn mã
 lglobal.@thisy = Tọa độ y của khối đang thực thi đoạn mã
 lglobal.@links = Tổng số khối đã liên kết đến bộ xử lý này
 lglobal.@ipt = Tốc độ thực thi của bộ xử lý tính bằng lệnh mỗi tích-tắc (60 tích-tắc = 1 giây)
+
 lglobal.@unitCount = Tổng số kiểu mẫu đơn vị trong trò chơi; được dùng với lệnh tra cứu
 lglobal.@blockCount = Tổng số kiểu mẫu khối trong trò chơi; được dùng với lệnh tra cứu
 lglobal.@itemCount = Tổng số kiểu mẫu vật phẩm trong trò chơi; được dùng với lệnh tra cứu
 lglobal.@liquidCount = Tổng số kiểu mẫu chất lỏng trong trò chơi; được dùng với lệnh tra cứu
+
 lglobal.@server = True nếu đoạn mã chạy trên máy chủ hoặc chơi đơn, ngược lại là false
 lglobal.@client = True nếu đoạn mã chạy trên máy khách được kết nối đến máy chủ
+
 lglobal.@clientLocale = Ngôn ngữ của máy khách đang chạy đoạn mã. Ví dụ: vi_VN
 lglobal.@clientUnit = Đơn vị máy khách đang chạy đoạn mã
 lglobal.@clientName = Tên người chơi của máy khách đang chạy đoạn mã
 lglobal.@clientTeam = Định danh đội của máy khách đang chạy đoạn mã
 lglobal.@clientMobile = True nếu máy khách đang chạy đoạn mã trên thiết bị di động, ngược lại là false
 
-logic.nounitbuild = [red]Lô-gíc xây dựng đơn vị không được phép ở đây.
+logic.nounitbuild = [red]Logic xây dựng đơn vị không được phép ở đây.
 
 lenum.type = Kiểu của công trình/đơn vị.\n Ví dụ, cho Bộ phân phát (router), nó sẽ trả về [accent]@router[].\nKhông phải một chuỗi.
-lenum.shoot = Bắn vào vị trí xác định.
+lenum.shoot = Bắn một vị trí.
 lenum.shootp = Bắn vào một đơn vị/công trình với tốc độ dự đoán.
 lenum.config = Cấu hình công trinh, kiểu như đồ của Khối sắp xếp.
-lenum.enabled = Bất cứ khi nào khối hoạt động.
+lenum.enabled = Khối có đang hoạt động.
 
 laccess.color = Màu đèn chiếu sáng.
-laccess.controller = Thứ điều khiển đơn vị. Nếu khối xử lý đã điều khiển, trả về khối xử lý.\nNếu trong đội hình, trả về đơn vị dẫn đầu.\nNgược lại, trả về chính đơn vị đó.
+laccess.controller = Thứ điều khiển đơn vị. Nếu khối xử lý đã điều khiển, trả về khối xử lý.\nNgược lại, trả về chính đơn vị đó.
 laccess.dead = Đơn vị/công trình đã chết hoặc không còn hợp lệ hay không.
-laccess.controlled = Trả về:\n[accent]@ctrlProcessor[] nếu điều khiển là khối xử lý\n[accent]@ctrlPlayer[] nếu người điều khiển đơn vị/công trình là người chơi\n[accent]@ctrlFormation[] nếu đơn vị trọng đội hình\nNgược lại, 0.
+laccess.controlled = Trả về:\n[accent]@ctrlProcessor[] nếu điều khiển là khối xử lý\n[accent]@ctrlPlayer[] nếu người điều khiển đơn vị/công trình là người chơi\n[accent]@ctrlCommand[] nếu đơn vị được điều khiển qua mệnh lệnh của người chơi\nNgược lại, 0.
 laccess.progress = Tiến trình thực hiện, 0 đến 1.\n Trả về tiến trình sản xuất, nạp đạn bệ súng hoặc xây dựng.
-laccess.speed = Tốc độ của đơn vị, tính bằng ô/giây.
+laccess.speed = Tốc độ cao nhất của đơn vị, tính bằng ô/giây.
 laccess.id = Định danh của một đơn vị/khối/vật phẩm/chất lỏng.\nViệc này làm ngược lại với thao tác tra cứu.
-lcategory.unknown = Không xác định
-lcategory.unknown.description = Chỉ thị không được phân loại.
+
+lcategory.unknown = Không rõ
+lcategory.unknown.description = Chỉ lệnh không được phân loại.
 lcategory.io = Đầu Vào & Ra
 lcategory.io.description = Chỉnh sửa nội dung của khối ô nhớ và bộ đệm khối xử lý.
 lcategory.block = Điều khiển khối
 lcategory.block.description = Tương tác với khối
 lcategory.operation = Các phép toán
-lcategory.operation.description = Các phép toán lô-gíc.
+lcategory.operation.description = Các phép toán logic.
 lcategory.control = Điều khiển luồng thực thi
 lcategory.control.description = Quản lý trình tự thực thi.
 lcategory.unit = Điều khiển đơn vị
@@ -2403,7 +2444,7 @@ lcategory.unit.description = Ra lệnh cho đơn vị.
 lcategory.world = Thế giới
 lcategory.world.description = Kiểm soát hành vi của thế giới.
 
-graphicstype.clear = Tô màu cho màn hình.
+graphicstype.clear = Tô màu cho toàn màn hình.
 graphicstype.color = Đặt màu cho thao tác vẽ tiếp theo.
 graphicstype.col = Tương tự màu, nhưng được đóng gói.\nMàu đã đóng gói được viết theo mã thập lục phân với tiền tố [accent]%[].\nVí dụ: [accent]%ff0000[] sẽ là màu đỏ.
 graphicstype.stroke = Đặt chiều rộng đoạn thẳng.
@@ -2414,7 +2455,7 @@ graphicstype.poly = Tô vào đa giác đều.
 graphicstype.linepoly = Vẽ đường viền đa giác đều.
 graphicstype.triangle = Tô một hình tam giác.
 graphicstype.image = Vẽ hình ảnh một số nội dung.\nVí dụ: [accent]@router[] hoặc [accent]@dagger[].
-graphicstype.print = Vẽ văn bản từ bộ đệm in ra.\nLàm sạch bộ đệm.
+graphicstype.print = Vẽ văn bản từ bộ đệm in ra.\nChỉ được phép dùng các kí tự ASCII.\nLàm sạch bộ đệm.
 
 lenum.always = Luôn đúng.
 lenum.idiv = Chia lấy phần nguyên.
@@ -2426,10 +2467,10 @@ lenum.strictequal = Bằng nhau ràng buộc. Không ép kiểu.\nCó thể dùn
 lenum.shl = Nhảy bit sang trái.
 lenum.shr = Nhảy bit sang phải.
 lenum.or = Phép toán bit OR.
-lenum.land = Lô-gíc AND.
+lenum.land = Phép toán logic AND.
 lenum.and = Phép toán bit AND.
 lenum.not = Phép toán lật bit.
-lenum.xor = Phép toán XOR.
+lenum.xor = Phép toán bit XOR.
 
 lenum.min = Số nhỏ nhất giữa hai số.
 lenum.max = Số lớn nhất giữa hai số.
@@ -2467,7 +2508,7 @@ lenum.damaged = Công trình bị hư tổn của đồng minh.
 lenum.spawn = Điểm xuất hiện của kẻ địch.\nCó thể là một lõi hoặc một vị trí.
 lenum.building = Công trình trong nhóm nhất định.
 
-lenum.core = Bất kì căn cứ.
+lenum.core = Bất kỳ lõi nào.
 lenum.storage = Khối lưu trữ, Ví dụ Nhà kho.
 lenum.generator = Khối có thể tạo ra năng lượng.
 lenum.factory = Khối có thể biến đổi vật phẩm.
@@ -2482,13 +2523,13 @@ sensor.in = Công trình/Đơn vị để cảm biến.
 radar.from = Công trình để cảm biến.\nPhạm vi cảm biến bị giới hạn bởi phạm vi của công trình.
 radar.target = Bộ lọc cho các đơn vị được cảm biến.
 radar.and = Bộ lọc bổ sung.
-radar.order = Sắp xếp theo thứ tự. đặt giá trị 0 để đảo ngược.
+radar.order = Sắp xếp theo thứ tự. 0 để đảo ngược.
 radar.sort = Số liệu để kết quả sắp xếp theo.
 radar.output = Biến để ghi đơn vị được xuất ra.
 
 unitradar.target = Bộ lọc cho các đơn vị được cảm biến.
 unitradar.and = Bộ lọc bổ sung.
-unitradar.order = Sắp xếp theo thứ tự. đặt giá trị 0 để đảo ngược.
+unitradar.order = Sắp xếp theo thứ tự. 0 để đảo ngược.
 unitradar.sort = Số liệu để kết quả sắp xếp theo.
 unitradar.output = Biến để ghi đơn vị được xuất ra.
 
@@ -2505,10 +2546,10 @@ unitlocate.group = Nhóm công trình để tìm kiếm.
 
 lenum.idle = Không di chuyển, nhưng vẫn xây dựng/đào.\nTrạng thái mặc định.
 lenum.stop = Dừng di chuyển/Đào/Xây dựng.
-lenum.unbind = Vô hiệu hóa hoàn toàn điều khiển lô-gíc.\n Khôi phục AI tiêu chuẩn.
+lenum.unbind = Vô hiệu hóa hoàn toàn điều khiển logic.\n Khôi phục AI tiêu chuẩn.
 lenum.move = Di chuyển đến vị trí xác định.
 lenum.approach = Tiếp cận một vị trí với bán kính.
-lenum.pathfind = Tìm đường đến nơi tạo ra kẻ địch.
+lenum.pathfind = Tìm đường đến một vị trí xác định.
 lenum.autopathfind = Tự động tìm đường đến lõi hoặc nơi hạ cánh gần nhất của kẻ địch.\n Việc này tương tự như việc tìm đường của kẻ địch trong các lượt.
 lenum.target = Bắn vào vị trí xác định.
 lenum.targetp = Bắn vào một mục tiêu với tốc độ dự đoán
@@ -2523,10 +2564,11 @@ lenum.build = Xây công trình.
 lenum.getblock = Lấy một cấu trúc và kiểu tại một tọa độ.\nĐơn vị phải nằm trong tầm của vị trí.\nKhối rắn không phải công trình có kiểu [accent]@solid[].
 lenum.within = Kiểm tra xem đơn vị có gần vị trí không.
 lenum.boost = Bắt đầu/Dừng tăng tốc.
-lenum.flushtext = Lấp đầy nội dung của bộ đệm cho điểm đánh dấu, nếu có thể áp dụng.\n Nếu [accent]fetch[] gắn là [accent]true[], sẽ cố truy vấn các thuộc tính từ gói ngôn ngữ của bản đồ hoặc trò chơi.
-lenum.texture = Tên kết cấu lấy thẳng từ bản khung kết cấu của trò chơi (dùng kiểu tên kebab-case, tên-chữ-thường-chứa-gạch-nối).\nNếu printFlush gán bằng true, sẽ sử dụng nội dung bộ đệm văn bản làm tham số văn bản.
+
+lenum.flushtext = Lấp đầy nội dung của bộ đệm cho điểm đánh dấu, nếu có thể áp dụng.\n Nếu [accent]fetch[] đặt là [accent]true[], sẽ cố truy vấn các thuộc tính từ gói ngôn ngữ của bản đồ hoặc trò chơi.
+lenum.texture = Tên kết cấu lấy thẳng từ bản khung kết cấu của trò chơi (dùng kiểu tên kebab-case, tên-chữ-thường-chứa-gạch-nối).\nNếu printFlush đặt là true, sẽ sử dụng nội dung bộ đệm văn bản làm tham số văn bản.
 lenum.texturesize = Kích thước của kết cấu bằng ô. Giá trị 0 chia tỷ lệ chiều rộng của điểm đánh dấu theo kích thước của kết cấu ban đầu.
 lenum.autoscale = Có chia tỷ lệ điểm đánh dấu tương ứng với mức thu phóng của người chơi hay không.
 lenum.posi = Vị trí theo chỉ số, dùng cho điểm đánh dấu đường kẻ (line) và bốn điểm (quad) với 0 là vị trí đầu tiên.
 lenum.uvi = Vị trí của kết cấu trong phạm vi từ 0 đến 1, dùng cho đánh dấu bốn điểm (quad).
-lenum.colori = Màu theo chỉ số, dùng cho điểm đánh dấu đường kẻ (line) và bốn điểm (quad) với 0 là màu đầu tiên.
+lenum.colori = Màu theo chỉ số, dùng cho điểm đánh dấu đường kẻ (line) và bốn điểm (quad) với 0 là màu đầu tiên.
\ No newline at end of file

From bc6493c54fcc3c7d8398af8b3be7e04807b7d087 Mon Sep 17 00:00:00 2001
From: Github Actions
 <runner@fv-az841-540.g11ey1dcctbuhkhojwlj3kcpwe.dx.internal.cloudapp.net>
Date: Sun, 14 Apr 2024 14:06:58 +0000
Subject: [PATCH 365/369] Automatic bundle update

---
 core/assets/bundles/bundle_vi.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties
index 11550e1885..7856f9339e 100644
--- a/core/assets/bundles/bundle_vi.properties
+++ b/core/assets/bundles/bundle_vi.properties
@@ -2571,4 +2571,4 @@ lenum.texturesize = Kích thước của kết cấu bằng ô. Giá trị 0 chi
 lenum.autoscale = Có chia tỷ lệ điểm đánh dấu tương ứng với mức thu phóng của người chơi hay không.
 lenum.posi = Vị trí theo chỉ số, dùng cho điểm đánh dấu đường kẻ (line) và bốn điểm (quad) với 0 là vị trí đầu tiên.
 lenum.uvi = Vị trí của kết cấu trong phạm vi từ 0 đến 1, dùng cho đánh dấu bốn điểm (quad).
-lenum.colori = Màu theo chỉ số, dùng cho điểm đánh dấu đường kẻ (line) và bốn điểm (quad) với 0 là màu đầu tiên.
\ No newline at end of file
+lenum.colori = Màu theo chỉ số, dùng cho điểm đánh dấu đường kẻ (line) và bốn điểm (quad) với 0 là màu đầu tiên.

From 569d0f8fac401f09809513987cf67dd5f4148c05 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 14 Apr 2024 11:17:57 -0400
Subject: [PATCH 366/369] Fixed #9747 / Fixed #9746

---
 core/src/mindustry/entities/comp/BuildingComp.java | 6 +++++-
 core/src/mindustry/entities/comp/UnitComp.java     | 2 +-
 core/src/mindustry/input/InputHandler.java         | 4 ++--
 core/src/mindustry/ui/dialogs/AdminsDialog.java    | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index a8d027cf1e..f7c114ab6d 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -1310,7 +1310,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         if(value instanceof UnitType) type = UnitType.class;
         
         if(builder != null && builder.isPlayer()){
-            lastAccessed = builder.getPlayer().coloredName();
+            updateLastAccess(builder.getPlayer());
         }
 
         if(block.configurations.containsKey(type)){
@@ -1324,6 +1324,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         }
     }
 
+    public void updateLastAccess(Player player){
+        lastAccessed = player.coloredName();
+    }
+
     /** Called when the block is tapped by the local player. */
     public void tapped(){
 
diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index 061d323858..8ca3361cdd 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -734,7 +734,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     /** @return name of direct or indirect player controller. */
     @Override
     public @Nullable String getControllerName(){
-        if(isPlayer()) return getPlayer().name;
+        if(isPlayer()) return getPlayer().coloredName();
         if(controller instanceof LogicAI ai && ai.controller != null) return ai.controller.lastAccessed;
         return null;
     }
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index e4ba051bac..b280a958be 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -391,7 +391,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             if(build == null || build.team() != player.team() || !build.block.commandable) continue;
 
             build.onCommand(target);
-            build.lastAccessed = player.name;
+            build.updateLastAccess(player);
 
             if(!state.isPaused() && player == Vars.player){
                 Fx.moveCommand.at(target);
@@ -596,7 +596,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             throw new ValidateException(player, "Player cannot rotate a block.");
         }
 
-        if(player != null) build.lastAccessed = player.name;
+        if(player != null) build.updateLastAccess(player);
         int previous = build.rotation;
         build.rotation = Mathf.mod(build.rotation + Mathf.sign(direction), 4);
         build.updateProximity();
diff --git a/core/src/mindustry/ui/dialogs/AdminsDialog.java b/core/src/mindustry/ui/dialogs/AdminsDialog.java
index 04bdf379d7..0d3eedba10 100644
--- a/core/src/mindustry/ui/dialogs/AdminsDialog.java
+++ b/core/src/mindustry/ui/dialogs/AdminsDialog.java
@@ -1,5 +1,6 @@
 package mindustry.ui.dialogs;
 
+import arc.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import mindustry.gen.*;
@@ -39,7 +40,7 @@ public class AdminsDialog extends BaseDialog{
             res.labelWrap("[lightgray]" + info.lastName).width(w - h - 24f);
             res.add().growX();
             res.button(Icon.cancel, () -> {
-                ui.showConfirm("@confirm", "@confirmunadmin", () -> {
+                ui.showConfirm("@confirm", Core.bundle.format("@confirmunadmin", info.lastName), () -> {
                     netServer.admins.unAdminPlayer(info.id);
                     Groups.player.each(player -> {
                         if(player != null && !player.isLocal() && player.uuid().equals(info.id)){

From 9333aa95996a6f9f627ee8ae6f92495854f71554 Mon Sep 17 00:00:00 2001
From: NealRead <160118416+NealRead@users.noreply.github.com>
Date: Mon, 15 Apr 2024 00:35:35 +0700
Subject: [PATCH 367/369] Update servers_v7.json (#9748)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 4bf64d8b48..1fcaf20e7a 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -291,7 +291,7 @@
   },
   {
     "name": "NPTS",
-    "address": ["81.94.156.54"]
+    "address": ["178.20.45.59"]
   },
   {
     "name": "Skywar.VN",

From 0be74922b0a31f3365cd6ce9d99e5717dd2d8e11 Mon Sep 17 00:00:00 2001
From: Leo <86385005+Leo-MathGuy@users.noreply.github.com>
Date: Mon, 15 Apr 2024 18:03:59 +0500
Subject: [PATCH 368/369] Added offset to DrawFlame (#9749)

---
 core/src/mindustry/world/draw/DrawFlame.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/world/draw/DrawFlame.java b/core/src/mindustry/world/draw/DrawFlame.java
index 0c6d3c41b3..60af38b497 100644
--- a/core/src/mindustry/world/draw/DrawFlame.java
+++ b/core/src/mindustry/world/draw/DrawFlame.java
@@ -14,6 +14,7 @@ public class DrawFlame extends DrawBlock{
     public TextureRegion top;
     public float lightRadius = 60f, lightAlpha = 0.65f, lightSinScl = 10f, lightSinMag = 5;
     public float flameRadius = 3f, flameRadiusIn = 1.9f, flameRadiusScl = 5f, flameRadiusMag = 2f, flameRadiusInMag = 1f;
+    public float flameX = 0, flameY = 0;
 
     public DrawFlame(){
     }
@@ -43,9 +44,9 @@ public class DrawFlame extends DrawBlock{
             Draw.alpha(((1f - g) + Mathf.absin(Time.time, 8f, g) + Mathf.random(r) - r) * build.warmup());
 
             Draw.tint(flameColor);
-            Fill.circle(build.x, build.y, flameRadius + Mathf.absin(Time.time, flameRadiusScl, flameRadiusMag) + cr);
+            Fill.circle(build.x + flameX, build.y + flameY, flameRadius + Mathf.absin(Time.time, flameRadiusScl, flameRadiusMag) + cr);
             Draw.color(1f, 1f, 1f, build.warmup());
-            Fill.circle(build.x, build.y, flameRadiusIn + Mathf.absin(Time.time, flameRadiusScl, flameRadiusInMag) + cr);
+            Fill.circle(build.x + flameX, build.y + flameY, flameRadiusIn + Mathf.absin(Time.time, flameRadiusScl, flameRadiusInMag) + cr);
 
             Draw.color();
         }
@@ -53,6 +54,6 @@ public class DrawFlame extends DrawBlock{
 
     @Override
     public void drawLight(Building build){
-        Drawf.light(build.x, build.y, (lightRadius + Mathf.absin(lightSinScl, lightSinMag)) * build.warmup() * build.block.size, flameColor, lightAlpha);
+        Drawf.light(build.x + flameX, build.y + flameY, (lightRadius + Mathf.absin(lightSinScl, lightSinMag)) * build.warmup() * build.block.size, flameColor, lightAlpha);
     }
 }

From b7fab3839afa4210f6c2cf19680680bf526c098c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 15 Apr 2024 12:54:07 -0400
Subject: [PATCH 369/369] Added Mod#getConfigFolder

---
 core/src/mindustry/mod/Mod.java  |  7 ++++++-
 core/src/mindustry/mod/Mods.java | 12 +++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/mod/Mod.java b/core/src/mindustry/mod/Mod.java
index d56ea9d526..930f967a06 100644
--- a/core/src/mindustry/mod/Mod.java
+++ b/core/src/mindustry/mod/Mod.java
@@ -6,6 +6,11 @@ import mindustry.*;
 
 public abstract class Mod{
 
+    /** @return the folder where configuration files for this mod should go.*/
+    public Fi getConfigFolder(){
+        return Vars.mods.getConfigFolder(this);
+    }
+
     /** @return the config file for this plugin, as the file 'mods/[plugin-name]/config.json'.*/
     public Fi getConfig(){
         return Vars.mods.getConfig(this);
@@ -26,7 +31,7 @@ public abstract class Mod{
 
     }
 
-    /** Register any commands to be used on the client side, e.g. sent from an in-game player.. */
+    /** Register any commands to be used on the client side, e.g. sent from an in-game player. */
     public void registerClientCommands(CommandHandler handler){
 
     }
diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
index 25a6e1cc4c..9e8e6b2b2b 100644
--- a/core/src/mindustry/mod/Mods.java
+++ b/core/src/mindustry/mod/Mods.java
@@ -62,12 +62,18 @@ public class Mods implements Loadable{
         return mainLoader;
     }
 
-    /** Returns a file named 'config.json' in a special folder for the specified plugin.
+    /** @return the folder where configuration files for this mod should go. The folder may not exist yet; call mkdirs() before writing to it.
      * Call this in init(). */
-    public Fi getConfig(Mod mod){
+    public Fi getConfigFolder(Mod mod){
         ModMeta load = metas.get(mod.getClass());
         if(load == null) throw new IllegalArgumentException("Mod is not loaded yet (or missing)!");
-        return modDirectory.child(load.name).child("config.json");
+        return modDirectory.child(load.name);
+    }
+
+    /** @return a file named 'config.json' in the config folder for the specified mod.
+     * Call this in init(). */
+    public Fi getConfig(Mod mod){
+        return getConfigFolder(mod).child("config.json");
     }
 
     /** Returns a list of files per mod subdirectory. */