Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
* | Add a few default java paths on linux0.3 | Petr Mrázek | 2014-03-30 | -0/+2 | |
| | |||||
* | Fix many memory leaks. | Petr Mrázek | 2014-03-30 | -103/+139 | |
| | |||||
* | Fix java checker crash, some memory leaks | Petr Mrázek | 2014-03-30 | -6/+8 | |
| | |||||
* | Try to read 'authorList' in mcmod.info for authors first, fall back to ↵ | Sky | 2014-03-30 | -1/+4 | |
| | | | | deprecated 'authors' if nothing is found. | ||||
* | Add mention of the config coding fix to the changelog. | Petr Mrázek | 2014-03-29 | -0/+1 | |
| | |||||
* | Setting PermGen to 64 will omit the java param | Petr Mrázek | 2014-03-29 | -1/+6 | |
| | |||||
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Petr Mrázek | 2014-03-29 | -1/+2 | |
|\ | |||||
| * | Tweak changelog | Sky | 2014-03-29 | -1/+2 | |
| | | |||||
* | | Fix issues with badly encoded escape sequences in config files. | Petr Mrázek | 2014-03-29 | -11/+88 | |
|/ | |||||
* | Merge branch 'release-0.3' into develop | Petr Mrázek | 2014-03-29 | -2/+28 | |
|\ | |||||
| * | Update changelog for 0.3 | Petr Mrázek | 2014-03-29 | -0/+20 | |
| | | |||||
| * | Raise console window when it's open, but hidden behind other windows. | Petr Mrázek | 2014-03-24 | -0/+6 | |
| | | |||||
| * | Bump version to 0.3.0 | Petr Mrázek | 2014-03-23 | -2/+2 | |
| | | |||||
* | | Merge pull request #168 from max96at/patch-1 | Petr Mrázek | 2014-03-24 | -1/+1 | |
|\ \ | | | | | | | Add build status to README.md | ||||
| * | | Add build status to README.md | max96at | 2014-03-24 | -1/+1 | |
|/ / | |||||
* / | Add a travis config file | Jan Dalheimer | 2014-03-24 | -0/+28 | |
|/ | |||||
* | Set permissions on the accounts.json file so other users can't access it. | Petr Mrázek | 2014-03-23 | -0/+1 | |
| | |||||
* | Make some more error messages translateable. | Petr Mrázek | 2014-03-23 | -20/+26 | |
| | |||||
* | Actually start the forge install job. | Petr Mrázek | 2014-03-20 | -0/+1 | |
| | |||||
* | Finalize version on reload. | Petr Mrázek | 2014-03-19 | -29/+30 | |
| | |||||
* | Merge remote-tracking branch 'origin/feature_notif_65449324' into develop | Petr Mrázek | 2014-03-19 | -20/+234 | |
|\ | |||||
| * | Allow reseting notifications | Jan Dalheimer | 2014-03-15 | -0/+15 | |
| | | |||||
| * | Add a timer for clicking away the notification dialog | Jan Dalheimer | 2014-03-15 | -20/+219 | |
| | | |||||
* | | Merge remote-tracking branch 'origin/feature_fix_timeout' into develop | Petr Mrázek | 2014-03-19 | -4/+34 | |
|\ \ | |||||
| * | | Remove the timeout for pre/post commands. Fixes #107 | Jan Dalheimer | 2014-03-15 | -4/+34 | |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/feature_json_fixes' into develop | Petr Mrázek | 2014-03-19 | -111/+393 | |
|\ \ | |||||
| * | | Get rid of one reloadInstanceVersion | Jan Dalheimer | 2014-03-14 | -6/+6 | |
| | | | |||||
| * | | Pull in BaseInstaller related changes from quickmod | Jan Dalheimer | 2014-03-14 | -59/+186 | |
| | | | |||||
| * | | Move version stuff to the model and reimplement reordering | Jan Dalheimer | 2014-03-14 | -48/+203 | |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/feature_badges' into develop | Petr Mrázek | 2014-03-19 | -25/+119 | |
|\ \ | |||||
| * | | Nicer icons | Jan Dalheimer | 2014-03-14 | -1/+5 | |
| | | | |||||
| * | | Merge branch 'develop' into feature_badges | Jan Dalheimer | 2014-03-10 | -1752/+2677 | |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: logic/OneSixInstance.cpp | ||||
| * | | | Instance badges. Some easter eggs and one for broken so far. | Jan Dalheimer | 2014-03-10 | -25/+115 | |
| | | | | |||||
* | | | | Revert "Better right-click behaviour, context menu on mouse-up instead of ↵ | Petr Mrázek | 2014-03-17 | -9/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mouse down" This reverts commit 00a945d84b59d6469e0c85335dc0ad4067d9f2ab. NOPE. | ||||
* | | | | Merge pull request #153 from Drayshak/develop | Sky | 2014-03-16 | -1/+9 | |
|\ \ \ \ | |_|_|/ |/| | | | Better right-click behaviour, context menu on mouse-up instead of down, fixes #151 | ||||
| * | | | Better right-click behaviour, context menu on mouse-up instead of mouse down | Sky | 2014-03-16 | -1/+9 | |
|/ / / | |||||
* | / | Fix missing return in ensureDouble() | Petr Mrázek | 2014-03-10 | -1/+1 | |
| |/ |/| | |||||
* | | Fix a compiling error by adding noexcept | Jan Dalheimer | 2014-03-10 | -6/+6 | |
| | | |||||
* | | Add missing include for math.h | Petr Mrázek | 2014-03-10 | -0/+1 | |
| | | |||||
* | | Merge remote-tracking branch 'origin/feature_paste_66994990' into ↵ | Petr Mrázek | 2014-03-10 | -7/+6 | |
|\ \ | | | | | | | | | | integration_butchery | ||||
| * | | Fix a few paste upload bugs | Jan Dalheimer | 2014-03-07 | -7/+6 | |
| |/ | | | | | | | Fixes https://www.pivotaltracker.com/story/show/66994990 | ||||
* | | Merge remote-tracking branch 'origin/fix_ftb_again' into integration_butchery | Petr Mrázek | 2014-03-09 | -2/+17 | |
|\ \ | |||||
| * | | Add project files I use to gitignore. | robotbrain | 2014-03-07 | -0/+2 | |
| | | | | | | | | | Its easier than opening a new pr for it. :P | ||||
| * | | Use a constant for the buffer size. | robotbrain | 2014-03-05 | -3/+4 | |
| | | | |||||
| * | | Fix it - it did it even if the op failed. | robotbrain | 2014-03-05 | -3/+6 | |
| | | | |||||
| * | | Use windows api to prevent encoding problems. | robotbrain | 2014-03-05 | -1/+10 | |
| | | | |||||
| * | | Fix ftb locations on old windows... again. | robotbrain | 2014-03-03 | -1/+1 | |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/feature_fix_log' into integration_butchery | Petr Mrázek | 2014-03-09 | -1/+14 | |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: logic/MinecraftProcess.cpp | ||||
| * | | | Fix logging when system language is not en_US. | robotbrain | 2014-03-07 | -0/+1 | |
| | |/ | |/| | |||||
* | | | Merge remote-tracking branch 'origin/feature_commands' into integration_butchery | Petr Mrázek | 2014-03-09 | -72/+184 | |
|\ \ \ |