From 376e5c0b29a8944939429540ddcb0c123a6e8dbf 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: Wed, 7 Jun 2023 21:13:41 +0300 Subject: [PATCH 1/3] :skull: (#8685) --- core/src/mindustry/core/UI.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index 8a0f81610f..3851d4880a 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -276,6 +276,7 @@ public class UI implements ApplicationListener, Loadable{ this.numeric = numbers; this.maxLength = textLength; this.accepted = confirmed; + this.canceled = closed; this.allowEmpty = false; }}); }else{ From a43d39597a08bf65639c1389e3792522f71d5c09 Mon Sep 17 00:00:00 2001 From: Valera <76255437+xzxADIxzx@users.noreply.github.com> Date: Thu, 8 Jun 2023 00:36:19 +0300 Subject: [PATCH 2/3] fix a small mistake made by inattention (#8686) --- core/src/mindustry/graphics/LoadRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/graphics/LoadRenderer.java b/core/src/mindustry/graphics/LoadRenderer.java index 432798d683..c0baa1ae7a 100644 --- a/core/src/mindustry/graphics/LoadRenderer.java +++ b/core/src/mindustry/graphics/LoadRenderer.java @@ -456,7 +456,7 @@ public class LoadRenderer implements Disposable{ float skew = bsize/2f; float v = w / 2 + cx * dir - width / 2f; - Fill.rects(v + dir*skew, h/2f - bsize/2f + bsize/2f, width, bsize/2f, -dir*skew); + Fill.rects(v + dir*skew, h/2f, width, bsize/2f, -dir*skew); Fill.rects(v, h/2f - bsize/2f, width, bsize/2f, dir*skew); } From 603efd76536a5d17fbfa7e162798ef1c225fe607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=8B=90?= <108625654+Yoru-Kitsune@users.noreply.github.com> Date: Thu, 8 Jun 2023 05:15:24 +0200 Subject: [PATCH 3/3] Update bundle_de.properties (#8688) --- core/assets/bundles/bundle_de.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index fbf238e949..5f264af602 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -1045,7 +1045,7 @@ category.crafting = Erzeugung category.function = Funktion category.optional = Optionale Zusätze setting.skipcoreanimation.name = Kern Start- und Lande-Animation überspringen -setting.landscape.name = Landschaft sperren +setting.landscape.name = Querformat sperren setting.shadows.name = Schatten setting.blockreplace.name = Automatische Blockvorschläge setting.linear.name = Lineare Filterung @@ -1056,7 +1056,7 @@ setting.buildautopause.name = Bauen automatisch pausieren setting.doubletapmine.name = Doppeltippen zum Abbauen setting.commandmodehold.name = Halten für Steuerungsmodus setting.modcrashdisable.name = Mods bei Absturz deaktivieren -setting.animatedwater.name = Animiertes Wasser +setting.animatedwater.name = Animierte Oberflächen setting.animatedshields.name = Animierte Schilde setting.playerindicators.name = Spieler-Indikatoren setting.indicators.name = Verbündeten-Indikatoren @@ -1470,8 +1470,8 @@ block.plastanium-wall.name = Plastaniummauer block.plastanium-wall-large.name = Große Plastaniummauer block.phase-wall.name = Phasenmauer block.phase-wall-large.name = Große Phasenmauer -block.thorium-wall.name = Thorium-Mauer -block.thorium-wall-large.name = Große Thorium-Mauer +block.thorium-wall.name = Thoriummauer +block.thorium-wall-large.name = Große Thoriummauer block.door.name = Tor block.door-large.name = Großes Tor block.duo.name = Doppelgeschütz