Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash

2023-06-23 14:38:30 +03:00
parent 67db141203 8df5ab8aa7
commit 85bbab0e92
47 changed files with 1214 additions and 157 deletions
--- a/launcher/ui/dialogs/ExportMrPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportMrPackDialog.cpp
@ -53,6 +53,7 @@ ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent)
    const QDir root(instance->gameRoot());
    proxy = new FileIgnoreProxy(instance->gameRoot(), this);
    proxy->setSourceModel(model);
+    proxy->setFilterRegularExpression("^(?!\\.DS_Store).+$");

    const QDir::Filters filter(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Hidden);