0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49dc9695f5
pollymc/logic
History
Petr Mrázek 49dc9695f5 Merge branch 'fix_json_version' into integration_json_and_tools 
Conflicts:
	logic/OneSixInstance.cpp
	logic/OneSixVersionBuilder.cpp

Some fixage. Yay for conflicts.
2014-02-24 02:35:01 +01:00
..
assets
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 Merge branch 'fix_ftb' into integration_json_and_tools 2014-02-24 00:28:59 +01:00
net New, better, liteloader support 2014-02-19 22:34:17 +01:00
news
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
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 Change naming from Derp -> OneSix until the new instance type supports legacy 2014-01-24 18:12:02 +01:00
BaseInstaller.h New, better, liteloader support 2014-02-19 22:34:17 +01:00
BaseInstance_p.h Instance flags. Currently used for marking instances as broken. Can later be used for badges. 2014-02-17 20:31:50 +01:00
BaseInstance.cpp Instance flags. Currently used for marking instances as broken. Can later be used for badges. 2014-02-17 20:31:50 +01:00
BaseInstance.h Merge branch 'fix_json_version' into integration_json_and_tools 2014-02-24 02:35:01 +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
EnabledItemFilter.h
ForgeInstaller.cpp Fix installing forge after liteloader and then removing liteloader. Also formatting. 2014-02-02 14:17:44 +01:00
ForgeInstaller.h Change the OneSix library view. It now shows a list of patches. 2014-02-01 14:52:21 +01:00
InstanceFactory.cpp Copying of FTB instances working again 2014-02-21 19:15:59 +01:00
InstanceFactory.h
InstanceLauncher.cpp
InstanceLauncher.h
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
JavaUtils.cpp Added more possible java paths on OSX. 2014-01-22 18:28:56 +01:00
JavaUtils.h
LegacyForge.cpp
LegacyForge.h
LegacyFTBInstance.cpp Instance flags. Currently used for marking instances as broken. Can later be used for badges. 2014-02-17 20:31:50 +01:00
LegacyFTBInstance.h Fix FTB. 2014-01-15 22:49:37 +01:00
LegacyInstance_p.h
LegacyInstance.cpp Merge branch 'fix_json_version' into integration_json_and_tools 2014-02-24 02:35:01 +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 New, better, liteloader support 2014-02-19 22:34:17 +01:00
LiteLoaderInstaller.h New, better, liteloader support 2014-02-19 22:34:17 +01:00
MinecraftProcess.cpp Fix a few bugs in profilers. 2014-02-16 00:10:45 +01:00
MinecraftProcess.h Fix a few bugs in profilers. 2014-02-16 00:10:45 +01:00
MinecraftVersion.h Change naming from Derp -> OneSix until the new instance type supports legacy 2014-01-24 18:12:02 +01:00
Mod.cpp Small tweaks to make things better. 2014-02-06 09:32:44 +01:00
Mod.h
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
NagUtils.h
NostalgiaInstance.cpp Instance flags. Currently used for marking instances as broken. Can later be used for badges. 2014-02-17 20:31:50 +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 'fix_json_version' into integration_json_and_tools 2014-02-24 02:35:01 +01:00
OneSixFTBInstance.h Copying of FTB instances working again 2014-02-21 19:15:59 +01:00
OneSixInstance_p.h Fix installing forge after liteloader and then removing liteloader. Also formatting. 2014-02-02 14:17:44 +01:00
OneSixInstance.cpp Merge branch 'fix_json_version' into integration_json_and_tools 2014-02-24 02:35:01 +01:00
OneSixInstance.h Copying of FTB instances working again 2014-02-21 19:15:59 +01:00
OneSixLibrary.cpp Add a MMC-depend field (soft/hard) for version checking 2014-02-02 14:05:07 +01:00
OneSixLibrary.h Add a MMC-depend field (soft/hard) for version checking 2014-02-02 14:05:07 +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 Copying of FTB instances working again 2014-02-21 19:15:59 +01:00
OneSixUpdate.h Copying of FTB instances working again 2014-02-21 19:15:59 +01:00
OneSixVersion.cpp Copying of FTB instances working again 2014-02-21 19:15:59 +01:00
OneSixVersion.h Don't assume forge for FTB instances. Fix FTB related stuff. 2014-02-21 18:01:06 +01:00
OneSixVersionBuilder.cpp Merge branch 'fix_json_version' into integration_json_and_tools 2014-02-24 02:35:01 +01:00
OneSixVersionBuilder.h Don't assume forge for FTB instances. Fix FTB related stuff. 2014-02-21 18:01:06 +01:00
OpSys.cpp
OpSys.h
SkinUtils.cpp
SkinUtils.h Scale faces to 64x64 2014-01-19 23:05:16 +01:00