diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-09-30 03:29:12 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-09-30 03:29:12 +0200 |
commit | c05a39147a462d610dabaf89dae59c004e7dd539 (patch) | |
tree | 10cff4a66c8d9999df7e02648b72b1c7a289ada5 /gui | |
parent | 2173abb9a87c67b53e64c9bdebbba5fa6b4d4b7d (diff) | |
parent | e45b444242104e557f1bce14e9c11e3792bbe41f (diff) | |
download | MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar.gz MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar.lz MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar.xz MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.zip |
Implemented xz and pack200 unpackers required for proper forge installation.
Merge branch 'feature_forge_unpackers' into develop
Conflicts:
CMakeLists.txt
Diffstat (limited to 'gui')
-rw-r--r-- | gui/LegacyModEditDialog.cpp | 2 | ||||
-rw-r--r-- | gui/OneSixModEditDialog.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gui/LegacyModEditDialog.cpp b/gui/LegacyModEditDialog.cpp index 20296769..053aef6b 100644 --- a/gui/LegacyModEditDialog.cpp +++ b/gui/LegacyModEditDialog.cpp @@ -210,7 +210,7 @@ void LegacyModEditDialog::on_addForgeBtn_clicked() if(entry->stale) { DownloadJob * fjob = new DownloadJob("Forge download"); - fjob->add(forge->universal_url, entry); + fjob->addCacheDownload(forge->universal_url, entry); ProgressDialog dlg(this); dlg.exec(fjob); if(dlg.result() == QDialog::Accepted) diff --git a/gui/OneSixModEditDialog.cpp b/gui/OneSixModEditDialog.cpp index 94fea933..f2e7c5d2 100644 --- a/gui/OneSixModEditDialog.cpp +++ b/gui/OneSixModEditDialog.cpp @@ -160,7 +160,7 @@ void OneSixModEditDialog::on_forgeBtn_clicked() if (entry->stale) { DownloadJob *fjob = new DownloadJob("Forge download"); - fjob->add(forgeVersion->installer_url, entry); + fjob->addCacheDownload(forgeVersion->installer_url, entry); ProgressDialog dlg(this); dlg.exec(fjob); if (dlg.result() == QDialog::Accepted) |