summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge remote-tracking branch 'origin/feature_new_login_dialog2' into developPetr Mrázek2014-04-21-43/+276
|\
| * Comments and reformatingJan Dalheimer2014-04-16-1/+4
| * Fix bugJan Dalheimer2014-04-16-16/+11
| * LoginDialog changesJan Dalheimer2014-04-16-73/+30
| * Create a new login dialogTaeyeon Mori2014-04-16-43/+321
* | Merge remote-tracking branch 'origin/feature_close_shortcut' into developPetr Mrázek2014-04-21-0/+0
|\ \
| * | Add a quit shortcut to the main window (#200)Taeyeon Mori2014-04-17-0/+7
| |/
* | Fix french translation.Petr Mrázek2014-04-21-3699/+3977
* | Add a quit shortcut to the main window (#200)Taeyeon Mori2014-04-21-0/+7
* | Merge remote-tracking branch 'origin/feature_raise_console' into developPetr Mrázek2014-04-21-0/+8
|\ \
| * | Make the console window raise itself after minecraft closes (#193)Taeyeon Mori2014-04-17-0/+8
| |/
* | Merge remote-tracking branch 'origin/feature_french' into developPetr Mrázek2014-04-21-0/+3671
|\ \
| * | Add french translation from #217Elros2014-04-19-0/+3671
| |/
* | Add proper FML libs URLPetr Mrázek2014-04-21-1/+1
* | Download and cache FML libs for legacy minecraft versions.Petr Mrázek2014-04-19-2/+195
|/
* Add to the changelog0.3.3Petr Mrázek2014-04-16-1/+2
* Give more feedback for YggdrasilTask network errors.Petr Mrázek2014-04-16-105/+139
* Put changelog additions under right version (0.3.3)Sky2014-04-15-0/+1
* Update changelogSky2014-04-15-1/+4
* Detect and report missing local libraries.Petr Mrázek2014-04-13-14/+32
* Merge pull request #212 from MultiMC/feature_travis_clangSky2014-04-12-2/+3
|\
| * Let travis build a clang versionJan Dalheimer2014-04-12-2/+3
|/
* Remove specific OpenSSL version from BUILD.mdSky2014-04-12-1/+1
* Merge pull request #211 from Drayshak/developSky2014-04-12-0/+32
|\
| * Give the Patreon button a logoSky2014-04-12-2/+10
| * Add Patreon button. Needs an icon (used I for now).Sky2014-04-11-0/+24
|/
* Context menu tweaksPetr Mrázek2014-04-08-11/+38
* Merge remote-tracking branch 'origin/feature_dotcmake' into developPetr Mrázek2014-04-06-51/+53
|\
| * .cmake files to reduce "code" duplicateJan Dalheimer2014-04-06-51/+53
* | Coverity build and upload target. Also GitFunctions.Jan Dalheimer2014-04-06-14/+77
|/
* Workaround for dirty build folders.Petr Mrázek2014-04-06-12/+12
* Build fixage for the changed build configPetr Mrázek2014-04-06-145/+348
* Merge branch 'patch-1' of https://github.com/max96at/MultiMC5 into developPetr Mrázek2014-04-06-1/+1
|\
| * Fix adding icons to custom icon directories.max96at2014-04-03-1/+1
* | Get rid of long rebuilds because of minor cmake config changesPetr Mrázek2014-04-06-193/+207
|/
* Do not spam logs too much, bump version and add to changelog.0.3.2Petr Mrázek2014-04-01-5/+8
* Deny april fools outside of first april.Petr Mrázek2014-04-01-0/+7
* Fix library replace issuePetr Mrázek2014-04-01-8/+22
* Fix for invalid prelaunch commandsPetr Mrázek2014-04-01-1/+4
* Fix FTB-related issues0.3.1Petr Mrázek2014-03-31-3/+80
* Add a few default java paths on linux0.3Petr Mrázek2014-03-30-0/+2
* Fix many memory leaks.Petr Mrázek2014-03-30-103/+139
* Fix java checker crash, some memory leaksPetr Mrázek2014-03-30-6/+8
* Try to read 'authorList' in mcmod.info for authors first, fall back to deprec...Sky2014-03-30-1/+4
* Add mention of the config coding fix to the changelog.Petr Mrázek2014-03-29-0/+1
* Setting PermGen to 64 will omit the java paramPetr Mrázek2014-03-29-1/+6
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2014-03-29-1/+2
|\
| * Tweak changelogSky2014-03-29-1/+2
* | Fix issues with badly encoded escape sequences in config files.Petr Mrázek2014-03-29-11/+88
|/
* Merge branch 'release-0.3' into developPetr Mrázek2014-03-29-2/+28
|\