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

2023-06-28 17:46:01 +03:00
parent 0063d52952 faec21d572
commit c23bf2fd22
146 changed files with 2711 additions and 2596 deletions
--- a/launcher/ui/pages/instance/ExternalResourcesPage.h
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.h
@ -61,6 +61,7 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
    virtual void viewConfigs();

    void ShowContextMenu(const QPoint& pos);
+    void ShowHeaderContextMenu(const QPoint& pos);

   protected:
    BaseInstance* m_instance = nullptr;