Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | 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 |
|\ \ \ | ||||
| * | | | Also reload the instance cfg | Jan Dalheimer | 2014-03-09 | -2/+23 |
| | | | | | | | | | | | | | | | | | | | | While this should work, there don't seem to be any places where the signals are listened for, so changes probably will only be available when calling Setting::get TODO: Fix that ^ | |||
| * | | | Some pre/post related stuff | Jan Dalheimer | 2014-03-09 | -72/+148 |
| |/ / | | | | | | | | | | | | | Reload the onesix version config after the commands (addresses https://www.pivotaltracker.com/story/show/60360652) Add a few more variables and also substitute them in the command (fixes https://www.pivotaltracker.com/story/show/66994828) | |||
| * | | Merge pull request #134 from MultiMC/feature_groupview | Petr Mrázek | 2014-03-07 | -0/+15 |
| |\ \ | | | | | | | | | Fix another GroupView bug | |||
| | * | | Fix another GroupView bug | Jan Dalheimer | 2014-03-07 | -0/+15 |
| |/ / | ||||
* | | | Improve reporting of version file errors.x | Petr Mrázek | 2014-03-09 | -126/+202 |
| | | | ||||
* | | | Remove version patch reordering. Remove the main class display from onesix ↵ | Petr Mrázek | 2014-03-09 | -144/+45 |
| | | | | | | | | | | | | edit mods. | |||
* | | | More refactor. | Petr Mrázek | 2014-03-05 | -215/+184 |
| | | | ||||
* | | | Merge branch 'develop' into feature_version_json_butchery | Petr Mrázek | 2014-03-03 | -0/+2 |
|\| | | ||||
| * | | Fix a GroupView crash that was triggered by the FTB tracking | Jan Dalheimer | 2014-03-03 | -0/+2 |
| | | | ||||
* | | | Fix missed version file assignment. | Petr Mrázek | 2014-03-03 | -4/+3 |
| | | | ||||
* | | | No end in sight :< | Petr Mrázek | 2014-03-03 | -19/+27 |
| | | | ||||
* | | | More code butchery related to version files. No end in sight. | Petr Mrázek | 2014-03-03 | -122/+109 |
| | | | ||||
* | | | Remove a lot of error code and error handling madness. | Petr Mrázek | 2014-03-02 | -309/+230 |
| | | | ||||
* | | | Remove widgets from logic. | Petr Mrázek | 2014-03-02 | -23/+34 |
| | | | ||||
* | | | Gather and store liteloader metadata. | Petr Mrázek | 2014-03-02 | -13/+56 |
| | | | ||||
* | | | Get rid of parse flags | Petr Mrázek | 2014-03-02 | -15/+4 |
| | | | ||||
* | | | Reorganize the version-related code. | Petr Mrázek | 2014-03-01 | -849/+880 |
| | | | ||||
* | | | Remove obsolete OneSixFTBInstanceForge | Petr Mrázek | 2014-03-01 | -70/+0 |
| | | | ||||
* | | | Fix to the way translations are handled. Also updated the german translation ↵ | Jan Dalheimer | 2014-02-25 | -155/+1090 |
|/ / | | | | | | | with the new strings. |