MultiMC - Minecraft modpack tooling with Google spyware removed

	Commit message (Collapse)	Author	Age	Lines
*	Fix missing includes in litaloader installer.	Petr Mrázek	2014-02-25	-0/+2
\|
*	Merge branch 'feature_screenshots' into integration_json_and_tools	Petr Mrázek	2014-02-25	-21/+531
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: logic/net/URLConstants.h Resolve issues with multiple definitions of URL constants by moving them to their own object file.
\| *	Screenshots: Optimize image loading and memory use, fix list and button layout.	Petr Mrázek	2014-02-25	-1/+20
\| \|
\| *	Reorganize all the screenshot files	Petr Mrázek	2014-02-25	-32/+40
\| \|
\| *	Fix memory leak in system	robotbrain	2014-02-24	-2/+2
\| \|
\| *	Deleting screenshots. Needs fixing.	robotbrain	2014-02-24	-1/+37
\| \|
\| *	Imgur album creation	Jan Dalheimer	2014-02-24	-24/+162
\| \|
\| *	Working screenshot upload	Jan Dalheimer	2014-02-24	-9/+9
\| \|
\| *	Screenshot fixes, move some code around, fix some stuff	Jan Dalheimer	2014-02-24	-15/+21
\| \|
\| *	Close to finished. Need to fix the upload part. Viewing works (in grayscale)	robotbrain	2014-02-23	-106/+37
\| \|
\| *	Initial stuff. It doesnt work.	robotbrain	2014-02-23	-0/+354
\| \|
* \|	Merge branch 'fix_json_version' into integration_json_and_tools	Petr Mrázek	2014-02-24	-159/+214
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: logic/OneSixInstance.cpp logic/OneSixVersionBuilder.cpp Some fixage. Yay for conflicts.
\| * \|	Instance flags. Currently used for marking instances as broken. Can later be ↵	Jan Dalheimer	2014-02-17	-7/+79
\| \| \| \| \| \| \| \| \| \| \| \|	used for badges.
\| * \|	Different error message if it's a launcher version mismatch	Jan Dalheimer	2014-02-17	-19/+49
\| \| \|
\| * \|	Actually remove instances if they fail to load	Jan Dalheimer	2014-02-17	-1/+8
\| \| \|
\| * \|	Check if the json version is one we know how to handle	Jan Dalheimer	2014-02-17	-6/+26
\| \|/ \| \| \| \| \| \|	Also some formatting.
* \|	Merge branch 'feature_profiling' into integration_json_and_tools	Petr Mrázek	2014-02-24	-4/+531
\|\ \
\| * \|	Fix MCEdit on OSX	Jan Dalheimer	2014-02-21	-2/+12
\| \| \|
\| * \|	Restructure	Jan Dalheimer	2014-02-16	-2/+2
\| \| \|
\| * \|	Only show folders that really are worlds	Jan Dalheimer	2014-02-16	-9/+34
\| \| \|
\| * \|	Attempt to find jvisualvm	Jan Dalheimer	2014-02-16	-1/+6
\| \| \|
\| * \|	Use a combobox instead of a file dialog	Jan Dalheimer	2014-02-16	-5/+8
\| \| \|
\| * \|	Fix for windows and update tool menu after closing settings dialog	Jan Dalheimer	2014-02-16	-3/+11
\| \| \|
\| * \|	Fix more stuff. Detached tools, only MCEdit for now.	Jan Dalheimer	2014-02-16	-40/+199
\| \| \|
\| * \|	More fixes.	Jan Dalheimer	2014-02-16	-5/+16
\| \| \|
\| * \|	Fix stuff. Make sure different ways of aborting profiling work.	Jan Dalheimer	2014-02-16	-2/+40
\| \| \|
\| * \|	Fix a few bugs in profilers.	Petr Mrázek	2014-02-16	-3/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Legacy was launching before the profiler. * Some clarity changes. * Report problem with empty strings as profiler paths.
\| * \|	Underp. Don't depend on OneSix. Nicer "menu" style choosing.	Jan Dalheimer	2014-02-15	-15/+44
\| \| \|
\| * \|	Another attempt at fixing windows build	Jan Dalheimer	2014-02-15	-4/+8
\| \| \|
\| * \|	Try to be cross-platform	Jan Dalheimer	2014-02-15	-1/+15
\| \| \|
\| * \|	Underp and fix some stuff. Works nicer now.	Jan Dalheimer	2014-02-15	-5/+1
\| \| \|
\| * \|	Profiler support. Currently JProfiler and JVisualVM are implemented.	Jan Dalheimer	2014-02-15	-1/+202
\| \|/
* \|	Merge branch 'fix_ftb' into integration_json_and_tools	Petr Mrázek	2014-02-24	-143/+318
\|\ \
\| * \|	Copying of FTB instances working again	Jan Dalheimer	2014-02-21	-5/+92
\| \| \|
\| * \|	Don't assume forge for FTB instances. Fix FTB related stuff.	Jan Dalheimer	2014-02-21	-138/+204
\| \| \|
\| * \|	Use FTB's libraries/ and versions/ folders for non-copied instances	Jan Dalheimer	2014-02-20	-5/+27
\| \|/
* /	New, better, liteloader support	Jan Dalheimer	2014-02-19	-33/+316
\|/
*	Merge https://github.com/max96at/MultiMC5 into develop	Petr Mrázek	2014-02-14	-1/+14
\|\
\| *	Added more possible java paths on OSX.	Noah Mayr	2014-01-22	-1/+14
\| \|
* \|	Merge branch 'integration_derpstances_groupview' into develop	Petr Mrázek	2014-02-09	-524/+1759
\|\ \
\| * \|	Blacklist the FTB voxel pack.	Petr Mrázek	2014-02-09	-0/+2
\| \| \|
\| * \|	Only load instance list twice.	Petr Mrázek	2014-02-09	-3/+9
\| \| \|
\| * \|	Fix crash bug related to messageboxes interrupting model resets in the ↵	Petr Mrázek	2014-02-08	-52/+72
\| \| \| \| \| \| \| \| \| \| \| \|	instance list.
\| * \|	Merge branch 'feature_groupview' into integration_derpstances_groupview	Petr Mrázek	2014-02-08	-7/+5
\| \|\ \
\| \| * \|	Pave.	Petr Mrázek	2014-02-04	-7/+5
\| \| \| \|
\| * \| \|	Allow overriding the order in which patches are applied	Jan Dalheimer	2014-02-08	-0/+84
\| \| \| \|
\| * \| \|	Error if a patch file is for a different version of minecraft	Jan Dalheimer	2014-02-08	-0/+9
\| \| \| \|
\| * \| \|	Fix installing forge after liteloader and then removing liteloader. Also ↵	Jan Dalheimer	2014-02-02	-82/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	formatting.
\| * \| \|	Add a MMC-depend field (soft/hard) for version checking	Jan Dalheimer	2014-02-02	-32/+100
\| \| \| \|
\| * \| \|	Disable anything related to user.json for now. Will be re-enabled once we ↵	Jan Dalheimer	2014-02-01	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	have a gui for it.