summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'fix_ftb' into integration_json_and_toolsPetr Mrázek2014-02-24-143/+318
|\
| * Copying of FTB instances working againJan Dalheimer2014-02-21-5/+92
| |
| * Don't assume forge for FTB instances. Fix FTB related stuff.Jan Dalheimer2014-02-21-138/+204
| |
| * Use FTB's libraries/ and versions/ folders for non-copied instancesJan Dalheimer2014-02-20-5/+27
| |
* | New, better, liteloader supportJan Dalheimer2014-02-19-51/+355
|/
* Merge https://github.com/p-schneider/MultiMC5 into developPetr Mrázek2014-02-14-2/+2
|\
| * fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 ↵p-schneider2014-02-14-2/+2
| | | | | | | | in AboutDialog.ui (+German translation)
* | Merge https://github.com/robotbrain/MultiMC5 into developPetr Mrázek2014-02-14-2/+2
|\ \
| * | Fix FTB paths on Windows XProbotbrain2014-02-13-2/+2
| |/
* | Merge https://github.com/max96at/MultiMC5 into developPetr Mrázek2014-02-14-1/+14
|\ \ | |/ |/|
| * Added more possible java paths on OSX.Noah Mayr2014-01-22-1/+14
| |
* | Fix groupview issuesPetr Mrázek2014-02-10-27/+26
| | | | | | | | | | * indexAt was using the wrong coordinate system * model events now trigger a delayed layout update instead of immediate.
* | Fix kitty. Meow.Petr Mrázek2014-02-09-1/+1
| |
* | Fix template magic in group view.Petr Mrázek2014-02-09-5/+5
| |
* | Do not divide by zero when the last group is collapsed.Petr Mrázek2014-02-09-8/+9
| |
* | 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
| | | |