Jan Dalheimer fcc5bc2ce0 Merge branch 'develop' into feature_badges ...

Conflicts:
	logic/OneSixInstance.cpp

2014-03-10 19:24:29 +01:00

..

assets

…

auth

…

icons

…

lists

Gather and store liteloader metadata.

2014-03-02 02:08:01 +01:00

net

Fix a few paste upload bugs

2014-03-07 16:15:38 +01:00

news

…

screenshots

…

status

…

tasks

…

tools

…

updater

…

BaseInstaller.cpp

Reorganize the version-related code.

2014-03-01 23:06:47 +01:00

BaseInstaller.h

…

BaseInstance_p.h

Instance badges. Some easter eggs and one for broken so far.

2014-03-10 17:38:27 +01:00

BaseInstance.cpp

Merge branch 'develop' into feature_badges

2014-03-10 19:24:29 +01:00

BaseInstance.h

Merge branch 'develop' into feature_badges

2014-03-10 19:24:29 +01:00

BaseVersion.h

…

EnabledItemFilter.cpp

…

EnabledItemFilter.h

…

ForgeInstaller.cpp

Reorganize the version-related code.

2014-03-01 23:06:47 +01:00

ForgeInstaller.h

Reorganize the version-related code.

2014-03-01 23:06:47 +01:00

InstanceFactory.cpp

…

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 badges. Some easter eggs and one for broken so far.

2014-03-10 17:38:27 +01:00

LegacyFTBInstance.h

…

LegacyInstance_p.h

…

LegacyInstance.cpp

Instance badges. Some easter eggs and one for broken so far.

2014-03-10 17:38:27 +01:00

LegacyInstance.h

…

LegacyUpdate.cpp

…

LegacyUpdate.h

…

LiteLoaderInstaller.cpp

Gather and store liteloader metadata.

2014-03-02 02:08:01 +01:00

LiteLoaderInstaller.h

…

MinecraftProcess.cpp

Merge remote-tracking branch 'origin/feature_fix_log' into integration_butchery

2014-03-09 23:59:30 +01:00

MinecraftProcess.h

Some pre/post related stuff

2014-03-09 08:18:50 +01:00

MinecraftVersion.h

…

MMCJson.cpp

Add missing include for math.h

2014-03-10 00:14:30 +01:00

MMCJson.h

Fix a compiling error by adding noexcept

2014-03-10 18:55:54 +01:00

Mod.cpp

…

Mod.h

…

ModList.cpp

…

ModList.h

…

NagUtils.cpp

…

NagUtils.h

…

NostalgiaInstance.cpp

Instance badges. Some easter eggs and one for broken so far.

2014-03-10 17:38:27 +01:00

NostalgiaInstance.h

…

OneSixFTBInstance.cpp

Merge branch 'develop' into feature_badges

2014-03-10 19:24:29 +01:00

OneSixFTBInstance.h

…

OneSixInstance_p.h

Reorganize the version-related code.

2014-03-01 23:06:47 +01:00

OneSixInstance.cpp

Merge branch 'develop' into feature_badges

2014-03-10 19:24:29 +01:00

OneSixInstance.h

Merge remote-tracking branch 'origin/feature_commands' into integration_butchery

2014-03-09 23:46:46 +01:00

OneSixLibrary.cpp

…

OneSixLibrary.h

More refactor.

2014-03-05 01:50:05 +01:00

OneSixRule.cpp

…

OneSixRule.h

…

OneSixUpdate.cpp

Improve reporting of version file errors.x

2014-03-09 23:42:25 +01:00

OneSixUpdate.h

…

OneSixVersionBuilder.cpp

Improve reporting of version file errors.x

2014-03-09 23:42:25 +01:00

OneSixVersionBuilder.h

More refactor.

2014-03-05 01:50:05 +01:00

OpSys.cpp

…

OpSys.h

…

SkinUtils.cpp

…

SkinUtils.h

…

VersionFile.cpp

Improve reporting of version file errors.x

2014-03-09 23:42:25 +01:00

VersionFile.h

Fix a compiling error by adding noexcept

2014-03-10 18:55:54 +01:00

VersionFinal.cpp

Improve reporting of version file errors.x

2014-03-09 23:42:25 +01:00

VersionFinal.h

Remove version patch reordering. Remove the main class display from onesix edit mods.

2014-03-09 17:38:42 +01:00