f7c97efcf3
Merge branch 'feature_profiling' into integration_json_and_tools
2014-02-24 00:29:13 +01:00
e3d2e5fd74
Merge branch 'fix_ftb' into integration_json_and_tools
2014-02-24 00:28:59 +01:00
4a77524b05
Initial stuff. It doesnt work.
2014-02-23 16:14:24 -05:00
a354e8bfae
Fix MCEdit on OSX
2014-02-21 20:13:12 +01:00
4883d15262
Copying of FTB instances working again
2014-02-21 19:15:59 +01:00
f54705e1c5
Don't assume forge for FTB instances. Fix FTB related stuff.
2014-02-21 18:01:06 +01:00
43881b9cdb
Use FTB's libraries/ and versions/ folders for non-copied instances
2014-02-20 17:06:32 +01:00
7146724607
New, better, liteloader support
2014-02-19 22:34:17 +01:00
0b56b5efaf
Instance flags. Currently used for marking instances as broken. Can later be used for badges.
2014-02-17 20:31:50 +01:00
4e8be668cb
Different error message if it's a launcher version mismatch
2014-02-17 17:46:43 +01:00
8d0ff99089
Actually remove instances if they fail to load
2014-02-17 17:36:29 +01:00
549198031d
Check if the json version is one we know how to handle
...
Also some formatting.
2014-02-17 17:19:58 +01:00
9c87bc6c4b
Restructure
2014-02-16 12:52:35 +01:00
f26b7dedad
Only show folders that really are worlds
2014-02-16 12:08:39 +01:00
c608841f77
Attempt to find jvisualvm
2014-02-16 12:00:38 +01:00
2e64d0308c
Use a combobox instead of a file dialog
2014-02-16 11:56:02 +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
3b236483df
Another attempt at fixing windows build
2014-02-15 19:07:01 +01:00
c0e58fbfb2
Try to be cross-platform
2014-02-15 18:15:41 +01:00
6f6d912d07
Underp and fix some stuff. Works nicer now.
2014-02-15 15:20:12 +01:00
efa8e26a3f
Profiler support. Currently JProfiler and JVisualVM are implemented.
2014-02-15 14:19:35 +01:00
a59dbdcb38
Merge https://github.com/max96at/MultiMC5 into develop
2014-02-14 20:58:09 +01:00
1f6a484cb2
Merge branch 'integration_derpstances_groupview' into develop
2014-02-09 20:49:48 +01:00
0d30a2655f
Blacklist the FTB voxel pack.
2014-02-09 19:10:56 +01:00
9022042360
Only load instance list twice.
2014-02-09 11:00:34 +01:00
583786757a
Fix crash bug related to messageboxes interrupting model resets in the instance list.
2014-02-08 23:52:15 +01:00
af33b96684
Merge branch 'feature_groupview' into integration_derpstances_groupview
2014-02-08 22:18:32 +01:00
53069205fa
Allow overriding the order in which patches are applied
2014-02-08 17:22:26 +01:00
6d9819cccf
Error if a patch file is for a different version of minecraft
2014-02-08 12:47:14 +01:00
f8df07c327
Small tweaks to make things better.
2014-02-06 09:32:44 +01:00
7839c4ecc0
Pave.
2014-02-04 01:40:51 +01:00
cdd35910c3
Fix installing forge after liteloader and then removing liteloader. Also formatting.
2014-02-02 14:17:44 +01:00
ece826bdbc
Add a MMC-depend field (soft/hard) for version checking
2014-02-02 14:05:07 +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
983a40698c
Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances
2014-02-01 19:58:13 +01:00
866d7029af
Fix some bugs that got uncovered while trying to get liteloader 1.7 to work
2014-02-01 19:42:47 +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
556d8f0ec1
custom.json overrides all. For user patching there now is instance.json
2014-01-28 07:39:43 +01:00
986141b503
Fix library ordering
2014-01-27 22:23:07 +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
0f7b38c76b
Fix some stuff
2014-01-24 18:17:26 +01:00
