Merge branch 'develop' into feature_badges

Conflicts:
	logic/OneSixInstance.cpp
This commit is contained in:
Jan Dalheimer 2014-03-10 19:24:29 +01:00
commit fcc5bc2ce0
40 changed files with 2683 additions and 1758 deletions

View file

@ -168,6 +168,11 @@ bool BaseInstance::canLaunch() const
return !flags().contains(VersionBrokenFlag);
}
bool BaseInstance::reload()
{
return settings().reload();
}
QString BaseInstance::baseJar() const
{
I_D(BaseInstance);