diff --git a/core/assets/features b/core/assets/features index 8cf4a95c0f..4899767a56 100644 --- a/core/assets/features +++ b/core/assets/features @@ -60,7 +60,6 @@ * {p}buildmine - A mix of {p}builder and {p}miner. Switches to buildpath when buildplans exist (and build is enabled) then switches back to mining after done. * {p} [message...] (note the space) - sends the given message in chat with an exclamation point at the start * {p}shrug [message...] - send ¯\_(ツ)_/¯ in chat followed by the message - * {p}login [name] [pw] - auto login to CN servers, not secure * {p}marker [x] [y] - place a named marker on the map * {p}js - run javascript code locally * {p}/js - run javascript both locally and on the server (if permitted) diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index d8457ab697..c90c31918f 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -777,7 +777,7 @@ public void draw(){ private void setPreview(){ var maxTime = Core.settings.getInt("schemloadtime"); - if(maxTime > 0 && previewTime > maxTime && !schematics.hasPreview(schematic)){ // Only allow 10ms of expensive preview creation each frame. Yes this is janky. No I don't care + if(maxTime > 0 && previewTime > Time.millisToNanos(maxTime) && !schematics.hasPreview(schematic)){ // Only allow 10ms of expensive preview creation each frame. Yes this is janky. No I don't care set = false; return; } diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 5a94045976..d7dd3ee99d 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -814,13 +814,13 @@ public void pref(Setting setting){ private void makeSearchBar(){ searchBarTable = table(s -> { - s.left(); s.image(Icon.zoom); searchBar = s.field(search, res -> { search = res; rebuild(); }).growX().get(); }).get(); + row(); } public SliderSetting sliderPref(String name, int def, int min, int max, StringProcessor s){