Petr Mrázek
ced640f68c
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-05 16:53:51 +01:00
Petr Mrázek
a64eebf8eb
Add an option to force using local updater binary (for updater development)
2014-01-05 14:24:33 +01:00
Petr Mrázek
613c01dab5
Some more updater fixes
...
Paths were wrong - still used work directory instead of root
2014-01-05 13:17:42 +01:00
Forkk
ee02eecfdc
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-04 19:47:28 -06:00
Forkk
d30962bf00
Implement changing update channels
...
Allow the user to select which update channel they would like to
download updates from.
2014-01-04 19:46:47 -06:00
Petr Mrázek
b49fa9d2a9
Mess with the updater again.
2014-01-05 00:06:55 +01:00
Petr Mrázek
8fa69307d2
Fix mod list checkboxes
2014-01-04 23:45:20 +01:00
Jan Dalheimer
3b97e3c363
Fix a few things related to the translations
2014-01-04 11:49:06 +01:00
Jan Dalheimer
71e1410b9f
Don't try to check for notifications if we don't have a URL for it
2014-01-03 20:39:21 +01:00
Jan Dalheimer
df9f9a34ef
Fix for pre-Qt5.2
2014-01-03 20:12:37 +01:00
Jan Dalheimer
b3dd1eba21
Notifications system. Mainly to be used in case the updater breaks.
2014-01-03 19:19:27 +01:00
Petr Mrázek
c35012f1a5
DEBUG: Add some logging for instance loading.
2014-01-03 02:42:32 +01:00
Petr Mrázek
1455f051e4
Force cached updater binary to always resolve as stale
2014-01-02 23:58:53 +01:00
Forkk
17f1864a71
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
...
Conflicts:
CMakeLists.txt
gui/MainWindow.h
2014-01-02 13:38:20 -06:00
Forkk
4495e20cd7
Add news checking system and news toolbar
2014-01-02 13:25:38 -06:00
Jan Dalheimer
c0b6fd0647
Make .ico files usable (the plugin is already included)
2014-01-02 18:51:40 +01:00
max96at
092b15fc87
Removed incomplete osx java detection log message
2014-01-02 17:07:47 +01:00
Noah Mayr
cdebeff179
Improved java detection on OSX.
2014-01-02 17:01:26 +01:00
Petr Mrázek
0e78d34d4c
ThreadTask for all your ThreadNeeds
...
Use only when absolutely required.
2014-01-01 19:21:58 +01:00
Sky
821fb5e0ae
Move assets migration to a task. Needs threading.
2014-01-01 14:56:26 +00:00
Petr Mrázek
396e63500e
Allow the use of synonyms in settings. Refactor settings.
...
Remove a bunch of obsolete/unused code.
2014-01-01 15:10:35 +01:00
Petr Mrázek
952b63f68d
Refactor icon lists heavily
...
* Icon list now uses a filesystem watcher for updates
* Icon folder is user-customizable
* All the little details. ALL OF THEM.
2013-12-31 01:32:51 +01:00
Petr Mrázek
654f444f55
Fix various LiteLoader related bugs.
2013-12-29 04:17:52 +01:00
Petr Mrázek
fbf1cc2848
Merge https://github.com/robotbrain/MultiMC5 into develop
2013-12-29 03:36:47 +01:00
robotbrainify
8549e5317f
Litemod version info.
2013-12-28 20:28:24 -05:00
Petr Mrázek
997be947c9
Maybe break updater even more?
2013-12-29 01:13:57 +01:00
Petr Mrázek
695ad1474e
Merge branch 'feature_liteloader' of https://github.com/02JanDal/MultiMC5 into develop
2013-12-28 23:48:48 +01:00
Jan Dalheimer
5b54a4ca8c
Don't hardcode stuff!!!
2013-12-28 23:34:18 +01:00
Petr Mrázek
c816a26647
Set permissions for the updater binary after updating it.
2013-12-28 22:32:45 +01:00
Jan Dalheimer
55e62a81b6
LiteLoader support
2013-12-28 14:22:36 +01:00
Petr Mrázek
7652b3d64a
Various updater fixes
...
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
2013-12-28 04:23:48 +01:00
Petr Mrázek
4bf1cac8d8
Handle the foo + foo.disabled jar mod corner case better.
2013-12-27 02:18:40 +01:00
Petr Mrázek
aa91d89aaa
Do not merge disabled jar mods.
2013-12-26 05:19:11 +01:00
Petr Mrázek
acf25d8a33
Disable/enable mods with checkboxes. Needs testing.
...
A lot of testing!
2013-12-26 05:14:32 +01:00
Petr Mrázek
8edd0100e8
Fix more updater derps.
...
* Updater requires unix style paths on input.
* No update notification was getting cloned with every check
2013-12-25 02:46:06 +01:00
Petr Mrázek
e3389a4eef
Log even more error stuff for login.
2013-12-25 01:27:38 +01:00
Petr Mrázek
5a2df0d41a
Merge branch 'develop' of https://github.com/robotbrain/MultiMC5 into develop
2013-12-25 01:19:38 +01:00
Petr Mrázek
2d144631e7
Merge branch 'feature_updater_update' of https://github.com/02JanDal/MultiMC5 into develop
2013-12-25 01:18:16 +01:00
Petr Mrázek
8d0ca72abb
Log SSL errors, give common solutions
2013-12-24 23:39:04 +01:00
robotbrainify
b1ec7841e0
Get the updater to display a no update found message.
2013-12-24 16:00:07 -05:00
Sky
027aafc3c1
Tidy status messages a bit
2013-12-23 15:48:26 +00:00
Jan Dalheimer
00822fa0f9
Treat the updater separately
2013-12-23 10:34:43 +01:00
Petr Mrázek
f402001453
Use the central URL list for forge URLs
2013-12-23 00:43:29 +01:00
Petr Mrázek
56aeaec7d6
Merge branch 'feature_forge_gradle' of https://github.com/02JanDal/MultiMC5 into develop
2013-12-23 00:16:47 +01:00
Jan Dalheimer
9e645f4a37
Support for the new forge gradle repo
2013-12-23 00:12:03 +01:00
Petr Mrázek
3841260ef1
Fix Java checker leaving behind temporary jar files
2013-12-22 23:05:18 +01:00
Petr Mrázek
77ddf8b5d7
Show errors when logging in in the account dialog.
2013-12-22 19:47:58 +01:00
Petr Mrázek
3051d0d328
Make pack200 use QFile by proxy, eliminating some unicode issues.
2013-12-22 18:49:52 +01:00
Petr Mrázek
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
Petr Mrázek
245d441a6e
Fail if we fail to find the right forge version
2013-12-22 05:15:26 +01:00
Petr Mrázek
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
Jan Dalheimer
82c87aa06f
Initial FTB support. Allows "tracking" of FTB instances.
2013-12-21 23:40:37 +01:00
Petr Mrázek
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
Petr Mrázek
d6c71488b3
Some test madness
2013-12-20 23:04:11 +01:00
Petr Mrázek
be8dba9ee2
Remove obsolete auto login option.
2013-12-16 22:30:42 +01:00
Petr Mrázek
5df86d9ffa
Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into develop
2013-12-15 23:47:57 +01:00
Andrew
9d8006b597
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
...
Conflicts:
CMakeLists.txt
2013-12-15 15:01:34 -06:00
Andrew
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
Jan Dalheimer
7f884a18a8
Finish unit tests for the DownloadUpdateTask class
2013-12-15 18:50:56 +01:00
Petr Mrázek
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
Petr Mrázek
5a3043398e
Use asset sizes from the index to make the progress bar better
2013-12-15 15:00:09 +01:00
Jan Dalheimer
3e8bcc1cf6
Unit tests for the DownloadUpdateTask class
2013-12-15 12:18:42 +01:00
Petr Mrázek
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
Jan Dalheimer
f273334212
More tests for the UpdateChecker class. It should be done for now.
2013-12-14 19:19:14 +01:00
Jan Dalheimer
a02e62f17f
Tests for parsing of channel lists in UpdateChecker
2013-12-14 16:02:51 +01:00
Petr Mrázek
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
Petr Mrázek
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
Petr Mrázek
0af6f96c3d
Do not log auth crud
2013-12-13 03:06:10 +01:00
Petr Mrázek
382e4fe6b3
Fix syntax error
...
You do not need goto for that. Really.
2013-12-13 02:52:54 +01:00
Petr Mrázek
7d20e2478a
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-12-13 02:48:31 +01:00
Petr Mrázek
39aebddf3b
Add support for 1.7.4 user_type (needs testing with legacy accounts)
2013-12-13 02:47:59 +01:00
Andrew
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
Petr Mrázek
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
Petr Mrázek
26a7544325
Merge https://github.com/Drayshak/MultiMC5 into develop
2013-12-11 08:39:35 +01:00
Petr Mrázek
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
Petr Mrázek
10e13df00d
Use metacache for minecraft.jar downloads
2013-12-10 20:33:24 +01:00
Petr Mrázek
1b185eba41
Nuke.
2013-12-10 07:52:36 +01:00
Petr Mrázek
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
Petr Mrázek
3f5c46a1c4
Finish assets update for 1.7.3
2013-12-10 07:12:52 +01:00
Andrew
712b87c643
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-12-09 12:06:33 -06:00
Andrew
7f52bed9e3
Merge branch 'feature_updater' into develop
2013-12-09 12:04:05 -06:00
Petr Mrázek
8db2e5db81
Merge branch 'feature_assets' into develop
2013-12-08 22:19:58 +01:00
Petr Mrázek
b0dbd4f4af
Fix offline mode bugs
2013-12-08 22:06:04 +01:00
Petr Mrázek
d68f49ffc0
Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 into develop
2013-12-08 17:39:32 +01:00
Petr Mrázek
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
robotbrainify
4548930e34
Open the url direectly.
2013-12-06 17:17:32 -05:00
robotbrainify
e2728317e7
Fixes to pasting
2013-12-06 17:13:09 -05:00
robotbrainify
5ad95134dc
work on pasting instance logs
...
blame clang for formatting changes
2013-12-06 16:24:55 -05:00
Andrew
6ac94ddcb6
Finish implementing update installation.
...
Also add the option to update on exit.
2013-12-06 12:59:58 -06:00
