Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

 Conflicts:
	gradle.properties
This commit is contained in:
Anuken
2021-07-09 19:48:35 -04:00
167 changed files with 17 additions and 1083 deletions

View File

@@ -20,8 +20,8 @@ public class FileChooser extends BaseDialog{
private static final Fi homeDirectory = Core.files.absolute(Core.files.getExternalStoragePath());
static Fi lastDirectory = Core.files.absolute(Core.settings.getString("lastDirectory", homeDirectory.absolutePath()));
private Table files;
Fi directory = lastDirectory;
private Table files;
private ScrollPane pane;
private TextField navigation, filefield;
private TextButton ok;
@@ -37,6 +37,10 @@ public class FileChooser extends BaseDialog{
this.filter = filter;
this.selectListener = result;
if(!lastDirectory.exists()){
lastDirectory = homeDirectory;
}
onResize(() -> {
cont.clear();
setupWidgets();