0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
786 Commits 1 Branch 0 Tags 29 MiB
b82eb5873e
Commit Graph

74 Commits

Author SHA1 Message Date
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
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
Sky
a774b3d248 Show Mojang service statuses in status bar 2014-01-12 18:28:42 +00:00
Forkk
3202b972f8 Rework version numbering system. 
Again...
 2014-01-07 18:09:05 -06:00
Forkk
0a312d3b08 Implement proxy settings 2014-01-06 15:02:58 -06:00
Petr Mrázek
6bf5c362ba Merge branch 'updater-tweak' into develop 2014-01-05 16:54:03 +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
0dcf694c87 More updater fixage 
Preserve --dir parameter after updating
Allow more than one copy of a command line parameter in MultiMC
Linux runner script no longer changes current directory, which allows '--dir .'
Fixed unit tests, removed the obsolete one (for some legacy updater command line params that were also removed)
[fixes 63127704]
 2014-01-05 16:47:12 +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
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
Jan Dalheimer
7f6b344b49 Clean up/update translation code and made language selectable in the settings dialog 2014-01-04 16:13:28 +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
f399207ae0 Log version, work paths 2014-01-03 02:29:05 +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
Sky
eb4e7d3f67 Save/restore settings dialog (and instance specific settings) window geometry 2014-01-02 02:20:34 +00:00
Petr Mrázek
f0ffd379fa Fix issue with PostExitCmd not translating to PostExitCommand 2014-01-01 16:17:49 +01:00
Petr Mrázek
f2e8a8c904 Enable high-dpi QIcon logic 2014-01-01 15:42:43 +01: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
Jan Dalheimer
5d0868a056 Notify the user of any errors 2013-12-30 14:45:59 +01:00
Jan Dalheimer
3380bc7563 Launch an editor for the custom.json file. Also allow overriding of the system default editor 2013-12-29 17:51:16 +01:00
Petr Mrázek
997be947c9 Maybe break updater even more? 2013-12-29 01:13:57 +01:00
Petr Mrázek
c816a26647 Set permissions for the updater binary after updating it. 2013-12-28 22:32:45 +01:00
Petr Mrázek
74b5b5f535 Make FTB instances behave better 
* Do not re-create on every reload
* Use the version.json/custom.json logic properly
* Should be offline-friendly
* FTB instances can be copied, turn into normal instances
 2013-12-22 04:31:30 +01:00
Jan Dalheimer
82c87aa06f Initial FTB support. Allows "tracking" of FTB instances. 2013-12-21 23:40:37 +01:00
Jan Dalheimer
34a3fedf7b Keep the last five logs 2013-12-21 23:39:24 +01:00
Petr Mrázek
d6c71488b3 Some test madness 2013-12-20 23:04:11 +01:00
Petr Mrázek
be8dba9ee2 Remove obsolete auto login option. 2013-12-16 22:30:42 +01:00
Andrew
9d8006b597 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news 
Conflicts:
	CMakeLists.txt
 2013-12-15 15:01:34 -06:00
Andrew
0ee8f90d40 Added a system to load news from MultiMC.org's RSS 
Currently it doesn't show it anywhere in the UI. That's next.
 2013-12-15 14:50:27 -06:00
Petr Mrázek
8f856f5573 Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into develop 
Conflicts:
	MultiMC.cpp
 2013-12-14 14:00:23 +01:00
Petr Mrázek
39aebddf3b Add support for 1.7.4 user_type (needs testing with legacy accounts) 2013-12-13 02:47:59 +01:00
Petr Mrázek
aa61bbe9e4 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 
Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp
 2013-12-10 07:22:22 +01:00
Petr Mrázek
3f5c46a1c4 Finish assets update for 1.7.3 2013-12-10 07:12:52 +01:00
Andrew
6ac94ddcb6 Finish implementing update installation. 
Also add the option to update on exit.
 2013-12-06 12:59:58 -06:00
Andrew
bf94aaea75 Rework the update checking system 2013-12-04 12:34:12 -06:00
Jan Dalheimer
0a6399b52c Unit testing 2013-12-02 11:09:56 +01:00
Petr Mrázek
6aa9bd0f77 Renew the updater branch 
Now with some actual consensus on what the updater will do!
 2013-12-02 00:55:24 +01:00
Andrew
613699b362 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-12-01 14:28:47 -06:00
Andrew
2427ad6871 Rework MultiMC's versioning system 2013-12-01 14:27:36 -06:00
Petr Mrázek
f56eff04ef Fix (hopefully) library dependency resolution. 
Installing libs is now enabled, hardcoded.
Enable -Wall for all builds.
Fix many warnings and latent bugs.
 2013-12-01 16:34:51 +01:00
Jan Dalheimer
8831856172 Remember the last selected instance and select it on startup 2013-11-30 12:28:20 +01:00
Andrew
eff38858ef Fixed compilation errors. 
Yeah... Forgot to recompile everything after deleting those files.
 2013-11-28 22:18:22 -06:00
Petr Mrázek
82225a21e1 Merge branch 'feature_yggdrasil' into develop 
Conflicts:
	gui/MainWindow.cpp
	logic/OneSixInstance.h

Fix missing session id functionality for legacy and old onesix.
 2013-11-24 18:41:35 +01:00
Petr Mrázek
4124faf474 Fix console window (now not a QDialog) 
It now opens and coloses as expected, depending on user
preferences and the status of the various processes involved.
Console window geometry and state are remembered between runs.
 2013-11-23 01:41:28 +01:00
Andrew
928e0d0b15 Implement saving account list to file 
Currently it only saves when accounts are added or removed. We'll have
to fix this, but we need signals for when account objects change first.
 2013-11-19 12:53:30 -06:00
Andrew
a9a0b65358 Implement loading accounts from list. 2013-11-18 12:58:03 -06:00
Petr Mrázek
bb7e8985f6 Reformat and (slightly) decruft all the things. 2013-11-04 02:53:05 +01:00
Petr Mrázek
d6e4fb2971 Implement instance sorting options. 2013-11-04 00:11:20 +01:00