Commit Graph

380 Commits

Author SHA1 Message Date
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
7b96d74d3b Sort forge versions right. Do not spam the multimc log with mc server status stuff. 2014-01-16 23:06:07 +01:00
d85e820a07 Fix FTB.
Add support of private packs.
Fix instance ID problems related to FTB instances.
2014-01-15 22:49:37 +01:00
555cbe00ce Do not use the java checker during instance update 2014-01-14 01:13:35 +01:00
4744ea07a8 Small fix for stale files getting stuck in the cache 2014-01-13 02:19:20 +01:00
85ff1657fd Merge branch 'feature_better_launch' into develop 2014-01-12 23:56:19 +01:00
afd1778fd7 Fix window title problem on OSX. 2014-01-12 23:38:12 +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
f552366e03 Merge branch 'feature_mojang_status' into develop 2014-01-12 22:34:53 +01:00
b589a12d17 Merge branch 'feature_better_launch' into develop 2014-01-12 22:17:14 +01:00
fca4441229 Replace old launcher part with a shiny new one. No more garbage on the command line. 2014-01-12 21:57:34 +01:00
Sky
500581d095 More comments removal 2014-01-12 18:42:02 +00:00
Sky
c51090dcff Remove wrong comments 2014-01-12 18:34:43 +00:00
Sky
a774b3d248 Show Mojang service statuses in status bar 2014-01-12 18:28:42 +00:00
43a39a3bfb Harden CacheDownload.
It's now super hard. SRSLY.
2014-01-11 02:06:22 +01:00
8e286c2b5c Make CacheDownload use QSaveFile 2014-01-10 22:08:00 +01:00
Sky
3c189a6553 Hide user properties in the console too 2014-01-10 12:52:14 +00:00
c51a993ff7 Add logging calls to the java checker. 2014-01-09 01:20:24 +01:00
3629f9b999 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-system 2014-01-07 18:31:49 -06:00
fb83299e59 Deploy jars instead of extracting them at runtime, remove non-working nvidia fix 2014-01-08 01:28:33 +01:00
3202b972f8 Rework version numbering system.
Again...
2014-01-07 18:09:05 -06:00
Sky
7773e77150 Don't include debugging messages :( 2014-01-07 03:18:26 +00:00