Merge branch 'develop' into remove-updater

2022-12-14 23:22:27 +01:00
parent fdbd8d9d2b d193ed9eeb
commit 849b92665e
251 changed files with 20746 additions and 1271 deletions
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@ -160,6 +160,8 @@ private slots:

    void on_actionEditInstance_triggered();

+    void on_actionCreateInstanceShortcut_triggered();
+
    void taskEnd();

    /**