diff options
| author | Elise <robotbrainify@gmail.com> | 2019-03-19 16:29:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 16:29:40 -0400 |
| commit | 22db95ce3b696a580688223e5d40b6b7b3ed88a3 (patch) | |
| tree | 02fbe0eeb16883555d518353969fd0f72aacb7b5 | |
| parent | a5e531d4f1e3a93befcbb2ae49f3474e32caffb7 (diff) | |
| parent | bf93ba02e9dd30599753d22e029e48d1ecc122a4 (diff) | |
| download | MultiMC-22db95ce3b696a580688223e5d40b6b7b3ed88a3.tar MultiMC-22db95ce3b696a580688223e5d40b6b7b3ed88a3.tar.gz MultiMC-22db95ce3b696a580688223e5d40b6b7b3ed88a3.tar.lz MultiMC-22db95ce3b696a580688223e5d40b6b7b3ed88a3.tar.xz MultiMC-22db95ce3b696a580688223e5d40b6b7b3ed88a3.zip | |
Merge branch 'develop' into feature/deletion_harder
| -rw-r--r-- | api/logic/meta/BaseEntity.cpp | 2 | ||||
| -rw-r--r-- | api/logic/translations/TranslationsModel.cpp | 5 | ||||
| -rw-r--r-- | api/logic/translations/TranslationsModel.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/api/logic/meta/BaseEntity.cpp b/api/logic/meta/BaseEntity.cpp index 33c349a1..ce0be859 100644 --- a/api/logic/meta/BaseEntity.cpp +++ b/api/logic/meta/BaseEntity.cpp @@ -74,7 +74,7 @@ Meta::BaseEntity::~BaseEntity() QUrl Meta::BaseEntity::url() const { - return QUrl("https://v1.meta.multimc.org").resolved(localFilename()); + return QUrl("https://meta.multimc.org/v1/").resolved(localFilename()); } bool Meta::BaseEntity::loadLocalFile() diff --git a/api/logic/translations/TranslationsModel.cpp b/api/logic/translations/TranslationsModel.cpp index 58ff4384..0d9eccbf 100644 --- a/api/logic/translations/TranslationsModel.cpp +++ b/api/logic/translations/TranslationsModel.cpp @@ -133,6 +133,7 @@ TranslationsModel::TranslationsModel(QString path, QObject* parent): QAbstractLi { d.reset(new Private); d->m_dir.setPath(path); + FS::ensureFolderPathExists(path); reloadLocalFiles(); d->watcher = new QFileSystemWatcher(this); @@ -151,7 +152,7 @@ void TranslationsModel::translationDirChanged(const QString& path) selectLanguage(selectedLanguage()); } -void TranslationsModel::indexRecieved() +void TranslationsModel::indexReceived() { qDebug() << "Got translations index!"; d->m_index_job.reset(); @@ -558,7 +559,7 @@ void TranslationsModel::downloadIndex() d->m_index_task = Net::Download::makeCached(QUrl("https://files.multimc.org/translations/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::indexRecieved); + connect(d->m_index_job.get(), &NetJob::succeeded, this, &TranslationsModel::indexReceived); d->m_index_job->start(); } diff --git a/api/logic/translations/TranslationsModel.h b/api/logic/translations/TranslationsModel.h index fa0ae5f6..a0327fcd 100644 --- a/api/logic/translations/TranslationsModel.h +++ b/api/logic/translations/TranslationsModel.h @@ -52,7 +52,7 @@ private: TranslationsModel &operator=(const TranslationsModel &) = delete; private slots: - void indexRecieved(); + void indexReceived(); void indexFailed(QString reason); void dlFailed(QString reason); void dlGood(); |