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 /logic/OneSixAssets.cpp | |
| 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 'logic/OneSixAssets.cpp')
| -rw-r--r-- | logic/OneSixAssets.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/OneSixAssets.cpp b/logic/OneSixAssets.cpp index 5bdd29d7..ca7a5534 100644 --- a/logic/OneSixAssets.cpp +++ b/logic/OneSixAssets.cpp @@ -113,7 +113,7 @@ void OneSixAssets::fetchXMLFinished() auto entry = metacache->resolveEntry("assets", keyStr, etagStr); if(entry->stale) { - job->add(QUrl(prefix + keyStr), entry); + job->addCacheDownload(QUrl(prefix + keyStr), entry); } } if(job->size()) @@ -130,7 +130,7 @@ void OneSixAssets::fetchXMLFinished() void OneSixAssets::start() { auto job = new DownloadJob("Assets index"); - job->add(QUrl ( "http://s3.amazonaws.com/Minecraft.Resources/" )); + job->addByteArrayDownload(QUrl ( "http://s3.amazonaws.com/Minecraft.Resources/" )); connect ( job, SIGNAL(succeeded()), SLOT ( fetchXMLFinished() ) ); index_job.reset ( job ); job->start(); |