diff options
| author | dada513 <dada513@protonmail.com> | 2022-02-10 08:04:59 +0100 |
|---|---|---|
| committer | dada513 <dada513@protonmail.com> | 2022-02-10 08:04:59 +0100 |
| commit | ca9929214daa0cdb41d137fe69c4f9d56e3d829f (patch) | |
| tree | c6bc0304414285b2ed371360bb8e8217bfae8a49 | |
| parent | d2f86cbf32aa4a41b920b70254ca3ae0380a5065 (diff) | |
| parent | 7531a2894b152c0efdaf4e259407b4a752410503 (diff) | |
| download | PrismLauncher-ca9929214daa0cdb41d137fe69c4f9d56e3d829f.tar.gz PrismLauncher-ca9929214daa0cdb41d137fe69c4f9d56e3d829f.tar.bz2 PrismLauncher-ca9929214daa0cdb41d137fe69c4f9d56e3d829f.zip | |
Merge remote-tracking branch 'polymc/develop' into macos_application_support
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | buildconfig/BuildConfig.h | 2 | ||||
| -rw-r--r-- | launcher/translations/TranslationsModel.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -138,7 +138,7 @@ In general, in order of importance: ## Translations -TODO +The translation effort for PolyMC is hosted on [Weblate](https://hosted.weblate.org/polymc/polymc) and information about translating PolyMC is available at https://github.com/PolyMC/Translations ## Forking/Redistributing/Custom builds policy diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h index d09d5288..c260b988 100644 --- a/buildconfig/BuildConfig.h +++ b/buildconfig/BuildConfig.h @@ -91,7 +91,7 @@ public: QString AUTH_BASE = "https://authserver.mojang.com/"; 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/"; + QString TRANSLATIONS_BASE_URL = "https://meta.polymc.org/translations/"; QString MODPACKSCH_API_BASE_URL = "https://api.modpacks.ch/"; diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp index 0fa82e35..250854d3 100644 --- a/launcher/translations/TranslationsModel.cpp +++ b/launcher/translations/TranslationsModel.cpp @@ -620,7 +620,7 @@ void TranslationsModel::downloadIndex() d->m_index_job = new NetJob("Translations Index", APPLICATION->network()); MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("translations", "index_v2.json"); entry->setStale(true); - d->m_index_task = Net::Download::makeCached(QUrl("https://files.multimc.org/translations/index_v2.json"), entry); + d->m_index_task = Net::Download::makeCached(QUrl(BuildConfig.TRANSLATIONS_BASE_URL + "index_v2.json"), entry); d->m_index_job->addNetAction(d->m_index_task); connect(d->m_index_job.get(), &NetJob::failed, this, &TranslationsModel::indexFailed); connect(d->m_index_job.get(), &NetJob::succeeded, this, &TranslationsModel::indexReceived); |