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

Merge branch 'fix_json_version' into integration_json_and_tools

Browse Source 
Conflicts:
	logic/OneSixInstance.cpp
	logic/OneSixVersionBuilder.cpp

Some fixage. Yay for conflicts.
This commit is contained in:
Petr Mrázek
2014-02-24 02:35:01 +01:00
parent f7c97efcf3 0b56b5efaf
commit 49dc9695f5
10 changed files with 224 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
logic/LegacyInstance.cpp
View File

@@ -268,13 +268,23 @@ QString LegacyInstance::defaultCustomBaseJar() const
bool LegacyInstance::menuActionEnabled(QString action_name) const
{
if (action_name == "actionChangeInstMCVersion")
if (flags() & VersionBrokenFlag)
{
return false;
}
if (action_name == "actionChangeInstMCVersion")
{
return false;
}
return true;
}
QString LegacyInstance::getStatusbarDescription()
{
if (flags() & VersionBrokenFlag)
{
return "Legacy : " + intendedVersionId() + " (broken)";
}
if (shouldUpdate())
return "Legacy : " + currentVersionId() + " -> " + intendedVersionId();
else