From ee79bc5501139d35f307749ec504cf845f8dd482 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 12 Jan 2021 10:20:07 -0500 Subject: [PATCH] =?UTF-8?q?Replaced=20waves.never=20with=20=E2=88=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/assets/bundles/bundle.properties | 1 - core/src/mindustry/editor/WaveInfoDialog.java | 2 +- core/src/mindustry/io/MapIO.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 9f1a3a1b63..57d9fa6755 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -362,7 +362,6 @@ editor.center = Center workshop = Workshop waves.title = Waves waves.remove = Remove -waves.never = waves.every = every waves.waves = wave(s) waves.perspawn = per spawn diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java index a98d03a923..a71d0a2d8f 100644 --- a/core/src/mindustry/editor/WaveInfoDialog.java +++ b/core/src/mindustry/editor/WaveInfoDialog.java @@ -190,7 +190,7 @@ public class WaveInfoDialog extends BaseDialog{ group.end = never; updateWaves(); } - }).width(100f).get().setMessageText(Core.bundle.get("waves.never")); + }).width(100f).get().setMessageText("∞"); }); t.row(); t.table(p -> { diff --git a/core/src/mindustry/io/MapIO.java b/core/src/mindustry/io/MapIO.java index 7b1256e543..c484524709 100644 --- a/core/src/mindustry/io/MapIO.java +++ b/core/src/mindustry/io/MapIO.java @@ -200,7 +200,7 @@ public class MapIO{ for(Point2 p : Geometry.d4){ Tile other = tiles.get(tile.x + p.x, tile.y + p.y); if(other != null && other.floor() != Blocks.air){ - tile.setFloor(other.floor()); + tile.setFloorUnder(other.floor()); break; } }