diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 8e9131fbce..a1f1387d60 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="50" + android:versionName="3.3b2" > diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index b5ea1471e5..373d539a6a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -109,7 +109,6 @@ public class SettingsMenuDialog extends SettingsDialog{ game.sliderPref("difficulty", 1, 0, 2, i -> Bundles.get("setting.difficulty." + (i == 0 ? "easy" : i == 1 ? "normal" : "hard"))); game.screenshakePref(); game.checkPref("smoothcam", true); - game.checkPref("indicators", true); game.checkPref("effects", true); game.sliderPref("sensitivity", 100, 10, 300, i -> i + "%"); game.sliderPref("saveinterval", 90, 10, 5*120, i -> Bundles.format("setting.seconds", i)); @@ -117,6 +116,7 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("fps", false); graphics.checkPref("vsync", true, b -> Gdx.graphics.setVSync(b)); graphics.checkPref("lasers", true); + graphics.checkPref("indicators", true); graphics.checkPref("healthbars", true); graphics.checkPref("pixelate", true, b -> { if(b){ diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 1acb94b26b..f32359d451 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -86,13 +86,13 @@ public class DesktopLauncher { DiscordRichPresence presence = new DiscordRichPresence(); if(!GameState.is(State.menu)){ - presence.state = Strings.capitalize(Vars.control.getMode().toString()) + ", Solo"; + presence.state = Strings.capitalize(Vars.control.getMode().name()) + ", Solo"; presence.details = Strings.capitalize(Vars.world.getMap().name) + " | Wave " + Vars.control.getWave(); presence.largeImageText = "Wave " + Vars.control.getWave(); if(Net.active() ){ presence.partyMax = 16; presence.partySize = Vars.control.playerGroup.amount(); - presence.state = Strings.capitalize(Vars.control.getMode().toString()); + presence.state = Strings.capitalize(Vars.control.getMode().name()); } }else{ if(Vars.ui.editor != null && Vars.ui.editor.isShown()){