PrismLauncher/logic
Jan Dalheimer fcc5bc2ce0 Merge branch 'develop' into feature_badges
Conflicts:
	logic/OneSixInstance.cpp
2014-03-10 19:24:29 +01:00
..
assets ThreadTask for all your ThreadNeeds 2014-01-01 19:21:58 +01:00
auth Offline mode can be used even when online. 2014-01-27 03:00:49 +01:00
icons Update the changelog, version, scale the instance icon 2014-01-20 01:14:11 +01:00
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 Add news checking system and news toolbar 2014-01-02 13:25:38 -06:00
screenshots Screenshots: Optimize image loading and memory use, fix list and button layout. 2014-02-25 01:23:33 +01:00
status Sort forge versions right. Do not spam the multimc log with mc server status stuff. 2014-01-16 23:06:07 +01:00
tasks Imgur album creation 2014-02-24 11:30:27 +01:00
tools Fix MCEdit on OSX 2014-02-21 20:13:12 +01:00
updater Merge branch 'fix_tests' of https://github.com/02JanDal/MultiMC5 into develop 2014-01-18 22:30:36 +01:00
BaseInstaller.cpp Reorganize the version-related code. 2014-03-01 23:06:47 +01:00
BaseInstaller.h New, better, liteloader support 2014-02-19 22:34:17 +01:00
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 Sort forge versions right. Do not spam the multimc log with mc server status stuff. 2014-01-16 23:06:07 +01:00
EnabledItemFilter.cpp Reformat and (slightly) decruft all the things. 2013-11-04 02:53:05 +01:00
EnabledItemFilter.h Reformat and (slightly) decruft all the things. 2013-11-04 02:53:05 +01:00
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 Copying of FTB instances working again 2014-02-21 19:15:59 +01:00
InstanceFactory.h Initial FTB support. Allows "tracking" of FTB instances. 2013-12-21 23:40:37 +01:00
InstanceLauncher.cpp Nuke dead code 2013-11-28 22:05:58 -06:00
InstanceLauncher.h Reformat and (slightly) decruft all the things. 2013-11-04 02:53:05 +01:00
JavaChecker.cpp Add logging calls to the java checker. 2014-01-09 01:20:24 +01:00
JavaChecker.h Deploy jars instead of extracting them at runtime, remove non-working nvidia fix 2014-01-08 01:28:33 +01:00
JavaCheckerJob.cpp Don't include debugging messages :( 2014-01-07 03:18:26 +00:00
JavaCheckerJob.h Better (but unsorted) Java detection 2013-12-11 04:54:00 +00:00
JavaUtils.cpp Added more possible java paths on OSX. 2014-01-22 18:28:56 +01:00
JavaUtils.h Java version list should be sorted, JRE->JDK, 64->32 2013-12-12 14:56:32 +00:00
LegacyForge.cpp Reformat and (slightly) decruft all the things. 2013-11-04 02:53:05 +01:00
LegacyForge.h Reformat and (slightly) decruft all the things. 2013-11-04 02:53:05 +01:00
LegacyFTBInstance.cpp Instance badges. Some easter eggs and one for broken so far. 2014-03-10 17:38:27 +01:00
LegacyFTBInstance.h Fix FTB. 2014-01-15 22:49:37 +01:00
LegacyInstance_p.h Reformat and (slightly) decruft all the things. 2013-11-04 02:53:05 +01:00
LegacyInstance.cpp Instance badges. Some easter eggs and one for broken so far. 2014-03-10 17:38:27 +01:00
LegacyInstance.h Offline mode can be used even when online. 2014-01-27 03:00:49 +01:00
LegacyUpdate.cpp Offline mode can be used even when online. 2014-01-27 03:00:49 +01:00
LegacyUpdate.h Offline mode can be used even when online. 2014-01-27 03:00:49 +01:00
LiteLoaderInstaller.cpp Gather and store liteloader metadata. 2014-03-02 02:08:01 +01:00
LiteLoaderInstaller.h New, better, liteloader support 2014-02-19 22:34:17 +01:00
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 Change naming from Derp -> OneSix until the new instance type supports legacy 2014-01-24 18:12:02 +01:00
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 Small tweaks to make things better. 2014-02-06 09:32:44 +01:00
Mod.h Litemod version info. 2013-12-28 20:28:24 -05:00
ModList.cpp Small tweaks to make things better. 2014-02-06 09:32:44 +01:00
ModList.h Small tweaks to make things better. 2014-02-06 09:32:44 +01:00
NagUtils.cpp Fix a few things related to the translations 2014-01-04 11:49:06 +01:00
NagUtils.h Added NagUtils, nag people about trying to override JVM memory options 2013-11-03 15:20:26 +00:00
NostalgiaInstance.cpp Instance badges. Some easter eggs and one for broken so far. 2014-03-10 17:38:27 +01:00
NostalgiaInstance.h Change naming from Derp -> OneSix until the new instance type supports legacy 2014-01-24 18:12:02 +01:00
OneSixFTBInstance.cpp Merge branch 'develop' into feature_badges 2014-03-10 19:24:29 +01:00
OneSixFTBInstance.h Copying of FTB instances working again 2014-02-21 19:15:59 +01:00
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 Add a MMC-depend field (soft/hard) for version checking 2014-02-02 14:05:07 +01:00
OneSixLibrary.h More refactor. 2014-03-05 01:50:05 +01:00
OneSixRule.cpp Change naming from Derp -> OneSix until the new instance type supports legacy 2014-01-24 18:12:02 +01:00
OneSixRule.h Change naming from Derp -> OneSix until the new instance type supports legacy 2014-01-24 18:12:02 +01:00
OneSixUpdate.cpp Improve reporting of version file errors.x 2014-03-09 23:42:25 +01:00
OneSixUpdate.h Copying of FTB instances working again 2014-02-21 19:15:59 +01:00
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 Reformat and (slightly) decruft all the things. 2013-11-04 02:53:05 +01:00
OpSys.h Reformat and (slightly) decruft all the things. 2013-11-04 02:53:05 +01:00
SkinUtils.cpp Nuke skins.json, use nice yggdrasil implementation instead. Grabs all Mojang account skins on addition, active on startup 2013-11-27 18:45:29 +00:00
SkinUtils.h Scale faces to 64x64 2014-01-19 23:05:16 +01:00
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