Fixed loading bar stroke not scaling correctly

* bundle_fr.properties Updates

Add new commits

* Update Bundle

.github/workflows/deployment.yml

@@ -47,7 +47,8 @@ jobs:
         git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
         cd ../MindustryBuilds
         echo "Updating version to ${RELEASE_VERSION:1}"
-        echo versionName=7-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${GITHUB_RUN_NUMBER} > version_fdroid.txt
+        BNUM=$(($GITHUB_RUN_NUMBER + 1000))
+        echo versionName=7-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${BNUM} > version_fdroid.txt
         git add .
         git commit -m "Updating to build ${RELEASE_VERSION:1}"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds

.gitignore

@@ -1,4 +1,5 @@
 logs/
+/fastlane/metadata/android/en-US/changelogs/
 /core/assets/mindustry-saves/
 /core/assets/mindustry-maps/
 /core/assets/bundles/output/

android/AndroidManifest.xml

@@ -14,6 +14,7 @@
             android:icon="@mipmap/ic_launcher"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:isGame="true"
+            android:theme="@style/ArcTheme"
             android:usesCleartextTraffic="true"
             android:appCategory="game"
             android:label="@string/app_name"

android/build.gradle

@@ -100,6 +100,9 @@ android{
         all{
             minifyEnabled = true
             shrinkResources = true
+            //this is the ONLY WAY I could find to force r8 to keep its filthy hands off of my default interfaces.
+            //may have undesirable side effects
+            debuggable = true
             proguardFiles("proguard-rules.pro")
         }
     }

android/res/values-v21/styles.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ArcTheme" parent="android:Theme.Material.NoActionBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
+</resources>

android/res/values/styles.xml

@@ -0,0 +1,10 @@
+<resources>
+    <style name="ArcTheme" parent="android:Theme">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
+</resources>

android/src/mindustry/android/AndroidLauncher.java

@@ -84,9 +84,9 @@ public class AndroidLauncher extends AndroidApplication{
                             try{
                                 //try to load own class first
                                 loadedClass = findClass(name);
-                            }catch(ClassNotFoundException e){
+                            }catch(ClassNotFoundException | NoClassDefFoundError e){
                                 //use parent if not found
-                                loadedClass = super.loadClass(name, resolve);
+                                return parent.loadClass(name);
                             }
                         }
 

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

