summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge remote-tracking branch 'origin/feature_fix_log' into integration_butcheryPetr Mrázek2014-03-09-1/+14
|\
| * Fix logging when system language is not en_US.robotbrain2014-03-07-0/+1
* | Merge remote-tracking branch 'origin/feature_commands' into integration_butcheryPetr Mrázek2014-03-09-72/+184
|\ \
| * | Also reload the instance cfgJan Dalheimer2014-03-09-2/+23
| * | Some pre/post related stuffJan Dalheimer2014-03-09-72/+148
| |/
| * Merge pull request #134 from MultiMC/feature_groupviewPetr Mrázek2014-03-07-0/+15
| |\
| | * Fix another GroupView bugJan Dalheimer2014-03-07-0/+15
| |/
* | Improve reporting of version file errors.xPetr Mrázek2014-03-09-126/+202
* | Remove version patch reordering. Remove the main class display from onesix ed...Petr Mrázek2014-03-09-144/+45
* | More refactor.Petr Mrázek2014-03-05-215/+184
* | Merge branch 'develop' into feature_version_json_butcheryPetr Mrázek2014-03-03-0/+2
|\|
| * Fix a GroupView crash that was triggered by the FTB trackingJan Dalheimer2014-03-03-0/+2
* | Fix missed version file assignment.Petr Mrázek2014-03-03-4/+3
* | No end in sight :<Petr Mrázek2014-03-03-19/+27
* | More code butchery related to version files. No end in sight.Petr Mrázek2014-03-03-122/+109
* | Remove a lot of error code and error handling madness.Petr Mrázek2014-03-02-309/+230
* | Remove widgets from logic.Petr Mrázek2014-03-02-23/+34
* | Gather and store liteloader metadata.Petr Mrázek2014-03-02-13/+56
* | Get rid of parse flagsPetr Mrázek2014-03-02-15/+4
* | Reorganize the version-related code.Petr Mrázek2014-03-01-849/+880
* | Remove obsolete OneSixFTBInstanceForgePetr Mrázek2014-03-01-70/+0
* | Fix to the way translations are handled. Also updated the german translation ...Jan Dalheimer2014-02-25-155/+1090
|/
* Fix missing includes in litaloader installer.Petr Mrázek2014-02-25-0/+2
* Merge branch 'feature_screenshots' into integration_json_and_toolsPetr Mrázek2014-02-25-172/+971
|\
| * Screenshots: Optimize image loading and memory use, fix list and button layout.Petr Mrázek2014-02-25-15/+38
| * Reorganize all the screenshot filesPetr Mrázek2014-02-25-49/+60
| * Fix memory leak in systemrobotbrain2014-02-24-7/+7
| * Deleting screenshots. Needs fixing.robotbrain2014-02-24-7/+56
| * Imgur album creationJan Dalheimer2014-02-24-52/+193
| * Working screenshot uploadJan Dalheimer2014-02-24-69/+84
| * Screenshot fixes, move some code around, fix some stuffJan Dalheimer2014-02-24-63/+91
| * Close to finished. Need to fix the upload part. Viewing works (in grayscale)robotbrain2014-02-23-134/+53
| * Initial stuff. It doesnt work.robotbrain2014-02-23-153/+746
* | Merge branch 'fix_json_version' into integration_json_and_toolsPetr Mrázek2014-02-24-160/+216
|\ \
| * | Instance flags. Currently used for marking instances as broken. Can later be ...Jan Dalheimer2014-02-17-8/+81
| * | 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-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