Forkk 17f1864a71 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news ...

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

2014-01-02 13:38:20 -06:00

..

assets

ThreadTask for all your ThreadNeeds

2014-01-01 19:21:58 +01:00

auth

…

icons

Make .ico files usable (the plugin is already included)

2014-01-02 18:51:40 +01:00

lists

Refactor icon lists heavily

2013-12-31 01:32:51 +01:00

net

…

news

Add news checking system and news toolbar

2014-01-02 13:25:38 -06:00

tasks

ThreadTask for all your ThreadNeeds

2014-01-01 19:21:58 +01:00

updater

…

BaseInstance_p.h

…

BaseInstance.cpp

Allow the use of synonyms in settings. Refactor settings.

2014-01-01 15:10:35 +01:00

BaseInstance.h

Refactor icon lists heavily

2013-12-31 01:32:51 +01:00

BaseVersion.h

…

EnabledItemFilter.cpp

…

EnabledItemFilter.h

…

ForgeInstaller.cpp

…

ForgeInstaller.h

…

InstanceFactory.cpp

Allow the use of synonyms in settings. Refactor settings.

2014-01-01 15:10:35 +01:00

InstanceFactory.h

…

InstanceLauncher.cpp

…

InstanceLauncher.h

…

JavaChecker.cpp

…

JavaChecker.h

…

JavaCheckerJob.cpp

…

JavaCheckerJob.h

…

JavaUtils.cpp

Removed incomplete osx java detection log message

2014-01-02 17:07:47 +01:00

JavaUtils.h

…

LegacyForge.cpp

…

LegacyForge.h

…

LegacyFTBInstance.cpp

…

LegacyFTBInstance.h

…

LegacyInstance_p.h

…

LegacyInstance.cpp

Allow the use of synonyms in settings. Refactor settings.

2014-01-01 15:10:35 +01:00

LegacyInstance.h

…

LegacyUpdate.cpp

…

LegacyUpdate.h

…

LiteLoaderInstaller.cpp

…

LiteLoaderInstaller.h

…

MinecraftProcess.cpp

…

MinecraftProcess.h

…

MinecraftVersion.h

…

Mod.cpp

Fix various LiteLoader related bugs.

2013-12-29 04:17:52 +01:00

Mod.h

…

ModList.cpp

…

ModList.h

…

NagUtils.cpp

…

NagUtils.h

…

NostalgiaInstance.cpp

…

NostalgiaInstance.h

…

OneSixFTBInstance.cpp

…

OneSixFTBInstance.h

…

OneSixInstance_p.h

…

OneSixInstance.cpp

Allow the use of synonyms in settings. Refactor settings.

2014-01-01 15:10:35 +01:00

OneSixInstance.h

…

OneSixLibrary.cpp

…

OneSixLibrary.h

…

OneSixRule.cpp

…

OneSixRule.h

…

OneSixUpdate.cpp

…

OneSixUpdate.h

…

OneSixVersion.cpp

…

OneSixVersion.h

…

OpSys.cpp

…

OpSys.h

…

SkinUtils.cpp

…

SkinUtils.h

…