summaryrefslogtreecommitdiffstats
path: root/api/logic/minecraft/onesix/update
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-08-07 00:46:29 +0200
committerPetr Mrázek <peterix@gmail.com>2017-08-07 00:46:29 +0200
commit8cf88ffc580310e2e814d097358ff783cd5c4416 (patch)
tree4ed75860253ffa667af38664b4fd10e6d7bc29de /api/logic/minecraft/onesix/update
parent117bfef151c2083085025c32f96461f1c97dbec3 (diff)
downloadMultiMC-8cf88ffc580310e2e814d097358ff783cd5c4416.tar
MultiMC-8cf88ffc580310e2e814d097358ff783cd5c4416.tar.gz
MultiMC-8cf88ffc580310e2e814d097358ff783cd5c4416.tar.lz
MultiMC-8cf88ffc580310e2e814d097358ff783cd5c4416.tar.xz
MultiMC-8cf88ffc580310e2e814d097358ff783cd5c4416.zip
GH-1314 add UI for custom minecraft jar addition
Also changes the text of the jar mod addition button. It should be clearer what it does and hopefully will not confuse as many people.
Diffstat (limited to 'api/logic/minecraft/onesix/update')
-rw-r--r--api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp b/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp
index 42148e67..13310e92 100644
--- a/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp
+++ b/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp
@@ -45,7 +45,7 @@ void FMLLibrariesTask::executeTask()
// now check the lib folder inside the instance for files.
for (auto &lib : libList)
{
- QFileInfo libInfo(FS::PathCombine(inst->libDir(), lib.filename));
+ QFileInfo libInfo(FS::PathCombine(inst->FMLlibDir(), lib.filename));
if (libInfo.exists())
continue;
fmlLibsToProcess.append(lib);
@@ -95,13 +95,13 @@ void FMLLibrariesTask::fmllibsFinished()
{
progress(index, fmlLibsToProcess.size());
auto entry = metacache->resolveEntry("fmllibs", lib.filename);
- auto path = FS::PathCombine(inst->libDir(), lib.filename);
+ auto path = FS::PathCombine(inst->FMLlibDir(), lib.filename);
if (!FS::ensureFilePathExists(path))
{
emitFailed(tr("Failed creating FML library folder inside the instance."));
return;
}
- if (!QFile::copy(entry->getFullPath(), FS::PathCombine(inst->libDir(), lib.filename)))
+ if (!QFile::copy(entry->getFullPath(), FS::PathCombine(inst->FMLlibDir(), lib.filename)))
{
emitFailed(tr("Failed copying Forge/FML library: %1.").arg(lib.filename));
return;