mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-12-15 15:20:57 -08:00
Code Issues Projects Releases Wiki Activity

Fixed #3725

Browse source
This commit is contained in:
Anuken 2020-12-02 14:14:42 -05:00
parent 55db91e53e
commit a0702559f3
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -267,7 +267,7 @@ project(":ios"){
props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + "" props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + ""
if(bversion != "custom build"){ if(bversion != "custom build"){
props['app.version'] = versionNumber + ".0" + ("." + bversion) props['app.version'] = versionNumber + "." + bversion + (bversion.contains(".") ? "" : ".0")
} }
props.store(vfile.newWriter(), null) props.store(vfile.newWriter(), null)
} }

5
core/src/mindustry/ui/dialogs/PlanetDialog.java
View file

@ -144,7 +144,10 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
//load legacy research //load legacy research
if(Core.settings.has("unlocks") && !Core.settings.has("junction-unlocked")){ if(Core.settings.has("unlocks") && !Core.settings.has("junction-unlocked")){
Core.app.post(() -> { Core.app.post(() -> {
ui.showCustomConfirm("@research", "@research.legacy", "@research.load", "@research.discard", LegacyIO::readResearch, () -> Core.settings.remove("unlocks")); ui.showCustomConfirm("@research", "@research.legacy", "@research.load", "@research.discard", () -> {
LegacyIO.readResearch();
Core.settings.remove("unlocks");
}, () -> Core.settings.remove("unlocks"));
}); });
} }