MultiMC - Minecraft modpack tooling with Google spyware removed

	Commit message (Collapse)	Author	Age	Lines
*	Merge branch 'master' of git://github.com/peterix/MultiMC5	Andrew	2013-03-28	-487/+1501
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: CMakeLists.txt gui/mainwindow.cpp
\| *	Store stub keyring data in the same folder as the binary	Petr Mrázek	2013-03-26	-1/+3
\| \|
\| *	Use Keyring in the login dialog	Petr Mrázek	2013-03-26	-18/+88
\| \|
\| *	Filter console output, no more sea of red when there's nothing to report.	Petr Mrázek	2013-03-26	-2/+33
\| \|
\| *	Mystery meat layout hack to get things aligned	Petr Mrázek	2013-03-25	-6/+8
\| \|
\| *	Fix an another layout problem in instance list	Petr Mrázek	2013-03-25	-1/+2
\| \|
\| *	Add instance view up/down keyboard navigation, fix some layout glitches (not ↵	Petr Mrázek	2013-03-25	-125/+152
\| \| \| \| \| \| \| \|	all)
\| *	Fix settings dialog java tab layout	Petr Mrázek	2013-03-24	-21/+23
\| \|
\| *	Fix settings objects, instances can be started from the GUI now	Petr Mrázek	2013-03-24	-12/+56
\| \|
\| *	fix merge issues, make console window work again	Orochimarufan	2013-03-22	-159/+171
\| \|
\| *	Merge branch 'master' of http://github.com/peterix/MultiMC5	Orochimarufan	2013-03-22	-84/+523
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: CMakeLists.txt main.cpp
\| \| *	Add SVG icon rendering/cache	Petr Mrázek	2013-03-20	-36/+187
\| \| \|
\| \| *	Property change propagation, changing instance groups, icon preview	Petr Mrázek	2013-03-19	-14/+85
\| \| \|
\| \| *	Added background cat. Proof of concept :3	Petr Mrázek	2013-03-19	-4/+28
\| \| \|
\| \| *	Loading instance groups and exposing them to the model	Petr Mrázek	2013-03-18	-2/+116
\| \| \|
\| \| *	Connect instance list to model.	Petr Mrázek	2013-03-18	-37/+105
\| \| \|
\| \| *	Use the actual selection for instance launch.	Petr Mrázek	2013-03-16	-3/+11
\| \| \|
\| * \|	refactor indendation, fix a bug in MinecraftProcess & fix a bug in	Orochimarufan	2013-03-22	-215/+211
\| \| \| \| \| \| \| \| \| \| \| \|	InstanceLauncher
\| * \|	Implement Keyring system base	Orochimarufan	2013-03-22	-0/+353
\| \| \|
\| * \|	Port minecraft.jar version detection to Qt	Orochimarufan	2013-03-22	-66/+101
\| \| \|
* \| \|	Implemented version lists.	Andrew	2013-03-28	-12/+352
\|/ / \| \| \| \| \| \| \| \| \| \|	Further work on this is still needed. Currently there is no sorting or filtering of any kind. In addition, changes need to be made to fix issues with bad ETags since the current system here is based on MultiMC 4's version list system before it was fixed.
* \|	Changed spaces to tabs in CMakeLists.txt because space indenting is the work ↵	Andrew	2013-03-19	-15/+15
\| \| \| \| \| \| \| \|	of satan.
* \|	Merge pull request #3 from GUIpsp/master	Andrew Okin	2013-03-19	-0/+18
\|\ \ \| \|/ \|/\|	Add travis CI building.
\| *	Add travis CI building.	Guilherme Espada	2013-03-19	-0/+18
\| \| \| \| \| \| \| \|	Uses GCC
* \|	Merge branch 'master' of github.com:Forkk/MultiMC5	Andrew	2013-03-14	-0/+0
\|\ \ \| \|/ \|/\|
\| *	Added properties to instance.h	Andrew	2013-03-13	-137/+107
\| \|
* \|	Fixed issues with libGroupView on Windows.	Andrew	2013-03-13	-7/+9
\| \|
* \|	Merge branch 'master' of git://github.com/peterix/MultiMC5	Andrew	2013-03-13	-108/+3582
\|\ \
\| * \|	Instance view, model, delegate.	Petr Mrázek	2013-03-11	-108/+3582
\| \| \|
* \| \|	Added properties to Instance class	Andrew	2013-03-13	-139/+129
\| \|/ \|/\|
* \|	Implemented version lists.	Andrew	2013-03-08	-28/+955
\| \|
* \|	Added a function to get an instance's type.	Andrew	2013-03-06	-5/+27
\|/
*	Massive re-organization.	Andrew	2013-02-26	-185/+223
\|
*	Added instance setting overrides.	Andrew	2013-02-25	-61/+241
\|
*	Fixed a lot of MSVC problems	Andrew	2013-02-25	-599/+651
\|
*	Fixed some formatting.	Andrew	2013-02-25	-334/+339
\|
*	Merge branch 'master' of git://github.com/peterix/MultiMC5	Andrew	2013-02-25	-22/+2196
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: CMakeLists.txt main.cpp
\| *	Full folder name is the instance ID, not just the first part.	Petr Mrázek	2013-02-23	-1/+1
\| \|
\| *	Implement ConsoleWindow	Orochimarufan	2013-02-22	-11/+257
\| \|
\| *	Merge branch 'master' of http://github.com/Forkk/MultiMC5	Orochimarufan	2013-02-22	-0/+74
\| \|\
\| * \|	Implement Instance launching	Orochimarufan	2013-02-22	-20/+425
\| \| \| \| \| \| \| \| \| \| \| \|	Use --launch <instance> to test
\| * \|	Merge branch 'inst_rewrite' of http://github.com/Forkk/MultiMC5	Orochimarufan	2013-02-21	-5/+9
\| \|\ \
\| * \| \|	use QtCreator's $QTPATH in CMake	Orochimarufan	2013-02-21	-1/+5
\| \| \| \|
\| * \| \|	Merge branch 'master' of http://github.com/peterix/MultiMC5	Orochimarufan	2013-02-21	-993/+1979
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: CMakeLists.txt gui/mainwindow.cpp main.cpp
\| * \| \| \|	Implement About Dialog	Orochimarufan	2013-02-21	-25/+397
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepared XDG icon theme in :/icons/multimc. will only be usefull as soon as Qt decides to support custom fallback themes. use the resources directly for now.
\| * \| \| \|	Merge branch 'master' of http://github.com/Forkk/MultiMC5	Orochimarufan	2013-02-20	-101/+372
\| \|\ \ \ \
\| * \| \| \| \|	implement commandline parsing	Orochimarufan	2013-02-20	-7/+764
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of http://github.com/Forkk/MultiMC5	Orochimarufan	2013-02-18	-1/+7
\| \|\ \ \ \ \
\| * \| \| \| \| \|	implement desktop shortcut creation. windows code not tested.	Orochimarufan	2013-02-13	-4/+152
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of http://github.com/Forkk/MultiMC5	Orochimarufan	2013-02-13	-13/+133
\| \|\ \ \ \ \ \