Andrew
52e927a6fd
Added vim *.swp files to .gitignore
2013-11-11 12:59:41 -06:00
Andrew
950088bee5
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-11-11 11:37:15 -06:00
Petr Mrázek
997054a535
Merge branch 'develop'
2013-11-11 04:47:09 +01:00
Petr Mrázek
e611aef0e7
Recover from the bin folder of converted legacy instance being deleted.
...
Use the new vanilla jar as the base jar if mcbackup.jar is missing.
2013-11-11 04:45:31 +01:00
Petr Mrázek
b097d2f744
Use the right LWJGL path while creating an instance
2013-11-11 03:47:14 +01:00
Petr Mrázek
ad7c41114f
Fix layout margins in console window
2013-11-07 22:31:15 +01:00
Petr Mrázek
cc6e9358fe
Merge branch 'develop'
2013-11-06 21:03:22 +01:00
Petr Mrázek
452cc1849f
Fix Sourceforge lwjgl version index download.
2013-11-06 20:59:44 +01:00
Sky
7ddc2b6a89
Merge branch 'develop'
2013-11-06 17:02:23 +00:00
Sky
bba4ed5ab2
Open on the correct settings tab
2013-11-06 17:00:02 +00:00
Sky
dd6af4efab
Nag for instance specific JVM args too
2013-11-06 01:18:47 +00:00
Sky
51dee3745f
Fix "Auto Login" instance specific setting, tweak UI
2013-11-06 01:01:09 +00:00
Sky
605423b8e4
Read mcmod.info first, forgeversion.properties second
2013-11-05 23:46:06 +00:00
Sky
4186623d0d
Nuke Travis CI
2013-11-05 21:08:42 +00:00
Andrew
5083a6a809
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-11-04 19:58:56 -06:00
Petr Mrázek
bb7e8985f6
Reformat and (slightly) decruft all the things.
2013-11-04 02:53:05 +01:00
Sky
dc3b0fcb2b
Merge branch 'develop'
2013-11-03 23:53:31 +00:00
Petr Mrázek
d6e4fb2971
Implement instance sorting options.
2013-11-04 00:11:20 +01:00
Petr Mrázek
4466929074
Add instance copying, fix instance creation (with identical names)
2013-11-03 21:28:04 +01:00
Sky
ab21b6977d
Catch assets index failure
2013-11-03 16:02:59 +00:00
Sky
bade253a1a
Added NagUtils, nag people about trying to override JVM memory options
2013-11-03 15:20:26 +00:00
Sky
406d8511bd
Merge branch 'develop'
2013-11-03 10:18:41 +00:00
Sky
09dc356883
Main window geometry and state saving/reloading
2013-11-03 00:45:25 +00:00
Sky
8c7f15cefb
Revamp Linux build instructions for Qt Creator
2013-10-31 20:28:10 +00:00
Petr Mrázek
b018aab1e9
Merge branch 'develop'
2013-10-31 09:06:42 +01:00
Petr Mrázek
8cd6604e40
List available proxies on start
2013-10-31 09:03:18 +01:00
Petr Mrázek
f39a83edc6
Hack for Intel graphics drivers on Windows.
2013-10-31 01:39:37 +01:00
Petr Mrázek
f941119fbd
Merge branch 'develop'
2013-10-30 00:56:43 +01:00
Petr Mrázek
44823324f9
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-10-29 22:14:57 +01:00
Petr Mrázek
946d397cce
Customizable folder browsing is same as for the instance folder. Syste Proxy usage.
2013-10-29 22:13:42 +01:00
Sky
511417c4f7
Make ConsoleWindow have Qt::Window flag (adds minimise/maximise buttons to titlebar)
2013-10-29 18:38:11 +00:00
Sky
aab5478ae7
Move "Forget" button to a sane place
2013-10-29 16:49:41 +00:00
Sky
ac4af46aed
Don't make LabeledToolButton selectable
2013-10-29 12:47:14 +00:00
Sky
b0ef429786
Add selectable message box helper, use it, make login GUI error label selectable
2013-10-29 12:40:09 +00:00
Petr Mrázek
e7e03c2b54
BLIND CODE, BLIND CODE HERE! WHERE IS THE COMPILER!?!?!
...
It choked on missing headers, maybe?
2013-10-28 22:01:37 +01:00
Petr Mrázek
7df667f823
Valgrind-checked early application start
2013-10-28 21:50:58 +01:00
Petr Mrázek
6ecb833dbf
Fix problem with instance list not using the instance folder path
2013-10-28 20:55:12 +01:00
Petr Mrázek
c46292c9b1
Merge branch 'develop'
2013-10-26 20:23:26 +02:00
Petr Mrázek
9233477295
S3 bucket listing support and network code refactors.
...
* Adds support for listing all objects in an S3 bucket.
* Renames a bunch of network related classes (Download->Action)
* Net actions now have static constructors
2013-10-26 19:55:48 +02:00
Sky
1f28a3b8af
Merge branch 'develop'
2013-10-26 11:13:14 +01:00
Sky
c467ebf132
Fix "no windows means MMC exits prematurely" issue
2013-10-26 08:38:21 +01:00
Sky
0430a2a38f
Add assets download status to status bar.
2013-10-26 02:31:58 +01:00
Petr Mrázek
ba938dd8e2
Fix java detection segfault
2013-10-24 01:47:54 +02:00
Petr Mrázek
c8b84257ae
Actually use QJson for Yggdrasil requests
2013-10-23 02:08:39 +02:00
Sky
c65bab6efe
Respect console options (opening a console at all, automatically closing)
2013-10-22 18:25:10 +01:00
Sky
cf07b90bda
Merge branch 'develop'
2013-10-22 05:21:44 +01:00
Sky
1d2183ea29
Tweak my credits
2013-10-22 04:55:36 +01:00
Sky
8c899885b1
Merge branch 'develop'
2013-10-21 22:26:37 +01:00
Sky
867efd53a2
Bugfixes for auto login
2013-10-21 22:08:09 +01:00
Sky
003fedde01
Implement auto login
2013-10-21 21:25:50 +01:00
