diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-30 15:33:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-30 15:33:46 -0700 |
| commit | b9fe37aec14b7cc61cbef09d5d2256f68a48d220 (patch) | |
| tree | d2f5422ffe3a2c4732068bdee3b6fede3404fb8e /launcher/Application.h | |
| parent | 520594e5296b09205e55bc018b1f759df5725e96 (diff) | |
| parent | 9137721e8e5b44f2338a36874a393435cbc6daa3 (diff) | |
| download | PrismLauncher-b9fe37aec14b7cc61cbef09d5d2256f68a48d220.tar.gz PrismLauncher-b9fe37aec14b7cc61cbef09d5d2256f68a48d220.tar.bz2 PrismLauncher-b9fe37aec14b7cc61cbef09d5d2256f68a48d220.zip | |
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/Application.h')
| -rw-r--r-- | launcher/Application.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/launcher/Application.h b/launcher/Application.h index ced0af17..c0a980b2 100644 --- a/launcher/Application.h +++ b/launcher/Application.h @@ -2,7 +2,7 @@ /* * Prism Launcher - Minecraft Launcher * Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net> - * Copyright (C) 2022 Tayou <tayou@gmx.net> + * Copyright (C) 2022 Tayou <git@tayou.org> * Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me> * * This program is free software: you can redistribute it and/or modify @@ -48,6 +48,7 @@ #include <BaseInstance.h> #include "minecraft/launch/MinecraftServerTarget.h" +#include "ui/themes/CatPack.h" class LaunchController; class LocalPeer; @@ -126,9 +127,11 @@ public: void setApplicationTheme(const QString& name); - 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(); |