summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'integration_derpstances_groupview' into developPetr Mrázek2014-02-09-3723/+3751
|\
| * Visual and scroll behavior changes to groupviewPetr Mrázek2014-02-09-130/+135
| | | | | | | | | | | | Scroll by rows, not pixels. Paint the checkboxy thing again! Make0 it behave. Set the group header height properly.
| * Blacklist the FTB voxel pack.Petr Mrázek2014-02-09-0/+2
| |
| * Only load instance list twice.Petr Mrázek2014-02-09-3/+9
| |
| * Fix crash bug related to messageboxes interrupting model resets in the ↵Petr Mrázek2014-02-08-52/+72
| | | | | | | | instance list.
| * Merge branch 'feature_groupview' into integration_derpstances_groupviewPetr Mrázek2014-02-08-3099/+1542
| |\
| | * Group View: Use painting code from the previous group headers, small ↵Petr Mrázek2014-02-08-19/+117
| | | | | | | | | | | | optimizations
| | * Paint the headers nicer.Petr Mrázek2014-02-05-28/+50
| | |
| | * Fix crash bug related to data changes in new group view.Petr Mrázek2014-02-04-0/+4
| | |
| | * A try at fixing the instance delegate. A bit. Maybe.Petr Mrázek2014-02-04-0/+5
| | |
| | * Pave.Petr Mrázek2014-02-04-514/+41
| | |
| | * Add 'depends/groupview/' from commit '946d49675cb4725c31ab49a51f3bcae302f89a19'Petr Mrázek2014-02-04-0/+1846
| | |\ | | | | | | | | | | | | | | | | | | | | git-subtree-dir: depends/groupview git-subtree-mainline: a17caba2c9c2aa5960581db01e4b66472a9c019c git-subtree-split: 946d49675cb4725c31ab49a51f3bcae302f89a19
| | | * Swap things around -- rename refactors, moving towards non-derpy design. Maybe.Petr Mrázek2014-02-04-66/+88
| | | |
| | | * Oh my.Petr Mrázek2014-02-02-18/+37
| | | |
| | | * Fix drag&drop pixmap renderingPetr Mrázek2014-02-02-21/+14
| | | |
| | | * Fix group mouse interaction issuesPetr Mrázek2014-02-02-33/+109
| | | |
| | | * Small tweaksPetr Mrázek2014-02-02-42/+56
| | | |
| | | * More reformat.Petr Mrázek2014-01-31-17/+16
| | | |
| | | * Reformat, Rename, RedoPetr Mrázek2014-01-31-230/+298
| | | |
| | | * Loads of changes and some refactoringsJan Dalheimer2013-12-31-273/+248
| | | |
| | | * Progress indicatorsJan Dalheimer2013-12-30-16/+111
| | | |
| | | * Fixing more bugsJan Dalheimer2013-12-30-12/+9
| | | |
| | | * Loads of fixesJan Dalheimer2013-12-30-48/+77
| | | |
| | | * Make the MultiMC delegate fully usable. Dynamic row heights.Jan Dalheimer2013-12-30-37/+363
| | | |
| | | * Take the spacing into accountJan Dalheimer2013-12-27-2/+3
| | | |
| | | * Fix scrollingJan Dalheimer2013-12-26-0/+19
| | | |
| | | * Fixing several d&d bugsJan Dalheimer2013-12-26-15/+38
| | | |
| | | * Remove a debug messageJan Dalheimer2013-12-26-1/+0
| | | |
| | | * Fix a bugJan Dalheimer2013-12-26-5/+0
| | | |
| | | * Loads of stuff, amongst others d&d and many bug fixesJan Dalheimer2013-12-26-162/+555
| | | |
| | | * Initial commit. Basics work. Next: Drag and DropJan Dalheimer2013-12-24-0/+803
| | |
| | * Nuke.Petr Mrázek2014-02-04-3059/+0
| | |
| * | Allow overriding the order in which patches are appliedJan Dalheimer2014-02-08-0/+240
| | |
| * | Error if a patch file is for a different version of minecraftJan Dalheimer2014-02-08-0/+9
| | |
| * | Reload version after removing custom.jsonJan Dalheimer2014-02-03-0/+2
| | |
| * | Fix installing forge after liteloader and then removing liteloader. Also ↵Jan Dalheimer2014-02-02-82/+96
| | | | | | | | | | | | formatting.
| * | Add a MMC-depend field (soft/hard) for version checkingJan Dalheimer2014-02-02-32/+351
| | |
| * | Disable anything related to user.json for now. Will be re-enabled once we ↵Jan Dalheimer2014-02-01-37/+4
| | | | | | | | | | | | have a gui for it.
| * | Merge remote-tracking branch 'upstream/feature_derpstances' into ↵Jan Dalheimer2014-02-01-304/+665
| |\ \ | | | | | | | | | | | | feature_derpstances
| | * \ Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek2014-02-01-591/+1581
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | into feature_derpstances Conflicts: gui/dialogs/OneSixModEditDialog.cpp logic/OneSixUpdate.cpp
| * | | Fix some bugs that got uncovered while trying to get liteloader 1.7 to workJan Dalheimer2014-02-01-1/+12
| | |/ | |/|
| * | Fix a bugJan Dalheimer2014-02-01-6/+15
| | |
| * | Change the OneSix library view. It now shows a list of patches.Jan Dalheimer2014-02-01-49/+183
| | |
| * | custom.json overrides all. For user patching there now is instance.jsonJan Dalheimer2014-01-28-42/+65
| | |
| * | Fix library orderingJan Dalheimer2014-01-27-29/+17
| | |
| * | Have the libraries tab show tweaker mods instead of librariesJan Dalheimer2014-01-27-43/+23
| | |
| * | Split parsing/applying. Better error logging. Fix crash.Jan Dalheimer2014-01-27-329/+816
| | |
| * | Merge branch 'develop' into feature_derpstancesJan Dalheimer2014-01-24-1/+3
| |\ \
| * | | Fix some stuffJan Dalheimer2014-01-24-4/+4
| | | |
| * | | Change naming from Derp -> OneSix until the new instance type supports legacyJan Dalheimer2014-01-24-821/+375
| | | |