External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2026-01-04 06:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Sebastian-byte
2021-10-21 17:57:41 -05:00
parent d05983ee65 8bc6560b5e
commit 49c464ebf3
182 changed files with 1512 additions and 2583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
buildconfig/BuildConfig.h
View File

@@ -8,6 +8,13 @@ class Config
{
public:
Config();
QString LAUNCHER_NAME;
QString LAUNCHER_DISPLAYNAME;
QString LAUNCHER_COPYRIGHT;
QString LAUNCHER_DOMAIN;
QString LAUNCHER_CONFIGFILE;
QString LAUNCHER_GIT;
/// The major version number.
int VERSION_MAJOR;
/// The minor version number.
@@ -31,10 +38,13 @@ public:
/// URL for the updater's channel
QString UPDATER_BASE;
/// User-Agent to use.
QString USER_AGENT = "MultiMC/5.0";
QString USER_AGENT;
/// User-Agent to use for uncached requests.
QString USER_AGENT_UNCACHED = "MultiMC/5.0 (Uncached)";
QString USER_AGENT_UNCACHED;
/// Google analytics ID
QString ANALYTICS_ID;
@@ -71,7 +81,7 @@ public:
QString IMGUR_CLIENT_ID;
/**
* MultiMC Metadata repository URL prefix
* Metadata repository URL prefix
*/
QString META_URL;
@@ -82,7 +92,6 @@ public:
QString RESOURCE_BASE = "https://resources.download.minecraft.net/";
QString LIBRARY_BASE = "https://libraries.minecraft.net/";
QString AUTH_BASE = "https://authserver.mojang.com/";
QString MOJANG_STATUS_URL = "https://status.mojang.com/check";
QString IMGUR_BASE_URL = "https://api.imgur.com/3/";
QString FMLLIBS_BASE_URL = "https://files.multimc.org/fmllibs/";
QString TRANSLATIONS_BASE_URL = "https://files.multimc.org/translations/";