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

92 Commits

Author SHA1 Message Date
Petr Mrázek
c9465e9e86 Merge remote-tracking branch 'origin/feature_raise_console' into develop 2014-04-21 21:25:39 +02:00
Petr Mrázek
565dab24b5 Download and cache FML libs for legacy minecraft versions. 
* minor fix for version filtering (1.5 no longer shows forge for 1.5.1 and 1.5.2)
* FML libs are downloaded to mods/minecraftforge/libs and cached
* FML libs are copied to instances which contain FML or forge
 2014-04-19 21:24:11 +02:00
Taeyeon Mori
0959aeb046 Make the console window raise itself after minecraft closes (#193) 
This needs further testing:
http://stackoverflow.com/questions/6087887/bring-window-to-front-raise-show-activatewindow-dont-work
 2014-04-17 14:13:16 +02:00
Petr Mrázek
482ad250a4 Workaround for dirty build folders. 
My disgust just turned into barely contained rage :<
 2014-04-06 03:59:37 +02:00
Petr Mrázek
42e305bb9d Get rid of long rebuilds because of minor cmake config changes 2014-04-06 00:33:33 +02:00
Petr Mrázek
df89183c10 Merge remote-tracking branch 'origin/fix_ftb_again' into integration_butchery 2014-03-09 23:59:47 +01:00
robotbrain
6e964acde5 Use a constant for the buffer size. 2014-03-05 16:35:35 -05:00
robotbrain
bb6894893d Fix it - it did it even if the op failed. 2014-03-05 16:27:18 -05:00
robotbrain
97ad7d287c Use windows api to prevent encoding problems. 2014-03-05 16:20:45 -05:00
robotbrain
a4779d32b6 Fix ftb locations on old windows... again. 2014-03-03 17:22:23 -05:00
Petr Mrázek
5a344a2933 Gather and store liteloader metadata. 2014-03-02 02:08:01 +01:00
Petr Mrázek
f7c97efcf3 Merge branch 'feature_profiling' into integration_json_and_tools 2014-02-24 00:29:13 +01:00
Jan Dalheimer
7146724607 New, better, liteloader support 2014-02-19 22:34:17 +01:00
Jan Dalheimer
9c87bc6c4b Restructure 2014-02-16 12:52:35 +01:00
Jan Dalheimer
616c372690 Fix more stuff. Detached tools, only MCEdit for now. 2014-02-16 10:46:14 +01:00
Jan Dalheimer
8219dbf612 Underp. Don't depend on OneSix. Nicer "menu" style choosing. 2014-02-15 22:26:44 +01:00
Jan Dalheimer
efa8e26a3f Profiler support. Currently JProfiler and JVisualVM are implemented. 2014-02-15 14:19:35 +01:00
robotbrain
93ee6f9010 Fix FTB paths on Windows XP 2014-02-13 16:00:51 -05: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
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