Merge remote-tracking branch 'origin/v7' into v7

core/assets/bundles/bundle.properties

@@ -1426,7 +1426,7 @@ setting.assumeunstrict.description = Attempts to teleport when pathing, won't wo
 setting.returnonmove.name = Reset Camera On Move
 setting.returnonmove.description = Stops freecam on player movement as in vanilla
 setting.nostrafepenalty.name = No strafing speed penalty
-setting.nostrafepenalty.description = Ignores speed reduction when not moving in the direction your unit is facing
+setting.nostrafepenalty.description = Ignores speed reduction when not moving in the direction your unit is facing (doesn't work on servers)
 setting.zerodrift.name = Zero drift
 setting.zerodrift.description = Eliminates drifting after releasing movement keys. Useful for precise movement.
 setting.decreasedrift.name = Decreased Drift

core/assets/bundles/bundle_zh_CN.properties

@@ -1426,7 +1426,7 @@ setting.assumeunstrict.description = 在移动至目标路径点时会尝试用
 setting.returnonmove.name = 在移动时重置镜头
 setting.returnonmove.description = 在玩家进行移动时像原版一样停止自由镜头
 setting.nostrafepenalty.name = 无射击速度惩罚
-setting.nostrafepenalty.description = 忽略未向着你的单位面朝方向移动时的移动速度降低效果
+setting.nostrafepenalty.description = 忽略未向着你的单位面朝方向移动时的移动速度降低效果 (在服务器中不生效)
 setting.zerodrift.name = 零漂移
 setting.zerodrift.description = 取消松开移动键后的惯性漂移. 有助于精确移动.
 setting.decreasedrift.name = 削减漂移

core/src/mindustry/graphics/OverlayRenderer.java

@@ -166,10 +166,10 @@ public void drawTop(){
         if(select == null) select = lastSelect;
         if(select != null && (!(select instanceof Unitc u) || u.isAI())){
             boolean showingError = !state.rules.possessionAllowed || (select instanceof Unit u && !u.type.playerControllable);
-            Draw.mixcol(showingError ? Color.valueOf("FF6666") : Pal.accent, 1f);
+            Draw.mixcol(showingError ? Pal.remove : Pal.accent, 1f);
             Draw.alpha(unitFade);
             Building build = (select instanceof BlockUnitc b ? b.tile() : select instanceof Building b ? b : null);
-            TextureRegion region = build != null ? build.block.uiIcon : select instanceof Unit u ? u.icon() : Core.atlas.white();
+            TextureRegion region = build != null ? build.block.fullIcon : select instanceof Unit u ? u.icon() : Core.atlas.white();
 
             Draw.rect(region, select.getX(), select.getY(), select instanceof Unit u && !(select instanceof BlockUnitc) ? u.rotation - 90f : 0f);