Commit Graph

286 Commits

Author SHA1 Message Date
Sky
c44bcfab4b Merge pull request #29 from 02JanDal/java_browse_button
Make the java browse button look like the other browse buttons
2013-12-30 06:36:16 -08:00
Jan Dalheimer
76892c284b Make the java browse button look like the other browse buttons 2013-12-30 15:15:07 +01:00
Jan Dalheimer
76438f6afe Fix spelling mistake 2013-12-30 14:55:55 +01:00
Jan Dalheimer
5d0868a056 Notify the user of any errors 2013-12-30 14:45:59 +01:00
Jan Dalheimer
c01678a3fa Don't use stuff that's new in 5.2 if we don't compile with that 2013-12-30 14:05:53 +01:00
Jan Dalheimer
5a7fc1e123 Use /usr/bin as default on linux 2013-12-30 13:00:55 +01:00
Jan Dalheimer
3380bc7563 Launch an editor for the custom.json file. Also allow overriding of the system default editor 2013-12-29 17:51:16 +01:00
Petr Mrázek
654f444f55 Fix various LiteLoader related bugs. 2013-12-29 04:17:52 +01:00
Jan Dalheimer
5b54a4ca8c Don't hardcode stuff!!! 2013-12-28 23:34:18 +01:00
Jan Dalheimer
55e62a81b6 LiteLoader support 2013-12-28 14:22:36 +01:00
Petr Mrázek
30d4f5981d Rearrange logiv for OneSix version change 2013-12-27 12:50:24 +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
5a2df0d41a Merge branch 'develop' of https://github.com/robotbrain/MultiMC5 into develop 2013-12-25 01:19:38 +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
ashka
d507526320 Fixed updater not restarting MultiMC after update. 2013-12-22 22:43:16 +01:00
Petr Mrázek
77ddf8b5d7 Show errors when logging in in the account dialog. 2013-12-22 19:47:58 +01:00
Jan Dalheimer
82c87aa06f Initial FTB support. Allows "tracking" of FTB instances. 2013-12-21 23:40:37 +01:00
Petr Mrázek
c077c91e90 Remove OSX hack that never worked anyway 2013-12-21 19:18:56 +01:00
Petr Mrázek
be8dba9ee2 Remove obsolete auto login option. 2013-12-16 22:30:42 +01:00
Petr Mrázek
dff00a6d2a Use monospace font in the console.
Still fugly as all hell, now in a slightly more appropriate style.
2013-12-16 02:19:07 +01:00
Petr Mrázek
b0e8037feb Make updates prevented by missing accounts verbose 2013-12-15 20:42:17 +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
Sky
699aba9222 Expand appropriate column of account selection dialog 2013-12-14 17:01:15 +00:00
Orochimarufan
50e9574c0c Fix various Dialogs (Titles, License formatting) 2013-12-14 01:54:27 +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
39aebddf3b Add support for 1.7.4 user_type (needs testing with legacy accounts) 2013-12-13 02:47:59 +01:00
Sky
35ec599730 Fix console window sticking open derp 2013-12-11 12:26:23 +00:00
Petr Mrázek
26a7544325 Merge https://github.com/Drayshak/MultiMC5 into develop 2013-12-11 08:39:35 +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
robotbrainify
6eb512e5d6 Fix my utter derp 2013-12-10 11:05:40 -05: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
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
5ad95134dc work on pasting instance logs
blame clang for formatting changes
2013-12-06 16:24:55 -05:00