summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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
|\
| * Update changelog for 0.3Petr Mrázek2014-03-29-0/+20
| |
| * Raise console window when it's open, but hidden behind other windows.Petr Mrázek2014-03-24-0/+6
| |
| * Bump version to 0.3.0Petr Mrázek2014-03-23-2/+2
| |
* | Merge pull request #168 from max96at/patch-1Petr Mrázek2014-03-24-1/+1
|\ \ | | | | | | Add build status to README.md
| * | Add build status to README.mdmax96at2014-03-24-1/+1
|/ /
* / Add a travis config fileJan Dalheimer2014-03-24-0/+28
|/
* Set permissions on the accounts.json file so other users can't access it.Petr Mrázek2014-03-23-0/+1
|
* Make some more error messages translateable.Petr Mrázek2014-03-23-20/+26
|
* Actually start the forge install job.Petr Mrázek2014-03-20-0/+1
|
* Finalize version on reload.Petr Mrázek2014-03-19-29/+30
|
* Merge remote-tracking branch 'origin/feature_notif_65449324' into developPetr Mrázek2014-03-19-20/+234
|\
| * Allow reseting notificationsJan Dalheimer2014-03-15-0/+15
| |
| * Add a timer for clicking away the notification dialogJan Dalheimer2014-03-15-20/+219
| |
* | Merge remote-tracking branch 'origin/feature_fix_timeout' into developPetr Mrázek2014-03-19-4/+34
|\ \
| * | Remove the timeout for pre/post commands. Fixes #107Jan Dalheimer2014-03-15-4/+34
| |/
* | Merge remote-tracking branch 'origin/feature_json_fixes' into developPetr Mrázek2014-03-19-111/+393
|\ \
| * | Get rid of one reloadInstanceVersionJan Dalheimer2014-03-14-6/+6
| | |
| * | Pull in BaseInstaller related changes from quickmodJan Dalheimer2014-03-14-59/+186
| | |
| * | Move version stuff to the model and reimplement reorderingJan Dalheimer2014-03-14-48/+203
| |/
* | Merge remote-tracking branch 'origin/feature_badges' into developPetr Mrázek2014-03-19-25/+119
|\ \
| * | Nicer iconsJan Dalheimer2014-03-14-1/+5
| | |
| * | Merge branch 'develop' into feature_badgesJan Dalheimer2014-03-10-1752/+2677
| |\ \ | | | | | | | | | | | | | | | | Conflicts: logic/OneSixInstance.cpp
| * | | Instance badges. Some easter eggs and one for broken so far.Jan Dalheimer2014-03-10-25/+115
| | | |
* | | | Revert "Better right-click behaviour, context menu on mouse-up instead of ↵Petr Mrázek2014-03-17-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mouse down" This reverts commit 00a945d84b59d6469e0c85335dc0ad4067d9f2ab. NOPE.
* | | | Merge pull request #153 from Drayshak/developSky2014-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 downSky2014-03-16-1/+9
|/ / /
* | / Fix missing return in ensureDouble()Petr Mrázek2014-03-10-1/+1
| |/ |/|
* | Fix a compiling error by adding noexceptJan Dalheimer2014-03-10-6/+6
| |
* | Add missing include for math.hPetr Mrázek2014-03-10-0/+1
| |
* | Merge remote-tracking branch 'origin/feature_paste_66994990' into ↵Petr Mrázek2014-03-10-7/+6
|\ \ | | | | | | | | | integration_butchery
| * | Fix a few paste upload bugsJan Dalheimer2014-03-07-7/+6
| |/ | | | | | | Fixes https://www.pivotaltracker.com/story/show/66994990
* | Merge remote-tracking branch 'origin/fix_ftb_again' into integration_butcheryPetr Mrázek2014-03-09-2/+17
|\ \
| * | Add project files I use to gitignore.robotbrain2014-03-07-0/+2
| | | | | | | | | Its easier than opening a new pr for it. :P
| * | Use a constant for the buffer size.robotbrain2014-03-05-3/+4
| | |
| * | Fix it - it did it even if the op failed.robotbrain2014-03-05-3/+6
| | |
| * | Use windows api to prevent encoding problems.robotbrain2014-03-05-1/+10
| | |
| * | Fix ftb locations on old windows... again.robotbrain2014-03-03-1/+1
| | |
* | | Merge remote-tracking branch 'origin/feature_fix_log' into integration_butcheryPetr Mrázek2014-03-09-1/+14
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: logic/MinecraftProcess.cpp
| * | | Fix logging when system language is not en_US.robotbrain2014-03-07-0/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/feature_commands' into integration_butcheryPetr Mrázek2014-03-09-72/+184
|\ \ \
| * | | Also reload the instance cfgJan Dalheimer2014-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 stuffJan Dalheimer2014-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_groupviewPetr Mrázek2014-03-07-0/+15
| |\ \ | | | | | | | | Fix another GroupView bug
| | * | Fix another GroupView bugJan Dalheimer2014-03-07-0/+15
| |/ /
* | | Improve reporting of version file errors.xPetr Mrázek2014-03-09-126/+202
| | |
* | | Remove version patch reordering. Remove the main class display from onesix ↵Petr Mrázek2014-03-09-144/+45
| | | | | | | | | | | | edit mods.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:49:16 +0000