Petr Mrázek affb2fdd6c Merge branch 'feature/forge_pre4_fix' into develop ...

Conflicts:
	logic/forge/ForgeVersionList.cpp
	logic/forge/ForgeVersionList.h

2014-06-25 00:54:00 +02:00

..

assets

…

auth

…

forge

Merge branch 'feature/forge_pre4_fix' into develop

2014-06-25 00:54:00 +02:00

icons

…

java

…

liteloader

Implement adding jar mods, break saving library order.

2014-06-09 01:38:31 +02:00

minecraft

Cleanup - QFileInfo derp and unused variables

2014-06-09 01:57:10 +02:00

net

Implement adding jar mods, break saving library order.

2014-06-09 01:38:31 +02:00

news

…

screenshots

…

status

…

tasks

…

tools

…

updater

…

BaseInstaller.cpp

…

BaseInstaller.h

…

BaseInstance_p.h

…

BaseInstance.cpp

Instance settings moved to a page.

2014-06-09 01:38:31 +02:00

BaseInstance.h

No more disabling of actions in the instance toolbar. It makes no sense.

2014-06-20 01:24:32 +02:00

BaseVersion.h

…

BaseVersionList.cpp

…

BaseVersionList.h

…

EnabledItemFilter.cpp

…

EnabledItemFilter.h

…

InstanceFactory.cpp

…

InstanceFactory.h

…

InstanceLauncher.cpp

…

InstanceLauncher.h

…

InstanceList.cpp

Break FTB. Yep. It has to be done better.

2014-06-09 01:38:30 +02:00

InstanceList.h

…

LegacyFTBInstance.cpp

No more disabling of actions in the instance toolbar. It makes no sense.

2014-06-20 01:24:32 +02:00

LegacyFTBInstance.h

No more disabling of actions in the instance toolbar. It makes no sense.

2014-06-20 01:24:32 +02:00

LegacyInstance_p.h

…

LegacyInstance.cpp

No more disabling of actions in the instance toolbar. It makes no sense.

2014-06-20 01:24:32 +02:00

LegacyInstance.h

No more disabling of actions in the instance toolbar. It makes no sense.

2014-06-20 01:24:32 +02:00

LegacyUpdate.cpp

…

LegacyUpdate.h

…

LwjglVersionList.cpp

…

LwjglVersionList.h

…

MinecraftProcess.cpp

…

MinecraftProcess.h

…

MMCJson.cpp

Disable window titles and isons again, windows build fixes

2014-06-09 01:38:30 +02:00

MMCJson.h

…

Mod.cpp

…

Mod.h

…

ModList.cpp

Add and implement pages and page dialog.

2014-06-09 01:38:31 +02:00

ModList.h

…

NagUtils.cpp

…

NagUtils.h

…

OneSixFTBInstance.cpp

No more disabling of actions in the instance toolbar. It makes no sense.

2014-06-20 01:24:32 +02:00

OneSixFTBInstance.h

No more disabling of actions in the instance toolbar. It makes no sense.

2014-06-20 01:24:32 +02:00

OneSixInstance_p.h

Add and implement pages and page dialog.

2014-06-09 01:38:31 +02:00

OneSixInstance.cpp

No more disabling of actions in the instance toolbar. It makes no sense.

2014-06-20 01:24:32 +02:00

OneSixInstance.h

No more disabling of actions in the instance toolbar. It makes no sense.

2014-06-20 01:24:32 +02:00

OneSixUpdate.cpp

Implement adding jar mods, break saving library order.

2014-06-09 01:38:31 +02:00

OneSixUpdate.h

…

SkinUtils.cpp

…

SkinUtils.h

…

URNResolver.cpp

…

URNResolver.h

…

VersionFilterData.cpp

…

VersionFilterData.h

…