summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk2014-01-02-2154/+4676
|\
| * Merge pull request #32 from 02JanDal/feature_ico_iconsSky2014-01-02-3/+3
| |\
| | * Make .ico files usable (the plugin is already included)Jan Dalheimer2014-01-02-3/+3
| |/
| * Merge pull request #31 from max96at/feature_osx_polishPetr Mrázek2014-01-02-2/+2
| |\
| | * Removed incomplete osx java detection log messagemax96at2014-01-02-2/+0
| | * Improved java detection on OSX.Noah Mayr2014-01-02-0/+2
| |/
| * Merge pull request #30 from max96at/feature_osx_polishPetr Mrázek2014-01-02-0/+14
| |\
| | * Fixed buttons on osx by adding the accessible plugin.Noah Mayr2014-01-02-0/+12
| | * Added .DS_Store to .gitignore.Noah Mayr2014-01-02-0/+2
| |/
| * Save/restore settings dialog (and instance specific settings) window geometrySky2014-01-02-4/+38
| * More credits tweakingSky2014-01-01-9/+14
| * Tweak update result dialog sizeSky2014-01-01-2/+2
| * ThreadTask for all your ThreadNeedsPetr Mrázek2014-01-01-9/+85
| * Merge https://github.com/Drayshak/MultiMC5 into developPetr Mrázek2014-01-01-81/+193
| |\
| | * Move assets migration to a task. Needs threading.Sky2014-01-01-81/+193
| * | Fix issue with PostExitCmd not translating to PostExitCommandPetr Mrázek2014-01-01-1/+1
| |/
| * Enable high-dpi QIcon logicPetr Mrázek2014-01-01-0/+1
| * Remove offending Settings constructor.Petr Mrázek2014-01-01-25/+8
| * Allow the use of synonyms in settings. Refactor settings.Petr Mrázek2014-01-01-639/+228
| * Tweak credits in about dialogSky2013-12-31-22/+29
| * Add the redistribution/fork text to the About dialog.Petr Mrázek2013-12-31-4/+37
| * Clarify terms of redistribution and our wishes under the Apache licenseSky2013-12-31-0/+8
| * Enable high DPI support on OSXPetr Mrázek2013-12-31-1/+44
| * Fix silly bug with icon not changing on the toolbar when the icon key changes.Petr Mrázek2013-12-31-2/+0
| * Refactor icon lists heavilyPetr Mrázek2013-12-31-306/+616
| * Merge pull request #29 from 02JanDal/java_browse_buttonSky2013-12-30-25/+41
| |\
| | * Make the java browse button look like the other browse buttonsJan Dalheimer2013-12-30-25/+41
| * | Clarify code style for contributionsSky2013-12-30-0/+2
| * | Merge pull request #28 from 02JanDal/feature_editorSky2013-12-30-5/+133
| |\ \ | | |/ | |/|
| | * Fix spelling mistakeJan Dalheimer2013-12-30-1/+1
| | * Notify the user of any errorsJan Dalheimer2013-12-30-7/+19
| | * Don't use stuff that's new in 5.2 if we don't compile with thatJan Dalheimer2013-12-30-5/+5
| | * Use /usr/bin as default on linuxJan Dalheimer2013-12-30-0/+4
| | * Launch an editor for the custom.json file. Also allow overriding of the syste...Jan Dalheimer2013-12-29-5/+117
| |/
| * Fix various LiteLoader related bugs.Petr Mrázek2013-12-29-4/+20
| * Merge https://github.com/robotbrain/MultiMC5 into developPetr Mrázek2013-12-29-14/+57
| |\
| | * Litemod version info.robotbrainify2013-12-28-14/+57
| * | Maybe break updater even more?Petr Mrázek2013-12-29-57/+32
| |/
| * Merge branch 'feature_liteloader' of https://github.com/02JanDal/MultiMC5 int...Petr Mrázek2013-12-28-0/+177
| |\
| | * Don't hardcode stuff!!!Jan Dalheimer2013-12-28-26/+87
| | * LiteLoader supportJan Dalheimer2013-12-28-0/+116
| * | Set permissions for the updater binary after updating it.Petr Mrázek2013-12-28-1/+12
| |/
| * Change TestParseScript path back to what it was.Petr Mrázek2013-12-28-1/+1
| * Various updater fixesPetr Mrázek2013-12-28-59/+171
| * Rearrange logiv for OneSix version changePetr Mrázek2013-12-27-17/+19
| * Handle the foo + foo.disabled jar mod corner case better.Petr Mrázek2013-12-27-4/+17
| * Do not merge disabled jar mods.Petr Mrázek2013-12-26-0/+5
| * Disable/enable mods with checkboxes. Needs testing.Petr Mrázek2013-12-26-81/+272
| * Fix linux runner script.Petr Mrázek2013-12-25-9/+9
| * No more windows paths in tests.Petr Mrázek2013-12-25-21/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:20:22 +0000