MultiMC - Minecraft modpack tooling with Google spyware removed

	Commit message (Collapse)	Author	Age	Lines
...
* \|	Bump version and update changelog.	Forkk	2014-05-01	-2/+9
\|/
*	Merge branch 'feature_credits' into develop	Forkk	2014-05-01	-28/+102
\|\
\| *	Show Patreon patrons in the about dialog	Forkk	2014-05-01	-28/+102
\|/
*	Update the icon, again	Petr Mrázek	2014-04-22	-0/+0
\|
*	Update the OSX icon	Petr Mrázek	2014-04-22	-0/+0
\| \| \| \|	Closes #230
*	Merge remote-tracking branch 'origin/feature_cmake_style' into develop	Petr Mrázek	2014-04-21	-859/+798
\|\ \| \| \| \| \| \| \| \|	Conflicts: CMakeLists.txt
\| *	Only use tabs for intendention	Jan Dalheimer	2014-04-09	-458/+459
\| \|
\| *	Merge remote-tracking branch 'origin/develop' into feature_cmake_style	Jan Dalheimer	2014-04-07	-75/+127
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: CMakeLists.txt
\| * \|	Use the same style of CMake files everywhere	Jan Dalheimer	2014-04-06	-811/+761
\| \| \|
* \| \|	Fix quit shortcut connect() call	Petr Mrázek	2014-04-21	-1/+2
\| \| \|
* \| \|	Update FR translation some more.	Petr Mrázek	2014-04-21	-523/+129
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/feature_new_login_dialog2' into develop	Petr Mrázek	2014-04-21	-43/+276
\|\ \ \
\| * \| \|	Comments and reformating	Jan Dalheimer	2014-04-16	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Fix bug	Jan Dalheimer	2014-04-16	-16/+11
\| \| \| \|
\| * \| \|	LoginDialog changes	Jan Dalheimer	2014-04-16	-73/+30
\| \| \| \|
\| * \| \|	Create a new login dialog	Taeyeon Mori	2014-04-16	-43/+321
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/feature_close_shortcut' into develop	Petr Mrázek	2014-04-21	-0/+0
\|\ \ \ \
\| * \| \| \|	Add a quit shortcut to the main window (#200)	Taeyeon Mori	2014-04-17	-0/+7
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The shortcut is Ctrl+Q on every platform but windows, which doesn have one. See also: http://qt-project.org/doc/qt-5/qkeysequence.html#details (StandardKey Quit)
* \| \| \|	Fix french translation.	Petr Mrázek	2014-04-21	-3699/+3977
\| \| \| \|
* \| \| \|	Add a quit shortcut to the main window (#200)	Taeyeon Mori	2014-04-21	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The shortcut is Ctrl+Q on every platform but windows, which doesn have one. See also: http://qt-project.org/doc/qt-5/qkeysequence.html#details (StandardKey Quit)
* \| \| \|	Merge remote-tracking branch 'origin/feature_raise_console' into develop	Petr Mrázek	2014-04-21	-0/+8
\|\ \ \ \
\| * \| \| \|	Make the console window raise itself after minecraft closes (#193)	Taeyeon Mori	2014-04-17	-0/+8
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This needs further testing: http://stackoverflow.com/questions/6087887/bring-window-to-front-raise-show-activatewindow-dont-work
* \| \| \|	Merge remote-tracking branch 'origin/feature_french' into develop	Petr Mrázek	2014-04-21	-0/+3671
\|\ \ \ \
\| * \| \| \|	Add french translation from #217	Elros	2014-04-19	-0/+3671
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes #217
* \| \| \|	Add proper FML libs URL	Petr Mrázek	2014-04-21	-1/+1
\| \| \| \|
* \| \| \|	Download and cache FML libs for legacy minecraft versions.	Petr Mrázek	2014-04-19	-2/+195
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* minor fix for version filtering (1.5 no longer shows forge for 1.5.1 and 1.5.2) * FML libs are downloaded to mods/minecraftforge/libs and cached * FML libs are copied to instances which contain FML or forge
* \| \|	Add to the changelog0.3.3	Petr Mrázek	2014-04-16	-1/+2
\| \| \|
* \| \|	Give more feedback for YggdrasilTask network errors.	Petr Mrázek	2014-04-16	-105/+139
\| \| \|
* \| \|	Put changelog additions under right version (0.3.3)	Sky	2014-04-15	-0/+1
\| \| \|
* \| \|	Update changelog	Sky	2014-04-15	-1/+4
\| \| \|
* \| \|	Detect and report missing local libraries.	Petr Mrázek	2014-04-13	-14/+32
\| \| \|
* \| \|	Merge pull request #212 from MultiMC/feature_travis_clang	Sky	2014-04-12	-2/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Get Travis to build GCC and Clang versions on Linux as we consider moving to Clang on Linux in general
\| * \| \|	Let travis build a clang version	Jan Dalheimer	2014-04-12	-2/+3
\|/ / /
* \| \|	Remove specific OpenSSL version from BUILD.md	Sky	2014-04-12	-1/+1
\| \| \|
* \| \|	Merge pull request #211 from Drayshak/develop	Sky	2014-04-12	-0/+32
\|\ \ \ \| \| \| \| \| \| \| \|	Add Patreon button with logo
\| * \| \|	Give the Patreon button a logo	Sky	2014-04-12	-2/+10
\| \| \| \|
\| * \| \|	Add Patreon button. Needs an icon (used I for now).	Sky	2014-04-11	-0/+24
\|/ / /
* \| /	Context menu tweaks	Petr Mrázek	2014-04-08	-11/+38
\| \|/ \|/\| \| \| \| \| \| \| \| \|	* Add create/copy instance actions to the context menu. * Context menu for the instance view background. * Top of the context menu is now a header, fixing the misclick problems.
* \|	Merge remote-tracking branch 'origin/feature_dotcmake' into develop	Petr Mrázek	2014-04-06	-51/+53
\|\ \
\| * \|	.cmake files to reduce "code" duplicate	Jan Dalheimer	2014-04-06	-51/+53
\| \|/
* /	Coverity build and upload target. Also GitFunctions.	Jan Dalheimer	2014-04-06	-14/+77
\|/
*	Workaround for dirty build folders.	Petr Mrázek	2014-04-06	-12/+12
\| \| \| \|	My disgust just turned into barely contained rage :<
*	Build fixage for the changed build config	Petr Mrázek	2014-04-06	-145/+348
\|
*	Merge branch 'patch-1' of https://github.com/max96at/MultiMC5 into develop	Petr Mrázek	2014-04-06	-1/+1
\|\
\| *	Fix adding icons to custom icon directories.	max96at	2014-04-03	-1/+1
\| \|
* \|	Get rid of long rebuilds because of minor cmake config changes	Petr Mrázek	2014-04-06	-193/+207
\|/
*	Do not spam logs too much, bump version and add to changelog.0.3.2	Petr Mrázek	2014-04-01	-5/+8
\|
*	Deny april fools outside of first april.	Petr Mrázek	2014-04-01	-0/+7
\|
*	Fix library replace issue	Petr Mrázek	2014-04-01	-8/+22
\|
*	Fix for invalid prelaunch commands	Petr Mrázek	2014-04-01	-1/+4
\|