summaryrefslogtreecommitdiffstats
path: root/logic
Commit message (Expand)AuthorAgeLines
...
| * Deleting screenshots. Needs fixing.robotbrain2014-02-24-1/+37
| * Imgur album creationJan Dalheimer2014-02-24-24/+162
| * Working screenshot uploadJan Dalheimer2014-02-24-9/+9
| * Screenshot fixes, move some code around, fix some stuffJan Dalheimer2014-02-24-15/+21
| * Close to finished. Need to fix the upload part. Viewing works (in grayscale)robotbrain2014-02-23-106/+37
| * Initial stuff. It doesnt work.robotbrain2014-02-23-0/+354
* | Merge branch 'fix_json_version' into integration_json_and_toolsPetr Mrázek2014-02-24-159/+214
|\ \
| * | Instance flags. Currently used for marking instances as broken. Can later be ...Jan Dalheimer2014-02-17-7/+79
| * | 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
| |/
* | Merge branch 'feature_profiling' into integration_json_and_toolsPetr Mrázek2014-02-24-4/+531
|\ \
| * | Fix MCEdit on OSXJan Dalheimer2014-02-21-2/+12
| * | RestructureJan Dalheimer2014-02-16-2/+2
| * | Only show folders that really are worldsJan Dalheimer2014-02-16-9/+34
| * | 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-3/+11
| * | Fix more stuff. Detached tools, only MCEdit for now.Jan Dalheimer2014-02-16-40/+199
| * | More fixes.Jan Dalheimer2014-02-16-5/+16
| * | Fix stuff. Make sure different ways of aborting profiling work.Jan Dalheimer2014-02-16-2/+40
| * | Fix a few bugs in profilers.Petr Mrázek2014-02-16-3/+27
| * | Underp. Don't depend on OneSix. Nicer "menu" style choosing.Jan Dalheimer2014-02-15-15/+44
| * | 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-1/+202
| |/
* | 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-33/+316
|/
* 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
* | Merge branch 'integration_derpstances_groupview' into developPetr Mrázek2014-02-09-524/+1759
|\ \
| * | 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 instan...Petr Mrázek2014-02-08-52/+72
| * | Merge branch 'feature_groupview' into integration_derpstances_groupviewPetr Mrázek2014-02-08-7/+5
| |\ \
| | * | Pave.Petr Mrázek2014-02-04-7/+5
| * | | Allow overriding the order in which patches are appliedJan Dalheimer2014-02-08-0/+84
| * | | Error if a patch file is for a different version of minecraftJan Dalheimer2014-02-08-0/+9
| * | | Fix installing forge after liteloader and then removing liteloader. Also form...Jan Dalheimer2014-02-02-82/+96
| * | | Add a MMC-depend field (soft/hard) for version checkingJan Dalheimer2014-02-02-32/+100
| * | | Disable anything related to user.json for now. Will be re-enabled once we hav...Jan Dalheimer2014-02-01-1/+3
| * | | Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derp...Jan Dalheimer2014-02-01-170/+238
| |\ \ \
| | * \ \ Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 in...Petr Mrázek2014-02-01-465/+1486
| | |\ \ \ | | | |/ / | | |/| |
| * | | | 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-3/+3
| * | | Change the OneSix library view. It now shows a list of patches.Jan Dalheimer2014-02-01-12/+116
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:52:19 +0000