External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-04 09:08:42 +00:00
Code Issues 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

4
logic/OneSixFTBInstance.cpp
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