Commit Graph

1044 Commits

Author SHA1 Message Date
Forkk
cba22f7ee0 Bump version and update changelog. 2014-05-01 13:10:46 -05:00
Forkk
3d8f6ac640 Merge branch 'feature_credits' into develop 2014-05-01 12:45:55 -05:00
Forkk
605a334057 Show Patreon patrons in the about dialog 2014-05-01 12:43:55 -05:00
Petr Mrázek
5fa36f67b3 Update the icon, again 2014-04-22 21:08:09 +02:00
Petr Mrázek
0cd8ded4d4 Update the OSX icon
Closes #230
2014-04-22 00:53:05 +02:00
Petr Mrázek
9d724e0fe4 Merge remote-tracking branch 'origin/feature_cmake_style' into develop
Conflicts:
	CMakeLists.txt
2014-04-21 23:33:00 +02:00
Petr Mrázek
a9dfe6d7ec Fix quit shortcut connect() call 2014-04-21 21:48:58 +02:00
Petr Mrázek
7de007502c Update FR translation some more. 2014-04-21 21:46:12 +02:00
Petr Mrázek
e955b1c6f9 Merge remote-tracking branch 'origin/feature_new_login_dialog2' into develop 2014-04-21 21:39:02 +02:00
Petr Mrázek
c8f468057e Merge remote-tracking branch 'origin/feature_close_shortcut' into develop 2014-04-21 21:38:24 +02:00
Petr Mrázek
6ded1168b0 Fix french translation. 2014-04-21 21:37:15 +02:00
Taeyeon Mori
adecc53df8 Add a quit shortcut to the main window (#200)
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)
2014-04-21 21:37:15 +02:00
Petr Mrázek
c9465e9e86 Merge remote-tracking branch 'origin/feature_raise_console' into develop 2014-04-21 21:25:39 +02:00
Petr Mrázek
f14c1888a9 Merge remote-tracking branch 'origin/feature_french' into develop 2014-04-21 21:24:24 +02:00
Petr Mrázek
ca60784a44 Add proper FML libs URL 2014-04-21 20:41:37 +02:00
Petr Mrázek
565dab24b5 Download and cache FML libs for legacy minecraft versions.
* 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
2014-04-19 21:24:11 +02:00
Elros
eea347b82c Add french translation from #217
Closes #217
2014-04-19 12:46:23 -04:00
Taeyeon Mori
0b60e50af8 Add a quit shortcut to the main window (#200)
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)
2014-04-17 14:49:03 +02:00
Taeyeon Mori
0959aeb046 Make the console window raise itself after minecraft closes (#193)
This needs further testing:
http://stackoverflow.com/questions/6087887/bring-window-to-front-raise-show-activatewindow-dont-work
2014-04-17 14:13:16 +02:00
Jan Dalheimer
89edc3e15e Comments and reformating
[ci skip]
2014-04-16 18:03:48 +02:00
Jan Dalheimer
f67ca674c4 Fix bug 2014-04-16 17:54:07 +02:00
Jan Dalheimer
3ed5b1570b LoginDialog changes 2014-04-16 17:38:26 +02:00
Taeyeon Mori
4674aad125 Create a new login dialog 2014-04-16 16:19:12 +02:00
Petr Mrázek
bf1632e4ed Add to the changelog 2014-04-16 01:05:03 +02:00
Petr Mrázek
b286b93281 Give more feedback for YggdrasilTask network errors. 2014-04-16 00:46:41 +02:00
Sky
632c087483 Put changelog additions under right version (0.3.3) 2014-04-15 23:34:51 +01:00
Sky
318a945d74 Update changelog 2014-04-15 23:31:46 +01:00
Petr Mrázek
b6d7ffab47 Detect and report missing local libraries. 2014-04-13 23:06:28 +02:00
Sky
04b36a3e55 Merge pull request #212 from MultiMC/feature_travis_clang
Get Travis to build GCC and Clang versions on Linux as we consider moving to Clang on Linux in general
2014-04-12 17:30:21 +01:00
Jan Dalheimer
3f2152c14d Let travis build a clang version 2014-04-12 18:11:30 +02:00
Sky
8a6c64ef62 Remove specific OpenSSL version from BUILD.md 2014-04-12 04:40:16 +01:00
Sky
6e42d51283 Merge pull request #211 from Drayshak/develop
Add Patreon button with logo
2014-04-12 02:11:51 +01:00
Sky
86830967b6 Give the Patreon button a logo 2014-04-12 02:05:42 +01:00
Sky
1657313105 Add Patreon button. Needs an icon (used I for now). 2014-04-11 02:59:30 +01:00
Jan Dalheimer
a00fb1e8da Only use tabs for intendention 2014-04-09 15:41:49 +02:00
Petr Mrázek
50d18a06d5 Context menu tweaks
* 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.
2014-04-08 00:16:49 +02:00
Jan Dalheimer
3cd2b898e5 Merge remote-tracking branch 'origin/develop' into feature_cmake_style
Conflicts:
	CMakeLists.txt
2014-04-07 17:44:52 +02:00
Petr Mrázek
17d4947b30 Merge remote-tracking branch 'origin/feature_dotcmake' into develop 2014-04-06 20:56:40 +02:00
Jan Dalheimer
dd7b6642a3 Use the same style of CMake files everywhere 2014-04-06 19:43:09 +02:00
Jan Dalheimer
eb246c4fa7 .cmake files to reduce "code" duplicate 2014-04-06 18:12:48 +02:00
Jan Dalheimer
6ef38d0873 Coverity build and upload target. Also GitFunctions. 2014-04-06 18:02:28 +02:00
Petr Mrázek
482ad250a4 Workaround for dirty build folders.
My disgust just turned into barely contained rage :<
2014-04-06 03:59:37 +02:00
Petr Mrázek
f9169654c5 Build fixage for the changed build config 2014-04-06 03:48:59 +02:00
Petr Mrázek
e58e2643ca Merge branch 'patch-1' of https://github.com/max96at/MultiMC5 into develop 2014-04-06 00:41:19 +02:00
Petr Mrázek
42e305bb9d Get rid of long rebuilds because of minor cmake config changes 2014-04-06 00:33:33 +02:00
max96at
8594cc8f6c Fix adding icons to custom icon directories. 2014-04-03 19:28:23 +02:00
Petr Mrázek
ad9d082f57 Do not spam logs too much, bump version and add to changelog. 2014-04-01 23:03:04 +02:00
Petr Mrázek
52ff6a4140 Deny april fools outside of first april. 2014-04-01 22:33:15 +02:00
Petr Mrázek
1ef6ec4178 Fix library replace issue 2014-04-01 21:58:15 +02:00
Petr Mrázek
72bc860983 Fix for invalid prelaunch commands 2014-04-01 00:04:26 +02:00