Petr Mrázek 49dc9695f5 Merge branch 'fix_json_version' into integration_json_and_tools ...

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

Some fixage. Yay for conflicts.

2014-02-24 02:35:01 +01:00

..

assets

…

auth

…

icons

…

lists

Merge branch 'fix_ftb' into integration_json_and_tools

2014-02-24 00:28:59 +01:00

net

New, better, liteloader support

2014-02-19 22:34:17 +01:00

news

…

status

…

tasks

…

tools

Fix MCEdit on OSX

2014-02-21 20:13:12 +01:00

updater

…

BaseInstaller.cpp

…

BaseInstaller.h

New, better, liteloader support

2014-02-19 22:34:17 +01:00

BaseInstance_p.h

Instance flags. Currently used for marking instances as broken. Can later be used for badges.

2014-02-17 20:31:50 +01:00

BaseInstance.cpp

Instance flags. Currently used for marking instances as broken. Can later be used for badges.

2014-02-17 20:31:50 +01:00

BaseInstance.h

Merge branch 'fix_json_version' into integration_json_and_tools

2014-02-24 02:35:01 +01:00

BaseVersion.h

…

EnabledItemFilter.cpp

…

EnabledItemFilter.h

…

ForgeInstaller.cpp

…

ForgeInstaller.h

…

InstanceFactory.cpp

Copying of FTB instances working again

2014-02-21 19:15:59 +01:00

InstanceFactory.h

…

InstanceLauncher.cpp

…

InstanceLauncher.h

…

JavaChecker.cpp

…

JavaChecker.h

…

JavaCheckerJob.cpp

…

JavaCheckerJob.h

…

JavaUtils.cpp

…

JavaUtils.h

…

LegacyForge.cpp

…

LegacyForge.h

…

LegacyFTBInstance.cpp

Instance flags. Currently used for marking instances as broken. Can later be used for badges.

2014-02-17 20:31:50 +01:00

LegacyFTBInstance.h

…

LegacyInstance_p.h

…

LegacyInstance.cpp

Merge branch 'fix_json_version' into integration_json_and_tools

2014-02-24 02:35:01 +01:00

LegacyInstance.h

…

LegacyUpdate.cpp

…

LegacyUpdate.h

…

LiteLoaderInstaller.cpp

New, better, liteloader support

2014-02-19 22:34:17 +01:00

LiteLoaderInstaller.h

New, better, liteloader support

2014-02-19 22:34:17 +01:00

MinecraftProcess.cpp

Fix a few bugs in profilers.

2014-02-16 00:10:45 +01:00

MinecraftProcess.h

Fix a few bugs in profilers.

2014-02-16 00:10:45 +01:00

MinecraftVersion.h

…

Mod.cpp

…

Mod.h

…

ModList.cpp

…

ModList.h

…

NagUtils.cpp

…

NagUtils.h

…

NostalgiaInstance.cpp

Instance flags. Currently used for marking instances as broken. Can later be used for badges.

2014-02-17 20:31:50 +01:00

NostalgiaInstance.h

…

OneSixFTBInstance.cpp

Merge branch 'fix_json_version' into integration_json_and_tools

2014-02-24 02:35:01 +01:00

OneSixFTBInstance.h

Copying of FTB instances working again

2014-02-21 19:15:59 +01:00

OneSixInstance_p.h

…

OneSixInstance.cpp

Merge branch 'fix_json_version' into integration_json_and_tools

2014-02-24 02:35:01 +01:00

OneSixInstance.h

Copying of FTB instances working again

2014-02-21 19:15:59 +01:00

OneSixLibrary.cpp

…

OneSixLibrary.h

…

OneSixRule.cpp

…

OneSixRule.h

…

OneSixUpdate.cpp

Copying of FTB instances working again

2014-02-21 19:15:59 +01:00

OneSixUpdate.h

Copying of FTB instances working again

2014-02-21 19:15:59 +01:00

OneSixVersion.cpp

Copying of FTB instances working again

2014-02-21 19:15:59 +01:00

OneSixVersion.h

Don't assume forge for FTB instances. Fix FTB related stuff.

2014-02-21 18:01:06 +01:00

OneSixVersionBuilder.cpp

Merge branch 'fix_json_version' into integration_json_and_tools

2014-02-24 02:35:01 +01:00

OneSixVersionBuilder.h

Don't assume forge for FTB instances. Fix FTB related stuff.

2014-02-21 18:01:06 +01:00

OpSys.cpp

…

OpSys.h

…

SkinUtils.cpp

…

SkinUtils.h

…