aboutsummaryrefslogtreecommitdiff
path: root/logic
AgeCommit message (Collapse)Author
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-16RestructureJan Dalheimer
2014-02-16Only show folders that really are worldsJan Dalheimer
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/max96at/MultiMC5 into developPetr Mrázek
2014-02-09Merge branch 'integration_derpstances_groupview' into developPetr Mrázek
2014-02-09Blacklist the FTB voxel pack.Petr Mrázek
2014-02-09Only load instance list twice.Petr Mrázek
2014-02-08Fix crash bug related to messageboxes interrupting model resets in the ↵Petr Mrázek
instance list.
2014-02-08Merge branch 'feature_groupview' into integration_derpstances_groupviewPetr Mrázek
2014-02-08Allow overriding the order in which patches are appliedJan Dalheimer
2014-02-08Error if a patch file is for a different version of minecraftJan Dalheimer
2014-02-06Small tweaks to make things better.Petr Mrázek
2014-02-04Pave.Petr Mrázek
2014-02-02Fix installing forge after liteloader and then removing liteloader. Also ↵Jan Dalheimer
formatting.
2014-02-02Add a MMC-depend field (soft/hard) for version checkingJan Dalheimer
2014-02-01Disable anything related to user.json for now. Will be re-enabled once we ↵Jan Dalheimer
have a gui for it.
2014-02-01Merge remote-tracking branch 'upstream/feature_derpstances' into ↵Jan Dalheimer
feature_derpstances
2014-02-01Fix some bugs that got uncovered while trying to get liteloader 1.7 to workJan Dalheimer
2014-02-01Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek
into feature_derpstances Conflicts: gui/dialogs/OneSixModEditDialog.cpp logic/OneSixUpdate.cpp
2014-02-01Fix a bugJan Dalheimer
2014-02-01Change the OneSix library view. It now shows a list of patches.Jan Dalheimer
2014-01-28custom.json overrides all. For user patching there now is instance.jsonJan Dalheimer
generated by cgit (git 2.46.0) at 2025-02-13 15:59:36 +0000