Merge branch 'PrismLauncher:develop' into data-packs

2025-06-01 07:54:16 +00:00
parent 80fb1a8f4e 9f1d19811b
commit e4ed3b4546
125 changed files with 3925 additions and 1596 deletions
--- a/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
+++ b/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
@@ -97,7 +97,7 @@ class FlameModPage : public ModPage {
    [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }

    void openUrl(const QUrl& url) override;
-    unique_qobject_ptr<ModFilterWidget> createFilterWidget() override;
+    std::unique_ptr<ModFilterWidget> createFilterWidget() override;

   protected:
    virtual void prepareProviderCategories() override;