Petr Mrázek
5df86d9ffa
Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into develop
2013-12-15 23:47:57 +01:00
Petr Mrázek
b773ef08af
Fix/remove tests from the gutted updater
2013-12-15 23:46:48 +01:00
Jan Dalheimer
e8dff0b99e
Make the linux runner script more helpful and add dialogs
2013-12-15 22:27:32 +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
Petr Mrázek
b0e8037feb
Make updates prevented by missing accounts verbose
2013-12-15 20:42:17 +01: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
ae169abd74
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-12-14 19:28:12 +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
Sky
699aba9222
Expand appropriate column of account selection dialog
2013-12-14 17:01:15 +00:00
Jan Dalheimer
a02e62f17f
Tests for parsing of channel lists in UpdateChecker
2013-12-14 16:02:51 +01:00
Jan Dalheimer
ac2721e954
Framework for some tests
2013-12-14 14:53:18 +01:00
Petr Mrázek
f15306a0ac
Use ctest
2013-12-14 14:17:59 +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
Orochimarufan
50e9574c0c
Fix various Dialogs (Titles, License formatting)
2013-12-14 01:54:27 +01:00
Petr Mrázek
bbd17b6224
Fix twitch
2013-12-14 01:18:54 +01:00
Andrew
1e96a0c8eb
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-12-13 12:10:40 -06:00
Andrew
07441a7e18
Disable some crazy OS X hacks on non-GCC compilers
2013-12-13 12:04:52 -06:00
Sky
01328b54e0
Fix typo
2013-12-13 16:23:12 +00:00
Andrew
e6e63307fd
Made the run script look for missing dependencies.
...
On Linux, MultiMC's startup script will now look for plugins with
missing depenedencies and warn the user about them if they are missing.
2013-12-13 09:38:17 -06: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
Andrew
45aa858090
Include unistd.h in ProcessUtils.h
2013-12-12 15:06:50 -06:00
Andrew
788adfeb3d
Remove -Werror from the updater's compile flags
2013-12-12 14:55:42 -06: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
Andrew
f3fffd5259
Remove QsLog destinations when they are destroyed.
...
This fixes some issues where MultiMC was segfaulting on exit because
things were trying to write to the logger while they were being destroyed,
but the destinations had already been destroyed and were left in the list.
2013-12-11 13:17:23 -06:00
Sky
35ec599730
Fix console window sticking open derp
2013-12-11 12:26:23 +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
018f328993
Merge branch 'feature_no_firstrun' of https://github.com/robotbrain/MultiMC5 into develop
2013-12-11 00:08:39 +01:00
robotbrain
ecf7bcf184
Nuke!
2013-12-10 18:06:35 -05:00
Petr Mrázek
fa2ba01a17
Do not let the console close while Minecraft is running (prevent return to main window)
2013-12-10 23:48:20 +01:00
Petr Mrázek
ab69c1b9e6
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-12-10 20:57:30 +01:00
Andrew
f0104edc3d
Move fixup_bundle CMake stuff into a separate file
2013-12-10 13:37:15 -06:00
