Petr Mrázek
|
49dc9695f5
|
Merge branch 'fix_json_version' into integration_json_and_tools
Conflicts:
logic/OneSixInstance.cpp
logic/OneSixVersionBuilder.cpp
Some fixage. Yay for conflicts.
|
2014-02-24 02:35:01 +01:00 |
|
Jan Dalheimer
|
f54705e1c5
|
Don't assume forge for FTB instances. Fix FTB related stuff.
|
2014-02-21 18:01:06 +01:00 |
|
Jan Dalheimer
|
0b56b5efaf
|
Instance flags. Currently used for marking instances as broken. Can later be used for badges.
|
2014-02-17 20:31:50 +01:00 |
|
Jan Dalheimer
|
4e8be668cb
|
Different error message if it's a launcher version mismatch
|
2014-02-17 17:46:43 +01:00 |
|
Jan Dalheimer
|
549198031d
|
Check if the json version is one we know how to handle
Also some formatting.
|
2014-02-17 17:19:58 +01:00 |
|
Jan Dalheimer
|
53069205fa
|
Allow overriding the order in which patches are applied
|
2014-02-08 17:22:26 +01:00 |
|
Jan Dalheimer
|
6d9819cccf
|
Error if a patch file is for a different version of minecraft
|
2014-02-08 12:47:14 +01:00 |
|
Jan Dalheimer
|
cdd35910c3
|
Fix installing forge after liteloader and then removing liteloader. Also formatting.
|
2014-02-02 14:17:44 +01:00 |
|
Jan Dalheimer
|
ece826bdbc
|
Add a MMC-depend field (soft/hard) for version checking
|
2014-02-02 14:05:07 +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 |
|
Jan Dalheimer
|
866d7029af
|
Fix some bugs that got uncovered while trying to get liteloader 1.7 to work
|
2014-02-01 19:42:47 +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 |
|
Jan Dalheimer
|
556d8f0ec1
|
custom.json overrides all. For user patching there now is instance.json
|
2014-01-28 07:39:43 +01:00 |
|
Jan Dalheimer
|
986141b503
|
Fix library ordering
|
2014-01-27 22:23:07 +01:00 |
|
Jan Dalheimer
|
f9ea3dbfde
|
Split parsing/applying. Better error logging. Fix crash.
|
2014-01-27 19:20:07 +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 |
|