aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-25Merge branch 'feature_screenshots' into integration_json_and_toolsPetr Mrázek
Conflicts: logic/net/URLConstants.h Resolve issues with multiple definitions of URL constants by moving them to their own object file.
2014-02-25Screenshots: Optimize image loading and memory use, fix list and button layout.Petr Mrázek
2014-02-25Reorganize all the screenshot filesPetr Mrázek
2014-02-24Fix memory leak in systemrobotbrain
2014-02-24Deleting screenshots. Needs fixing.robotbrain
2014-02-24Imgur album creationJan Dalheimer
2014-02-24Working screenshot uploadJan Dalheimer
2014-02-24Screenshot fixes, move some code around, fix some stuffJan Dalheimer
2014-02-24Merge branch 'fix_json_version' into integration_json_and_toolsPetr Mrázek
Conflicts: logic/OneSixInstance.cpp logic/OneSixVersionBuilder.cpp Some fixage. Yay for conflicts.
2014-02-23Close to finished. Need to fix the upload part. Viewing works (in grayscale)robotbrain
2014-02-24Merge branch 'feature_profiling' into integration_json_and_toolsPetr Mrázek
2014-02-24Merge branch 'fix_ftb' into integration_json_and_toolsPetr Mrázek
2014-02-23Initial stuff. It doesnt work.robotbrain
2014-02-21Fix MCEdit on OSXJan Dalheimer
2014-02-21Copying of FTB instances working againJan Dalheimer
2014-02-21Don't assume forge for FTB instances. Fix FTB related stuff.Jan Dalheimer
2014-02-20Use FTB's libraries/ and versions/ folders for non-copied instancesJan Dalheimer
2014-02-19New, better, liteloader supportJan Dalheimer
2014-02-17Instance flags. Currently used for marking instances as broken. Can later be ↵Jan Dalheimer
used for badges.
2014-02-17Different error message if it's a launcher version mismatchJan Dalheimer
2014-02-17Actually remove instances if they fail to loadJan Dalheimer
2014-02-17Check if the json version is one we know how to handleJan Dalheimer
Also some formatting.
2014-02-16Fix some external tool related string sin the settings dialog.Petr Mrázek
2014-02-16Nicer way of selecting tool folders and executablesPetr Mrázek
2014-02-16Links to the toolsJan Dalheimer
2014-02-16RestructureJan Dalheimer
2014-02-16Only show folders that really are worldsJan Dalheimer
2014-02-16Merge remote-tracking branch 'origin/feature_profiling' into feature_profilingJan Dalheimer
2014-02-16Fix path selections for tools (settings dialog)Petr Mrázek
2014-02-16Attempt to find jvisualvmJan Dalheimer
2014-02-16Use a combobox instead of a file dialogJan Dalheimer
2014-02-16Fix for windows and update tool menu after closing settings dialogJan Dalheimer
2014-02-16Fix more stuff. Detached tools, only MCEdit for now.Jan Dalheimer
2014-02-16More fixes.Jan Dalheimer
2014-02-16Fix stuff. Make sure different ways of aborting profiling work.Jan Dalheimer
2014-02-16Fix a few bugs in profilers.Petr Mrázek
* Legacy was launching before the profiler. * Some clarity changes. * Report problem with empty strings as profiler paths.
2014-02-15Underp. Don't depend on OneSix. Nicer "menu" style choosing.Jan Dalheimer
2014-02-15Another attempt at fixing windows buildJan Dalheimer
2014-02-15Try to be cross-platformJan Dalheimer
2014-02-15Underp and fix some stuff. Works nicer now.Jan Dalheimer
2014-02-15Profiler support. Currently JProfiler and JVisualVM are implemented.Jan Dalheimer
2014-02-14Merge https://github.com/p-schneider/MultiMC5 into developPetr Mrázek
2014-02-14Merge https://github.com/robotbrain/MultiMC5 into developPetr Mrázek
2014-02-14Merge https://github.com/max96at/MultiMC5 into developPetr Mrázek
2014-02-14fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 ↵p-schneider
in AboutDialog.ui (+German translation)
2014-02-13Fix FTB paths on Windows XProbotbrain
2014-02-10Fix groupview issuesPetr Mrázek
* indexAt was using the wrong coordinate system * model events now trigger a delayed layout update instead of immediate.
2014-02-09Fix kitty. Meow.Petr Mrázek
2014-02-09Fix template magic in group view.Petr Mrázek
2014-02-09Do not divide by zero when the last group is collapsed.Petr Mrázek