Commit Graph

31 Commits

Author SHA1 Message Date
d2b2d55aa9 New flat icon themes from pexner
Squash and rework of commits from robotbrain
2014-05-25 04:01:38 +02:00
55e4cb6fb5 Allow reseting notifications 2014-03-15 14:35:35 +01:00
dd2d8f48fa Nicer way of selecting tool folders and executables 2014-02-16 14:42:44 +01:00
e4ecc31e07 Links to the tools 2014-02-16 13:02:59 +01:00
616c372690 Fix more stuff. Detached tools, only MCEdit for now. 2014-02-16 10:46:14 +01:00
82b35b5445 Fix stuff. Make sure different ways of aborting profiling work. 2014-02-16 08:54:52 +01:00
8219dbf612 Underp. Don't depend on OneSix. Nicer "menu" style choosing. 2014-02-15 22:26:44 +01:00
efa8e26a3f Profiler support. Currently JProfiler and JVisualVM are implemented. 2014-02-15 14:19:35 +01:00
54a9ee5eb0 Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 into develop
Conflicts:
	gui/dialogs/SettingsDialog.cpp
	gui/dialogs/SettingsDialog.ui
2014-01-12 23:04:05 +01:00
Sky
9ddf2aec31 Add tooltips to Java memory spinboxes 2014-01-10 13:16:31 +00:00
Sky
86b6cdfcb3 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-09 15:42:44 +00:00
Sky
e6201f9ff7 Add "MB" as a suffix to memory spinboxes 2014-01-09 15:30:21 +00:00
b4fcbab513 Word wrap the update channel description label
Previously, channel descriptions that were too long would mess up the
dialog.
2014-01-08 17:56:38 -06:00
28c35ea0db Fix proxy settings radio buttons not triggering updates of the proxy settings. 2014-01-07 02:19:26 +01:00
0a312d3b08 Implement proxy settings 2014-01-06 15:02:58 -06:00
ee02eecfdc Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-04 19:47:28 -06:00
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
Sky
ffacaba1aa Fix settings dialog tab ordering again 2014-01-05 01:00:29 +00:00
7f6b344b49 Clean up/update translation code and made language selectable in the settings dialog 2014-01-04 16:13:28 +01:00
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
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
76892c284b Make the java browse button look like the other browse buttons 2013-12-30 15:15:07 +01:00
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
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
82c87aa06f Initial FTB support. Allows "tracking" of FTB instances. 2013-12-21 23:40:37 +01:00
be8dba9ee2 Remove obsolete auto login option. 2013-12-16 22:30:42 +01:00
d6b09f7c13 Add java checker to the instance settings 2013-11-25 01:14:30 +01:00
ca297fca79 Prepare for rework of instance launch/update
Added missing licenses
Added a Java functionality checker (detects 32/64bit java)
Refactor of *Update - no longer based on BaseUpdate, but Task directly
Fixed runner script to not derp up on 32bit linux. Could add more detection and error reporting there.
Resources are now split into graphics and generated. Generated resources are placed in the build tree and included from there.
Used the Java checker in the main settings dialog (TODO: instance settings).
Partial support for ${arch}-using libraries - both 32 and 64 variants of ${arch} are downloaded.
2013-11-24 06:36:16 +01:00
Sky
bba4ed5ab2 Open on the correct settings tab 2013-11-06 17:00:02 +00:00
Sky
51dee3745f Fix "Auto Login" instance specific setting, tweak UI 2013-11-06 01:01:09 +00:00
bb7e8985f6 Reformat and (slightly) decruft all the things. 2013-11-04 02:53:05 +01:00