MultiMC - Minecraft modpack tooling with Google spyware removed

	Commit message (Collapse)	Author	Age	Lines
...
* \|	Merge branch 'feature_screenshots' into integration_json_and_tools	Petr Mrázek	2014-02-25	-172/+971
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	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	-15/+38
\| \|
\| *	Reorganize all the screenshot files	Petr Mrázek	2014-02-25	-49/+60
\| \|
\| *	Fix memory leak in system	robotbrain	2014-02-24	-7/+7
\| \|
\| *	Deleting screenshots. Needs fixing.	robotbrain	2014-02-24	-7/+56
\| \|
\| *	Imgur album creation	Jan Dalheimer	2014-02-24	-52/+193
\| \|
\| *	Working screenshot upload	Jan Dalheimer	2014-02-24	-69/+84
\| \|
\| *	Screenshot fixes, move some code around, fix some stuff	Jan Dalheimer	2014-02-24	-63/+91
\| \|
\| *	Close to finished. Need to fix the upload part. Viewing works (in grayscale)	robotbrain	2014-02-23	-134/+53
\| \|
\| *	Initial stuff. It doesnt work.	robotbrain	2014-02-23	-153/+746
\| \|
* \|	Merge branch 'fix_json_version' into integration_json_and_tools	Petr Mrázek	2014-02-24	-160/+216
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-8/+81
\| \| \| \| \| \| \| \| \| \| \| \|	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	-62/+1058
\|\ \
\| * \|	Fix MCEdit on OSX	Jan Dalheimer	2014-02-21	-2/+17
\| \| \|
\| * \|	Fix some external tool related string sin the settings dialog.	Petr Mrázek	2014-02-16	-2/+2
\| \| \|
\| * \|	Nicer way of selecting tool folders and executables	Petr Mrázek	2014-02-16	-79/+129
\| \| \|
\| * \|	Links to the tools	Jan Dalheimer	2014-02-16	-0/+21
\| \| \|
\| * \|	Restructure	Jan Dalheimer	2014-02-16	-18/+18
\| \| \|
\| * \|	Only show folders that really are worlds	Jan Dalheimer	2014-02-16	-9/+34
\| \| \|
\| * \|	Merge remote-tracking branch 'origin/feature_profiling' into feature_profiling	Jan Dalheimer	2014-02-16	-5/+18
\| \|\ \
\| \| * \|	Fix path selections for tools (settings dialog)	Petr Mrázek	2014-02-16	-5/+18
\| \| \| \|
\| * \| \|	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	-44/+60
\| \| \|
\| * \|	Fix more stuff. Detached tools, only MCEdit for now.	Jan Dalheimer	2014-02-16	-44/+307
\| \| \|
\| * \|	More fixes.	Jan Dalheimer	2014-02-16	-6/+17
\| \| \|
\| * \|	Fix stuff. Make sure different ways of aborting profiling work.	Jan Dalheimer	2014-02-16	-5/+57
\| \| \|
\| * \|	Fix a few bugs in profilers.	Petr Mrázek	2014-02-16	-24/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	-125/+96
\| \| \|
\| * \|	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	-17/+505
\| \|/
* \|	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	-51/+355
\|/
*	Merge https://github.com/p-schneider/MultiMC5 into develop	Petr Mrázek	2014-02-14	-2/+2
\|\
\| *	fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 ↵	p-schneider	2014-02-14	-2/+2
\| \| \| \| \| \| \| \|	in AboutDialog.ui (+German translation)
* \|	Merge https://github.com/robotbrain/MultiMC5 into develop	Petr Mrázek	2014-02-14	-2/+2
\|\ \
\| * \|	Fix FTB paths on Windows XP	robotbrain	2014-02-13	-2/+2
\| \|/
* \|	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
\| \|
* \|	Fix groupview issues	Petr Mrázek	2014-02-10	-27/+26
\| \| \| \| \| \| \| \| \| \|	* indexAt was using the wrong coordinate system * model events now trigger a delayed layout update instead of immediate.
* \|	Fix kitty. Meow.	Petr Mrázek	2014-02-09	-1/+1
\| \|
* \|	Fix template magic in group view.	Petr Mrázek	2014-02-09	-5/+5
\| \|