fix conflicts with develop

4 files changed, 8 insertions, 5 deletions

diff --git a/launcher/ui/dialogs/ModDownloadDialog.cpp b/launcher/ui/dialogs/ModDownloadDialog.cpp
index d02ea476..305e85c0 100644
--- a/launcher/ui/dialogs/ModDownloadDialog.cpp
+++ b/launcher/ui/dialogs/ModDownloadDialog.cpp
@@ -13,7 +13,7 @@
 #include <QDialogButtonBox>
 
 #include "ui/widgets/PageContainer.h"
-#include "ui/pages/modplatform/modrinth/ModrinthPage.h"
+#include "ui/pages/modplatform/modrinth/ModrinthModPage.h"
 #include "ModDownloadTask.h"
 
 
@@ -98,7 +98,7 @@ void ModDownloadDialog::accept()
 
 QList<BasePage *> ModDownloadDialog::getPages()
 {
-    modrinthPage = new ModrinthPage(this, m_instance);
+    modrinthPage = new ModrinthModPage(this, m_instance);
     flameModPage = new FlameModPage(this, m_instance);
     return
     {
diff --git a/launcher/ui/dialogs/ModDownloadDialog.h b/launcher/ui/dialogs/ModDownloadDialog.h
index 309d89d0..782dc361 100644
--- a/launcher/ui/dialogs/ModDownloadDialog.h
+++ b/launcher/ui/dialogs/ModDownloadDialog.h
@@ -16,7 +16,7 @@ class ModDownloadDialog;
 
 class PageContainer;
 class QDialogButtonBox;
-class ModrinthPage;
+class ModrinthModPage;
 
 class ModDownloadDialog : public QDialog, public BasePageProvider
 {
@@ -50,7 +50,7 @@ private:
     QVBoxLayout *m_verticalLayout = nullptr;
 
 
-    ModrinthPage *modrinthPage = nullptr;
+    ModrinthModPage *modrinthPage = nullptr;
     FlameModPage *flameModPage = nullptr;
     QHash<QString, ModDownloadTask*> modTask;
     BaseInstance *m_instance;
diff --git a/launcher/ui/dialogs/NewInstanceDialog.cpp b/launcher/ui/dialogs/NewInstanceDialog.cpp
index b402839c..05ea091d 100644
--- a/launcher/ui/dialogs/NewInstanceDialog.cpp
+++ b/launcher/ui/dialogs/NewInstanceDialog.cpp
@@ -39,6 +39,7 @@
 #include "ui/pages/modplatform/legacy_ftb/Page.h"
 #include "ui/pages/modplatform/flame/FlamePage.h"
 #include "ui/pages/modplatform/ImportPage.h"
+#include "ui/pages/modplatform/modrinth/ModrinthPage.h"
 #include "ui/pages/modplatform/technic/TechnicPage.h"
 
 
@@ -134,6 +135,7 @@ QList<BasePage *> NewInstanceDialog::getPages()
         flamePage,
         new FtbPage(this),
         new LegacyFTB::Page(this),
+        new ModrinthPage(this),
         technicPage
     };
 }
diff --git a/launcher/ui/dialogs/SkinUploadDialog.cpp b/launcher/ui/dialogs/SkinUploadDialog.cpp
index 6a5a324f..8d137afc 100644
--- a/launcher/ui/dialogs/SkinUploadDialog.cpp
+++ b/launcher/ui/dialogs/SkinUploadDialog.cpp
@@ -100,7 +100,8 @@ void SkinUploadDialog::on_buttonBox_accepted()
 
 void SkinUploadDialog::on_skinBrowseBtn_clicked()
 {
-    QString raw_path = QFileDialog::getOpenFileName(this, tr("Select Skin Texture"), QString(), "*.png");
+    auto filter = QMimeDatabase().mimeTypeForName("image/png").filterString();
+    QString raw_path = QFileDialog::getOpenFileName(this, tr("Select Skin Texture"), QString(), filter);
     if (raw_path.isEmpty() || !QFileInfo::exists(raw_path))
     {
         return;