Commit Graph

380 Commits

Author SHA1 Message Date
77ddf8b5d7 Show errors when logging in in the account dialog. 2013-12-22 19:47:58 +01:00
3051d0d328 Make pack200 use QFile by proxy, eliminating some unicode issues. 2013-12-22 18:49:52 +01:00
7a07ed7940 FTB fixage
* 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
2013-12-22 05:47:10 +01:00
245d441a6e Fail if we fail to find the right forge version 2013-12-22 05:15:26 +01:00
74b5b5f535 Make FTB instances behave better
* 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
2013-12-22 04:31:30 +01:00
82c87aa06f Initial FTB support. Allows "tracking" of FTB instances. 2013-12-21 23:40:37 +01:00
01dbebdfc8 Fix issues with the updater
* 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.
2013-12-21 14:25:16 +01:00
d6c71488b3 Some test madness 2013-12-20 23:04:11 +01:00
be8dba9ee2 Remove obsolete auto login option. 2013-12-16 22:30:42 +01:00
5df86d9ffa Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into develop 2013-12-15 23:47:57 +01:00
9d8006b597 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
Conflicts:
	CMakeLists.txt
2013-12-15 15:01:34 -06:00
0ee8f90d40 Added a system to load news from MultiMC.org's RSS
Currently it doesn't show it anywhere in the UI. That's next.
2013-12-15 14:50:27 -06:00
7f884a18a8 Finish unit tests for the DownloadUpdateTask class 2013-12-15 18:50:56 +01:00
dd9e04000c Improve group changing, update instance on version change
Gives a list of existing groups to choose from.
Instances are updated as long as there is at least one valid account.
2013-12-15 18:13:46 +01:00
5a3043398e Use asset sizes from the index to make the progress bar better 2013-12-15 15:00:09 +01:00
3e8bcc1cf6 Unit tests for the DownloadUpdateTask class 2013-12-15 12:18:42 +01:00
d15a6490f6 Fix bugs introduced by unit test branch
Account json was getting rewritten by a folder
Missing icon on Windows (hopefully fixed, `doing it live`)
2013-12-14 19:26:50 +01:00
f273334212 More tests for the UpdateChecker class. It should be done for now. 2013-12-14 19:19:14 +01:00
a02e62f17f Tests for parsing of channel lists in UpdateChecker 2013-12-14 16:02:51 +01:00
8f856f5573 Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into develop
Conflicts:
	MultiMC.cpp
2013-12-14 14:00:23 +01:00
Sky
4623aa44f5 Add status shown specifically when downloading assets 2013-12-14 10:06:32 +00:00
Sky
20a332e97c Make the account selection list use checkboxes rather than text for active boolean 2013-12-14 09:35:23 +00:00
bbd17b6224 Fix twitch 2013-12-14 01:18:54 +01:00
Sky
b69351d50d Merge branch 'develop' of github.com:Drayshak/MultiMC5 into develop 2013-12-13 14:58:35 +00:00
Sky
979946b7bb First sweep moving URLs to a constants file 2013-12-13 14:58:11 +00:00
0af6f96c3d Do not log auth crud 2013-12-13 03:06:10 +01:00
382e4fe6b3 Fix syntax error
You do not need goto for that. Really.
2013-12-13 02:52:54 +01:00
7d20e2478a Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-12-13 02:48:31 +01:00
39aebddf3b Add support for 1.7.4 user_type (needs testing with legacy accounts) 2013-12-13 02:47:59 +01:00
a954fc1a32 Fix updater removing all files.
Yeah, I don't know what I was thinking, but somehow it worked before.
2013-12-12 17:10:43 -06:00
bf34aa7fbd Use temporary files for the java checker 2013-12-13 00:02:58 +01:00
Sky
808ca76363 Make sure adding forced candidates doesn't result in duplicates 2013-12-12 15:25:02 +00:00
Sky
b963ff7416 Don't break Linux and OS X builds :( 2013-12-12 15:04:24 +00:00
Sky
a2b0941029 Java version list should be sorted, JRE->JDK, 64->32 2013-12-12 14:56:32 +00:00
Sky
3e8e0dd639 Fix checker progress derp 2013-12-11 09:39:25 +00:00
26a7544325 Merge https://github.com/Drayshak/MultiMC5 into develop 2013-12-11 08:39:35 +01:00
bace3c2eab Swap https -> http for asset indexes 2013-12-11 08:34:22 +01:00
Sky
afa5e14e20 Better (but unsorted) Java detection 2013-12-11 04:54:00 +00:00
10e13df00d Use metacache for minecraft.jar downloads 2013-12-10 20:33:24 +01:00
1b185eba41 Nuke. 2013-12-10 07:52:36 +01:00
aa61bbe9e4 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp
2013-12-10 07:22:22 +01:00
3f5c46a1c4 Finish assets update for 1.7.3 2013-12-10 07:12:52 +01:00
712b87c643 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-12-09 12:06:33 -06:00
7f52bed9e3 Merge branch 'feature_updater' into develop 2013-12-09 12:04:05 -06:00
8db2e5db81 Merge branch 'feature_assets' into develop 2013-12-08 22:19:58 +01:00
b0dbd4f4af Fix offline mode bugs 2013-12-08 22:06:04 +01:00
d68f49ffc0 Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 into develop 2013-12-08 17:39:32 +01:00
0cb8ff40b2 Finish preliminary offline support
* ProgressProvider now has an abort() call
* Abort button support added to the progress dialog
* YggdrasilTask and MojangAccount adapted to support abort

YggdrasilTask will time out after 10 seconds of no network activity, or when the user pushes the Play Offline button.
In offline mode, all instance update tasks are skipped! This will need further work.
2013-12-08 17:34:45 +01:00
Sky
2fe27fd0da More work on new assets system. Works given a properly constructed assets folder, no downloading yet 2013-12-08 06:12:53 +00:00
Sky
6d438b2ef3 Work on new assets system. Working legacy assets importer, disabled assets downloading for now 2013-12-08 02:58:44 +00:00