summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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.
* | | More refactor.Petr Mrázek2014-03-05-215/+184
| | |
* | | Merge branch 'develop' into feature_version_json_butcheryPetr Mrázek2014-03-03-0/+2
|\| |
| * | Fix a GroupView crash that was triggered by the FTB trackingJan Dalheimer2014-03-03-0/+2
| | |
* | | Fix missed version file assignment.Petr Mrázek2014-03-03-4/+3
| | |
* | | No end in sight :<Petr Mrázek2014-03-03-19/+27
| | |
* | | More code butchery related to version files. No end in sight.Petr Mrázek2014-03-03-122/+109
| | |
* | | Remove a lot of error code and error handling madness.Petr Mrázek2014-03-02-309/+230
| | |
* | | Remove widgets from logic.Petr Mrázek2014-03-02-23/+34
| | |
* | | Gather and store liteloader metadata.Petr Mrázek2014-03-02-13/+56
| | |
* | | Get rid of parse flagsPetr Mrázek2014-03-02-15/+4
| | |
* | | Reorganize the version-related code.Petr Mrázek2014-03-01-849/+880
| | |
* | | Remove obsolete OneSixFTBInstanceForgePetr Mrázek2014-03-01-70/+0
| | |
* | | Fix to the way translations are handled. Also updated the german translation ↵Jan Dalheimer2014-02-25-155/+1090
|/ / | | | | | | with the new strings.
* | Fix missing includes in litaloader installer.Petr Mrázek2014-02-25-0/+2
| |
* | Merge branch 'feature_screenshots' into integration_json_and_toolsPetr Mrázek2014-02-25-172/+971
|\| | | | | | | | | | | | | Conflicts: logic/net/URLConstants.h Resolve issues with multiple definitions of URL constants by moving them to their own object file.
| * Screenshots: Optimize image loading and memory use, fix list and button layout.Petr Mrázek2014-02-25-15/+38
| |
| * Reorganize all the screenshot filesPetr Mrázek2014-02-25-49/+60
| |
| * Fix memory leak in systemrobotbrain2014-02-24-7/+7
| |
| * Deleting screenshots. Needs fixing.robotbrain2014-02-24-7/+56
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:42:15 +0000