From 3f0dd7264d05eaa33b143af74fde446c12afddeb Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 27 Aug 2020 11:38:12 -0400 Subject: [PATCH] Removed useless menu button for desktop --- core/src/mindustry/ui/dialogs/PausedDialog.java | 11 +---------- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/core/src/mindustry/ui/dialogs/PausedDialog.java b/core/src/mindustry/ui/dialogs/PausedDialog.java index 13479fa151..0d5f873562 100644 --- a/core/src/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/mindustry/ui/dialogs/PausedDialog.java @@ -44,16 +44,7 @@ public class PausedDialog extends BaseDialog{ float dw = 220f; cont.defaults().width(dw).height(55).pad(5f); - cont.button("@back", Icon.left, this::hide).colspan(2).width(dw * 2 + 20f); - - cont.row(); - //if(state.isCampaign()){ - // cont.button("@techtree", Icon.tree, ui.tech::show); - //}else{ - // cont.button("@database", Icon.book, ui.database::show); - //} - //TODO remove - cont.button("nothing", Icon.warning, () -> ui.showInfo("no")); + cont.button("@back", Icon.left, this::hide); cont.button("@settings", Icon.settings, ui.settings::show); if(!state.rules.tutorial){ diff --git a/gradle.properties b/gradle.properties index d6f1b99a58..94b9b3987e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=c899ca692e409237ff08631845cf0ea8b9392bb5 +archash=98b2693ae19feedb72d577ef9bdae5cfa4315c68