Petr Mrázek
e3d2e5fd74
Merge branch 'fix_ftb' into integration_json_and_tools
2014-02-24 00:28:59 +01:00
Jan Dalheimer
4883d15262
Copying of FTB instances working again
2014-02-21 19:15:59 +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
43881b9cdb
Use FTB's libraries/ and versions/ folders for non-copied instances
2014-02-20 17:06:32 +01:00
Jan Dalheimer
7146724607
New, better, liteloader support
2014-02-19 22:34:17 +01:00
Petr Mrázek
a59dbdcb38
Merge https://github.com/max96at/MultiMC5 into develop
2014-02-14 20:58:09 +01:00
Petr Mrázek
1f6a484cb2
Merge branch 'integration_derpstances_groupview' into develop
2014-02-09 20:49:48 +01:00
Petr Mrázek
0d30a2655f
Blacklist the FTB voxel pack.
2014-02-09 19:10:56 +01:00
Petr Mrázek
9022042360
Only load instance list twice.
2014-02-09 11:00:34 +01:00
Petr Mrázek
583786757a
Fix crash bug related to messageboxes interrupting model resets in the instance list.
2014-02-08 23:52:15 +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
Jan Dalheimer
6d9819cccf
Error if a patch file is for a different version of minecraft
2014-02-08 12:47:14 +01:00
Petr Mrázek
f8df07c327
Small tweaks to make things better.
2014-02-06 09:32:44 +01:00
Petr Mrázek
7839c4ecc0
Pave.
2014-02-04 01:40:51 +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
983a40698c
Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances
2014-02-01 19:58:13 +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
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
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
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
0f7b38c76b
Fix some stuff
2014-01-24 18:17:26 +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
c39d26f445
Got liteloader working. Patching more or less works
2014-01-22 22:15:50 +01:00
Noah Mayr
2831ca94f8
Added more possible java paths on OSX.
2014-01-22 18:28:56 +01:00
Jan Dalheimer
0a592ab99b
Work towards liteloader support. Fix creating new instance
2014-01-22 15:20:48 +01:00
Jan Dalheimer
d166b48072
Merge branch 'develop' into feature_derpstances
2014-01-22 14:06:58 +01:00
Jan Dalheimer
13ac46bc18
Fix launching
2014-01-22 14:06:32 +01:00
Jan Dalheimer
a1a06cc89f
Derpstances. Everything renamed. Launching does not yet work.
2014-01-22 07:33:32 +01:00
Petr Mrázek
c46c508fc6
Extract native libs in the launcher part.
2014-01-22 02:20:09 +01:00
Petr Mrázek
b182f12c20
Fix library path for 64bit natives
2014-01-21 00:50:18 +01:00
Petr Mrázek
3a3c9ac951
Update the changelog, version, scale the instance icon
2014-01-20 01:14:11 +01:00
Petr Mrázek
5eb9ef5d56
Scale faces to 64x64
2014-01-19 23:05:16 +01:00
Petr Mrázek
50c441a773
Merge branch 'fix_tests' of https://github.com/02JanDal/MultiMC5 into develop
2014-01-18 22:30:36 +01:00
Petr Mrázek
e9186d6d2c
DERP DERP DERP
...
DERP ALERT. DUCK AND COVER!
2014-01-18 22:20:36 +01:00
Petr Mrázek
208209e4a7
Fix derp: there is no static QFileInfo::exists in Qt 5.1.1
2014-01-18 22:16:47 +01:00
Petr Mrázek
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
Petr Mrázek
ecc80bd763
Change the native extraction/loading logic.
2014-01-18 03:33:04 +01:00
Orochimarufan
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
Petr Mrázek
7b96d74d3b
Sort forge versions right. Do not spam the multimc log with mc server status stuff.
2014-01-16 23:06:07 +01:00
Petr Mrázek
d85e820a07
Fix FTB.
...
Add support of private packs.
Fix instance ID problems related to FTB instances.
2014-01-15 22:49:37 +01:00
Petr Mrázek
555cbe00ce
Do not use the java checker during instance update
2014-01-14 01:13:35 +01:00
