summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Move assets migration to a task. Needs threading.Sky2014-01-01-81/+193
|
* Enable high-dpi QIcon logicPetr Mrázek2014-01-01-0/+1
|
* Remove offending Settings constructor.Petr Mrázek2014-01-01-25/+8
| | | | Was causing build problems on OSX.
* Allow the use of synonyms in settings. Refactor settings.Petr Mrázek2014-01-01-639/+228
| | | | Remove a bunch of obsolete/unused code.
* 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
| | | | | | * Icon list now uses a filesystem watcher for updates * Icon folder is user-customizable * All the little details. ALL OF THEM.
* Merge pull request #29 from 02JanDal/java_browse_buttonSky2013-12-30-25/+41
|\ | | | | Make the java browse button look like the other browse buttons
| * 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
|\ \ | |/ |/| Button for opening an editor for the custom.json file
| * 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 ↵Jan Dalheimer2013-12-29-5/+117
|/ | | | system default editor
* 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 ↵Petr Mrázek2013-12-28-0/+177
|\ | | | | | | into develop
| * 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
| | | | | | | Updater tests for path utils The updater now doesn't use splitpath on Windows (fixes problems with Windows XP) Fix up paths for the OSX updater - should now install the updates into the right place Fix translations install path - translation isntall and deploy should be fixed
* 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
| | | | A lot of testing!
* Fix linux runner script.Petr Mrázek2013-12-25-9/+9
|
* No more windows paths in tests.Petr Mrázek2013-12-25-21/+0
|
* Fix more updater derps.Petr Mrázek2013-12-25-13/+14
| | | | | * Updater requires unix style paths on input. * No update notification was getting cloned with every check
* Log even more error stuff for login.Petr Mrázek2013-12-25-7/+13
|
* Merge branch 'develop' of https://github.com/robotbrain/MultiMC5 into developPetr Mrázek2013-12-25-31/+53
|\
| * Get the updater to display a no update found message.robotbrainify2013-12-24-31/+53
| |
* | Merge branch 'feature_updater_update' of ↵Petr Mrázek2013-12-25-2/+31
|\ \ | | | | | | | | | https://github.com/02JanDal/MultiMC5 into develop
| * | Treat the updater separatelyJan Dalheimer2013-12-23-2/+31
| | |
* | | Log SSL errors, give common solutionsPetr Mrázek2013-12-24-5/+64
| |/ |/|
* | Tidy status messages a bitSky2013-12-23-37/+35
| |
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-23-1/+1
|\ \
| * \ Merge pull request #21 from Azenet/developPetr Mrázek2013-12-22-1/+1
| |\ \ | | | | | | | | Fixed updater not restarting MultiMC after update.
| | * | Fixed updater not restarting MultiMC after update.ashka2013-12-22-1/+1
| | | |
* | | | Use the central URL list for forge URLsPetr Mrázek2013-12-23-22/+23
| | | |
* | | | Merge branch 'feature_forge_gradle' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek2013-12-23-29/+184
|\ \ \ \ | |/ / / |/| | | | | | | into develop
| * | | Support for the new forge gradle repoJan Dalheimer2013-12-23-29/+184
| | |/ | |/|
* | | Fix Java checker leaving behind temporary jar filesPetr Mrázek2013-12-22-6/+8
| | |