Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater

2023-09-26 20:16:46 +03:00
parent befa3baa6a 0406e168e7
commit ebde563648
76 changed files with 1253 additions and 299 deletions
--- a/launcher/ui/dialogs/ResourceDownloadDialog.cpp
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
@ -370,6 +370,8 @@ QList<BasePage*> ShaderPackDownloadDialog::getPages()
 {
    QList<BasePage*> pages;
    pages.append(ModrinthShaderPackPage::create(this, *m_instance));
+    if (APPLICATION->capabilities() & Application::SupportsFlame)
+        pages.append(FlameShaderPackPage::create(this, *m_instance));
    return pages;
 }