summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'fix_json_version' into integration_json_and_toolsPetr Mrázek2014-02-24-160/+216
|\ | | | | | | | | | | | | | | Conflicts: logic/OneSixInstance.cpp logic/OneSixVersionBuilder.cpp Some fixage. Yay for conflicts.
| * Instance flags. Currently used for marking instances as broken. Can later be ↵Jan Dalheimer2014-02-17-8/+81
| | | | | | | | used for badges.
| * Different error message if it's a launcher version mismatchJan Dalheimer2014-02-17-19/+49
| |
| * Actually remove instances if they fail to loadJan Dalheimer2014-02-17-1/+8
| |
| * Check if the json version is one we know how to handleJan Dalheimer2014-02-17-6/+26
| | | | | | | | Also some formatting.
* | Merge branch 'feature_profiling' into integration_json_and_toolsPetr Mrázek2014-02-24-62/+1058
|\ \
| * | Fix MCEdit on OSXJan Dalheimer2014-02-21-2/+17
| | |
| * | Fix some external tool related string sin the settings dialog.Petr Mrázek2014-02-16-2/+2
| | |
| * | Nicer way of selecting tool folders and executablesPetr Mrázek2014-02-16-79/+129
| | |
| * | Links to the toolsJan Dalheimer2014-02-16-0/+21
| | |
| * | RestructureJan Dalheimer2014-02-16-18/+18
| | |
| * | Only show folders that really are worldsJan Dalheimer2014-02-16-9/+34
| | |
| * | Merge remote-tracking branch 'origin/feature_profiling' into feature_profilingJan Dalheimer2014-02-16-5/+18
| |\ \
| | * | Fix path selections for tools (settings dialog)Petr Mrázek2014-02-16-5/+18
| | | |
| * | | Attempt to find jvisualvmJan Dalheimer2014-02-16-1/+6
| |/ /
| * | Use a combobox instead of a file dialogJan Dalheimer2014-02-16-5/+8
| | |
| * | Fix for windows and update tool menu after closing settings dialogJan Dalheimer2014-02-16-44/+60
| | |
| * | Fix more stuff. Detached tools, only MCEdit for now.Jan Dalheimer2014-02-16-44/+307
| | |
| * | More fixes.Jan Dalheimer2014-02-16-6/+17
| | |
| * | Fix stuff. Make sure different ways of aborting profiling work.Jan Dalheimer2014-02-16-5/+57
| | |
| * | Fix a few bugs in profilers.Petr Mrázek2014-02-16-24/+73
| | | | | | | | | | | | | | | | | | * Legacy was launching before the profiler. * Some clarity changes. * Report problem with empty strings as profiler paths.
| * | Underp. Don't depend on OneSix. Nicer "menu" style choosing.Jan Dalheimer2014-02-15-125/+96
| | |
| * | Another attempt at fixing windows buildJan Dalheimer2014-02-15-4/+8
| | |
| * | Try to be cross-platformJan Dalheimer2014-02-15-1/+15
| | |
| * | Underp and fix some stuff. Works nicer now.Jan Dalheimer2014-02-15-5/+1
| | |
| * | Profiler support. Currently JProfiler and JVisualVM are implemented.Jan Dalheimer2014-02-15-17/+505
| |/
* | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-21 01:51:44 +0000