diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-25 01:52:58 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-25 01:52:58 +0100 |
| commit | acff15562431d5d9e9f091ed7cf912f5fe34a61a (patch) | |
| tree | e78502e7eda84696632be9b6539d386b829053b2 /logic/net/URLConstants.h | |
| parent | 49dc9695f5204bb80a91214c411bcb1b868ee0db (diff) | |
| parent | 9d4e840a6e1a7169a2863fa1ff1812f8fe19e615 (diff) | |
| download | MultiMC-acff15562431d5d9e9f091ed7cf912f5fe34a61a.tar MultiMC-acff15562431d5d9e9f091ed7cf912f5fe34a61a.tar.gz MultiMC-acff15562431d5d9e9f091ed7cf912f5fe34a61a.tar.lz MultiMC-acff15562431d5d9e9f091ed7cf912f5fe34a61a.tar.xz MultiMC-acff15562431d5d9e9f091ed7cf912f5fe34a61a.zip | |
Merge branch 'feature_screenshots' into integration_json_and_tools
Conflicts:
logic/net/URLConstants.h
Resolve issues with multiple definitions of URL constants by moving them to their own object file.
Diffstat (limited to 'logic/net/URLConstants.h')
| -rw-r--r-- | logic/net/URLConstants.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/logic/net/URLConstants.h b/logic/net/URLConstants.h index 07b35c4f..c1064115 100644 --- a/logic/net/URLConstants.h +++ b/logic/net/URLConstants.h @@ -19,19 +19,19 @@ namespace URLConstants { -const QString AWS_DOWNLOAD_BASE("s3.amazonaws.com/Minecraft.Download/"); -const QString AWS_DOWNLOAD_VERSIONS(AWS_DOWNLOAD_BASE + "versions/"); -const QString AWS_DOWNLOAD_LIBRARIES(AWS_DOWNLOAD_BASE + "libraries/"); -const QString AWS_DOWNLOAD_INDEXES(AWS_DOWNLOAD_BASE + "indexes/"); -const QString ASSETS_BASE("assets.minecraft.net/"); -//const QString MCN_BASE("sonicrules.org/mcnweb.py"); -const QString RESOURCE_BASE("resources.download.minecraft.net/"); -const QString LIBRARY_BASE("libraries.minecraft.net/"); -const QString SKINS_BASE("skins.minecraft.net/MinecraftSkins/"); -const QString AUTH_BASE("authserver.mojang.com/"); -const QString FORGE_LEGACY_URL("http://files.minecraftforge.net/minecraftforge/json"); -const QString FORGE_GRADLE_URL("http://files.minecraftforge.net/maven/net/minecraftforge/forge/json"); -const QString MOJANG_STATUS_URL("http://status.mojang.com/check"); -const QString MOJANG_STATUS_NEWS_URL("http://status.mojang.com/news"); -const QString LITELOADER_URL("http://dl.liteloader.com/versions/versions.json"); +extern const QString AWS_DOWNLOAD_BASE; +extern const QString AWS_DOWNLOAD_VERSIONS; +extern const QString AWS_DOWNLOAD_LIBRARIES; +extern const QString AWS_DOWNLOAD_INDEXES; +extern const QString ASSETS_BASE; +extern const QString RESOURCE_BASE; +extern const QString LIBRARY_BASE; +extern const QString SKINS_BASE; +extern const QString AUTH_BASE; +extern const QString FORGE_LEGACY_URL; +extern const QString FORGE_GRADLE_URL; +extern const QString MOJANG_STATUS_URL; +extern const QString MOJANG_STATUS_NEWS_URL; +extern const QString LITELOADER_URL; +extern const QString IMGUR_BASE_URL; } |