0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances

Browse Source 
Conflicts:
	gui/dialogs/OneSixModEditDialog.cpp
	logic/OneSixUpdate.cpp
This commit is contained in:
Petr Mrázek
2014-02-01 19:37:16 +01:00
parent b4b6091372 8637cce433
commit 1936bd181f
24 changed files with 1596 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
logic/OneSixFTBInstance.cpp
View File

@@ -55,15 +55,13 @@ slots:
setStatus(tr("Installing Forge..."));
QString forgePath = entry->getFullPath();
ForgeInstaller forge(forgePath, forgeVersion->universal_url);
if (!instance->reloadFullVersion())
if (!instance->reloadVersion())
{
emitFailed(tr("Couldn't load the version config"));
return;
}
instance->revertCustomVersion();
instance->customizeVersion();
auto version = instance->getFullVersion();
if (!forge.apply(version))
if (!forge.add(instance))
{
emitFailed(tr("Couldn't install Forge"));
return;