@@ -143,7 +143,8 @@ public class EntityIO{
                 if(sl) cont("if(!islocal)");
 
                 if(sf){
-                    st(field.name + lastSuf + " = this." + field.name + targetSuf);
+                    //TODO adding + targetSuf to the assignment fixes units being interpolated incorrectly during physics, but makes interpolation snap instead.
+                    st(field.name + lastSuf + " = this." + field.name);
                 }
 
                 io(field.type, "this." + (sf ? field.name + targetSuf : field.name) + " = ");

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

@@ -87,18 +87,18 @@ public class AssetsProcess extends BaseProcessor{
             filename = filename.substring(0, filename.indexOf("."));
 
             String sfilen = filename;
-            String dtype = p.name().endsWith(".9.png") ? "arc.scene.style.NinePatchDrawable" : "arc.scene.style.TextureRegionDrawable";
+            String dtype = "arc.scene.style.Drawable";
 
             String varname = capitalize(sfilen);
 
             if(SourceVersion.isKeyword(varname)) varname += "s";
 
             type.addField(ClassName.bestGuess(dtype), varname, Modifier.STATIC, Modifier.PUBLIC);
-            load.addStatement(varname + " = (" + dtype + ")arc.Core.atlas.drawable($S)", sfilen);
+            load.addStatement(varname + " = arc.Core.atlas.drawable($S)", sfilen);
         });
 
         for(Element elem : elements){
-            Seq.with(((TypeElement)elem).getEnclosedElements()).each(e -> e.getKind() == ElementKind.FIELD, field -> {
+            Seq.with(elem.getEnclosedElements()).each(e -> e.getKind() == ElementKind.FIELD, field -> {
                 String fname = field.getSimpleName().toString();
                 if(fname.startsWith("default")){
                     loadStyles.addStatement("arc.Core.scene.addStyle(" + field.asType().toString() + ".class, mindustry.ui.Styles." + fname + ")");
@@ -124,7 +124,7 @@ public class AssetsProcess extends BaseProcessor{
             String name = p.nameWithoutExtension();
 
             if(names.contains(name)){
-                BaseProcessor.err("Duplicate file name: " + p.toString() + "!");
+                BaseProcessor.err("Duplicate file name: " + p + "!");
             }else{
                 names.add(name);
             }

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

@@ -0,0 +1 @@
+{version:2,fields:[{name:collided,type:arc.struct.IntSeq},{name:damage,type:float},{name:data,type:java.lang.Object},{name:fdata,type:float},{name:lifetime,type:float},{name:owner,type:mindustry.gen.Entityc},{name:rotation,type:float},{name:team,type:mindustry.game.Team},{name:time,type:float},{name:type,type:mindustry.entities.bullet.BulletType},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

build.gradle

@@ -501,8 +501,10 @@ task deployAll{
     dependsOn "desktop:packrWindows64"
     dependsOn "desktop:packrWindows32"
     dependsOn "desktop:packrMacOS"
-    dependsOn "server:deploy"
+    if(versionModifier != "steam"){
-    dependsOn "android:deploy"
+        dependsOn "server:deploy"
+        dependsOn "android:deploy"
+    }
 }
 
 task resolveDependencies{

core/assets/bundles/bundle.properties

@@ -806,6 +806,7 @@ bullet.reload = [stat]{0}[lightgray]x fire rate
 unit.blocks = blocks
 unit.blockssquared = blocks²
 unit.powersecond = power units/second
+unit.tilessecond = tiles/second
 unit.liquidsecond = liquid units/second
 unit.itemssecond = items/second
 unit.liquidunits = liquid units
@@ -1592,7 +1593,7 @@ lst.set = Set a variable.
 lst.operation = Perform an operation on 1-2 variables.
 lst.end = Jump to the top of the instruction stack.
 lst.wait = Wait a certain number of seconds.
-lst.lookup = Look up a item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.lookup = Look up an item/liquid/unit/block type by ID.\nTotal counts of each type can be accessed with:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
 lst.jump = Conditionally jump to another statement.
 lst.unitbind = Bind to the next unit of a type, and store it in [accent]@unit[].
 lst.unitcontrol = Control the currently bound unit.

core/assets/bundles/bundle_de.properties

@@ -460,6 +460,7 @@ toolmode.drawteams = Teams zeichnen
 toolmode.drawteams.description = Zeichnet Teams statt Blöcke.
 
 filters.empty = [lightgray]Keine Filter! Füge einen mit dem unteren Knopf hinzu.
+
 filter.distort = Verzerren
 filter.noise = Rauschen
 filter.enemyspawn = Gegnerischer Spawn Auswahl
@@ -476,6 +477,7 @@ filter.clear = Löschen
 filter.option.ignore = Ignorieren
 filter.scatter = Streuen
 filter.terrain = Landschaft
+
 filter.option.scale = Skalierung
 filter.option.chance = Wahrscheinlichkeit
 filter.option.mag = Größe
@@ -490,6 +492,7 @@ filter.option.block = Block
 filter.option.floor = Boden
 filter.option.flooronto = Zielboden
 filter.option.target = Ziel
+filter.option.replacement = Ersatz
 filter.option.wall = Wand
 filter.option.ore = Erz
 filter.option.floor2 = Sekundärer Boden
@@ -675,6 +678,7 @@ unit.nobuild = [scarlet]Einheit kann nicht bauen!
 lastaccessed = [lightgray]Zuletzt konfiguriert: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <öffne Spiel um zu zeigen>
 stat.description = Beschreibung
 stat.input = Eingang
 stat.output = Ausgang
@@ -991,6 +995,7 @@ rules.waves = Wellen
 rules.attack = Angriff-Modus
 rules.buildai = KI kann bauen
 rules.corecapture = Kern nach Zerstörung einnehmen
+rules.polygoncoreprotection = Polygonaler Kernschutz
 rules.enemyCheat = Unbegrenzte Ressourcen für die KI (Rotes Team)
 rules.blockhealthmultiplier = Block-Lebenspunkte-Multiplikator
 rules.blockdamagemultiplier = Block-Schaden-Multiplikator
@@ -1161,6 +1166,7 @@ block.spore-cluster.name = Sporen-Cluster
 block.metal-floor.name = Metallboden 1
 block.metal-floor-2.name = Metallboden 2
 block.metal-floor-3.name = Metallboden 3
+block.metal-floor-4.name = Metallboden 4
 block.metal-floor-5.name = Metallboden 5
 block.metal-floor-damaged.name = beschädigter Metallboden
 block.dark-panel-1.name = Dunkles Panel 1
@@ -1585,6 +1591,8 @@ lst.sensor = Gibt Daten über einen Block oder eine Einheit wieder.
 lst.set = Setzt eine Variable fest.
 lst.operation = Verändert eine Variable.
 lst.end = Springt wieder nach oben.
+lst.wait = Wartet eine bestimmte Zeit.
+lst.lookup = Sucht ein Item, eine Flüssigkeit, eine Einheit oder einen Block.\nGesamtmengen von jeder Sache können mit \n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]\nabgerufen werden.
 lst.jump = Falls die Bedingung erfüllt ist, wird woanders weitergemacht.
 lst.unitbind = Speichert eine Einheit einer Sorte als [accent]@unit[].
 lst.unitcontrol = Steuert [accent]@unit[].

core/assets/bundles/bundle_es.properties

@@ -41,11 +41,13 @@ be.ignore = Ignorar
 be.noupdates = No se encontraron actualizaciones.
 be.check = Buscar actualizaciones
 
-mod.featured.title = Explorador de mods
+mods.browser = Explorador de Mods
-mod.featured.dialog.title = Explorador de Mods
 mods.browser.selected = Mod seleccionado
-mods.browser.add = Installar Mod
+mods.browser.add = Instalar
-mods.github.open = Abrir en Github
+mods.browser.reinstall = Reinstalar
+mods.github.open = Repositorio
+mods.browser.sortdate = Más recientes
+mods.browser.sortstars = Mejor valorados
 
 schematic = Plantilla
 schematic.add = Guardar plantilla...
@@ -55,16 +57,24 @@ schematic.exists = Ya existe una plantilla con ese nombre.
 schematic.import = Importar plantilla...
 schematic.exportfile = Exportar archivo
 schematic.importfile = Importar archivo
-schematic.browseworkshop = Buscar en el Steam Workshop
+schematic.browseworkshop = Buscar en Steam Workshop
 schematic.copy = Copiar al portapapeles.
 schematic.copy.import = Importar desde el portapapeles.
-schematic.shareworkshop = Compartir en el Steam Workshop
+schematic.shareworkshop = Compartir en Steam Workshop
 schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Girar plantilla
 schematic.saved = Plantilla guardada.
 schematic.delete.confirm = Se borrará ésta plantilla.
 schematic.rename = Renombrar plantilla
 schematic.info = {0}x{1}, {2} bloques
 schematic.disabled = [scarlet]Plantillas desactivadas.[]\nNo puedes usar plantillas en este [accent]mapa[] o [accent]servidor.
+schematic.tags = Etiquetas:
+schematic.edittags = Editar Etiquetas
+schematic.addtag = Añadir Etiqueta
+schematic.texttag = Texto de Etiqueta
+schematic.icontag = Icono de Etiqueta
+schematic.renametag = Renombrar Etiqueta
+schematic.tagdelconfirm = ¿Eliminar ésta etiqueta?
+schematic.tagexists = Esa etiqueta ya existe.
 
 stats = Estadísticas
 stat.wave = Oleadas Derrotadas:[accent] {0}
@@ -77,12 +87,12 @@ stat.playtime = Tiempo jugado:[accent] {0}
 stat.rank = Rango final: [accent]{0}
 
 globalitems = [accent]Recursos Totales
-map.delete = ¿Estás seguro de que quieres borrar el mapa "[accent]{0}[]"?
+map.delete = ¿Quieres borrar el mapa "[accent]{0}[]"?
 level.highscore = Puntuación más alta: [accent]{0}
-level.select = Selección de nivel
+level.select = Selección de Nivel
 level.mode = Modo de juego:
 coreattack = < ¡El núcleo está bajo ataque! >
-nearpoint = [[ [scarlet]ABANDONA EL PUNTO DE APARICIÓN INMEDIATAMENTE[] ]\nRiesgo de aniquilación inminente
+nearpoint = [[ [scarlet]ABANDONA EL PUNTO DE ATERRIZAJE INMEDIATAMENTE[] ]\nRiesgo de aniquilación inminente
 database = Base de datos
 savegame = Guardar Partida
 loadgame = Cargar Partida
@@ -90,6 +100,7 @@ joingame = Unirse a Partida
 customgame = Crear Partida
 newgame = Nueva Partida
 none = <no hay>
+none.found = [lightgray]<no hay coincidencias>
 minimap = Minimapa
 position = Posición
 close = Cerrar
@@ -110,17 +121,20 @@ committingchanges = Confirmando Cambios
 done = Hecho
 feature.unsupported = Tu dispositivo no es compatible con esta función.
 
-mods.alphainfo = Ten en cuenta que los mods estan en fase Alpha, y[scarlet] pueden tener varios errores[].\nReporta cualquier error que encuentres en la página de GitHub de Mindustry.
+mods.initfailed = [red]⚠[] La anterior ejecución de Mindustry encontró un fallo al inicializarse. Seguramente fue causado por algún mod erróneo.\n\nPara evitar un bucle de erroes al iniciar el juego, [red]se han desactivado todos los mods.[]\n\nPuedes desactivar ésta medida de seguridad desde [accent]Opciones->Juego->Desactivar mods si el juego encuentra un error al iniciarse.[].
 mods = Mods
 mods.none = [lightgray]¡No se encontraron Mods!
-mods.guide = Guía de Modding
+mods.guide = Guía sobre Mods
 mods.report = Reportar Error
 mods.openfolder = Abrir carpeta de mods
+mods.viewcontent = Ver Contenido
 mods.reload = Recargar
 mods.reloadexit = A continuación se cerrará el juego para recargar los mods.
+mod.installed = [[Instalado]
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Activado
 mod.disabled = [scarlet]Desactivado
+mod.multiplayer.compatible = [gray]Compatible con Multijugador
 mod.disable = Desactivar
 mod.content = Contenido:
 mod.delete.error = No se pudo elminar el mod. Tal vez esté en uso por el juego.
@@ -130,20 +144,20 @@ mod.missingdependencies = [scarlet]Dependencias faltantes: {0}
 mod.erroredcontent = [scarlet]Contenido erróneo
 mod.errors = Ha ocurrido un fallo al cargar el contenido.
 mod.noerrorplay = [scarlet]Se están ejecutando algunos mods con fallos.[]Deshabilítalos o arregla los errores antes de jugar.
-mod.nowdisabled = [scarlet]Al/Los Mod/s '{0}'le esta/n faltando dependencias:[accent] {1}\n[lightgray]Estos mods necesitan descargarse primero.\nEste mod será automaticamente desactivado.
+mod.nowdisabled = [scarlet]El mod '{0}' necesita ejecutarse junto a otros mods de los que depende:[accent] {1}\n[lightgray]Es necesario descargar primero estos mods.\nEste mod será automaticamente desactivado.
 mod.enable = Activar
 mod.requiresrestart = El juego se cerrará para aplicar los mods.
-mod.reloadrequired = [scarlet]Se requiere volver a cargar
+mod.reloadrequired = [scarlet]Es necesario Reiniciar
 mod.import = Importar mod
 mod.import.file = Importar archivo
-mod.import.github = Importar Mod de Github
+mod.import.github = Importar desde Github
 mod.jarwarn = [scarlet]Los mods JAR pueden no ser seguros.[]\n¡Asegúrate de haberlos descargado de una fuente en la que confíes!
 mod.item.remove = Este objeto es parte del[accent] '{0}'[] mod. Para eliminarlo, desinstala ese mod.
 mod.remove.confirm = Este mod va a ser eliminado.\n¿Quieres continuar?
 mod.author = [lightgray]Autor:[] {0}
 mod.missing = Esta partida guardada usa mods que has actualizado recientemente o que no tienes instalados. Se puede corromper la partida guardada. ¿Quieres cargarla a pesar de ello?\n[lightgray]Mods:\n{0}
-mod.preview.missing = Antes de publicar este mod en el Steam Workshop, debe añadir una imagen de vista previa.\nAñada una imagen  con nombre[accent] preview.png[] en la carpeta del mod e intente nuevamente.
+mod.preview.missing = Antes de publicar este mod en Steam Workshop, debes añadir una imagen de vista previa.\nAñade una imagen llamada[accent] preview.png[] en la carpeta del mod e inténtalo de nuevo.
-mod.folder.missing = Solo los mods en forma de carpeta se pueden publicar en el Steam Workshop.\nPara convertir cualquier mod en una carpeta, simplemente descomprima su archivo a una carpeta y elimine el zip anterior, luego reinicie su juego o vuelva a cargar sus mods.
+mod.folder.missing = Sólo los mods en forma de carpeta se pueden publicar en Steam Workshop.\nPara convertir cualquier mod en una carpeta, descomprime su archivo a una carpeta y elimina el zip anterior, luego reinicia el juego o vuelve a cargar tus mods.
 mod.scripts.disable = Tu dispositivo no es compatible con mods con scripts. Debes deshabilitar esos mods para jugar.
 
 about.button = Acerca de...
@@ -214,6 +228,8 @@ trace.ip = IP: [accent]{0}
 trace.id = ID Única: [accent]{0}
 trace.mobile = Cliente de móvil: [accent]{0}
 trace.modclient = Cliente Personalizado: [accent]{0}
+trace.times.joined = Se ha unido [accent]{0} []veces
+trace.times.kicked = Fue expulsado [accent]{0} []veces
 invalidid = ¡ID de cliente inválida! Por favor, envía un informe del error.
 server.bans = Expulsiones
 server.bans.none = No se ha baneado a ningún usuario aún
@@ -222,16 +238,16 @@ server.admins.none = ¡No hay ningún administrador!
 server.add = Agregar Servidor
 server.delete = ¿Estás seguro de querer borrar este servidor?
 server.edit = Editar Servidor
-server.outdated = [crimson]¡Servidor desactualizado![]
+server.outdated = [scarlet]¡Servidor Desactualizado![]
-server.outdated.client = [crimson]¡Cliente desactualizado![]
+server.outdated.client = [scarlet]¡Cliente Desactualizado![]
-server.version = [lightgray]Versión: {0}
+server.version = [gray]v{0} {1}
-server.custombuild = [accent]Versión personalizada
+server.custombuild = [accent]Versión Personalizada
-confirmban = ¿Quieres banear a este jugador?
+confirmban = ¿Quieres banear a "{0}[white]"?
-confirmkick = ¿Estás seguro de querer expulsar este jugador?
+confirmkick = ¿Quieres expulsar a "{0}[white]"?
-confirmvotekick = ¿Estás de acuerdo en expulsar este jugador?
+confirmvotekick = ¿Estás a favor de expulsar a "{0}[white]"?
 confirmunban = ¿Quieres desbanear a este jugador?
-confirmadmin = ¿Quieres hacer administrador a este jugador?
+confirmadmin = ¿Quieres hacer administrador a "{0}[white]"?
-confirmunadmin = ¿Quieres quitar los permisos de administrador a este jugador?
+confirmunadmin = ¿Quieres quitarle los permisos de administrador a "{0}[white]"?
 joingame.title = Unirse a Partida
 joingame.ip = IP:
 disconnect = Desconectado.
@@ -287,6 +303,7 @@ cancel = Cancelar
 openlink = Abrir Enlace
 copylink = Copiar Enlace
 back = Atrás
+max = Máximo
 crash.export = Exportar Registros de errores
 crash.none = No se encontraron Registros de errores.
 crash.exported = Registros de errores exportados.
@@ -361,7 +378,6 @@ editor.center = Centrar
 workshop = Steam Workshop
 waves.title = Oleadas
 waves.remove = Borrar
-waves.never = <nunca>
 waves.every = cada
 waves.waves = oleada(s)
 waves.perspawn = por lugar de aparición
@@ -444,6 +460,7 @@ toolmode.drawteams = Dibujar Equipos
 toolmode.drawteams.description = Dibuja equipos en lugar de bloques.
 
 filters.empty = [lightgray]¡No hay filtros! Añade uno con el botón de abajo.
+
 filter.distort = Distorsionar
 filter.noise = Ruido
 filter.enemyspawn = Punto de aparición enemigo
@@ -460,19 +477,22 @@ filter.clear = Despejar
 filter.option.ignore = Ignorar
 filter.scatter = Dispersar
 filter.terrain = Terreno
+
 filter.option.scale = Escala
 filter.option.chance = Probabilidad
 filter.option.mag = Magnitud
 filter.option.threshold = Umbral
 filter.option.circle-scale = Escala del círculo
 filter.option.octaves = Continuidad
-filter.option.falloff = Aterrizaje
+filter.option.falloff = Caída
 filter.option.angle = Ángulo
+filter.option.rotate = Rotación
 filter.option.amount = Cantidad
 filter.option.block = Bloque
 filter.option.floor = Suelo
 filter.option.flooronto = Suelo objetivo
-filter.option.target = Target
+filter.option.target = Objetivo
+filter.option.replacement = Reemplazo
 filter.option.wall = Muro
 filter.option.ore = Veta
 filter.option.floor2 = Terreno secundario
@@ -484,11 +504,12 @@ width = Ancho:
 height = Alto:
 menu = Menú
 play = Jugar
-campaign = Continuar Campaña
+campaign = Campaña
 load = Cargar
 save = Guardar
 fps = FPS: {0}
-ping = Ping: {0} ms
+ping = Ping: {0}ms
+tps = TPS: {0}
 memory = Mem: {0}mb
 memory2 = Mem:\n {0}mb +\n {1}mb
 language.restart = Reinicia el juego para que los cambios en el idioma tengan efecto.
@@ -565,6 +586,7 @@ sector.attacked = Sector [accent]{0}[white] bajo ataque[]!
 sector.lost = ¡Sector [accent]{0}[white] perdido[]!
 #nota: el espacio en blanco en la línea siguiente es intencionado
 sector.captured = ¡Sector [accent]{0}[white] capturado[]!
+sector.changeicon = Cambiar Icono
 
 threat.low = Baja
 threat.medium = Media
@@ -611,6 +633,20 @@ sector.extractionOutpost.description = Una base remota, construida por el enemig
 sector.impact0078.description = Aquí yacen las ruinas de la primera estación de transporte interestelar en estar operativa del sistema.\n\nRecupera todo lo posible de los escombros. Investiga cualquier tecnología intacta.
 sector.planetaryTerminal.description = El objetivo final.\n\nÉsta base costera alberga una estructura capaz de lanzar Núcleos a planeteas locales. Está extremadamente bien protegida.\n\nProduce unidades navales. Acaba con el enemigo lo antes posible. Analiza la estructura de lanzamiento.
 
+status.burning.name = En llamas
+status.freezing.name = Congelado
+status.wet.name = Húmedo
+status.muddy.name = Fangoso
+status.melting.name = Fundido
+status.sapped.name = Debilitado
+status.electrified.name = Electrificado
+status.spore-slowed.name = Ralentizado
+status.tarred.name = Alquitranado
+status.overclock.name = Sobrecargado
+status.shocked.name = Aturdido
+status.blasted.name = Explotado
+status.unmoving.name = Inmóvil
+
 settings.language = Idioma
 settings.data = Datos del Juego
 settings.reset = Reiniciar a los valores por defecto
@@ -632,6 +668,7 @@ settings.clearcampaignsaves.confirm = ¿Quieres borrar tus partidas guardadas en
 paused = [accent] < Pausado >
 clear = Vaciar
 banned = [scarlet]Baneado
+unsupported.environment = [scarlet]Entorno no válido
 yes = Sí
 no = No
 info.title = Información
@@ -641,12 +678,14 @@ unit.nobuild = [scarlet]Esta unidad no puede construir
 lastaccessed = [lightgray]Último usado: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <cargar mapa para mostrar>
 stat.description = Objetivo
 stat.input = Entrada
 stat.output = Salida
 stat.booster = Potenciador
 stat.tiles = Terreno requerido
 stat.affinities = Afinidades
+stat.opposites = Opuestos
 stat.powercapacity = Capacidad de Energía
 stat.powershot = Energía/Disparo
 stat.damage = Daño
@@ -669,6 +708,7 @@ stat.memorycapacity = Capacidad de memoria
 stat.basepowergeneration = Generación de energía
 stat.productiontime = Tiempo de producción
 stat.repairtime = Tiempo para Reparar Bloque Completamente
+stat.repairspeed = Velocidad de Reparación
 stat.weapons = Armas
 stat.bullet = Proyectil
 stat.speedincrease = Aumento de Velocidad
@@ -705,15 +745,24 @@ stat.minetier = Nivel de taladro
 stat.payloadcapacity = Capacidad de carga
 stat.commandlimit = Límite de comando
 stat.abilities = Habilidades
-stat.canboost = Tiene Propulsores
+stat.canboost = Potenciador
 stat.flying = Aéreo
+stat.ammouse = Usa Munición
+stat.damagemultiplier = Multiplicador de Daño
+stat.healthmultiplier = Multiplicador de Vida
+stat.speedmultiplier = Multiplicador de Velocidad
+stat.reloadmultiplier = Multiplicador de Recarga
+stat.buildspeedmultiplier = Multiplicador de Velocidad de Construcción
+stat.reactive = Reacciona
+stat.healing = Sanador
 
-ability.forcefield = Campo de Fuerza
+ability.forcefield = Campo de Escudo
 ability.repairfield = Campo de Reparación
-ability.statusfield = Campo de Estado
+ability.statusfield = {0} Campo de aceleración
-ability.unitspawn = {0} Fábrica de Drones
+ability.unitspawn = {0} Fábrica
-ability.shieldregenfield = Campo de Regeneración de Escudos
+ability.shieldregenfield = Regeneración de Armaduras
 ability.movelightning = Movimiento Relámpago
+ability.energyfield = Campo de Energía: [accent]{0}[] daño ~ [accent]{1}[] bloques / [accent]{2}[] objetivos
 
 bar.drilltierreq = Requiere un taladro mejor
 bar.noresources = Recursos insuficientes
@@ -736,29 +785,28 @@ bar.power = Energía
 bar.progress = Progreso de construcción
 bar.input = Entrada
 bar.output = Salida
+bar.strength = [stat]{0}[lightgray]x fuerza
 
 units.processorcontrol = [lightgray]Controlado por Procesador
 
 bullet.damage = [stat]{0}[lightgray] Daño
-bullet.splashdamage = [stat]{0}[lightgray] daño de área ~[stat] {1}[lightgray] casillas
+bullet.splashdamage = [stat]{0}[lightgray] área daño ~[stat] {1}[lightgray] bloques
 bullet.incendiary = [stat]Incendiaria
-bullet.sapping = [stat]Oxidante
 bullet.homing = [stat]Rastreadora
-bullet.shock = [stat]Electrizante
 bullet.frag = [stat]De fragmentación
-bullet.buildingdamage = [stat]{0}%[lightgray]daño a estructuras
+bullet.lightning = [stat]{0}[lightgray]x rayo ~ [stat]{1}[lightgray] daño
-bullet.knockback = [stat]{0}[lightgray] Empuje
+bullet.buildingdamage = [stat]{0}%[lightgray] daño a estructuras
-bullet.pierce = [stat]{0}[lightgray]x penetración
+bullet.knockback = [stat]{0}[lightgray] empuje
-bullet.infinitepierce = [stat]Penetrante
+bullet.pierce = [stat]{0}[lightgray]x perforación
+bullet.infinitepierce = [stat]Perforante
 bullet.healpercent = [stat]{0}[lightgray]% reparación
-bullet.freezing = [stat]Congelación
-bullet.tarred = [stat]Ralentizado
 bullet.multiplier = [stat]{0}[lightgray]x multiplicador de munición
 bullet.reload = [stat]{0}[lightgray]x cadencia de fuego
 
 unit.blocks = bloques
 unit.blockssquared = bloques²
 unit.powersecond = unidades de energía/segundo
+unit.tilessecond = bloques/segundo
 unit.liquidsecond = unidades de líquido/segundo
 unit.itemssecond = objetos/segundo
 unit.liquidunits = unidades de líquido
@@ -775,6 +823,7 @@ unit.items = objetos
 unit.thousands = k
 unit.millions = M
 unit.billions = b
+unit.pershot = /disparo
 category.purpose = Objetivo
 category.general = General
 category.power = Energía
@@ -788,10 +837,13 @@ setting.shadows.name = Sombras
 setting.blockreplace.name = Sugerir bloques al construir
 setting.linear.name = Filtrado Lineal
 setting.hints.name = Consejos
+setting.logichints.name = Consejos sobre "Bloques Lógicos"
 setting.flow.name = Mostrar tasa de flujo de recursos
 setting.backgroundpause.name = Pausar en segundo plano
 setting.buildautopause.name = Auto-pausar construcción
-setting.animatedwater.name = Animaciones de Terreno
+setting.doubletapmine.name = Doble-Click para Extraer minerales
+setting.modcrashdisable.name = Desactivar Mods si se cuelga el juego
+setting.animatedwater.name = Animación de Terreno
 setting.animatedshields.name = Animación de Escudos
 setting.antialias.name = Antialias[lightgray] (necesita un reinicio)[]
 setting.playerindicators.name = Indicadores de Jugadores
@@ -844,6 +896,7 @@ setting.bridgeopacity.name = Opacidad de Puentes Transportadores
 setting.playerchat.name = Mostrar el chat de burbuja
 setting.showweather.name = Efectos visuales climáticos
 public.confirm = ¿Quieres hacer pública tu partida?\n[lightgray]Esto se puede cambiar más tarde en "Configuración->Juego->Visibilidad pública de la partida".
+public.confirm.really = ¡Si quieres jugar con amigos, usa [green]Invitar a Amigos[] en lugar de un [scarlet]Servidor Público[]!\n¿De verdad quieres hacer [scarlet]pública[] tu partida?
 public.beta = Recuerda que no puedes crear partidas públicas en las versiones beta del juego.
 uiscale.reset = La escala de la interfaz ha sido modificada.\nPulsa "OK" para conservar esta escala.\n[scarlet]Se desharán los cambios automáticamente en [accent] {0}[] segundos...
 uiscale.cancel = Cancelar y Salir
@@ -908,7 +961,8 @@ keybind.pause.name = Pausa
 keybind.pause_building.name = Pausar/Reanudar construcción
 keybind.minimap.name = Minimapa
 keybind.planet_map.name = Mapa del Planeta
-keybind.research.name = Investigaciones
+keybind.research.name = Investigar
+keybind.block_info.name = Información del Bloque
 keybind.chat.name = Chat
 keybind.player_list.name = Lista de jugadores
 keybind.console.name = Consola
@@ -935,18 +989,23 @@ mode.custom = Normas personalizadas
 
 rules.infiniteresources = Recursos infinitos
 rules.reactorexplosions = Los reactores pueden explotar
+rules.coreincinerates = Núcleos inceran exceso de recursos
 rules.schematic = Permitir Plantillas
 rules.wavetimer = Temporizador de Oleadas
 rules.waves = Oleadas
-rules.attack = Ataque
+rules.attack = Asalto
-rules.buildai = La IA enemiga puede construir
+rules.buildai = Contrucción de IA
-rules.enemyCheat = La IA enemiga tiene recursos infinitos
+rules.corecapture = Capturar Núcleo al Destruirlo
-rules.blockhealthmultiplier = Multiplicador de salud de bloque
+rules.polygoncoreprotection = Protección de Núcleo Poligonal
-rules.blockdamagemultiplier = Multiplicador de daño de bloque
+rules.enemyCheat = La IA (Equipo Rojo) tiene recursos infinitos
+rules.blockhealthmultiplier = Multiplicador de Salud de Bloque
+rules.blockdamagemultiplier = Multiplicador de Daño de Bloque
 rules.unitbuildspeedmultiplier = Multiplicador de velocidad de creación de unidades
-rules.unithealthmultiplier = Multiplicador de la vida de las unidades
+rules.unithealthmultiplier = Multiplicador de Vida de Unidades
-rules.unitdamagemultiplier = Multiplicador del daño de unidades
+rules.unitdamagemultiplier = Multiplicador de Daño de Unidades
-rules.enemycorebuildradius = Radio de No-Construcción del Núcleo Enemigo:[lightgray] (casillas)
+rules.unitcapvariable = Núcleos alteran el Límite de Unidades
+rules.unitcap = Límite Base de Unidades
+rules.enemycorebuildradius = Radio de No-Construcción del Núcleo Enemigo:[lightgray] (bloques)
 rules.wavespacing = Tiempo entre oleadas:[lightgray] (seg)
 rules.buildcostmultiplier = Multiplicador de coste de construcción
 rules.buildspeedmultiplier = Multiplicador de velocidad de construcción
@@ -967,12 +1026,14 @@ rules.explosions = Daño de explosiones de Bloques/Unidades
 rules.ambientlight = Iluminación ambiental
 rules.weather = Clima
 rules.weather.frequency = Frequencia:
+rules.weather.always = Siempre
 rules.weather.duration = Duracion:
 
 content.item.name = Objetos
 content.liquid.name = Líquidos
 content.unit.name = Unidades
 content.block.name = Bloques
+content.status.name = Alteraciones de Estado
 content.sector.name = Sectores
 
 item.copper.name = Cobre
@@ -983,7 +1044,7 @@ item.titanium.name = Titanio
 item.thorium.name = Torio
 item.silicon.name = Silicio
 item.plastanium.name = Plastanio
-item.phase-fabric.name = Tejido de fase
+item.phase-fabric.name = Tejido de Fase
 item.surge-alloy.name = Aleación Eléctrica
 item.spore-pod.name = Vaina de Esporas
 item.sand.name = Arena
@@ -991,11 +1052,12 @@ item.blast-compound.name = Compuesto Explosivo
 item.pyratite.name = Pirotita
 item.metaglass.name = Metacristal
 item.scrap.name = Chatarra
+
 liquid.water.name = Agua
 liquid.slag.name = Magma
 liquid.oil.name = Petróleo
 liquid.cryofluid.name = Líquido criogénico
-#Names of Units and Turrets look better untranslated, since they are propper/own names
+#Names of Units and Turrets looks better untranslated, since they are propper/own names
 unit.dagger.name = Dagger
 unit.mace.name = Mace
 unit.fortress.name = Fortress
@@ -1022,6 +1084,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -1082,23 +1149,25 @@ block.sand-water.name = Agua con arena
 block.darksand-water.name = Agua con arena oscura
 block.char.name = Cenizas
 block.dacite.name = Dacita
-block.dacite-wall.name = Bloque de dacita
+block.rhyolite.name = Riolita
-block.dacite-boulder.name = Roca de dacita
+block.dacite-wall.name = Bloque de Dacita
+block.dacite-boulder.name = Roca de Dacita
 block.ice-snow.name = Hielo-Nieve
-block.stone-wall.name = Bloque de piedra
+block.stone-wall.name = Bloque de Piedra
-block.ice-wall.name = Bloque de hielo
+block.ice-wall.name = Bloque de Hielo
-block.snow-wall.name = Bloque de nieve
+block.snow-wall.name = Bloque de Nieve
-block.dune-wall.name = Bloque de arena
+block.dune-wall.name = Bloque de Arena
 block.pine.name = Pino
 block.dirt.name = Tierra
 block.dirt-wall.name = Bloque de tierra
 block.mud.name = Lodo
 block.white-tree-dead.name = Árbol Blanco Muerto
 block.white-tree.name = Árbol Blanco
-block.spore-cluster.name = Concentración de Esporas
+block.spore-cluster.name = Esporas
-block.metal-floor.name = Suelo de Metal
+block.metal-floor.name = Suelo de Metal 1
 block.metal-floor-2.name = Suelo de Metal 2
 block.metal-floor-3.name = Suelo de Metal 3
+block.metal-floor-4.name = Suelo de Metal 4
 block.metal-floor-5.name = Suelo de Metal 5
 block.metal-floor-damaged.name = Suelo de Metal dañado
 block.dark-panel-1.name = Panel Oscuro 1
@@ -1189,6 +1258,7 @@ block.solar-panel.name = Panel Solar
 block.solar-panel-large.name = Panel Solar Grande
 block.oil-extractor.name = Extractor de Petróleo
 block.repair-point.name = Punto de Reparación de Unidades
+block.repair-turret.name = Torreta Reparadora
 block.pulse-conduit.name = Conducto de Pulso
 block.plated-conduit.name = Conducto Acorazado
 block.phase-conduit.name = Conducto de Fase
@@ -1221,16 +1291,22 @@ block.container.name = Contenedor
 block.launch-pad.name = Plataforma de Lanzamiento
 block.launch-pad-large.name = Plataforma de Lanzamiento Grande
 block.segment.name = Segment
-block.command-center.name = Centro de comando
+block.command-center.name = Centro de Comando
-block.ground-factory.name = Fábrica terrestre
+block.ground-factory.name = Fábrica Terrestre
-block.air-factory.name = Fábrica aérea
+block.air-factory.name = Fábrica Aérea
 block.naval-factory.name = Fábrica naval
-block.additive-reconstructor.name = Reconstructor aditivo
+block.additive-reconstructor.name = Reconstructor Aditivo
-block.multiplicative-reconstructor.name = Reconstructor multiplicativo
+block.multiplicative-reconstructor.name = Reconstructor Multiplicativo
-block.exponential-reconstructor.name = Reconstructor exponencial
+block.exponential-reconstructor.name = Reconstructor Exponencial
-block.tetrative-reconstructor.name = Reconstructor tetrativo
+block.tetrative-reconstructor.name = Reconstructor Tetrativo
-block.payload-conveyor.name = Transportador de carga
+block.payload-conveyor.name = Cinta Transportadora de Carga
-block.payload-router.name = Enrutador de carga
+block.payload-router.name = Enrutador de Carga
+block.duct.name = Túnel
+block.duct-router.name = Túnel Enrutador
+block.duct-bridge.name = Túnel Puente
+block.payload-propulsion-tower.name = Torre de Propulsión de Bloques
+block.payload-void.name = Vacío de Bloques
+block.payload-source.name = Fuente de Bloques
 block.disassembler.name = Desensamblador
 block.silicon-crucible.name = Crisol de silicio
 block.overdrive-dome.name = Campo de Aceleración
@@ -1252,7 +1328,6 @@ block.memory-bank.name = Servidor de memoria
 team.blue.name = azul
 team.crux.name = crux
 team.sharded.name = sharded
-team.orange.name = naranja
 team.derelict.name = delerict
 team.green.name = verde
 team.purple.name = morado
@@ -1273,6 +1348,7 @@ hint.placeConveyor.mobile = Las cintas transportadoras pueden mover objetos de l
 hint.placeTurret = Construye \uf861 [accent]Torretas[] para defender tu base de los enemigos.\n\nLas torretas necesitan munición - en este caso, \uf838cobre.\nUsa cintas transportadoras y taladros para abastecerlas con cobre.
 hint.breaking = Pulsa [accent]Clic-derecho[] y arrastra para destruir bloques.
 hint.breaking.mobile = Activa el botón con el \ue817 [accent]martillo[] situado abajo a la derecha y selecciona bloques para eliminarlos.\n\nMantén el dedo un segundo y arrastra para eliminar bloques directamente en esa selección.
+hint.blockInfo = Puedes visualizar información de un bloque seleccionándolo en el [accent]menú de construcción[], mediante el botón [accent][[?][] en la derecha.
 hint.research = Usa el botón \ue875 [accent]Investigación[] para acceder al menú de descubrimientos tecnológicos.
 hint.research.mobile = Usa el botón \ue875 [accent]Investigación[] para acceder al menú de descubrimientos tecnológicos.
 hint.unitControl = Mantén [accent][[L-ctrl][] y [accent]haz clic[] sobre unidades o torretas aliadas para controlarlas manualmente.
@@ -1319,7 +1395,7 @@ item.spore-pod.details = Esporas. Es algo parecido a una forma de vida sintétic
 item.blast-compound.description = Usado en bombas y munición explosiva.
 item.pyratite.description = Usado en armas incendiarias y generadores  de combustión.
 
-liquid.water.description = Usada comúnmente para enfriar máquinas y para procesar residuos.
+liquid.water.description = Usada para enfriar máquinas y para procesar residuos.
 liquid.slag.description = Diferentes tipos de metales fundidos mezclados. Puede ser separado en sus minerales constituyentes, o disparado a unidades enemigas como arma.
 liquid.oil.description = Se utiliza en producción de materiales avanzados, y en munición incendiaria.
 liquid.cryofluid.description = Usado como refrigerante para reactores, torretas, y fábricas.
@@ -1502,3 +1578,155 @@ unit.omura.description = Dispara rayos contínuos perforantes. Construye unidade
 unit.alpha.description = Defiende el núcleo Shard de los enemigos. Construye estructuras.
 unit.beta.description = Defiende el núcleo Foundation de los enemigos. Construye estructuras.
 unit.gamma.description = Defiende el núcleo Nucleus de los enemigos. Construye estructuras.
+
+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 impresión.\nNo mostrará nada hasta que se use [accent]Ejecutar Imprimir[].
+lst.draw = Añade una operación a la cola de gráfico.\nNo mostrará nada hasta que se use [accent]Ejecutar Gráfico[].
+lst.drawflush = Ejecución en cola de operaciones [accent]Gráfico[] a un monitor gráfico.
+lst.printflush = Ejecución en cola de operaciones [accent]Imprimir[] a un bloque de mensaje.
+lst.getlink = Obtiene el número de enlace de procesador. Inicia en 0.
+lst.control = Controla el estado de un bloque.
+lst.radar = Localiza unidades alrededor de un bloque con rango.
+lst.sensor = Recopila datos de un bloque o unidad.
+lst.set = Establece una variable.
+lst.operation = Realiza una operación sobre 1-2 variables.
+lst.end = Salta al inicio de la lista de instrucciones.
+lst.wait = Espera unos segundos.
+lst.lookup = Busca un objeto/líquido/unidad/tipo de bloque por ID.\nSe puede acceder al número total de cada tipo con:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
+lst.jump = Salta a otra instrucción.
+lst.unitbind = Se enlaza a la siguiente unidad de un tipo, y la almacena en [accent]@unit[].
+lst.unitcontrol = Controla la unidad actualmente enlazada.
+lst.unitradar = Localiza unidades alrededor de la unidad actualmente enlazada.
+lst.unitlocate = Localiza un tipo específico de posición/bloque en cualquier lugar del mapa.\nRequiere una unidad enlazada.
+
+logic.nounitbuild = [red]No se permite la construcción de bloques de categoría lógica.
+
+lenum.type = El tipo de bloque/unidad\nEjemplo: "para cualquier enrutador", devolverá [accent]@router[].\nNo es una cadena de texto.
+lenum.shoot = Dispara a una posición.
+lenum.shootp = Dispara a una unidad/bloque con predicción de velocidad.
+lenum.config = Configuración de bloque, por ejemplo: clasificador.
+lenum.enabled = Si el bloque está activado o no.
+
+laccess.color = Color del iluminador.
+laccess.controller = Controlador de unidad. Si se controla mediante un procesador, devuelve dicho procesador.\nSi está en formación, devuelve su líder.\nDe otra forma, devuelve la misma unidad.
+laccess.dead = Si una unidad/bloque es destruída o inválida.
+laccess.controlled = Devuelve:\n[accent]@ctrlProcessor[] si el control de la unidad lo tiene un procesador\n[accent]@ctrlPlayer[] si el control de la unidad/bloque lo tiene un jugador\n[accent]@ctrlFormation[] si la unidad está en formación\nDe otra forma, devuelve 0.
+laccess.commanded = [red]En desuso. ¡Será eliminado![]\nUsa [accent]controlado[] en su lugar.
+laccess.progress = Progreso de una acción, 0 a 1.\nDevuelve de una producción, recarga de una torreta o progreso de una construcción.
+
+graphicstype.clear = Llena el monitor con un color.
+graphicstype.color = Establece el color para próximas operaciones de gráficos.
+graphicstype.stroke = Establece el ancho de la línea.
+graphicstype.line = Segmento de la línea del gráfico.
+graphicstype.rect = Rellena un rectángulo.
+graphicstype.linerect = Dibuja las aristas de un rectángulo.
+graphicstype.poly = Rellena un polígono regular.
+graphicstype.linepoly = Dibuja las aristas de un polígono regular.
+graphicstype.triangle = Rellena un triángulo.
+graphicstype.image = Dibuja una imágen de un contenido.\nEjemplo: [accent]@router[] o [accent]@dagger[].
+
+lenum.always = Siempre "true".
+lenum.idiv = División de un número entero.
+lenum.div = División.\nDevuelve [accent]null[] al dividir entre cero.
+lenum.mod = Modulo.
+lenum.equal = Igual. Coacciona tipos.\nObjetos no-nulos coaccionados con números pasan a 1, si no coinciden pasan a 0.
+lenum.notequal = No igual. Coacciona tipos.
+lenum.strictequal = Igualdad estricta. No coacciona tipos.\nSe puede usar para comprobar si un resultado es [accent]null[].
+lenum.shl = Cambia bits a izquierda.
+lenum.shr = Cambia bits a derecha.
+lenum.or = Comprobación bit a bit OR.
+lenum.land = Comprobación lógica AND.
+lenum.and = Comprobación bit a bit AND.
+lenum.not = Comprobación bit a bit invertida.
+lenum.xor = Comprobación bit a bit XOR.
+
+lenum.min = Mínimo de dos números.
+lenum.max = Máximo de dos números.
+lenum.angle = Ángulo del vector en grados.
+lenum.len = Longitud del vector.
+
+lenum.sin = Seno, en grados.
+lenum.cos = Coseno, en grados.
+lenum.tan = Tangente, en grados.
+
+lenum.asin = Arco seno, en grados.
+lenum.acos = Arco coseno, en grados.
+lenum.atan = Arco tangente, en grados.
+
+#not a typo, look up 'range notation'
+lenum.rand = Número decimal aleatorio en un rango [0, valor).
+lenum.log = Logaritmo natural (ln).
+lenum.log10 = Logaritmo en base 10.
+lenum.noise = Ruido simplex 2D.
+lenum.abs = Valor absoluto.
+lenum.sqrt = Raíz cuadrada.
+
+lenum.any = Cualquier unidad.
+lenum.ally = Unidad aliada.
+lenum.attacker = Unidad con un arma.
+lenum.enemy = Unidad enemiga.
+lenum.boss = Unidad guardián (Jefe).
+lenum.flying = Unidad aérea.
+lenum.ground = Unidad terrestre.
+lenum.player = Unidad controlada por un jugador.
+
+lenum.ore = Depósito mineral.
+lenum.damaged = Bloque aliado dañado.
+lenum.spawn = Punto de aterrizaje enemigo.\nPuede ser un núcleo o una posición.
+lenum.building = Un bloque de una categoría específica.
+
+lenum.core = Cualquier núcleo.
+lenum.storage = Bloque de almacenamiento, ejemplo: Contenedor.
+lenum.generator = Bloques que generan energía.
+lenum.factory = Bloques que transforman recursos.
+lenum.repair = Puntos de reparación.
+lenum.rally = Centro de comando.
+lenum.battery = Cualquier batería.
+lenum.resupply = Puntos de reabastecimiento.\nSólo es relevante cuando [accent]"Unidades necesitan munición"[] está activada.
+lenum.reactor = Reactor de Impacto/Torio.
+lenum.turret = Cualquier torreta.
+
+sensor.in = El bloque/unidad a detectar.
+
+radar.from = Bloque del que detectar.\nEl rango del sensor está limitado por el rango de dicha construcción.
+radar.target = Filtro de unidades a detectar.
+radar.and = Filtros adicionales.
+radar.order = Orden para ordenar. 0 para invertir.
+radar.sort = Métrica a usar al ordenar resultados.
+radar.output = Variable en la que escribir la salida de una unidad.
+
+unitradar.target = Filtro para detectar unidades.
+unitradar.and = Filtros adicionales.
+unitradar.order = Orden para ordenar. 0 para invertir.
+unitradar.sort = Métrica a usar al ordenar resultados.
+unitradar.output = Variable en la que escribir la salida de una unidad.
+
+control.of = Bloque a controlar.
+control.unit = Unidad/bloque al que apuntar.
+control.shoot = Cuándo disparar.
+
+unitlocate.enemy = Cuándo localizar construcciones enemigas.
+unitlocate.found = Cuándo el objeto es encontrado.
+unitlocate.building = Variable de salida para contrucciones localizadas.
+unitlocate.outx = Coordenada X devuelta.
+unitlocate.outy = Coordenada Y devuelta.
+unitlocate.group = Grupo de bloque a buscar.
+
+lenum.idle = No se mueve, pero seguirá construyendo/extrayendo minerales.\nEs el estado por defecto.
+lenum.stop = Deja de moverse/extraer minerales/contruir.
+lenum.move = Moverse a una posición exacta.
+lenum.approach = Aproximarse a una posición con un radio.
+lenum.pathfind = Establece una ruta hasta el punto de aterrizaje enemigo.
+lenum.target = Dispara a una posición.
+lenum.targetp = Dispara a un objetivo con predicción de velocidad.
+lenum.itemdrop = Suelta un objeto.
+lenum.itemtake = Recoge un objeto de una construcción.
+lenum.paydrop = Suelta la carga actual.
+lenum.paytake = Recoge bloques o unidades en la posición actual como carga a trasnportar.
+lenum.flag = Etiqueta numérica de la unidad.
+lenum.mine = Extrae minerales de una posición.
+lenum.build = Construye una estructura.
+lenum.getblock = Obtiene la construcción 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 = Inicia/Detiene potenciación.

core/assets/bundles/bundle_fr.properties

@@ -807,6 +807,7 @@ bullet.reload = [stat]{0}[lightgray]x vitesse de tir
 unit.blocks = blocs
 unit.blockssquared = blocs²
 unit.powersecond = unités d'énergie/seconde
+unit.tilessecond = tuiles/seconde
 unit.liquidsecond = unités de liquide/seconde
 unit.itemssecond = objets/seconde
 unit.liquidunits = unités de liquide
@@ -1601,6 +1602,8 @@ lst.sensor = Récupère des données depuis un bâtiment ou une unité.
 lst.set = Définit une variable.
 lst.operation = Effectue une opération sur 1 ou 2 variables.
 lst.end = Saute au sommet de la série d’instructions.
+lst.wait =  Attendre un certain nombre de secondes.
+lst.lookup = Recherche d'un type d'objet/liquide/unité/bloc par ID.\nLe nombre total de chaque type peut être consulté avec:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
 lst.jump = Saute conditionnellement vers une autre instruction.
 lst.unitbind = Se lie à une unité du type donné et la stocke dans [accent]@unit[].
 lst.unitcontrol = Contrôle l'unité actuellement liée.

core/assets/bundles/bundle_in_ID.properties

@@ -1591,6 +1591,8 @@ lst.sensor = Mengambil data dari bangunan atau unit.
 lst.set = Menentukan sebuah variabel.
 lst.operation = Melakukan operasi pada 1-2 variabel.
 lst.end = Loncati ke awal dari tumpukan perintah.
+lst.wait = Memberi jeda dalam detik yang ditentukan.
+lst.lookup = Mencari tipe barang/cairan/unit/blok dengan ID.\nJumlah hitungan dari setiap tipe dapat dilihat dengan:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
 lst.jump = Loncati secara bersyarat ke pernyataan berikutnya.
 lst.unitbind = Menautkan ke unit jenis berikutnya, dan menyimpannya di [accent]@unit[].
 lst.unitcontrol = Mengendalikan unit yang saat ini dihubungkan.

core/assets/bundles/bundle_ko.properties

@@ -806,6 +806,7 @@ bullet.reload = [stat]{0}[lightgray]배 발사 속도
 unit.blocks = 블록
 unit.blockssquared = 블록²
 unit.powersecond = 전력/초
+unit.tilessecond = 타일/초
 unit.liquidsecond = 액체/초
 unit.itemssecond = 자원/초
 unit.liquidunits = 액체

core/assets/bundles/bundle_ru.properties

@@ -806,6 +806,7 @@ bullet.reload = [stat]{0}[lightgray]x скорость стрельбы
 unit.blocks = блоков
 unit.blockssquared = блоков²
 unit.powersecond = единиц энергии/секунду
+unit.tilessecond = плиток/секунду
 unit.liquidsecond = жидкостных единиц/секунду
 unit.itemssecond = предметов/секунду
 unit.liquidunits = жидкостных единиц
@@ -1570,7 +1571,7 @@ unit.mega.description = Автоматически ремонтирует пов
 unit.quad.description = Сбрасывает большие бомбы на наземные цели, восстанавливая союзные постройки и повреждая врагов. Может переносить единицы среднего размера.
 unit.oct.description = Защищает союзников поблизости при помощи своего восстанавливающегося щита. Может переносить большинство наземных единиц.
 unit.risso.description = Стреляет залпами ракет и пуль по всем врагам поблизости.
-unit.minke.description = Стреляет зажигательными снарядами и стандартными пулями по наземным целям.
+unit.minke.description = Стреляет артиллерийскими снарядами и стандартными пулями по наземным целям.
 unit.bryde.description = Стреляет дальнобойными артиллерийскими снарядами и ракетами по врагам.
 unit.sei.description = Стреляет залпами ракет и бронебойных пуль по врагам.
 unit.omura.description = Стреляет дальнобойным пробивающим снарядом из рельсотрона по врагам. Производит единицы «Вспышка».
@@ -1591,6 +1592,8 @@ lst.sensor = Получает данные из постройки или еди
 lst.set = Устанавливает переменную.
 lst.operation = Совершает операцию над 1-2 переменными.
 lst.end = Переходит к началу стека операций.
+lst.wait = Ждёт определённое количество секунд.
+lst.lookup = Находит тип предмета/жидкости/единицы/блока по ID.\nОбщее количество каждого типа может быть получено при помощи:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
 lst.jump = Условно переходит к другой операции.
 lst.unitbind = Привязывается к единице определённого типа и сохраняет её в [accent]@unit[].
 lst.unitcontrol = Управляет привязанной в данный момент единицей.

core/assets/bundles/bundle_tr.properties

@@ -460,6 +460,7 @@ toolmode.drawteams = Takım Çiz
 toolmode.drawteams.description = Bloklar yerine takımları çizer..
 
 filters.empty = [lightgray]Hiç filtre yok! Aşağıdaki butonla bir adet ekleyin.
+
 filter.distort = Çarpıt
 filter.noise = Gürültü
 filter.enemyspawn = Düşman Doğma Alanı Seçimi
@@ -476,6 +477,7 @@ filter.clear = Temizle
 filter.option.ignore = Yoksay
 filter.scatter = Saç
 filter.terrain = Arazi
+
 filter.option.scale = Ölçek
 filter.option.chance = Şans
 filter.option.mag = Genlik
@@ -490,6 +492,7 @@ filter.option.block = Blok
 filter.option.floor = Zemin
 filter.option.flooronto = Hedef Zemin
 filter.option.target = Target
+filter.option.replacement = Değiştirme
 filter.option.wall = Duvar
 filter.option.ore = Maden
 filter.option.floor2 = İkincil Duvar
@@ -675,6 +678,7 @@ unit.nobuild = [scarlet]Birlik inşa edemiyor
 lastaccessed = [lightgray]Son Erişme: {0}
 block.unknown = [lightgray]???
 
+stat.showinmap = <görüntülenecek haritayı yükle>
 stat.description = Amaç
 stat.input = Giriş
 stat.output = Çıkış
@@ -991,6 +995,7 @@ rules.waves = Dalgalar
 rules.attack = Saldırı Modu
 rules.buildai = Yapay Zeka İnşası
 rules.corecapture = Yıkımca Çekirdeği Elegeçir
+rules.polygoncoreprotection = Çokgenli Çekirdek Koruması
 rules.enemyCheat = Sonsuz AI (Kırmızı Takım) Kaynakları
 rules.blockhealthmultiplier = Blok Canı Çarpanı
 rules.blockdamagemultiplier = Blok Hasarı Çarpanı
@@ -1161,7 +1166,8 @@ block.spore-cluster.name = Spor Kümesi
 block.metal-floor.name = Metal Zemin 1
 block.metal-floor-2.name = Metal Zemin 2
 block.metal-floor-3.name = Metal Zemin 3
-block.metal-floor-5.name = Metal Zemin 4
+block.metal-floor-4.name = Metal Zemin 4
+block.metal-floor-5.name = Metal Zemin 5
 block.metal-floor-damaged.name = Hasarlı Metal Zemin
 block.dark-panel-1.name = Kara Panel 1
 block.dark-panel-2.name = Kara Panel 2

core/assets/contributors

@@ -126,3 +126,4 @@ Skat
 WilloIzCitron
 SAMBUYYA
 genNAowl
+TranquillyUnpleasant

core/assets/scripts/global.js

@@ -155,6 +155,7 @@ const BlockBuildBeginEvent = Packages.mindustry.game.EventType.BlockBuildBeginEv
 const ResearchEvent = Packages.mindustry.game.EventType.ResearchEvent
 const UnlockEvent = Packages.mindustry.game.EventType.UnlockEvent
 const StateChangeEvent = Packages.mindustry.game.EventType.StateChangeEvent
+const CoreChangeEvent = Packages.mindustry.game.EventType.CoreChangeEvent
 const TileChangeEvent = Packages.mindustry.game.EventType.TileChangeEvent
 const TilePreChangeEvent = Packages.mindustry.game.EventType.TilePreChangeEvent
 const GameOverEvent = Packages.mindustry.game.EventType.GameOverEvent
@@ -166,6 +167,7 @@ const DepositEvent = Packages.mindustry.game.EventType.DepositEvent
 const WithdrawEvent = Packages.mindustry.game.EventType.WithdrawEvent
 const SectorCaptureEvent = Packages.mindustry.game.EventType.SectorCaptureEvent
 const PlayerChatEvent = Packages.mindustry.game.EventType.PlayerChatEvent
+const MenuOptionChooseEvent = Packages.mindustry.game.EventType.MenuOptionChooseEvent
 const ClientPreConnectEvent = Packages.mindustry.game.EventType.ClientPreConnectEvent
 const CommandIssueEvent = Packages.mindustry.game.EventType.CommandIssueEvent
 const SchematicCreateEvent = Packages.mindustry.game.EventType.SchematicCreateEvent

core/assets/shaders/mud.frag

@@ -20,9 +20,9 @@ void main(){
     vec4 color = texture2D(u_texture, c);
 
     if(noise > 0.54 && noise < 0.68){
-        color.rgb *= 1.4;
+        color.rgb *= vec3(1.4);
     }else if(!(noise > 0.40 && noise < 0.54)){
-        color.rgb *= 1.2;
+        color.rgb *= vec3(1.2);
     }
 
     gl_FragColor = color;

core/convert_sounds.sh

@@ -1,12 +0,0 @@
-#convert from stereo to mono
-cd assets/sounds/
-for i in *.ogg; do
-  echo $i
-  ffmpeg -i "$i" -ac 1 "OUT_$i"
-done
-
-find . -type f ! -name "OUT_*" -delete
-
-for file in OUT_*; do mv "$file" "${file#OUT_}"; done;
-
-cd ../../

core/src/mindustry/ClientLauncher.java

@@ -149,7 +149,16 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform
                 }
                 mods.eachClass(Mod::init);
                 finished = true;
-                Events.fire(new ClientLoadEvent());
+                var event = new ClientLoadEvent();
+                //a temporary measure for compatibility with certain mods
+                Events.fireWrap(event.getClass(), event, listener -> {
+                    try{
+                        listener.get(event);
+                    }catch(NoSuchFieldError | NoSuchMethodError | NoClassDefFoundError error){
+                        Log.err(error);
+                    }
+
+                });
                 clientLoaded = true;
                 super.resize(graphics.getWidth(), graphics.getHeight());
                 app.post(() -> app.post(() -> app.post(() -> app.post(() -> {

core/src/mindustry/Vars.java

@@ -148,6 +148,8 @@ public class Vars implements Loadable{
     public static int maxTextureSize = 2048;
     /** Whether to show the core landing animation. */
     public static boolean showLandAnimation = true;
+    /** Whether to check for memory use before taking screenshots. */
+    public static boolean checkScreenshotMemory = true;
     /** Whether to prompt the user to confirm exiting. */
     public static boolean confirmExit = true;
     /** if true, UI is not drawn */

core/src/mindustry/ai/BlockIndexer.java

@@ -285,7 +285,7 @@ public class BlockIndexer{
         for(int i = 0; i < activeTeams.size; i++){
             Team enemy = activeTeams.items[i];
 
-            if(enemy == team || team == Team.derelict) continue;
+            if(enemy == team || (team == Team.derelict && !state.rules.coreCapture)) continue;
 
             Building entity = indexer.findTile(enemy, x, y, range, pred, true);
             if(entity != null){
@@ -360,7 +360,7 @@ public class BlockIndexer{
     private void process(Tile tile){
         var team = tile.team();
         //only process entity changes with centered tiles
-        if(tile.isCenter() && team != Team.derelict){
+        if(tile.isCenter() && tile.build != null){
             var data = team.data();
             if(tile.block().flags.size() > 0 && tile.isCenter()){
                 TileArray[] map = getFlagged(team);

core/src/mindustry/ai/Pathfinder.java

@@ -119,9 +119,11 @@ public class Pathfinder implements Runnable{
             }
         }
 
+        int tid = tile.getTeamID();
+
         return PathTile.get(
             tile.build == null || !solid || tile.block() instanceof CoreBlock ? 0 : Math.min((int)(tile.build.health / 40), 80),
-            tile.getTeamID(),
+            tid == 0 && tile.build != null && state.rules.coreCapture ? 255 : tid, //use teamid = 255 when core capture is enabled to mark out derelict structures
             solid,
             tile.floor().isLiquid,
             tile.staticDarkness() >= 2 || (tile.floor().solid && tile.block() == Blocks.air),

core/src/mindustry/ai/types/LogicAI.java

@@ -104,7 +104,7 @@ public class LogicAI extends AIController{
         //look where moving if there's nothing to aim at
         if(!shoot){
             unit.lookAt(unit.prefRotation());
-        }else if(unit.hasWeapons() && unit.mounts.length > 0){ //if there is, look at the object
+        }else if(unit.hasWeapons() && unit.mounts.length > 0 && !unit.mounts[0].weapon.ignoreRotation){ //if there is, look at the object
             unit.lookAt(unit.mounts[0].aimX, unit.mounts[0].aimY);
         }
     }

core/src/mindustry/async/PhysicsProcess.java

@@ -24,6 +24,7 @@ public class PhysicsProcess implements AsyncProcess{
     @Override
     public void begin(){
         if(physics == null) return;
+        boolean local = !Vars.net.client();
 
         //remove stale entities
         refs.removeAll(ref -> {
@@ -60,8 +61,9 @@ public class PhysicsProcess implements AsyncProcess{
             ref.body.layer =
                 entity.type.allowLegStep ? layerLegs :
                 entity.isGrounded() ? layerGround : layerFlying;
-            ref.x = entity.x();
+            ref.x = entity.x;
-            ref.y = entity.y();
+            ref.y = entity.y;
+            ref.body.local = local || entity.isLocal();
         }
     }
 
@@ -156,6 +158,10 @@ public class PhysicsProcess implements AsyncProcess{
 
             for(int i = 0; i < bodies.size; i++){
                 PhysicsBody body = bodies.items[i];
+
+                //for clients, the only body that collides is the local one; all other physics simulations are handled by the server.
+                if(!body.local) continue;
+
                 body.hitbox(rect);
 
                 seq.size = 0;
@@ -174,10 +180,14 @@ public class PhysicsProcess implements AsyncProcess{
                         float ms = body.mass + other.mass;
                         float m1 = other.mass / ms, m2 = body.mass / ms;
 
+                        //first body is always local due to guard check above
                         body.x += vec.x * m1 / scl;
                         body.y += vec.y * m1 / scl;
-                        other.x -= vec.x * m2 / scl;
+
-                        other.y -= vec.y * m2 / scl;
+                        if(other.local){
+                            other.x -= vec.x * m2 / scl;
+                            other.y -= vec.y * m2 / scl;
+                        }
                     }
                 }
                 body.collided = true;
@@ -187,7 +197,7 @@ public class PhysicsProcess implements AsyncProcess{
         public static class PhysicsBody implements QuadTreeObject{
             public float x, y, radius, mass;
             public int layer = 0;
-            public boolean collided = false;
+            public boolean collided = false, local = true;
 
             @Override
             public void hitbox(Rect out){

core/src/mindustry/content/Blocks.java

@@ -51,7 +51,7 @@ public class Blocks implements ContentList{
     melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge,
 
     //sandbox
-    powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadVoid, payloadSource, illuminator,
+    powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator,
 
     //defense
     copperWall, copperWallLarge, titaniumWall, titaniumWallLarge, plastaniumWall, plastaniumWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge,
@@ -659,12 +659,12 @@ public class Blocks implements ContentList{
         }};
 
         disassembler = new Separator("disassembler"){{
-            requirements(Category.crafting, with(Items.graphite, 140, Items.titanium, 100, Items.silicon, 150, Items.surgeAlloy, 70));
+            requirements(Category.crafting, with(Items.plastanium, 40, Items.titanium, 100, Items.silicon, 150, Items.thorium, 80));
             results = with(
                 Items.sand, 4,
                 Items.graphite, 2,
                 Items.titanium, 2,
-                Items.thorium, 1
+                Items.thorium, 2
             );
             hasPower = true;
             craftTime = 15f;
@@ -1589,13 +1589,13 @@ public class Blocks implements ContentList{
             shots = 4;
             burstSpacing = 5;
             inaccuracy = 10f;
-            range = 210f;
+            range = 215f;
             xRand = 6f;
             size = 2;
             health = 300 * size * size;
             shootSound = Sounds.missile;
 
-            limitRange(2f);
+            limitRange(5f);
         }};
 
         salvo = new ItemTurret("salvo"){{
@@ -1610,7 +1610,7 @@ public class Blocks implements ContentList{
 
             size = 2;
             range = 190f;
-            reloadTime = 34f;
+            reloadTime = 31f;
             restitution = 0.03f;
             ammoEjectBack = 3f;
             cooldown = 0.03f;
@@ -1978,25 +1978,25 @@ public class Blocks implements ContentList{
         }};
 
         repairPoint = new RepairPoint("repair-point"){{
-            requirements(Category.units, with(Items.lead, 20, Items.copper, 20, Items.silicon, 15));
+            requirements(Category.units, with(Items.lead, 30, Items.copper, 30, Items.silicon, 20));
-            repairSpeed = 0.5f;
+            repairSpeed = 0.45f;
-            repairRadius = 65f;
+            repairRadius = 60f;
             beamWidth = 0.73f;
             powerUse = 1f;
             pulseRadius = 5f;
         }};
 
         repairTurret = new RepairPoint("repair-turret"){{
-            requirements(Category.units, with(Items.silicon, 70, Items.thorium, 60, Items.plastanium, 60));
+            requirements(Category.units, with(Items.silicon, 90, Items.thorium, 80, Items.plastanium, 60));
             size = 2;
             length = 6f;
-            repairSpeed = 4f;
+            repairSpeed = 3f;
-            repairRadius = 140f;
+            repairRadius = 145f;
             powerUse = 5f;
             beamWidth = 1.1f;
             pulseRadius = 6.1f;
-            coolantUse = 0.15f;
+            coolantUse = 0.16f;
-            coolantMultiplier = 1.7f;
+            coolantMultiplier = 1.6f;
             acceptCoolant = true;
         }};
 
@@ -2068,12 +2068,12 @@ public class Blocks implements ContentList{
             alwaysUnlocked = true;
         }};
 
-        payloadVoid = new PayloadVoid("payload-void"){{
+        payloadSource = new PayloadSource("payload-source"){{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
         }};
 
-        payloadSource = new PayloadSource("payload-source"){{
+        payloadVoid = new PayloadVoid("payload-void"){{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
         }};

core/src/mindustry/content/Bullets.java

@@ -257,7 +257,6 @@ public class Bullets implements ContentList{
             width = 8f;
             height = 8f;
             shrinkY = 0f;
-            drag = -0.01f;
             splashDamageRadius = 30f;
             splashDamage = 30f * 1.5f;
             ammoMultiplier = 5f;
@@ -274,7 +273,6 @@ public class Bullets implements ContentList{
             width = 7f;
             height = 8f;
             shrinkY = 0f;
-            drag = -0.01f;
             homingPower = 0.08f;
             splashDamageRadius = 20f;
             splashDamage = 20f * 1.5f;
@@ -288,7 +286,6 @@ public class Bullets implements ContentList{
             width = 8f;
             height = 8f;
             shrinkY = 0f;
-            drag = -0.01f;
             splashDamageRadius = 25f;
             splashDamage = 25f * 1.4f;
             hitEffect = Fx.blastExplosion;

core/src/mindustry/content/Fx.java

@@ -854,7 +854,7 @@ public class Fx{
     fireRemove = new Effect(70f, e -> {
         if(Fire.regions[0] == null) return;
         alpha(e.fout());
-        rect(Fire.regions[((int)(e.rotation + e.fin() * Fire.frames)) % Fire.frames], e.x, e.y);
+        rect(Fire.regions[((int)(e.rotation + e.fin() * Fire.frames)) % Fire.frames], e.x + Mathf.randomSeedRange((int)e.y, 2), e.y + Mathf.randomSeedRange((int)e.x, 2));
         Drawf.light(e.x, e.y, 50f + Mathf.absin(5f, 5f), Pal.lightFlame, 0.6f  * e.fout());
     }),
 

core/src/mindustry/content/UnitTypes.java

@@ -87,7 +87,7 @@ public class UnitTypes implements ContentList{
         mace = new UnitType("mace"){{
             speed = 0.45f;
             hitSize = 10f;
-            health = 530;
+            health = 540;
             armor = 4f;
 
             immunities.add(StatusEffects.burning);
@@ -96,7 +96,7 @@ public class UnitTypes implements ContentList{
                 top = false;
                 shootSound = Sounds.flame;
                 shootY = 2f;
-                reload = 12f;
+                reload = 11f;
                 recoil = 1f;
                 ejectEffect = Fx.none;
                 bullet = new BulletType(4.1f, 32f){{
@@ -120,7 +120,7 @@ public class UnitTypes implements ContentList{
             hitSize = 13f;
             rotateSpeed = 3f;
             targetAir = false;
-            health = 820;
+            health = 900;
             armor = 9f;
             mechFrontSway = 0.55f;
 
@@ -133,15 +133,15 @@ public class UnitTypes implements ContentList{
                 shake = 2f;
                 ejectEffect = Fx.casing2;
                 shootSound = Sounds.artillery;
-                bullet = new ArtilleryBulletType(2f, 8, "shell"){{
+                bullet = new ArtilleryBulletType(2f, 20, "shell"){{
                     hitEffect = Fx.blastExplosion;
                     knockback = 0.8f;
                     lifetime = 120f;
                     width = height = 14f;
                     collides = true;
                     collidesTiles = true;
-                    splashDamageRadius = 30f;
+                    splashDamageRadius = 35f;
-                    splashDamage = 60f;
+                    splashDamage = 80f;
                     backColor = Pal.bulletYellowBack;
                     frontColor = Pal.bulletYellow;
                 }};
@@ -572,7 +572,7 @@ public class UnitTypes implements ContentList{
                     speed = 1f;
                     splashDamageRadius = 60f;
                     instantDisappear = true;
-                    splashDamage = 88f;
+                    splashDamage = 90f;
                     killShooter = true;
                     hittable = false;
                     collidesAir = true;
@@ -581,7 +581,7 @@ public class UnitTypes implements ContentList{
         }};
 
         atrax = new UnitType("atrax"){{
-            speed = 0.5f;
+            speed = 0.54f;
             drag = 0.4f;
             hitSize = 13f;
             rotateSpeed = 3f;
@@ -621,7 +621,7 @@ public class UnitTypes implements ContentList{
         }};
 
         spiroct = new UnitType("spiroct"){{
-            speed = 0.45f;
+            speed = 0.48f;
             drag = 0.4f;
             hitSize = 15f;
             rotateSpeed = 3f;
@@ -1125,10 +1125,10 @@ public class UnitTypes implements ContentList{
             BulletType fragBullet = new FlakBulletType(4f, 5){{
                 shootEffect = Fx.shootBig;
                 ammoMultiplier = 4f;
-                splashDamage = 50f;
+                splashDamage = 60f;
                 splashDamageRadius = 25f;
                 collidesGround = true;
-                lifetime = 38f;
+                lifetime = 47f;
 
                 status = StatusEffects.blasted;
                 statusDuration = 60f;
@@ -1148,12 +1148,12 @@ public class UnitTypes implements ContentList{
                 rotate = true;
 
                 bullet = new LaserBulletType(){{
-                    damage = 100f;
+                    damage = 110f;
                     sideAngle = 20f;
                     sideWidth = 1.5f;
                     sideLength = 80f;
                     width = 25f;
-                    length = 200f;
+                    length = 230f;
                     shootEffect = Fx.shockwave;
                     colors = new Color[]{Color.valueOf("ec7458aa"), Color.valueOf("ff9c5a"), Color.white};
                 }};
@@ -2047,7 +2047,6 @@ public class UnitTypes implements ContentList{
             buildSpeed = 3f;
 
             abilities.add(new EnergyFieldAbility(35f, 65f, 180f){{
-                repair = 35f;
                 statusDuration = 60f * 6f;
                 maxTargets = 25;
             }});
@@ -2113,7 +2112,7 @@ public class UnitTypes implements ContentList{
 
                         bullet = new ContinuousLaserBulletType(){{
                             maxRange = 90f;
-                            damage = 26f;
+                            damage = 27f;
                             length = 95f;
                             hitEffect = Fx.hitMeltHeal;
                             drawSize = 200f;
@@ -2144,7 +2143,7 @@ public class UnitTypes implements ContentList{
                 x = 70f/4f;
                 y = -26f/4f;
 
-                reload = 70f;
+                reload = 65f;
                 shake = 3f;
                 rotateSpeed = 2f;
                 shadow = 30f;
@@ -2155,13 +2154,14 @@ public class UnitTypes implements ContentList{
                 bullet = new EmpBulletType(){{
                     float rad = 100f;
 
+                    scaleVelocity = true;
                     lightOpacity = 0.7f;
                     unitDamageScl = 0.8f;
                     healPercent = 20f;
                     timeIncrease = 3f;
                     timeDuration = 60f * 20f;
                     powerDamageScl = 3f;
-                    damage = 50;
+                    damage = 60;
                     hitColor = lightColor = Pal.heal;
                     lightRadius = 70f;
                     clipSize = 250f;
@@ -2177,7 +2177,7 @@ public class UnitTypes implements ContentList{
                     trailWidth = 6f;
                     trailColor = Pal.heal;
                     trailInterval = 3f;
-                    splashDamage = 60f;
+                    splashDamage = 70f;
                     splashDamageRadius = rad;
                     hitShake = 4f;
                     trailRotation = true;

core/src/mindustry/core/Logic.java

@@ -247,11 +247,11 @@ public class Logic implements ApplicationListener{
                 Events.fire(new GameOverEvent(state.rules.waveTeam));
             }else if(state.rules.attackMode){
                 //count # of teams alive
-                int countAlive = state.teams.getActive().count(TeamData::hasCore);
+                int countAlive = state.teams.getActive().count(t -> t.hasCore() && t.team != Team.derelict);
 
                 if((countAlive <= 1 || (!state.rules.pvp && state.rules.defaultTeam.core() == null)) && !state.gameOver){
                     //find team that won
-                    TeamData left = state.teams.getActive().find(TeamData::hasCore);
+                    TeamData left = state.teams.getActive().find(t -> t.hasCore() && t.team != Team.derelict);
                     Events.fire(new GameOverEvent(left == null ? Team.derelict : left.team));
                     state.gameOver = true;
                 }

core/src/mindustry/core/NetServer.java

@@ -48,7 +48,7 @@ public class NetServer implements ApplicationListener{
         if(state.rules.pvp){
             //find team with minimum amount of players and auto-assign player to that.
             TeamData re = state.teams.getActive().min(data -> {
-                if((state.rules.waveTeam == data.team && state.rules.waves) || !data.team.active()) return Integer.MAX_VALUE;
+                if((state.rules.waveTeam == data.team && state.rules.waves) || !data.team.active() || data.team == Team.derelict) return Integer.MAX_VALUE;
 
                 int count = 0;
                 for(Player other : players){
@@ -344,8 +344,7 @@ public class NetServer implements ApplicationListener{
             boolean checkPass(){
                 if(votes >= votesRequired()){
                     Call.sendMessage(Strings.format("[orange]Vote passed.[scarlet] @[orange] will be banned from the server for @ minutes.", target.name, (kickDuration / 60)));
-                    target.getInfo().lastKicked = Time.millis() + kickDuration * 1000;
+                    Groups.player.each(p -> p.uuid().equals(target.uuid()), p -> p.kick(KickReason.vote, kickDuration * 1000));
-                    Groups.player.each(p -> p.uuid().equals(target.uuid()), p -> p.kick(KickReason.vote));
                     map[0] = null;
                     task.cancel();
                     return true;
@@ -472,6 +471,10 @@ public class NetServer implements ApplicationListener{
                     return;
                 }
 
+                if(!player.dead() && player.unit().isCommanding()){
+                    player.unit().clearCommand();
+                }
+
                 player.getInfo().lastSyncTime = Time.millis();
                 Call.worldDataBegin(player.con);
                 netServer.sendWorldData(player);

core/src/mindustry/core/Renderer.java

@@ -11,6 +11,7 @@ import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.async.*;
+import mindustry.*;
 import mindustry.content.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
@@ -355,7 +356,7 @@ public class Renderer implements ApplicationListener{
         int w = world.width() * tilesize, h = world.height() * tilesize;
         int memory = w * h * 4 / 1024 / 1024;
 
-        if(memory >= (mobile ? 65 : 120)){
+        if(Vars.checkScreenshotMemory && memory >= (mobile ? 65 : 120)){
             ui.showInfo("@screenshot.invalid");
             return;
         }

core/src/mindustry/editor/WaveGraph.java

@@ -53,7 +53,7 @@ public class WaveGraph extends Table{
 
                     for(int i = 0; i < values.length; i++){
                         int val = values[i][type.id];
-                        float cx = graphX + i*spacing, cy = 2f + graphY + val * (graphH - 4f) / max;
+                        float cx = graphX + i*spacing, cy = graphY + val * graphH / max;
                         Lines.linePoint(cx, cy);
                     }
 
@@ -69,7 +69,7 @@ public class WaveGraph extends Table{
                         sum += values[i][type.id];
                     }
 
-                    float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxTotal;
+                    float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxTotal;
                     Lines.linePoint(cx, cy);
                 }
 
@@ -84,7 +84,7 @@ public class WaveGraph extends Table{
                         sum += (type.health) * values[i][type.id];
                     }
 
-                    float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxHealth;
+                    float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxHealth;
                     Lines.linePoint(cx, cy);
                 }
 
@@ -92,29 +92,29 @@ public class WaveGraph extends Table{
             }
 
             //how many numbers can fit here
-            float totalMarks = (height - offsetY - getMarginBottom() *2f - 1f) / (lay.height * 2);
+            float totalMarks = (graphH - getMarginBottom() *2f) / (lay.height * 2);
 
             int markSpace = Math.max(1, Mathf.ceil(max / totalMarks));
 
             Draw.color(Color.lightGray);
             for(int i = 0; i < max; i += markSpace){
-                float cy = 2f + y + i * (height - 4f) / max + offsetY, cx = x + offsetX;
+                float cy = graphY + i * graphH / max, cx = graphX;
                 //Lines.line(cx, cy, cx + len, cy);
 
                 lay.setText(font, "" + i);
 
-                font.draw("" + i, cx, cy + lay.height/2f - Scl.scl(3f), Align.right);
+                font.draw("" + i, cx, cy + lay.height/2f, Align.right);
             }
 
             float len = Scl.scl(4f);
             font.setColor(Color.lightGray);
 
             for(int i = 0; i < values.length; i++){
-                float cy = y + fh, cx = x + graphW / (values.length - 1) * i + offsetX;
+                float cy = y + fh, cx = graphX + graphW / (values.length - 1) * i;
 
                 Lines.line(cx, cy, cx, cy + len);
                 if(i == values.length/2){
-                    font.draw("" + (i + from + 1), cx, cy - 2f, Align.center);
+                    font.draw("" + (i + from + 1), cx, cy - Scl.scl(2f), Align.center);
                 }
             }
             font.setColor(Color.white);

core/src/mindustry/entities/Puddles.java

@@ -52,22 +52,22 @@ public class Puddles{
         Puddle p = map.get(tile.pos());
         if(p == null){
             Puddle puddle = Puddle.create();
-            puddle.tile(tile);
+            puddle.tile = tile;
-            puddle.liquid(liquid);
+            puddle.liquid = liquid;
-            puddle.amount(amount);
+            puddle.amount = amount;
-            puddle.generation(generation);
+            puddle.generation = generation;
             puddle.set((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f);
             puddle.add();
             map.put(tile.pos(), puddle);
-        }else if(p.liquid() == liquid){
+        }else if(p.liquid == liquid){
-            p.accepting(Math.max(amount, p.accepting()));
+            p.accepting = Math.max(amount, p.accepting);
 
-            if(generation == 0 && p.lastRipple <= Time.time - 40f && p.amount() >= maxLiquid / 2f){
+            if(generation == 0 && p.lastRipple <= Time.time - 40f && p.amount >= maxLiquid / 2f){
-                Fx.ripple.at((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f, 1f, p.liquid().color);
+                Fx.ripple.at((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f, 1f, p.liquid.color);
                 p.lastRipple = Time.time;
             }
         }else{
-            p.amount(p.amount() + reactPuddle(p.liquid(), liquid, amount, p.tile(), (p.x() + source.worldx())/2f, (p.y() + source.worldy())/2f));
+            p.amount += reactPuddle(p.liquid, liquid, amount, p.tile, (p.x + source.worldx())/2f, (p.y + source.worldy())/2f);
         }
     }
 

core/src/mindustry/entities/abilities/EnergyFieldAbility.java

@@ -16,14 +16,14 @@ import mindustry.type.*;
 public class EnergyFieldAbility extends Ability{
     private static final Seq<Healthc> all = new Seq<>();
 
-    public float damage = 1, repair = 20f, reload = 100, range = 60;
+    public float damage = 1, reload = 100, range = 60;
     public Effect healEffect = Fx.heal, hitEffect = Fx.hitLaserBlast, damageEffect = Fx.chainLightning;
     public StatusEffect status = StatusEffects.electrified;
     public float statusDuration = 60f * 6f;
     public float x, y;
     public boolean hitBuildings = true;
     public int maxTargets = 25;
-    public float healPercent = 3f;
+    public float healPercent = 2.5f;
 
     public float layer = Layer.bullet - 0.001f, blinkScl = 20f;
     public float effectRadius = 5f, sectorRad = 0.14f, rotateSpeed = 0.5f;

core/src/mindustry/entities/bullet/BulletType.java

@@ -93,7 +93,7 @@ public class BulletType extends Content implements Cloneable{
     public boolean collides = true;
     /** Whether velocity is inherited from the shooter. */
     public boolean keepVelocity = true;
-    /** Whether to scale velocity to disappear at the target position. Used for artillery. */
+    /** Whether to scale lifetime (not actually velocity!) to disappear at the target position. Used for artillery. */
     public boolean scaleVelocity;
     /** Whether this bullet can be hit by point defense. */
     public boolean hittable = true;

core/src/mindustry/entities/comp/BoundedComp.java

@@ -1,6 +1,7 @@
 package mindustry.entities.comp;
 
 import arc.math.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 
@@ -24,7 +25,7 @@ abstract class BoundedComp implements Velc, Posc, Healthc, Flyingc{
             if(x > world.unitWidth()) dx -= (x - world.unitWidth())/warpDst;
             if(y > world.unitHeight()) dy -= (y - world.unitHeight())/warpDst;
 
-            velAddNet(dx, dy);
+            velAddNet(dx * Time.delta, dy * Time.delta);
         }
 
         //clamp position if not flying

core/src/mindustry/entities/comp/BulletComp.java

@@ -44,6 +44,13 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
         }
     }
 
+    //bullets always considered local
+    @Override
+    @Replace
+    public boolean isLocal(){
+        return true;
+    }
+
     @Override
     public void add(){
         type.init(self());

core/src/mindustry/entities/comp/FireComp.java

@@ -28,6 +28,7 @@ abstract class FireComp implements Timedc, Posc, Syncc, Drawc{
     public static final TextureRegion[] regions = new TextureRegion[frames];
 
     @Import float time, lifetime, x, y;
+    @Import int id;
 
     Tile tile;
     private transient Block block;
@@ -116,7 +117,7 @@ abstract class FireComp implements Timedc, Posc, Syncc, Drawc{
 
         Draw.alpha(Mathf.clamp(warmup / warmupDuration));
         Draw.z(Layer.effect);
-        Draw.rect(regions[Math.min((int)animation, regions.length - 1)], x, y);
+        Draw.rect(regions[Math.min((int)animation, regions.length - 1)], x + Mathf.randomSeedRange((int)y, 2), y + Mathf.randomSeedRange((int)x, 2));
         Draw.reset();
 
         Drawf.light(x, y, 50f + Mathf.absin(5f, 5f), Pal.lightFlame, 0.6f  * Mathf.clamp(warmup / warmupDuration));

core/src/mindustry/entities/comp/HealthComp.java

@@ -1,6 +1,5 @@
 package mindustry.entities.comp;
 
-import arc.math.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
@@ -34,7 +33,7 @@ abstract class HealthComp implements Entityc, Posc{
     void kill(){
         if(dead) return;
 
-        health = 0;
+        health = Math.min(health, 0);
         dead = true;
         killed();
         remove();
@@ -86,7 +85,7 @@ abstract class HealthComp implements Entityc, Posc{
     }
 
     void clampHealth(){
-        health = Mathf.clamp(health, 0, maxHealth);
+        health = Math.min(health, maxHealth);
     }
 
     /** Heals by a flat amount. */

core/src/mindustry/entities/comp/PlayerComp.java

@@ -51,13 +51,11 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         return unit.canBuild();
     }
 
-    public @Nullable
+    public @Nullable CoreBuild closestCore(){
-    CoreBuild closestCore(){
         return state.teams.closestCore(x, y, team);
     }
 
-    public @Nullable
+    public @Nullable CoreBuild core(){
-    CoreBuild core(){
         return team.core();
     }
 
@@ -240,6 +238,10 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         con.kick(reason);
     }
 
+    void kick(KickReason reason, long duration){
+        con.kick(reason, duration);
+    }
+
     void kick(String reason){
         con.kick(reason);
     }

core/src/mindustry/entities/comp/ShieldComp.java

@@ -16,8 +16,8 @@ abstract class ShieldComp implements Healthc, Posc{
 
     /** Absorbs health damage. */
     float shield;
-    /** Subtracts an amount from damage. */
+    /** Subtracts an amount from damage. No need to save. */
-    float armor;
+    transient float armor;
     /** Shield opacity. */
     transient float shieldAlpha = 0f;
 

core/src/mindustry/entities/comp/UnitComp.java

@@ -397,7 +397,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             //move down
             elevation -= type.fallSpeed * Time.delta;
 
-            if(isGrounded()){
+            if(isGrounded() || health <= -maxHealth){
                 Call.unitDestroy(id);
             }
         }
@@ -528,7 +528,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     @Override
     public void killed(){
         wasPlayer = isLocal();
-        health = 0;
+        health = Math.min(health, 0);
         dead = true;
 
         //don't waste time when the unit is already on the ground, just destroy it

core/src/mindustry/entities/comp/VelComp.java

@@ -13,20 +13,24 @@ import static mindustry.Vars.*;
 abstract class VelComp implements Posc{
     @Import float x, y;
 
-    //TODO @SyncLocal this? does it even need to be sent?
+    @SyncLocal Vec2 vel = new Vec2();
-    transient final Vec2 vel = new Vec2();
+
     transient float drag = 0f;
 
     //velocity needs to be called first, as it affects delta and lastPosition
     @MethodPriority(-1)
     @Override
     public void update(){
-        float px = x, py = y;
+        //do not update velocity on the client at all, unless it's non-interpolated
-        move(vel.x * Time.delta, vel.y * Time.delta);
+        //velocity conflicts with interpolation.
-        if(Mathf.equal(px, x)) vel.x = 0;
+        if(!net.client() || isLocal()){
-        if(Mathf.equal(py, y)) vel.y = 0;
+            float px = x, py = y;
+            move(vel.x * Time.delta, vel.y * Time.delta);
+            if(Mathf.equal(px, x)) vel.x = 0;
+            if(Mathf.equal(py, y)) vel.y = 0;
 
-        vel.scl(Math.max(1f - drag * Time.delta, 0));
+            vel.scl(Math.max(1f - drag * Time.delta, 0));
+        }
     }
 
     /** @return function to use for check solid state. if null, no checking is done. */

core/src/mindustry/entities/comp/WaterMoveComp.java

@@ -19,7 +19,7 @@ import static mindustry.Vars.*;
 
 @Component
 abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
-    @Import float x, y, rotation;
+    @Import float x, y, rotation, speedMultiplier;
     @Import UnitType type;
 
     private transient Trail tleft = new Trail(1), tright = new Trail(1);
@@ -74,7 +74,7 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
     @Replace
     public float floorSpeedMultiplier(){
         Floor on = isFlying() ? Blocks.air.asFloor() : floorOn();
-        return on.isDeep() ? 1.3f : 1f;
+        return (on.isDeep() ? 1.3f : 1f) * speedMultiplier;
     }
 
     public boolean onLiquid(){

core/src/mindustry/game/Rules.java

@@ -114,22 +114,6 @@ public class Rules{
     /** special tags for additional info. */
     public StringMap tags = new StringMap();
 
-    /** A team-specific ruleset. */
-    public static class TeamRule{
-        /** Whether to use building AI. */
-        public boolean ai;
-        /** TODO Tier of blocks/designs that the AI uses for building. [0, 1] */
-        public float aiTier = 1f;
-        /** Whether, when AI is enabled, ships should be spawned from the core. */
-        public boolean aiCoreSpawn = true;
-        /** If true, blocks don't require power or resources. */
-        public boolean cheat;
-        /** If true, resources are not consumed when building. */
-        public boolean infiniteResources;
-        /** If true, this team has infinite unit ammo. */
-        public boolean infiniteAmmo;
-    }
-
     /** Copies this ruleset exactly. Not efficient at all, do not use often. */
     public Rules copy(){
         return JsonIO.copy(this);
@@ -150,6 +134,22 @@ public class Rules{
         }
     }
 
+    /** A team-specific ruleset. */
+    public static class TeamRule{
+        /** Whether to use building AI. */
+        public boolean ai;
+        /** TODO Tier of blocks/designs that the AI uses for building. [0, 1] */
+        public float aiTier = 1f;
+        /** Whether, when AI is enabled, ships should be spawned from the core. */
+        public boolean aiCoreSpawn = true;
+        /** If true, blocks don't require power or resources. */
+        public boolean cheat;
+        /** If true, resources are not consumed when building. */
+        public boolean infiniteResources;
+        /** If true, this team has infinite unit ammo. */
+        public boolean infiniteAmmo;
+    }
+
     /** A simple map for storing TeamRules in an efficient way without hashing. */
     public static class TeamRules implements JsonSerializable{
         final TeamRule[] values = new TeamRule[Team.all.length];

core/src/mindustry/game/Team.java

@@ -97,7 +97,7 @@ public class Team implements Comparable<Team>{
     }
 
     public boolean isEnemy(Team other){
-        return state.teams.areEnemies(this, other);
+        return this != other;
     }
 
     public Seq<CoreBuild> cores(){

core/src/mindustry/game/Teams.java

@@ -49,7 +49,7 @@ public class Teams{
 
     public boolean eachEnemyCore(Team team, Boolf<CoreBuild> ret){
         for(TeamData data : active){
-            if(areEnemies(team, data.team)){
+            if(team != data.team){
                 for(CoreBuild tile : data.cores){
                     if(ret.get(tile)){
                         return true;
@@ -62,7 +62,7 @@ public class Teams{
 
     public void eachEnemyCore(Team team, Cons<Building> ret){
         for(TeamData data : active){
-            if(areEnemies(team, data.team)){
+            if(team != data.team){
                 for(Building tile : data.cores){
                     ret.get(tile);
                 }
@@ -91,11 +91,6 @@ public class Teams{
         return get(team).active();
     }
 
-    /** Returns whether {@param other} is an enemy of {@param #team}. */
-    public boolean areEnemies(Team team, Team other){
-        return team != other;
-    }
-
     public boolean canInteract(Team team, Team other){
         return team == other || other == Team.derelict;
     }
@@ -216,7 +211,7 @@ public class Teams{
             Seq<Team> enemies = new Seq<>();
 
             for(TeamData other : active){
-                if(areEnemies(data.team, other.team)){
+                if(data.team != other.team){
                     enemies.add(other.team);
                 }
             }

core/src/mindustry/graphics/BlockRenderer.java

@@ -165,6 +165,7 @@ public class BlockRenderer{
 
             darkEvents.each(pos -> {
                 var tile = world.tile(pos);
+                if(tile == null) return;
                 float darkness = world.getDarkness(tile.x, tile.y);
                 //then draw the shadow
                 Draw.colorl(darkness <= 0f ? 1f : 1f - Math.min((darkness + 0.5f) / 4f, 1f));
@@ -338,7 +339,7 @@ public class BlockRenderer{
                         Draw.z(Layer.block);
                     }
 
-                    if(renderer.drawStatus && block.consumes.any()){
+                    if(entity.team == player.team() && renderer.drawStatus && block.consumes.any()){
                         entity.drawStatus();
                     }
                 }

core/src/mindustry/input/InputHandler.java

@@ -1242,12 +1242,14 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             diagonal = !diagonal;
         }
 
+        int endRotation = -1;
         if(diagonal){
             var start = world.build(startX, startY);
             var end = world.build(endX, endY);
             if(block != null && start instanceof ChainedBuilding && end instanceof ChainedBuilding
                     && block.canReplace(end.block) && block.canReplace(start.block)){
                 points = Placement.upgradeLine(startX, startY, endX, endY);
+                endRotation = end.rotation;
             }else{
                 points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY);
             }
@@ -1281,6 +1283,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
                 int result = baseRotation;
                 if(next != null){
                     result = Tile.relativeTo(point.x, point.y, next.x, next.y);
+                }else if(endRotation != -1){
+                    result = endRotation;
                 }else if(block.conveyorPlacement && i > 0){
                     Point2 prev = points.get(i - 1);
                     result = Tile.relativeTo(prev.x, prev.y, point.x, point.y);

core/src/mindustry/logic/LCanvas.java

@@ -181,7 +181,7 @@ public class LCanvas extends Table{
             float dst = Math.min(y - this.y, Core.graphics.getHeight() - y);
             if(dst < Scl.scl(100f)){ //scroll margin
                 int sign = Mathf.sign(Core.graphics.getHeight()/2f - y);
-                pane.setScrollY(pane.getScrollY() + sign * Scl.scl(15f));
+                pane.setScrollY(pane.getScrollY() + sign * Scl.scl(15f) * Time.delta);
             }
         }
     }

core/src/mindustry/maps/Maps.java

@@ -422,7 +422,7 @@ public class Maps{
     }
 
     private void writeCache(Map map) throws IOException{
-        try(DataOutputStream stream = new DataOutputStream(map.cacheFile().write(false, Streams.DEFAULT_BUFFER_SIZE))){
+        try(DataOutputStream stream = new DataOutputStream(map.cacheFile().write(false, Streams.defaultBufferSize))){
             stream.write(0);
             stream.writeInt(map.spawns);
             stream.write(map.teams.size);
@@ -434,7 +434,7 @@ public class Maps{
     }
 
     private void readCache(Map map) throws IOException{
-        try(DataInputStream stream = new DataInputStream(map.cacheFile().read(Streams.DEFAULT_BUFFER_SIZE))){
+        try(DataInputStream stream = new DataInputStream(map.cacheFile().read(Streams.defaultBufferSize))){
             stream.read(); //version
             map.spawns = stream.readInt();
             int teamsize = stream.readByte();

core/src/mindustry/maps/filters/FilterOption.java

@@ -3,12 +3,15 @@ package mindustry.maps.filters;
 
 import arc.*;
 import arc.func.*;
+import arc.scene.event.*;
 import arc.scene.style.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
+import arc.util.*;
 import mindustry.*;
 import mindustry.content.*;
 import mindustry.gen.*;
+import mindustry.ui.*;
 import mindustry.ui.dialogs.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
@@ -35,7 +38,7 @@ public abstract class FilterOption{
         final Floatc setter;
         final float min, max, step;
 
-        boolean display;
+        boolean display = true;
 
         SliderOption(String name, Floatp getter, Floatc setter, float min, float max){
             this(name, getter, setter, min, max, (max - min) / 200);
@@ -57,19 +60,27 @@ public abstract class FilterOption{
 
         @Override
         public void build(Table table){
+            Label label;
             if(!display){
-                table.add("@filter.option." + name);
+                label = new Label("@filter.option." + name);
             }else{
-                table.label(() -> Core.bundle.get("filter.option." + name) + ": " + (int)getter.get());
+                label = new Label(() -> Core.bundle.get("filter.option." + name) + ": " + Strings.autoFixed(getter.get(), 2));
             }
-            table.row();
+            label.setWrap(true);
-            Slider slider = table.slider(min, max, step, setter).growX().get();
+            label.setAlignment(Align.center);
+            label.touchable = Touchable.disabled;
+            label.setStyle(Styles.outlineLabel);
+
+            Slider slider = new Slider(min, max, step, false);
+            slider.moved(setter);
             slider.setValue(getter.get());
             if(updateEditorOnChange){
                 slider.changed(changed);
             }else{
                 slider.released(changed);
             }
+
+            table.stack(slider, label).colspan(2).pad(3).growX().row();
         }
     }
 

core/src/mindustry/mod/ClassMap.java

@@ -1,9 +1,6 @@
 package mindustry.mod;
 
 import arc.struct.*;
-import mindustry.world.blocks.environment.*;
-import mindustry.world.blocks.payloads.*;
-
 /** Generated class. Maps simple class names to concrete classes. For use in JSON mods. */
 @SuppressWarnings("deprecation")
 public class ClassMap{
@@ -168,26 +165,28 @@ public class ClassMap{
         classes.put("StackConveyor", mindustry.world.blocks.distribution.StackConveyor.class);
         classes.put("StackConveyorBuild", mindustry.world.blocks.distribution.StackConveyor.StackConveyorBuild.class);
         classes.put("AirBlock", mindustry.world.blocks.environment.AirBlock.class);
+        classes.put("Bush", mindustry.world.blocks.environment.Bush.class);
         classes.put("Cliff", mindustry.world.blocks.environment.Cliff.class);
         classes.put("DoubleOverlayFloor", mindustry.world.blocks.environment.DoubleOverlayFloor.class);
         classes.put("Floor", mindustry.world.blocks.environment.Floor.class);
         classes.put("OreBlock", mindustry.world.blocks.environment.OreBlock.class);
         classes.put("OverlayFloor", mindustry.world.blocks.environment.OverlayFloor.class);
         classes.put("Prop", mindustry.world.blocks.environment.Prop.class);
-        classes.put("Bush", Bush.class);
-        classes.put("WavingProp", WavingProp.class);
         classes.put("ShallowLiquid", mindustry.world.blocks.environment.ShallowLiquid.class);
         classes.put("SpawnBlock", mindustry.world.blocks.environment.SpawnBlock.class);
-        classes.put("StaticClusterWall", StaticClusterWall.class);
+        classes.put("StaticClusterWall", mindustry.world.blocks.environment.StaticClusterWall.class);
         classes.put("StaticTree", mindustry.world.blocks.environment.StaticTree.class);
         classes.put("StaticWall", mindustry.world.blocks.environment.StaticWall.class);
         classes.put("TreeBlock", mindustry.world.blocks.environment.TreeBlock.class);
         classes.put("WallOreBlock", mindustry.world.blocks.environment.WallOreBlock.class);
+        classes.put("WavingProp", mindustry.world.blocks.environment.WavingProp.class);
         classes.put("WobbleProp", mindustry.world.blocks.environment.WobbleProp.class);
-        classes.put("BlockLoader", BlockLoader.class);
+        classes.put("BlockForge", mindustry.world.blocks.experimental.BlockForge.class);
-        classes.put("BlockLoaderBuild", BlockLoader.BlockLoaderBuild.class);
+        classes.put("BlockForgeBuild", mindustry.world.blocks.experimental.BlockForge.BlockForgeBuild.class);
-        classes.put("BlockUnloader", BlockUnloader.class);
+        classes.put("BlockLoader", mindustry.world.blocks.experimental.BlockLoader.class);
-        classes.put("BlockUnloaderBuild", BlockUnloader.BlockUnloaderBuild.class);
+        classes.put("BlockLoaderBuild", mindustry.world.blocks.experimental.BlockLoader.BlockLoaderBuild.class);
+        classes.put("BlockUnloader", mindustry.world.blocks.experimental.BlockUnloader.class);
+        classes.put("BlockUnloaderBuild", mindustry.world.blocks.experimental.BlockUnloader.BlockUnloaderBuild.class);
         classes.put("LegacyBlock", mindustry.world.blocks.legacy.LegacyBlock.class);
         classes.put("LegacyMechPad", mindustry.world.blocks.legacy.LegacyMechPad.class);
         classes.put("LegacyMechPadBuild", mindustry.world.blocks.legacy.LegacyMechPad.LegacyMechPadBuild.class);
@@ -223,8 +222,12 @@ public class ClassMap{
         classes.put("BallisticSiloBuild", mindustry.world.blocks.payloads.BallisticSilo.BallisticSiloBuild.class);
         classes.put("BlockForge", mindustry.world.blocks.payloads.BlockForge.class);
         classes.put("BlockForgeBuild", mindustry.world.blocks.payloads.BlockForge.BlockForgeBuild.class);
+        classes.put("BlockLoader", mindustry.world.blocks.payloads.BlockLoader.class);
+        classes.put("BlockLoaderBuild", mindustry.world.blocks.payloads.BlockLoader.BlockLoaderBuild.class);
         classes.put("BlockProducer", mindustry.world.blocks.payloads.BlockProducer.class);
         classes.put("BlockProducerBuild", mindustry.world.blocks.payloads.BlockProducer.BlockProducerBuild.class);
+        classes.put("BlockUnloader", mindustry.world.blocks.payloads.BlockUnloader.class);
+        classes.put("BlockUnloaderBuild", mindustry.world.blocks.payloads.BlockUnloader.BlockUnloaderBuild.class);
         classes.put("BuildPayload", mindustry.world.blocks.payloads.BuildPayload.class);
         classes.put("NuclearWarhead", mindustry.world.blocks.payloads.NuclearWarhead.class);
         classes.put("NuclearWarheadBuild", mindustry.world.blocks.payloads.NuclearWarhead.NuclearWarheadBuild.class);
@@ -238,7 +241,7 @@ public class ClassMap{
         classes.put("PayloadSource", mindustry.world.blocks.payloads.PayloadSource.class);
         classes.put("PayloadSourceBuild", mindustry.world.blocks.payloads.PayloadSource.PayloadSourceBuild.class);
         classes.put("PayloadVoid", mindustry.world.blocks.payloads.PayloadVoid.class);
-        classes.put("BlockLoaderBuild", PayloadVoid.PayloadVoidBuild.class);
+        classes.put("PayloadVoidBuild", mindustry.world.blocks.payloads.PayloadVoid.PayloadVoidBuild.class);
         classes.put("UnitPayload", mindustry.world.blocks.payloads.UnitPayload.class);
         classes.put("Battery", mindustry.world.blocks.power.Battery.class);
         classes.put("BatteryBuild", mindustry.world.blocks.power.Battery.BatteryBuild.class);
@@ -246,6 +249,7 @@ public class ClassMap{
         classes.put("BurnerGeneratorBuild", mindustry.world.blocks.power.BurnerGenerator.BurnerGeneratorBuild.class);
         classes.put("ConditionalConsumePower", mindustry.world.blocks.power.ConditionalConsumePower.class);
         classes.put("DecayGenerator", mindustry.world.blocks.power.DecayGenerator.class);
+        classes.put("DynamicConsumePower", mindustry.world.blocks.power.DynamicConsumePower.class);
         classes.put("ImpactReactor", mindustry.world.blocks.power.ImpactReactor.class);
         classes.put("ImpactReactorBuild", mindustry.world.blocks.power.ImpactReactor.ImpactReactorBuild.class);
         classes.put("ItemLiquidGenerator", mindustry.world.blocks.power.ItemLiquidGenerator.class);
@@ -334,6 +338,7 @@ public class ClassMap{
         classes.put("DrawCells", mindustry.world.draw.DrawCells.class);
         classes.put("DrawCultivator", mindustry.world.draw.DrawCultivator.class);
         classes.put("DrawGlow", mindustry.world.draw.DrawGlow.class);
+        classes.put("DrawLiquid", mindustry.world.draw.DrawLiquid.class);
         classes.put("DrawMixer", mindustry.world.draw.DrawMixer.class);
         classes.put("DrawRotator", mindustry.world.draw.DrawRotator.class);
         classes.put("DrawSmelter", mindustry.world.draw.DrawSmelter.class);

core/src/mindustry/mod/ModClassLoader.java

@@ -11,6 +11,10 @@ public class ModClassLoader extends ClassLoader{
         }
     };
 
+    public ModClassLoader(ClassLoader parent){
+        super(parent);
+    }
+
     public void addChild(ClassLoader child){
         children.add(child);
     }

core/src/mindustry/mod/Mods.java

@@ -39,7 +39,7 @@ public class Mods implements Loadable{
 
     private int totalSprites;
     private MultiPacker packer;
-    private ModClassLoader mainLoader = new ModClassLoader();
+    private ModClassLoader mainLoader = new ModClassLoader(getClass().getClassLoader());
 
     Seq<LoadedMod> mods = new Seq<>();
     private ObjectMap<Class<?>, ModMeta> metas = new ObjectMap<>();
@@ -86,7 +86,8 @@ public class Mods implements Loadable{
 
     /** Imports an external mod file. Folders are not supported here. */
     public LoadedMod importMod(Fi file) throws IOException{
-        String baseName = file.nameWithoutExtension();
+        //for some reason, android likes to add colons to file names, e.g. primary:ExampleJavaMod.jar, which breaks dexing
+        String baseName = file.nameWithoutExtension().replace(':', '_').replace(' ', '_');
         String finalName = baseName;
         //find a name to prevent any name conflicts
         int count = 1;
@@ -300,12 +301,12 @@ public class Mods implements Loadable{
     }
 
     private PageType getPage(Fi file){
-        String parent = file.parent().name();
+        String path = file.path();
         return
-            parent.equals("environment") ? PageType.environment :
+            path.contains("sprites/blocks/environment") ? PageType.environment :
-            parent.equals("editor") ? PageType.editor :
+            path.contains("sprites/editor") ? PageType.editor :
-            parent.equals("rubble") ? PageType.editor :
+            path.contains("sprites/rubble") ? PageType.editor :
-            parent.equals("ui") || file.parent().parent().name().equals("ui") ? PageType.ui :
+            path.contains("sprites/ui") ? PageType.ui :
             PageType.main;
     }
 

core/src/mindustry/mod/Scripts.java

@@ -7,9 +7,9 @@ import arc.assets.loaders.SoundLoader.*;
 import arc.audio.*;
 import arc.files.*;
 import arc.func.*;
-import arc.struct.*;
 import arc.util.*;
 import arc.util.Log.*;
+import arc.util.io.*;
 import mindustry.*;
 import mindustry.mod.Mods.*;
 import rhino.*;
@@ -18,7 +18,6 @@ import rhino.module.provider.*;
 
 import java.io.*;
 import java.net.*;
-import java.util.*;
 import java.util.regex.*;
 
 public class Scripts implements Disposable{
@@ -131,7 +130,7 @@ public class Scripts implements Disposable{
 
     /** writeFile but for a byte[] */
     public void writeBinFile(String purpose, String ext, byte[] contents){
-        if(contents == null) contents = new byte[0];
+        if(contents == null) contents = Streams.emptyBytes;
         final byte[] fContents = contents;
         selectFile(false, purpose, ext, fi -> fi.writeBytes(fContents));
     }
@@ -183,7 +182,7 @@ public class Scripts implements Disposable{
     }
 
     private class ScriptModuleProvider extends UrlModuleSourceProvider{
-        private Pattern directory = Pattern.compile("^(.+?)/(.+)");
+        private final Pattern directory = Pattern.compile("^(.+?)/(.+)");
 
         public ScriptModuleProvider(){
             super(null, null);

core/src/mindustry/net/BeControl.java

@@ -1,7 +1,6 @@
 package mindustry.net;
 
 import arc.*;
-import arc.Net.*;
 import arc.files.*;
 import arc.func.*;
 import arc.util.*;
@@ -62,27 +61,25 @@ public class BeControl{
 
     /** asynchronously checks for updates. */
     public void checkUpdate(Boolc done){
-        Core.net.httpGet("https://api.github.com/repos/Anuken/MindustryBuilds/releases/latest", res -> {
+        Http.get("https://api.github.com/repos/Anuken/MindustryBuilds/releases/latest")
-            if(res.getStatus() == HttpStatus.OK){
+        .error(e -> {}) //ignore errors
-                Jval val = Jval.read(res.getResultAsString());
+        .submit(res -> {
-                int newBuild = Strings.parseInt(val.getString("tag_name", "0"));
+            Jval val = Jval.read(res.getResultAsString());
-                if(newBuild > Version.build){
+            int newBuild = Strings.parseInt(val.getString("tag_name", "0"));
-                    Jval asset = val.get("assets").asArray().find(v -> v.getString("name", "").startsWith(headless ? "Mindustry-BE-Server" : "Mindustry-BE-Desktop"));
+            if(newBuild > Version.build){
-                    String url = asset.getString("browser_download_url", "");
+                Jval asset = val.get("assets").asArray().find(v -> v.getString("name", "").startsWith(headless ? "Mindustry-BE-Server" : "Mindustry-BE-Desktop"));
-                    updateAvailable = true;
+                String url = asset.getString("browser_download_url", "");
-                    updateBuild = newBuild;
+                updateAvailable = true;
-                    updateUrl = url;
+                updateBuild = newBuild;
-                    Core.app.post(() -> {
+                updateUrl = url;
-                        showUpdateDialog();
+                Core.app.post(() -> {
-                        done.get(true);
+                    showUpdateDialog();
-                    });
+                    done.get(true);
-                }else{
+                });
-                    Core.app.post(() -> done.get(false));
-                }
             }else{
                 Core.app.post(() -> done.get(false));
             }
-        }, error -> {}); //ignore errors
+        });
     }
 
     /** @return whether a new update is available */

core/src/mindustry/net/CrashSender.java

@@ -1,7 +1,6 @@
 package mindustry.net;
 
 import arc.*;
-import arc.Net.*;
 import arc.files.*;
 import arc.func.*;
 import arc.struct.*;
@@ -147,26 +146,18 @@ public class CrashSender{
             ex(() -> value.addChild("javaVersion", new JsonValue(System.getProperty("java.version"))));
             ex(() -> value.addChild("javaArch", new JsonValue(System.getProperty("sun.arch.data.model"))));
 
-            boolean[] sent = {false};
-
             Log.info("Sending crash report.");
+
             //post to crash report URL, exit code indicates send success
-            httpPost(Vars.crashReportURL, value.toJson(OutputType.json), r -> {
+            Http.post(Vars.crashReportURL, value.toJson(OutputType.json)).error(t -> {
-                Log.info("Crash sent successfully.");
+                Log.info("Crash report not sent.");
-                sent[0] = true;
-                System.exit(1);
-            }, t -> {
-                t.printStackTrace();
-                sent[0] = true;
                 System.exit(-1);
+            }).block(r -> {
+                Log.info("Crash sent successfully.");
+                System.exit(1);
             });
 
-            //sleep until report is sent
+            ret();
-            try{
-                while(!sent[0]){
-                    Thread.sleep(30);
-                }
-            }catch(InterruptedException ignored){}
         }catch(Throwable death){
             death.printStackTrace();
         }
@@ -178,10 +169,6 @@ public class CrashSender{
         System.exit(1);
     }
 
-    private static void httpPost(String url, String content, Cons<HttpResponse> success, Cons<Throwable> failure){
-        new NetJavaImpl().http(new HttpRequest().method(HttpMethod.POST).content(content).url(url), success, failure);
-    }
-
     private static String parseException(Throwable e){
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);

core/src/mindustry/net/Net.java

@@ -9,6 +9,7 @@ import arc.util.async.*;
 import mindustry.gen.*;
 import mindustry.net.Packets.*;
 import mindustry.net.Streamable.*;
+import net.jpountz.lz4.*;
 
 import java.io.*;
 import java.nio.*;
@@ -33,7 +34,7 @@ public class Net{
     private final ObjectMap<Class<?>, Cons> clientListeners = new ObjectMap<>();
     private final ObjectMap<Class<?>, Cons2<NetConnection, Object>> serverListeners = new ObjectMap<>();
     private final IntMap<StreamBuilder> streams = new IntMap<>();
-    private final ExecutorService pingExecutor = Threads.executor(Math.max(Runtime.getRuntime().availableProcessors(), 6));
+    private final ExecutorService pingExecutor = Threads.cachedExecutor();
 
     private final NetProvider provider;
 
@@ -97,7 +98,7 @@ public class Net{
 
             if(e instanceof BufferUnderflowException || e instanceof BufferOverflowException){
                 error = Core.bundle.get("error.io");
-            }else if(error.equals("mismatch")){
+            }else if(error.equals("mismatch") || e instanceof LZ4Exception || (e instanceof IndexOutOfBoundsException && e.getStackTrace()[0].getClassName().contains("java.nio"))){
                 error = Core.bundle.get("error.mismatch");
             }else if(error.contains("port out of range") || error.contains("invalid argument") || (error.contains("invalid") && error.contains("address")) || Strings.neatError(e).contains("address associated")){
                 error = Core.bundle.get("error.invalidaddress");
@@ -325,13 +326,6 @@ public class Net{
         pingExecutor.submit(() -> provider.pingHost(address, port, valid, failed));
     }
 
-    /**
-     * Pings a host in an new thread. If an error occurred, failed() should be called with the exception.
-     */
-    public void pingHostThread(String address, int port, Cons<Host> valid, Cons<Exception> failed){
-        Threads.daemon(() -> provider.pingHost(address, port, valid, failed));
-    }
-
     /**
      * Whether the net is active, e.g. whether this is a multiplayer game.
      */

core/src/mindustry/net/NetConnection.java

@@ -4,7 +4,6 @@ import arc.struct.*;
 import arc.util.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
-import mindustry.net.Administration.*;
 import mindustry.net.Packets.*;
 
 import java.io.*;
@@ -37,38 +36,39 @@ public abstract class NetConnection{
 
     /** Kick with a special, localized reason. Use this if possible. */
     public void kick(KickReason reason){
-        if(kicked) return;
+        kick(reason, (reason == KickReason.kick || reason == KickReason.banned || reason == KickReason.vote) ? 30 * 1000 : 0);
+    }
 
-        Log.info("Kicking connection @ / @; Reason: @", address, uuid, reason.name());
+    /** Kick with a special, localized reason. Use this if possible. */
-
+    public void kick(KickReason reason, long kickDuration){
-        if((reason == KickReason.kick || reason == KickReason.banned || reason == KickReason.vote)){
+        kick(null, reason, kickDuration);
-            PlayerInfo info = netServer.admins.getInfo(uuid);
-            info.timesKicked++;
-            info.lastKicked = Math.max(Time.millis() + 30 * 1000, info.lastKicked);
-        }
-
-        Call.kick(this, reason);
-
-        close();
-
-        netServer.admins.save();
-        kicked = true;
     }
 
     /** Kick with an arbitrary reason. */
     public void kick(String reason){
-        kick(reason, 30 * 1000);
+        kick(reason, null, 30 * 1000);
+    }
+
+    /** Kick with an arbitrary reason. */
+    public void kick(String reason, long duration){
+        kick(reason, null, duration);
     }
 
     /** Kick with an arbitrary reason, and a kick duration in milliseconds. */
-    public void kick(String reason, long kickDuration){
+    private void kick(String reason, KickReason kickType, long kickDuration){
         if(kicked) return;
 
-        Log.info("Kicking connection @ / @; Reason: @", address, uuid, reason.replace("\n", " "));
+        Log.info("Kicking connection @ / @; Reason: @", address, uuid, reason == null ? kickType.name() : reason.replace("\n", " "));
 
-        netServer.admins.handleKicked(uuid, address, kickDuration);
+        if(kickDuration > 0){
+            netServer.admins.handleKicked(uuid, address, kickDuration);
+        }
 
-        Call.kick(this, reason);
+        if(reason == null){
+            Call.kick(this, kickType);
+        }else{
+            Call.kick(this, reason);
+        }
 
         close();
 

core/src/mindustry/type/UnitType.java

@@ -255,7 +255,7 @@ public class UnitType extends UnlockableContent{
 
         stats.add(Stat.health, health);
         stats.add(Stat.armor, armor);
-        stats.add(Stat.speed, speed);
+        stats.add(Stat.speed, speed * 60f / tilesize, StatUnit.tilesSecond);
         stats.add(Stat.size, hitSize / tilesize, StatUnit.blocksSquared);
         stats.add(Stat.itemCapacity, itemCapacity);
         stats.add(Stat.range, (int)(maxRange / tilesize), StatUnit.blocks);

core/src/mindustry/ui/Fonts.java

@@ -203,7 +203,7 @@ public class Fonts{
 
     /** Merges the UI and font atlas together for better performance. */
     public static void mergeFontAtlas(TextureAtlas atlas){
-        //grab all textures from the ui page, remove all the regions assigned to it, then copy them over to Fonts.packer and replace the texture in this atlas.
+        //grab all textures from the ui page, remove all the regions assigned to it, then copy them over to UI.packer and replace the texture in this atlas.
 
         //grab old UI texture and regions...
         Texture texture = atlas.find("logo").texture;