Merge remote-tracking branch 'polymc/develop' into fix_kwin_icon
This commit is contained in:
		@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -92,7 +92,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/";
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user