Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2020-09-20 15:23:41 -04:00
5 changed files with 9 additions and 6 deletions

View File

@@ -334,7 +334,7 @@ public class Control implements ApplicationListener, Loadable{
}
public void playTutorial(){
ui.showInfo("There is no tutorial yet.");
ui.showInfo("@indev.notready");
//TODO implement
//ui.showInfo("death");
/*
@@ -434,7 +434,7 @@ public class Control implements ApplicationListener, Loadable{
//just a regular reminder
if(!OS.prop("user.name").equals("anuke") && !OS.hasEnv("iknowwhatimdoing")){
app.post(() -> app.post(() -> {
ui.showStartupInfo("@indevpopup");
ui.showStartupInfo("@indev.popup");
}));
}