Merge branch 'fix_json_version' into integration_json_and_tools

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
commit 49dc9695f5
10 changed files with 224 additions and 168 deletions

View file

@ -182,6 +182,10 @@ bool OneSixFTBInstance::providesVersionFile() const
QString OneSixFTBInstance::getStatusbarDescription()
{
if (flags() & VersionBrokenFlag)
{
return "OneSix FTB: " + intendedVersionId() + " (broken)";
}
return "OneSix FTB: " + intendedVersionId();
}
bool OneSixFTBInstance::menuActionEnabled(QString action_name) const