Merge branch 'master' into master

CONTRIBUTING.md

@@ -20,6 +20,12 @@ Yes, there are occurrences of trailing spaces, extra newlines, empty indents, an
 
 I **especially** do not want to see PRs that apply any kind of automated analysis to the source code to "optimize" anything - my IDE can do that already. If the PR doesn't actually change anything useful, I'm not going to review or merge it.
 
+### Do not make AI "contributions".
+
+If I see a PR with significant amounts of code that's obviously written by AI, I will reject your PR, and you will be blocked. Don't waste my time with slop.
+
+Asking AI questions, and using that information to help you write code? Fine. Using it to actually write code? No.
+
 ## Style Guidelines
 
 ### Follow the formatting guidelines.

core/assets/bundles/bundle_zh_CN.properties

@@ -2540,7 +2540,7 @@ unit.risso.description = 向敌人发射一串导弹与子弹。
 unit.minke.description = 向敌人发射炮弹和标准子弹。
 unit.bryde.description = 向敌人发射远程炮弹和导弹。
 unit.sei.description = 向敌人发射一串导弹与穿甲弹。
-unit.omura.description = 向敌人发射远程穿透轨道炮。自动生产星辉单位。
+unit.omura.description = 向敌人发射远程穿透轨道炮。
 unit.alpha.description = 保护初代核心，可建造建筑。
 unit.beta.description = 保护次代核心,可建造建筑。
 unit.gamma.description = 保护终代核心，可建造建筑。

core/assets/contributors

@@ -189,4 +189,5 @@ Someone's Shadow
 buj
 Agzam4
 ItsKirby69
-giannir1988
+giannir1988
+TheCuber

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

@@ -92,11 +92,13 @@ public class ShieldArcAbility extends Ability{
             }else if(paramField.pushUnits && !(!unit.isFlying() && paramUnit.isFlying())){
 
                 float reach = paramField.radius + paramField.width;
-                float overlapDst = reach - unit.dst(paramPos.x,paramPos.y);
+                float overlapDst = reach - unit.dst(paramPos.x, paramPos.y);
 
                 if(overlapDst > 0){
-                    //stop
-                    unit.vel.setZero();
+                    //only nullify velocity if it's heading towards the shield
+                    if(Angles.angleDist(unit.angleTo(paramPos), unit.vel.angle()) < 90f){
+                        unit.vel.setZero();
+                    }
                     // get out
                     unit.move(Tmp.v1.set(unit).sub(paramUnit).setLength(overlapDst + 0.01f));
 

core/src/mindustry/ui/dialogs/DatabaseDialog.java

@@ -84,8 +84,8 @@ public class DatabaseDialog extends BaseDialog{
         for(var contents : allContent){
             for(var content : contents){
                 if(content instanceof UnlockableContent u){
-                    var categoryContents = sortedContents.get(u.databaseCategory, new OrderedMap<>());
-                    var taggedContents = categoryContents.get(u.databaseTag, new Seq<>());
+                    var categoryContents = sortedContents.get(u.databaseCategory == null ? u.getContentType().name() : u.databaseCategory, new OrderedMap<>());
+                    var taggedContents = categoryContents.get(u.databaseTag == null ? "default" : u.databaseTag, new Seq<>());
                     taggedContents.add(u);
                     categoryContents.put(u.databaseTag, taggedContents);
                     sortedContents.put(u.databaseCategory, categoryContents);

gradle.properties

@@ -26,4 +26,4 @@ org.gradle.caching=true
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
 android.enableR8.fullMode=false
-archash=b6f4958d92
+archash=186401532c