Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge https://github.com/robotbrain/MultiMC5 into develop | Petr Mrázek | 2013-12-29 | -14/+57 |
|\ | ||||
| * | Litemod version info. | robotbrainify | 2013-12-28 | -14/+57 |
| | | ||||
* | | Maybe break updater even more? | Petr Mrázek | 2013-12-29 | -57/+32 |
|/ | ||||
* | Merge branch 'feature_liteloader' of https://github.com/02JanDal/MultiMC5 ↵ | Petr Mrázek | 2013-12-28 | -0/+177 |
|\ | | | | | | | into develop | |||
| * | Don't hardcode stuff!!! | Jan Dalheimer | 2013-12-28 | -26/+87 |
| | | ||||
| * | LiteLoader support | Jan Dalheimer | 2013-12-28 | -0/+116 |
| | | ||||
* | | Set permissions for the updater binary after updating it. | Petr Mrázek | 2013-12-28 | -1/+12 |
|/ | ||||
* | Change TestParseScript path back to what it was. | Petr Mrázek | 2013-12-28 | -1/+1 |
| | ||||
* | Various updater fixes | Petr Mrázek | 2013-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 change | Petr Mrázek | 2013-12-27 | -17/+19 |
| | ||||
* | Handle the foo + foo.disabled jar mod corner case better. | Petr Mrázek | 2013-12-27 | -4/+17 |
| | ||||
* | Do not merge disabled jar mods. | Petr Mrázek | 2013-12-26 | -0/+5 |
| | ||||
* | Disable/enable mods with checkboxes. Needs testing. | Petr Mrázek | 2013-12-26 | -81/+272 |
| | | | | A lot of testing! | |||
* | Fix linux runner script. | Petr Mrázek | 2013-12-25 | -9/+9 |
| | ||||
* | No more windows paths in tests. | Petr Mrázek | 2013-12-25 | -21/+0 |
| | ||||
* | Fix more updater derps. | Petr Mrázek | 2013-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ázek | 2013-12-25 | -7/+13 |
| | ||||
* | Merge branch 'develop' of https://github.com/robotbrain/MultiMC5 into develop | Petr Mrázek | 2013-12-25 | -31/+53 |
|\ | ||||
| * | Get the updater to display a no update found message. | robotbrainify | 2013-12-24 | -31/+53 |
| | | ||||
* | | Merge branch 'feature_updater_update' of ↵ | Petr Mrázek | 2013-12-25 | -2/+31 |
|\ \ | | | | | | | | | | https://github.com/02JanDal/MultiMC5 into develop | |||
| * | | Treat the updater separately | Jan Dalheimer | 2013-12-23 | -2/+31 |
| | | | ||||
* | | | Log SSL errors, give common solutions | Petr Mrázek | 2013-12-24 | -5/+64 |
| |/ |/| | ||||
* | | Tidy status messages a bit | Sky | 2013-12-23 | -37/+35 |
| | | ||||
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Petr Mrázek | 2013-12-23 | -1/+1 |
|\ \ | ||||
| * \ | Merge pull request #21 from Azenet/develop | Petr Mrázek | 2013-12-22 | -1/+1 |
| |\ \ | | | | | | | | | Fixed updater not restarting MultiMC after update. | |||
| | * | | Fixed updater not restarting MultiMC after update. | ashka | 2013-12-22 | -1/+1 |
| | | | | ||||
* | | | | Use the central URL list for forge URLs | Petr Mrázek | 2013-12-23 | -22/+23 |
| | | | | ||||
* | | | | Merge branch 'feature_forge_gradle' of https://github.com/02JanDal/MultiMC5 ↵ | Petr Mrázek | 2013-12-23 | -29/+184 |
|\ \ \ \ | |/ / / |/| | | | | | | | into develop | |||
| * | | | Support for the new forge gradle repo | Jan Dalheimer | 2013-12-23 | -29/+184 |
| | |/ | |/| | ||||
* | | | Fix Java checker leaving behind temporary jar files | Petr Mrázek | 2013-12-22 | -6/+8 |
| | | | ||||
* | | | BASH! | Petr Mrázek | 2013-12-22 | -1/+1 |
| |/ |/| | ||||
* | | Show errors when logging in in the account dialog. | Petr Mrázek | 2013-12-22 | -13/+24 |
| | | ||||
* | | Make pack200 use QFile by proxy, eliminating some unicode issues. | Petr Mrázek | 2013-12-22 | -34/+73 |
|/ | ||||
* | FTB fixage | Petr Mrázek | 2013-12-22 | -1/+4 |
| | | | | | * Corrected an uninitialized variable that prevented forge list loadinf on Windows * Run the update step twice for FTB instances to ensure forge libs get downloaded | |||
* | Fail if we fail to find the right forge version | Petr Mrázek | 2013-12-22 | -0/+3 |
| | ||||
* | Make FTB instances behave better | Petr Mrázek | 2013-12-22 | -131/+214 |
| | | | | | | | * Do not re-create on every reload * Use the version.json/custom.json logic properly * Should be offline-friendly * FTB instances can be copied, turn into normal instances | |||
* | Initial FTB support. Allows "tracking" of FTB instances. | Jan Dalheimer | 2013-12-21 | -67/+643 |
| | ||||
* | Keep the last five logs | Jan Dalheimer | 2013-12-21 | -1/+14 |
| | ||||
* | Remove OSX hack that never worked anyway | Petr Mrázek | 2013-12-21 | -1/+1 |
| | ||||
* | Fix issues with the updater | Petr Mrázek | 2013-12-21 | -20/+37 |
| | | | | | | * Bad URLs used for downloading update files * MD5ETagDownload resetting the expected ETag after failure to the failed file MD5 checksum * Delete MD5ETagDownload downloaded files if the download fails. | |||
* | Prevent running as root on linux | Petr Mrázek | 2013-12-21 | -7/+15 |
| | ||||
* | Some test madness | Petr Mrázek | 2013-12-20 | -201/+457 |
| | ||||
* | Merge branch 'feature_runner_symlink' of ↵ | Petr Mrázek | 2013-12-17 | -1/+1 |
|\ | | | | | | | https://github.com/02JanDal/MultiMC5 into develop | |||
| * | Fix running the runner script using a symlink | Jan Dalheimer | 2013-12-16 | -1/+1 |
| | | ||||
* | | Merge branch 'feature_runner' of https://github.com/02JanDal/MultiMC5 into ↵ | Petr Mrázek | 2013-12-17 | -5/+42 |
|\ \ | | | | | | | | | | develop | |||
| * | | Make the linux runner script more helpful and add dialogs | Jan Dalheimer | 2013-12-15 | -5/+42 |
| |/ | ||||
* | | Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into ↵ | Petr Mrázek | 2013-12-17 | -5/+17 |
|\ \ | | | | | | | | | | develop | |||
| * \ | Merge remote-tracking branch 'upstream/develop' into updater_tests | Jan Dalheimer | 2013-12-16 | -710/+284 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: mmc_updater/src/tests/CMakeLists.txt | |||
| * | | | Fix some failing tests and attempt to fix running tests on a headless computer | Jan Dalheimer | 2013-12-16 | -7/+19 |
| | | | | ||||
* | | | | Magical pixie dust for windows updater reliability | Petr Mrázek | 2013-12-17 | -15/+105 |
| | | | | | | | | | | | | | | | | Don't ask. |