Merge remote-tracking branch 'upstream/develop' into icon-indexing

2023-07-21 12:48:05 +01:00
parent 5088d33fd2 821dd8400b
commit f8b935ab37
11 changed files with 333 additions and 39 deletions
--- a/launcher/Application.h
+++ b/launcher/Application.h
@ -48,6 +48,7 @@
 #include <BaseInstance.h>

 #include "minecraft/launch/MinecraftServerTarget.h"
+#include "ui/themes/CatPack.h"

 class LaunchController;
 class LocalPeer;
@ -121,9 +122,11 @@ public:

    ThemeManager* themeManager() { return m_themeManager.get(); }

-    shared_qobject_ptr<ExternalUpdater> updater() {
-        return m_updater;
-    }
+    QList<CatPack*> getValidCatPacks();
+
+    QString getCatPack(QString catName = "");
+
+    shared_qobject_ptr<ExternalUpdater> updater() { return m_updater; }

    void triggerUpdateCheck();