From 2c8eb1e5b8d7af501cfb98fc05fee04d7d1f1988 Mon Sep 17 00:00:00 2001 From: Arik Date: Wed, 30 Jun 2021 05:29:35 -0700 Subject: [PATCH 1/3] Conveyor Upgrade End Rotation (#5512) --- core/src/mindustry/input/InputHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 073550efd0..e0f2b88116 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/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); From 5cc92506c912f75b5439c5a3874a86b6ab949a37 Mon Sep 17 00:00:00 2001 From: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com> Date: Wed, 30 Jun 2021 19:34:08 +0700 Subject: [PATCH 2/3] [ID] Updates Indonesian V7 translation (#5513) * Indonesian bundle update lenum.controller description and Tar Fields map * translation bundle sync * Indonesian translation standardization * healing status effect * Indonesian translation for V7 bit confused on line 1611 * [ID] WIP polygonal core protection * [ID] Updates Indonesian V7 translation Logic wait & content look up instructions --- core/assets/bundles/bundle_in_ID.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 0296c5f792..c78204530d 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/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. From 4f561a3875944a8c3e0fb298db3be059bb0efce9 Mon Sep 17 00:00:00 2001 From: ulwepo <85295540+ulwepo@users.noreply.github.com> Date: Wed, 30 Jun 2021 21:34:18 +0900 Subject: [PATCH 3/3] Update servers_v6.json (#5515) Sakura is a Japanese server. I add attack mode. Thank you. --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index e3db39edbe..10da115b74 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -101,7 +101,7 @@ }, { "name": "Sakura", - "address": ["160.16.207.141", "160.16.207.141:21527", "160.16.207.141:31587"] + "address": ["160.16.207.141", "160.16.207.141:21527", "160.16.207.141:31587", "160.16.207.141:26810"] }, { "name": "MeowLand",