Petr Mrázek c91adfb3d1 Merge branch 'master' into develop ...

Conflicts:
	CMakeLists.txt
	changelog.md

2014-07-20 14:23:14 +02:00

..

assets

…

auth

Make the auth timeout longer (30s)

2014-07-09 19:53:35 +02:00

forge

Make forge work.

2014-07-19 23:16:02 +02:00

icons

…

java

…

liteloader

Make forge work.

2014-07-19 23:16:02 +02:00

minecraft

Make forge work.

2014-07-19 23:16:02 +02:00

net

…

news

…

screenshots

…

settings

…

status

…

tasks

…

tools

…

updater

Show changelog even when there are no new updates available.

2014-07-14 00:57:54 +02:00

BaseInstaller.cpp

…

BaseInstaller.h

…

BaseInstance_p.h

…

BaseInstance.cpp

…

BaseInstance.h

…

BaseVersion.h

…

BaseVersionList.cpp

…

BaseVersionList.h

Make forge work.

2014-07-19 23:16:02 +02:00

DefaultVariable.h

Implement gradle spec reader/writer

2014-07-16 02:03:52 +02:00

EnabledItemFilter.cpp

…

EnabledItemFilter.h

…

InstanceFactory.cpp

…

InstanceFactory.h

…

InstanceLauncher.cpp

…

InstanceLauncher.h

…

InstanceList.cpp

Implement gradle spec reader/writer

2014-07-16 02:03:52 +02:00

InstanceList.h

…

LegacyFTBInstance.cpp

…

LegacyFTBInstance.h

…

LegacyInstance_p.h

…

LegacyInstance.cpp

…

LegacyInstance.h

…

LegacyUpdate.cpp

…

LegacyUpdate.h

…

LwjglVersionList.cpp

Fix LWJGL version list loading.

2014-07-20 12:59:44 +02:00

LwjglVersionList.h

…

MinecraftProcess.cpp

…

MinecraftProcess.h

…

MMCJson.cpp

…

MMCJson.h

…

Mod.cpp

Fix #361

2014-07-13 15:26:26 +02:00

Mod.h

…

ModList.cpp

Fix mod list sorting predicate, convert the changelog to markdown and reverse it.

2014-07-08 23:05:33 +02:00

ModList.h

…

NagUtils.cpp

…

NagUtils.h

…

OneSixFTBInstance.cpp

…

OneSixFTBInstance.h

…

OneSixInstance_p.h

…

OneSixInstance.cpp

Add a new page that can show all sorts of logs

2014-07-12 23:31:05 +02:00

OneSixInstance.h

…

OneSixUpdate.cpp

…

OneSixUpdate.h

…

RecursiveFileSystemWatcher.cpp

Finish of the OtherLogs page, and (re)format page related files

2014-07-12 23:31:06 +02:00

RecursiveFileSystemWatcher.h

Finish of the OtherLogs page, and (re)format page related files

2014-07-12 23:31:06 +02:00

RWStorage.h

…

SkinUtils.cpp

…

SkinUtils.h

…

URNResolver.cpp

…

URNResolver.h

…

VersionFilterData.cpp

Make forge work.

2014-07-19 23:16:02 +02:00

VersionFilterData.h

Make forge work.

2014-07-19 23:16:02 +02:00