Merge pull request #537 from PolyMC/stable

Merge stable into develop
This commit is contained in:
timoreo22 2022-05-09 18:06:56 +02:00 committed by GitHub
commit 649b8ac7c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 264 additions and 379 deletions

View file

@ -90,6 +90,7 @@ Config::Config()
HELP_URL = "@Launcher_HELP_URL@";
IMGUR_CLIENT_ID = "@Launcher_IMGUR_CLIENT_ID@";
MSA_CLIENT_ID = "@Launcher_MSA_CLIENT_ID@";
CURSEFORGE_API_KEY = "@Launcher_CURSEFORGE_API_KEY@";
META_URL = "@Launcher_META_URL@";
BUG_TRACKER_URL = "@Launcher_BUG_TRACKER_URL@";

View file

@ -40,9 +40,8 @@
/**
* \brief The Config class holds all the build-time information passed from the build system.
*/
class Config
{
public:
class Config {
public:
Config();
QString LAUNCHER_NAME;
QString LAUNCHER_DISPLAYNAME;
@ -75,7 +74,6 @@ public:
/// URL for the updater's channel
QString UPDATER_BASE;
/// User-Agent to use.
QString USER_AGENT;
@ -117,6 +115,11 @@ public:
*/
QString MSA_CLIENT_ID;
/**
* Client API key for CurseForge
*/
QString CURSEFORGE_API_KEY;
/**
* Metadata repository URL prefix
*/
@ -156,4 +159,3 @@ public:
};
extern const Config BuildConfig;