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
Petr Mrázek
4744ea07a8
Small fix for stale files getting stuck in the cache
2014-01-13 02:19:20 +01:00
Petr Mrázek
85ff1657fd
Merge branch 'feature_better_launch' into develop
2014-01-12 23:56:19 +01:00
Petr Mrázek
afd1778fd7
Fix window title problem on OSX.
2014-01-12 23:38:12 +01:00
Petr Mrázek
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
Petr Mrázek
f552366e03
Merge branch 'feature_mojang_status' into develop
2014-01-12 22:34:53 +01:00
Petr Mrázek
b589a12d17
Merge branch 'feature_better_launch' into develop
2014-01-12 22:17:14 +01:00
Petr Mrázek
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
Petr Mrázek
43a39a3bfb
Harden CacheDownload.
...
It's now super hard. SRSLY.
2014-01-11 02:06:22 +01:00
Petr Mrázek
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
Petr Mrázek
c51a993ff7
Add logging calls to the java checker.
2014-01-09 01:20:24 +01:00
Forkk
3629f9b999
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-system
2014-01-07 18:31:49 -06:00
Petr Mrázek
fb83299e59
Deploy jars instead of extracting them at runtime, remove non-working nvidia fix
2014-01-08 01:28:33 +01:00
Forkk
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
Sky
5fe0ed7e8f
Return a properly sorted list of checked javas
2014-01-07 03:16:47 +00:00
Petr Mrázek
012b007e56
Do not log each and every possible update. Only the latest one.
2014-01-07 02:43:25 +01:00
Jan Dalheimer
7d76fd57e9
Get rid of some obsolete functions
2014-01-05 23:24:19 +01:00
Petr Mrázek
becaebd60d
Remove the $PWD hack and tests that depended on it.
2014-01-05 19:54:05 +01:00
Petr Mrázek
ced640f68c
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-05 16:53:51 +01:00
Petr Mrázek
a64eebf8eb
Add an option to force using local updater binary (for updater development)
2014-01-05 14:24:33 +01:00
Petr Mrázek
613c01dab5
Some more updater fixes
...
Paths were wrong - still used work directory instead of root
2014-01-05 13:17:42 +01:00
Forkk
ee02eecfdc
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-04 19:47:28 -06:00
Forkk
d30962bf00
Implement changing update channels
...
Allow the user to select which update channel they would like to
download updates from.
2014-01-04 19:46:47 -06:00
Petr Mrázek
b49fa9d2a9
Mess with the updater again.
2014-01-05 00:06:55 +01:00
Petr Mrázek
8fa69307d2
Fix mod list checkboxes
2014-01-04 23:45:20 +01:00
Jan Dalheimer
3b97e3c363
Fix a few things related to the translations
2014-01-04 11:49:06 +01:00
Jan Dalheimer
71e1410b9f
Don't try to check for notifications if we don't have a URL for it
2014-01-03 20:39:21 +01:00
Jan Dalheimer
df9f9a34ef
Fix for pre-Qt5.2
2014-01-03 20:12:37 +01:00
Jan Dalheimer
b3dd1eba21
Notifications system. Mainly to be used in case the updater breaks.
2014-01-03 19:19:27 +01:00
Petr Mrázek
c35012f1a5
DEBUG: Add some logging for instance loading.
2014-01-03 02:42:32 +01:00
Petr Mrázek
1455f051e4
Force cached updater binary to always resolve as stale
2014-01-02 23:58:53 +01:00
Forkk
17f1864a71
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
...
Conflicts:
CMakeLists.txt
gui/MainWindow.h
2014-01-02 13:38:20 -06:00
Forkk
4495e20cd7
Add news checking system and news toolbar
2014-01-02 13:25:38 -06:00
Jan Dalheimer
c0b6fd0647
Make .ico files usable (the plugin is already included)
2014-01-02 18:51:40 +01:00
max96at
092b15fc87
Removed incomplete osx java detection log message
2014-01-02 17:07:47 +01:00
Noah Mayr
cdebeff179
Improved java detection on OSX.
2014-01-02 17:01:26 +01:00
Petr Mrázek
0e78d34d4c
ThreadTask for all your ThreadNeeds
...
Use only when absolutely required.
2014-01-01 19:21:58 +01:00
Sky
821fb5e0ae
Move assets migration to a task. Needs threading.
2014-01-01 14:56:26 +00:00
Petr Mrázek
396e63500e
Allow the use of synonyms in settings. Refactor settings.
...
Remove a bunch of obsolete/unused code.
2014-01-01 15:10:35 +01:00
Petr Mrázek
952b63f68d
Refactor icon lists heavily
...
* Icon list now uses a filesystem watcher for updates
* Icon folder is user-customizable
* All the little details. ALL OF THEM.
2013-12-31 01:32:51 +01:00
Petr Mrázek
654f444f55
Fix various LiteLoader related bugs.
2013-12-29 04:17:52 +01:00
Petr Mrázek
fbf1cc2848
Merge https://github.com/robotbrain/MultiMC5 into develop
2013-12-29 03:36:47 +01:00
robotbrainify
8549e5317f
Litemod version info.
2013-12-28 20:28:24 -05:00
Petr Mrázek
997be947c9
Maybe break updater even more?
2013-12-29 01:13:57 +01:00
Petr Mrázek
695ad1474e
Merge branch 'feature_liteloader' of https://github.com/02JanDal/MultiMC5 into develop
2013-12-28 23:48:48 +01:00
Jan Dalheimer
5b54a4ca8c
Don't hardcode stuff!!!
2013-12-28 23:34:18 +01:00
Petr Mrázek
c816a26647
Set permissions for the updater binary after updating it.
2013-12-28 22:32:45 +01:00
Jan Dalheimer
55e62a81b6
LiteLoader support
2013-12-28 14:22:36 +01:00
Petr Mrázek
7652b3d64a
Various updater fixes
...
Updater tests for path utils
The updater now doesn't use splitpath on Windows (fixes problems with Windows XP)
Fix up paths for the OSX updater - should now install the updates into the right place
Fix translations install path - translation isntall and deploy should be fixed
2013-12-28 04:23:48 +01:00
Petr Mrázek
4bf1cac8d8
Handle the foo + foo.disabled jar mod corner case better.
2013-12-27 02:18:40 +01:00
Petr Mrázek
aa91d89aaa
Do not merge disabled jar mods.
2013-12-26 05:19:11 +01:00
Petr Mrázek
acf25d8a33
Disable/enable mods with checkboxes. Needs testing.
...
A lot of testing!
2013-12-26 05:14:32 +01:00
Petr Mrázek
8edd0100e8
Fix more updater derps.
...
* Updater requires unix style paths on input.
* No update notification was getting cloned with every check
2013-12-25 02:46:06 +01:00
Petr Mrázek
e3389a4eef
Log even more error stuff for login.
2013-12-25 01:27:38 +01:00
Petr Mrázek
5a2df0d41a
Merge branch 'develop' of https://github.com/robotbrain/MultiMC5 into develop
2013-12-25 01:19:38 +01:00
Petr Mrázek
2d144631e7
Merge branch 'feature_updater_update' of https://github.com/02JanDal/MultiMC5 into develop
2013-12-25 01:18:16 +01:00