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
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
c39d26f445
Got liteloader working. Patching more or less works
2014-01-22 22:15:50 +01:00
2831ca94f8
Added more possible java paths on OSX.
2014-01-22 18:28:56 +01:00
0a592ab99b
Work towards liteloader support. Fix creating new instance
2014-01-22 15:20:48 +01:00
d166b48072
Merge branch 'develop' into feature_derpstances
2014-01-22 14:06:58 +01:00
13ac46bc18
Fix launching
2014-01-22 14:06:32 +01:00
a1a06cc89f
Derpstances. Everything renamed. Launching does not yet work.
2014-01-22 07:33:32 +01:00
c46c508fc6
Extract native libs in the launcher part.
2014-01-22 02:20:09 +01:00
b182f12c20
Fix library path for 64bit natives
2014-01-21 00:50:18 +01:00
3a3c9ac951
Update the changelog, version, scale the instance icon
2014-01-20 01:14:11 +01:00
5eb9ef5d56
Scale faces to 64x64
2014-01-19 23:05:16 +01:00
50c441a773
Merge branch 'fix_tests' of https://github.com/02JanDal/MultiMC5 into develop
2014-01-18 22:30:36 +01:00
e9186d6d2c
DERP DERP DERP
...
DERP ALERT. DUCK AND COVER!
2014-01-18 22:20:36 +01:00
208209e4a7
Fix derp: there is no static QFileInfo::exists in Qt 5.1.1
2014-01-18 22:16:47 +01:00
3fabb11f4c
Marginally improve OneSix offline mode launch
...
While reconstructing assets, skip files that don't exist.
Report missing OneSix native libraries.
2014-01-18 22:11:33 +01:00
ecc80bd763
Change the native extraction/loading logic.
2014-01-18 03:33:04 +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
