MultiMC - Minecraft modpack tooling with Google spyware removed

	Commit message (Collapse)	Author	Age	Lines
*	Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news	Forkk	2014-01-02	-2/+2
\|\
\| *	Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop	Sky	2014-01-02	-5/+19
\| \|\
\| * \|	Don't show extra space in status bar, tweak "none selected" message	Sky	2014-01-02	-2/+2
\| \| \|
* \| \|	Implement the news button	Forkk	2014-01-02	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the news button open the latest news post in the user's web browser. Also remove the webkit dependency. I was planning on using it to display the news in a custom window, but we'll just use the user's browser for now.
* \| \|	Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news	Forkk	2014-01-02	-2154/+4676
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: CMakeLists.txt gui/MainWindow.h
\| * \|	Merge pull request #32 from 02JanDal/feature_ico_icons	Sky	2014-01-02	-3/+3
\| \|\ \ \| \| \| \| \| \| \| \|	Make .ico files usable (the plugin is already included)
\| \| * \|	Make .ico files usable (the plugin is already included)	Jan Dalheimer	2014-01-02	-3/+3
\| \|/ /
\| * \|	Merge pull request #31 from max96at/feature_osx_polish	Petr Mrázek	2014-01-02	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \|	Improved java detection on OSX.
\| \| * \|	Removed incomplete osx java detection log message	max96at	2014-01-02	-2/+0
\| \| \| \|
\| \| * \|	Improved java detection on OSX.	Noah Mayr	2014-01-02	-0/+2
\| \|/ /
\| * \|	Merge pull request #30 from max96at/feature_osx_polish	Petr Mrázek	2014-01-02	-0/+14
\| \|\ \ \| \| \|/ \| \|/\|	Fixed buttons on osx and added .DS_Store to the gitignore file.
\| \| *	Fixed buttons on osx by adding the accessible plugin.	Noah Mayr	2014-01-02	-0/+12
\| \| \|
\| \| *	Added .DS_Store to .gitignore.	Noah Mayr	2014-01-02	-0/+2
\| \|/
\| *	Save/restore settings dialog (and instance specific settings) window geometry	Sky	2014-01-02	-4/+38
\| \|
\| *	More credits tweaking	Sky	2014-01-01	-9/+14
\| \|
\| *	Tweak update result dialog size	Sky	2014-01-01	-2/+2
\| \|
\| *	ThreadTask for all your ThreadNeeds	Petr Mrázek	2014-01-01	-9/+85
\| \| \| \| \| \| \| \|	Use only when absolutely required.
\| *	Merge https://github.com/Drayshak/MultiMC5 into develop	Petr Mrázek	2014-01-01	-81/+193
\| \|\
\| \| *	Move assets migration to a task. Needs threading.	Sky	2014-01-01	-81/+193
\| \| \|
\| * \|	Fix issue with PostExitCmd not translating to PostExitCommand	Petr Mrázek	2014-01-01	-1/+1
\| \|/
\| *	Enable high-dpi QIcon logic	Petr Mrázek	2014-01-01	-0/+1
\| \|
\| *	Remove offending Settings constructor.	Petr Mrázek	2014-01-01	-25/+8
\| \| \| \| \| \| \| \|	Was causing build problems on OSX.
\| *	Allow the use of synonyms in settings. Refactor settings.	Petr Mrázek	2014-01-01	-639/+228
\| \| \| \| \| \| \| \|	Remove a bunch of obsolete/unused code.
\| *	Tweak credits in about dialog	Sky	2013-12-31	-22/+29
\| \|
\| *	Add the redistribution/fork text to the About dialog.	Petr Mrázek	2013-12-31	-4/+37
\| \|
\| *	Clarify terms of redistribution and our wishes under the Apache license	Sky	2013-12-31	-0/+8
\| \|
\| *	Enable high DPI support on OSX	Petr Mrázek	2013-12-31	-1/+44
\| \|
\| *	Fix silly bug with icon not changing on the toolbar when the icon key changes.	Petr Mrázek	2013-12-31	-2/+0
\| \|
\| *	Refactor icon lists heavily	Petr Mrázek	2013-12-31	-306/+616
\| \| \| \| \| \| \| \| \| \| \| \|	* Icon list now uses a filesystem watcher for updates * Icon folder is user-customizable * All the little details. ALL OF THEM.
\| *	Merge pull request #29 from 02JanDal/java_browse_button	Sky	2013-12-30	-25/+41
\| \|\ \| \| \| \| \| \|	Make the java browse button look like the other browse buttons
\| \| *	Make the java browse button look like the other browse buttons	Jan Dalheimer	2013-12-30	-25/+41
\| \| \|
\| * \|	Clarify code style for contributions	Sky	2013-12-30	-0/+2
\| \| \|
\| * \|	Merge pull request #28 from 02JanDal/feature_editor	Sky	2013-12-30	-5/+133
\| \|\ \ \| \| \|/ \| \|/\|	Button for opening an editor for the custom.json file
\| \| *	Fix spelling mistake	Jan Dalheimer	2013-12-30	-1/+1
\| \| \|
\| \| *	Notify the user of any errors	Jan Dalheimer	2013-12-30	-7/+19
\| \| \|
\| \| *	Don't use stuff that's new in 5.2 if we don't compile with that	Jan Dalheimer	2013-12-30	-5/+5
\| \| \|
\| \| *	Use /usr/bin as default on linux	Jan Dalheimer	2013-12-30	-0/+4
\| \| \|
\| \| *	Launch an editor for the custom.json file. Also allow overriding of the ↵	Jan Dalheimer	2013-12-29	-5/+117
\| \|/ \| \| \| \| \| \|	system default editor
\| *	Fix various LiteLoader related bugs.	Petr Mrázek	2013-12-29	-4/+20
\| \|
\| *	Merge https://github.com/robotbrain/MultiMC5 into develop	Petr Mrázek	2013-12-29	-14/+57
\| \|\
\| \| *	Litemod version info.	robotbrainify	2013-12-28	-14/+57
\| \| \|
\| * \|	Maybe break updater even more?	Petr Mrázek	2013-12-29	-57/+32
\| \|/
\| *	Merge branch 'feature_liteloader' of https://github.com/02JanDal/MultiMC5 ↵	Petr Mrázek	2013-12-28	-0/+177
\| \|\ \| \| \| \| \| \| \| \| \|	into develop
\| \| *	Don't hardcode stuff!!!	Jan Dalheimer	2013-12-28	-26/+87
\| \| \|
\| \| *	LiteLoader support	Jan Dalheimer	2013-12-28	-0/+116
\| \| \|
\| * \|	Set permissions for the updater binary after updating it.	Petr Mrázek	2013-12-28	-1/+12
\| \|/
\| *	Change TestParseScript path back to what it was.	Petr Mrázek	2013-12-28	-1/+1
\| \|
\| *	Various updater fixes	Petr Mrázek	2013-12-28	-59/+171
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updater tests for path utils The updater now doesn't use splitpath on Windows (fixes problems with Windows XP) Fix up paths for the OSX updater - should now install the updates into the right place Fix translations install path - translation isntall and deploy should be fixed
\| *	Rearrange logiv for OneSix version change	Petr Mrázek	2013-12-27	-17/+19
\| \|
\| *	Handle the foo + foo.disabled jar mod corner case better.	Petr Mrázek	2013-12-27	-4/+17
\| \|