dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
commit 1936bd181f
24 changed files with 1596 additions and 606 deletions
Download patch file Download diff file Expand all files Collapse all files

4
logic/OneSixUpdate.cpp
View file

@ -131,7 +131,7 @@ void OneSixUpdate::versionFileFinished()
{
finfo.remove();
}
inst->reloadFullVersion();
inst->reloadVersion();
jarlibStart();
}
@ -229,7 +229,7 @@ void OneSixUpdate::jarlibStart()
setStatus(tr("Getting the library files from Mojang..."));
QLOG_INFO() << m_inst->name() << ": downloading libraries";
OneSixInstance *inst = (OneSixInstance *)m_inst;
bool successful = inst->reloadFullVersion();
bool successful = inst->reloadVersion();
if (!successful)
{
emitFailed("Failed to load the version description file. It might be "