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
Petr Mrázek
10e13df00d
Use metacache for minecraft.jar downloads
2013-12-10 20:33:24 +01:00
robotbrainify
6eb512e5d6
Fix my utter derp
2013-12-10 11:05:40 -05: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
robotbrain
4d348581d3
Fix I think.
2013-12-09 19:16:58 -05:00
robotbrain
c7dbc14885
Make it update the instance when it creates it, so you can install forge
...
right away
2013-12-09 19:13:35 -05: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
9410dd042e
Move pastebin button on the console window to the left
...
It's been there before, it's there now :D
2013-12-08 17:43:41 +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
Petr Mrázek
220e07aef4
Merge branch 'feature_updater' of github.com:MultiMC/MultiMC5 into feature_updater
2013-12-07 03:57:40 +01:00
Petr Mrázek
858916b951
Fix build failures on Windows.
...
* remove atoll
* fix include path of updater depends
2013-12-07 03:51:21 +01:00
robotbrainify
c6f0d9ce93
fix revert
2013-12-06 17:37:12 -05:00
Andrew
7a6705030c
Include shellapi.h in the updater on Windows.
2013-12-06 16:36:22 -06:00
robotbrainify
c614fe1cef
revert
2013-12-06 17:36:22 -05: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
Andrew
bab6c18965
Added WIN32_LEAN_AND_MEAN
...
Should reduce compile times and help get rid of some error things.
2013-12-06 16:08:09 -06: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
Andrew
e90f1a2756
Implement update installer
2013-12-05 20:32:52 -06:00
Andrew
48ec8e67b8
Implement DownloadUpdateTask
...
Installing updates is not implemented yet. That's next.
2013-12-05 13:52:55 -06:00
Petr Mrázek
f028aa76bc
Offline mode support, part 1
...
Refactor MojangAccount so it exposes a less generic interface and supports login. Hide the ugly details.
Yggdrasil tasks are now only used from MojangAccount.
2013-12-05 02:39:52 +01:00
Andrew
bf94aaea75
Rework the update checking system
2013-12-04 12:34:12 -06:00
