summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* 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
* Fix more updater derps.Petr Mrázek2013-12-25-13/+14
* 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 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-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.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 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
* | | BASH!Petr Mrázek2013-12-22-1/+1
| |/ |/|
* | Show errors when logging in in the account dialog.Petr Mrázek2013-12-22-13/+24
* | Make pack200 use QFile by proxy, eliminating some unicode issues.Petr Mrázek2013-12-22-34/+73
|/
* 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-131/+214
* Initial FTB support. Allows "tracking" of FTB instances.Jan Dalheimer2013-12-21-67/+643
* Keep the last five logsJan Dalheimer2013-12-21-1/+14
* Remove OSX hack that never worked anywayPetr Mrázek2013-12-21-1/+1
* Fix issues with the updaterPetr Mrázek2013-12-21-20/+37
* Prevent running as root on linuxPetr Mrázek2013-12-21-7/+15
* Some test madnessPetr Mrázek2013-12-20-201/+457
* Merge branch 'feature_runner_symlink' of https://github.com/02JanDal/MultiMC5...Petr Mrázek2013-12-17-1/+1
|\
| * Fix running the runner script using a symlinkJan Dalheimer2013-12-16-1/+1
* | Merge branch 'feature_runner' of https://github.com/02JanDal/MultiMC5 into de...Petr Mrázek2013-12-17-5/+42
|\ \
| * | Make the linux runner script more helpful and add dialogsJan Dalheimer2013-12-15-5/+42
| |/
* | Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into dev...Petr Mrázek2013-12-17-5/+17
|\ \
| * \ Merge remote-tracking branch 'upstream/develop' into updater_testsJan Dalheimer2013-12-16-710/+284
| |\ \
| * | | Fix some failing tests and attempt to fix running tests on a headless computerJan Dalheimer2013-12-16-7/+19
* | | | Magical pixie dust for windows updater reliabilityPetr Mrázek2013-12-17-15/+105
* | | | Remove obsolete auto login option.Petr Mrázek2013-12-16-72/+0
| |/ / |/| |
* | | Use monospace font in the console.Petr Mrázek2013-12-16-9/+11
* | | Fix broken test (wrong URL)Petr Mrázek2013-12-16-1/+1
* | | Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into dev...Petr Mrázek2013-12-15-86/+685
|\| |
| * | Finish unit tests for the DownloadUpdateTask classJan Dalheimer2013-12-15-35/+109
| * | Unit tests for the DownloadUpdateTask classJan Dalheimer2013-12-15-55/+321
| * | More tests for the UpdateChecker class. It should be done for now.Jan Dalheimer2013-12-14-4/+131