summaryrefslogtreecommitdiffstats
path: root/logic
Commit message (Expand)AuthorAgeLines
...
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk2014-01-02-845/+2567
|\
| * Make .ico files usable (the plugin is already included)Jan Dalheimer2014-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
| * ThreadTask for all your ThreadNeedsPetr Mrázek2014-01-01-0/+68
| * Move assets migration to a task. Needs threading.Sky2014-01-01-79/+165
| * Allow the use of synonyms in settings. Refactor settings.Petr Mrázek2014-01-01-48/+36
| * Refactor icon lists heavilyPetr Mrázek2013-12-31-280/+538
| * Fix various LiteLoader related bugs.Petr Mrázek2013-12-29-1/+8
| * 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-46/+20
| |/
| * Merge branch 'feature_liteloader' of https://github.com/02JanDal/MultiMC5 int...Petr Mrázek2013-12-28-0/+147
| |\
| | * Don't hardcode stuff!!!Jan Dalheimer2013-12-28-25/+76
| | * LiteLoader supportJan Dalheimer2013-12-28-0/+96
| * | Set permissions for the updater binary after updating it.Petr Mrázek2013-12-28-0/+6
| |/
| * Various updater fixesPetr Mrázek2013-12-28-6/+46
| * 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-78/+268
| * Fix more updater derps.Petr Mrázek2013-12-25-8/+5
| * 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-29/+48
| |\
| | * Get the updater to display a no update found message.robotbrainify2013-12-24-29/+48
| * | Merge branch 'feature_updater_update' of https://github.com/02JanDal/MultiMC5...Petr Mrázek2013-12-25-2/+31
| |\ \
| | * | Treat the updater separatelyJan Dalheimer2013-12-23-2/+31
| * | | Log SSL errors, give common solutionsPetr Mrázek2013-12-24-0/+26
| | |/ | |/|
| * | Tidy status messages a bitSky2013-12-23-37/+35
| * | 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 i...Petr Mrázek2013-12-23-29/+184
| |\ \
| | * | 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
| * | Show errors when logging in in the account dialog.Petr Mrázek2013-12-22-13/+15
| * | Make pack200 use QFile by proxy, eliminating some unicode issues.Petr Mrázek2013-12-22-6/+39
| |/
| * FTB fixagePetr Mrázek2013-12-22-1/+4
| * Fail if we fail to find the right forge versionPetr Mrázek2013-12-22-0/+3
| * Make FTB instances behave betterPetr Mrázek2013-12-22-70/+145
| * Initial FTB support. Allows "tracking" of FTB instances.Jan Dalheimer2013-12-21-67/+465
| * Fix issues with the updaterPetr Mrázek2013-12-21-20/+37
| * Some test madnessPetr Mrázek2013-12-20-96/+193
| * Remove obsolete auto login option.Petr Mrázek2013-12-16-5/+0
| * Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into dev...Petr Mrázek2013-12-15-86/+127
| |\
| | * Finish unit tests for the DownloadUpdateTask classJan Dalheimer2013-12-15-34/+44
| | * Unit tests for the DownloadUpdateTask classJan Dalheimer2013-12-15-54/+80
| | * More tests for the UpdateChecker class. It should be done for now.Jan Dalheimer2013-12-14-0/+2
| | * Tests for parsing of channel lists in UpdateCheckerJan Dalheimer2013-12-14-1/+4
* | | Add news checking system and news toolbarForkk2014-01-02-3/+8
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsAndrew2013-12-15-287/+195
|\| |
| * | Improve group changing, update instance on version changePetr Mrázek2013-12-15-7/+37
| * | Use asset sizes from the index to make the progress bar betterPetr Mrázek2013-12-15-264/+70