Merge branch 'develop' into feature_badges
Conflicts: logic/OneSixInstance.cpp
This commit is contained in:
commit
fcc5bc2ce0
40 changed files with 2683 additions and 1758 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue