Commit Graph

99 Commits

Author SHA1 Message Date
Petr Mrázek
dd2d8f48fa Nicer way of selecting tool folders and executables 2014-02-16 14:42:44 +01:00
Jan Dalheimer
e4ecc31e07 Links to the tools 2014-02-16 13:02:59 +01:00
Jan Dalheimer
9c87bc6c4b Restructure 2014-02-16 12:52:35 +01:00
Petr Mrázek
1dc34269bd Fix path selections for tools (settings dialog) 2014-02-16 12:04:26 +01:00
Jan Dalheimer
616c372690 Fix more stuff. Detached tools, only MCEdit for now. 2014-02-16 10:46:14 +01:00
Jan Dalheimer
82b35b5445 Fix stuff. Make sure different ways of aborting profiling work. 2014-02-16 08:54:52 +01:00
Petr Mrázek
7ceb2cacb1 Fix a few bugs in profilers.
* Legacy was launching before the profiler.
* Some clarity changes.
* Report problem with empty strings as profiler paths.
2014-02-16 00:10:45 +01:00
Jan Dalheimer
8219dbf612 Underp. Don't depend on OneSix. Nicer "menu" style choosing. 2014-02-15 22:26:44 +01:00
Jan Dalheimer
efa8e26a3f Profiler support. Currently JProfiler and JVisualVM are implemented. 2014-02-15 14:19:35 +01:00
p-schneider
725e6a36bb fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 in AboutDialog.ui (+German translation) 2014-02-14 13:39:00 +01:00
Petr Mrázek
af33b96684 Merge branch 'feature_groupview' into integration_derpstances_groupview 2014-02-08 22:18:32 +01:00
Jan Dalheimer
53069205fa Allow overriding the order in which patches are applied 2014-02-08 17:22:26 +01:00
Petr Mrázek
7839c4ecc0 Pave. 2014-02-04 01:40:51 +01:00
Jan Dalheimer
ac2f64f337 Reload version after removing custom.json 2014-02-03 20:42:04 +01:00
Jan Dalheimer
790402bdce Disable anything related to user.json for now. Will be re-enabled once we have a gui for it. 2014-02-01 22:32:48 +01:00
Petr Mrázek
1936bd181f Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances
Conflicts:
	gui/dialogs/OneSixModEditDialog.cpp
	logic/OneSixUpdate.cpp
2014-02-01 19:37:16 +01:00
Jan Dalheimer
8637cce433 Fix a bug 2014-02-01 16:26:38 +01:00
Jan Dalheimer
4a9e213238 Change the OneSix library view. It now shows a list of patches. 2014-02-01 14:52:21 +01:00
Petr Mrázek
b4b6091372 Add 'empty text' to all the version selection dialogs.
Customize it for the Forge one so people finally shut up about 1.7.4
2014-01-29 01:20:19 +01:00
Jan Dalheimer
176783c8ca Have the libraries tab show tweaker mods instead of libraries 2014-01-27 20:17:29 +01:00
Jan Dalheimer
f9ea3dbfde Split parsing/applying. Better error logging. Fix crash. 2014-01-27 19:20:07 +01:00
Petr Mrázek
ffbc5bb62c Offline mode can be used even when online.
Allow the user to pick a player name for offline mode.
Big auth refactor. Now using session objects instead of the accounts themselves.
Sessions only last for one instance start and hold all the auth and player data.
2014-01-27 03:00:49 +01:00
Jan Dalheimer
7d5787025a Change naming from Derp -> OneSix until the new instance type supports legacy 2014-01-24 18:12:02 +01:00
Jan Dalheimer
156bc8f276 Forge works now too, and so does forge+liteloader 2014-01-23 21:31:41 +01:00
Jan Dalheimer
0a592ab99b Work towards liteloader support. Fix creating new instance 2014-01-22 15:20:48 +01:00
Jan Dalheimer
a1a06cc89f Derpstances. Everything renamed. Launching does not yet work. 2014-01-22 07:33:32 +01:00
Petr Mrázek
8650aa81f0 Fix settings dialog when offline 2014-01-18 10:31:34 +01:00
Petr Mrázek
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
Petr Mrázek
b589a12d17 Merge branch 'feature_better_launch' into develop 2014-01-12 22:17:14 +01:00
Petr Mrázek
fca4441229 Replace old launcher part with a shiny new one. No more garbage on the command line. 2014-01-12 21:57:34 +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
Forkk
52c9cd5497 Make the GitHub link in the about dialog clickable
Fixes #38
2014-01-08 23:38:34 -06:00
Forkk
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
Forkk
a14eeab2d6 Add information to the about dialog. 2014-01-07 18:31:31 -06:00
Petr Mrázek
28c35ea0db Fix proxy settings radio buttons not triggering updates of the proxy settings. 2014-01-07 02:19:26 +01:00
Forkk
0a312d3b08 Implement proxy settings 2014-01-06 15:02:58 -06:00
Forkk
ee02eecfdc Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-04 19:47:28 -06:00
Forkk
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
Jan Dalheimer
8950953d91 Hopefully fix Qt 5.1 compilation 2014-01-04 19:20:20 +01:00
Jan Dalheimer
7f6b344b49 Clean up/update translation code and made language selectable in the settings dialog 2014-01-04 16:13:28 +01:00
Jan Dalheimer
3b97e3c363 Fix a few things related to the translations 2014-01-04 11:49:06 +01:00
Jan Dalheimer
c0b6fd0647 Make .ico files usable (the plugin is already included) 2014-01-02 18:51:40 +01:00
Sky
eb4e7d3f67 Save/restore settings dialog (and instance specific settings) window geometry 2014-01-02 02:20:34 +00:00
Sky
7f89da2043 More credits tweaking 2014-01-01 22:35:59 +00:00
Sky
6648c7ad90 Tweak credits in about dialog 2013-12-31 17:45:27 +00:00
Petr Mrázek
a6808b0399 Add the redistribution/fork text to the About dialog. 2013-12-31 15:44:09 +01:00
Petr Mrázek
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