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	-0/+229
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	-14/+17
\| \|
\| *	Reorganize all the screenshot files	Petr Mrázek	2014-02-25	-11/+11
\| \|
\| *	Fix memory leak in system	robotbrain	2014-02-24	-5/+5
\| \|
\| *	Deleting screenshots. Needs fixing.	robotbrain	2014-02-24	-4/+17
\| \|
\| *	Imgur album creation	Jan Dalheimer	2014-02-24	-18/+26
\| \|
\| *	Working screenshot upload	Jan Dalheimer	2014-02-24	-58/+73
\| \|
\| *	Screenshot fixes, move some code around, fix some stuff	Jan Dalheimer	2014-02-24	-19/+50
\| \|
\| *	Close to finished. Need to fix the upload part. Viewing works (in grayscale)	robotbrain	2014-02-23	-7/+16
\| \|
\| *	Initial stuff. It doesnt work.	robotbrain	2014-02-23	-0/+150
\| \|
* \|	Merge branch 'feature_profiling' into integration_json_and_tools	Petr Mrázek	2014-02-24	-37/+333
\|\ \
\| * \|	Fix MCEdit on OSX	Jan Dalheimer	2014-02-21	-0/+5
\| \| \|
\| * \|	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	-1/+1
\| \| \|
\| * \|	Fix path selections for tools (settings dialog)	Petr Mrázek	2014-02-16	-5/+18
\| \| \|
\| * \|	Fix more stuff. Detached tools, only MCEdit for now.	Jan Dalheimer	2014-02-16	-2/+62
\| \| \|
\| * \|	Fix stuff. Make sure different ways of aborting profiling work.	Jan Dalheimer	2014-02-16	-3/+5
\| \| \|
\| * \|	Fix a few bugs in profilers.	Petr Mrázek	2014-02-16	-14/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	-60/+3
\| \| \|
\| * \|	Profiler support. Currently JProfiler and JVisualVM are implemented.	Jan Dalheimer	2014-02-15	-1/+201
\| \|/
* /	New, better, liteloader support	Jan Dalheimer	2014-02-19	-18/+23
\|/
*	fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 ↵	p-schneider	2014-02-14	-1/+1
\| \| \| \|	in AboutDialog.ui (+German translation)
*	Merge branch 'feature_groupview' into integration_derpstances_groupview	Petr Mrázek	2014-02-08	-1/+1
\|\
\| *	Pave.	Petr Mrázek	2014-02-04	-1/+1
\| \|
* \|	Allow overriding the order in which patches are applied	Jan Dalheimer	2014-02-08	-0/+156
\| \|
* \|	Reload version after removing custom.json	Jan Dalheimer	2014-02-03	-0/+2
\| \|
* \|	Disable anything related to user.json for now. Will be re-enabled once we ↵	Jan Dalheimer	2014-02-01	-36/+1
\| \| \| \| \| \| \| \|	have a gui for it.
* \|	Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 ↵	Petr Mrázek	2014-02-01	-122/+87
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \|	into feature_derpstances Conflicts: gui/dialogs/OneSixModEditDialog.cpp logic/OneSixUpdate.cpp
\| *	Fix a bug	Jan Dalheimer	2014-02-01	-3/+12
\| \|
\| *	Change the OneSix library view. It now shows a list of patches.	Jan Dalheimer	2014-02-01	-37/+67
\| \|
\| *	Have the libraries tab show tweaker mods instead of libraries	Jan Dalheimer	2014-01-27	-0/+10
\| \|
\| *	Split parsing/applying. Better error logging. Fix crash.	Jan Dalheimer	2014-01-27	-2/+2
\| \|
\| *	Change naming from Derp -> OneSix until the new instance type supports legacy	Jan Dalheimer	2014-01-24	-33/+33
\| \|
\| *	Forge works now too, and so does forge+liteloader	Jan Dalheimer	2014-01-23	-5/+11
\| \|
\| *	Work towards liteloader support. Fix creating new instance	Jan Dalheimer	2014-01-22	-4/+4
\| \|
\| *	Derpstances. Everything renamed. Launching does not yet work.	Jan Dalheimer	2014-01-22	-124/+35
\| \|
* \|	Add 'empty text' to all the version selection dialogs.	Petr Mrázek	2014-01-29	-5/+21
\| \| \| \| \| \| \| \|	Customize it for the Forge one so people finally shut up about 1.7.4
* \|	Offline mode can be used even when online.	Petr Mrázek	2014-01-27	-1/+1
\|/ \| \| \| \| \|	Allow the user to pick a player name for offline mode. Big auth refactor. Now using session objects instead of the accounts themselves. Sessions only last for one instance start and hold all the auth and player data.
*	Fix settings dialog when offline	Petr Mrázek	2014-01-18	-0/+4
\|
*	Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 ↵	Petr Mrázek	2014-01-12	-235/+273
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into develop Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui
\| *	Hopefully fix Qt 5.1 compilation	Jan Dalheimer	2014-01-04	-1/+1
\| \|
\| *	Clean up/update translation code and made language selectable in the ↵	Jan Dalheimer	2014-01-04	-2/+31
\| \| \| \| \| \| \| \|	settings dialog
\| *	Fix a few things related to the translations	Jan Dalheimer	2014-01-04	-2/+2
\| \|
* \|	Merge branch 'feature_better_launch' into develop	Petr Mrázek	2014-01-12	-13/+42
\|\ \
\| * \|	Replace old launcher part with a shiny new one. No more garbage on the ↵	Petr Mrázek	2014-01-12	-13/+42
\| \| \| \| \| \| \| \| \| \| \| \|	command line.
* \| \|	Add tooltips to Java memory spinboxes	Sky	2014-01-10	-1/+19
\| \| \|
* \| \|	Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop	Sky	2014-01-09	-0/+5
\|\ \ \
\| * \| \|	Make the GitHub link in the about dialog clickable	Forkk	2014-01-08	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #38