From 8c7523b3b302af763c1263990a01be9386c84bd8 Mon Sep 17 00:00:00 2001
From: Uenhe <119563256+Uenhe@users.noreply.github.com>
Date: Wed, 28 Jun 2023 22:58:28 +0800
Subject: [PATCH 1/3] Update RegenProjector.java (#8768)

---
 core/src/mindustry/world/blocks/defense/RegenProjector.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/world/blocks/defense/RegenProjector.java b/core/src/mindustry/world/blocks/defense/RegenProjector.java
index 10c1126695..69bbb61116 100644
--- a/core/src/mindustry/world/blocks/defense/RegenProjector.java
+++ b/core/src/mindustry/world/blocks/defense/RegenProjector.java
@@ -5,7 +5,6 @@ import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.struct.*;
 import arc.util.*;
-import mindustry.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
@@ -55,9 +54,11 @@ public class RegenProjector extends Block{
 
         x *= tilesize;
         y *= tilesize;
+        x += offset;
+        y += offset;
 
         Drawf.dashSquare(baseColor, x, y, range * tilesize);
-        indexer.eachBlock(Vars.player.team(), Tmp.r1.setCentered(x, y, range * tilesize), b -> true, t -> {
+        indexer.eachBlock(player.team(), Tmp.r1.setCentered(x, y, range * tilesize), b -> true, t -> {
             Drawf.selected(t, Tmp.c1.set(baseColor).a(Mathf.absin(4f, 1f)));
         });
     }

From 1d1ec8ee2d9baa9b0d078ab0aa5fd167201e97ab Mon Sep 17 00:00:00 2001
From: Slotterleet <62336673+Slotterleet@users.noreply.github.com>
Date: Wed, 28 Jun 2023 17:58:39 +0300
Subject: [PATCH 2/3] Update bundle_ru.properties (#8770)

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

diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 069742cda9..b7b0ffc778 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -253,7 +253,7 @@ viewplayer = Отслеживаем игрока: [accent]{0}
 
 trace = Отслеживать игрока
 trace.playername = Имя игрока: [accent]{0}
-trace.ip = Адрес: [accent]{0}
+trace.ip = IP: [accent]{0}
 trace.id = ID: [accent]{0}
 trace.mobile = Мобильный клиент: [accent]{0}
 trace.modclient = Пользовательский клиент: [accent]{0}
@@ -286,7 +286,7 @@ confirmunadmin = Вы действительно хотите убрать иг
 votekick.reason = Причина 
 votekick.reason.message = Вы уверены, что хотите голосованием выгнать "{0}[white]"?\nЕсли да, введите причину:
 joingame.title = Присоединиться к игре
-joingame.ip = Адрес:
+joingame.ip = IP:
 disconnect = Отключено.
 disconnect.error = Ошибка соединения.
 disconnect.closed = Соединение закрыто.

From cc41b99c750ff311be6dd06c1b6beb0b9f6234fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D1=80=D0=BA=D0=BD=D0=B5=D1=81=D1=81=233729?=
 <79508138+Darkness6030@users.noreply.github.com>
Date: Thu, 29 Jun 2023 16:43:41 +0300
Subject: [PATCH 3/3] Update UnitType.java (#8778)

---
 core/src/mindustry/type/UnitType.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 9c13066887..ee2e01a4de 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -684,8 +684,8 @@ public class UnitType extends UnlockableContent{
 
         if(pathCost == null){
             pathCost =
-                example instanceof WaterMovec ? ControlPathfinder.costNaval :
-                allowLegStep ? ControlPathfinder.costLegs :
+                naval ? ControlPathfinder.costNaval :
+                allowLegStep || example instanceof Crawlc ? ControlPathfinder.costLegs :
                 hovering ? ControlPathfinder.costHover :
                 ControlPathfinder.costGround;
         }