f7c97efcf3
Merge branch 'feature_profiling' into integration_json_and_tools
2014-02-24 00:29:13 +01:00
a354e8bfae
Fix MCEdit on OSX
2014-02-21 20:13:12 +01:00
7146724607
New, better, liteloader support
2014-02-19 22:34:17 +01:00
16d378687c
Fix some external tool related string sin the settings dialog.
2014-02-16 14:53:03 +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
9c87bc6c4b
Restructure
2014-02-16 12:52:35 +01:00
1dc34269bd
Fix path selections for tools (settings dialog)
2014-02-16 12:04:26 +01:00
c88c639b8e
Fix for windows and update tool menu after closing settings dialog
2014-02-16 11:49:55 +01:00
616c372690
Fix more stuff. Detached tools, only MCEdit for now.
2014-02-16 10:46:14 +01:00
994972bf5d
More fixes.
2014-02-16 09:30:38 +01:00
82b35b5445
Fix stuff. Make sure different ways of aborting profiling work.
2014-02-16 08:54:52 +01:00
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
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
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
5a0e7877b0
Fix groupview issues
...
* indexAt was using the wrong coordinate system
* model events now trigger a delayed layout update instead of immediate.
2014-02-10 00:51:52 +01:00
2f0275c194
Fix kitty. Meow.
2014-02-09 22:55:44 +01:00
1f218bb8cd
Fix template magic in group view.
2014-02-09 21:14:34 +01:00
ba401922e1
Do not divide by zero when the last group is collapsed.
2014-02-09 21:04:00 +01:00
1f6a484cb2
Merge branch 'integration_derpstances_groupview' into develop
2014-02-09 20:49:48 +01:00
18f532b0d7
Visual and scroll behavior changes to groupview
...
Scroll by rows, not pixels.
Paint the checkboxy thing again! Make0 it behave.
Set the group header height properly.
2014-02-09 20:45:18 +01:00
af33b96684
Merge branch 'feature_groupview' into integration_derpstances_groupview
2014-02-08 22:18:32 +01:00
aa41b891f0
Group View: Use painting code from the previous group headers, small optimizations
2014-02-08 21:46:29 +01:00
53069205fa
Allow overriding the order in which patches are applied
2014-02-08 17:22:26 +01:00
f8df07c327
Small tweaks to make things better.
2014-02-06 09:32:44 +01:00
573d4c8050
Paint the headers nicer.
2014-02-05 01:34:50 +01:00
c84c51860d
Fix crash bug related to data changes in new group view.
2014-02-04 21:18:02 +01:00
6206a241ea
A try at fixing the instance delegate. A bit. Maybe.
2014-02-04 02:01:11 +01:00
7839c4ecc0
Pave.
2014-02-04 01:40:51 +01:00
ac2f64f337
Reload version after removing custom.json
2014-02-03 20:42:04 +01:00
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
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
8637cce433
Fix a bug
2014-02-01 16:26:38 +01:00
4a9e213238
Change the OneSix library view. It now shows a list of patches.
2014-02-01 14:52:21 +01:00
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
176783c8ca
Have the libraries tab show tweaker mods instead of libraries
2014-01-27 20:17:29 +01:00
f9ea3dbfde
Split parsing/applying. Better error logging. Fix crash.
2014-01-27 19:20:07 +01:00
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
7d5787025a
Change naming from Derp -> OneSix until the new instance type supports legacy
2014-01-24 18:12:02 +01:00
156bc8f276
Forge works now too, and so does forge+liteloader
2014-01-23 21:31:41 +01:00
0a592ab99b
Work towards liteloader support. Fix creating new instance
2014-01-22 15:20:48 +01:00
a1a06cc89f
Derpstances. Everything renamed. Launching does not yet work.
2014-01-22 07:33:32 +01:00
3a3c9ac951
Update the changelog, version, scale the instance icon
2014-01-20 01:14:11 +01:00
2fe033c4a0
Move a bunch of resources into the resources folder.
...
Also, cat is no longer mysterious. It's just FLUFFY!
2014-01-19 05:21:09 +01:00
d8413fa5ec
Use icon theme so we can have more than one icon size per icon
2014-01-19 04:52:34 +01:00
e6ab57b8b1
Try to improve status arrows a bit
2014-01-19 01:33:32 +00:00
8650aa81f0
Fix settings dialog when offline
2014-01-18 10:31:34 +01:00
188d0d5886
Improve Console window output.
...
-> Log Pre- and Post-Launch command happenings
-> Enable the java part to specify the level
TODO: fix logging with mc 1.7's log4j logging infrastructure
Signed-off-by: Orochimarufan <orochimarufan.x3@gmail.com >
2014-01-17 22:55:10 +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
