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

681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Petr Mrázek
0e78d34d4c ThreadTask for all your ThreadNeeds 
Use only when absolutely required.
 2014-01-01 19:21:58 +01:00
Petr Mrázek
cf7335186d Merge https://github.com/Drayshak/MultiMC5 into develop 2014-01-01 16:18:27 +01:00
Petr Mrázek
f0ffd379fa Fix issue with PostExitCmd not translating to PostExitCommand 2014-01-01 16:17:49 +01:00
Sky
821fb5e0ae Move assets migration to a task. Needs threading. 2014-01-01 14:56:26 +00:00
Petr Mrázek
f2e8a8c904 Enable high-dpi QIcon logic 2014-01-01 15:42:43 +01:00
Petr Mrázek
cb0f7a06a1 Remove offending Settings constructor. 
Was causing build problems on OSX.
 2014-01-01 15:30:26 +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
Sky
6648c7ad90 Tweak credits in about dialog 2013-12-31 17:45:27 +00:00
Petr Mrázek
a6808b0399 Add the redistribution/fork text to the About dialog. 2013-12-31 15:44:09 +01:00
Sky
967be1f42a Clarify terms of redistribution and our wishes under the Apache license 2013-12-31 11:22:53 +00:00
Petr Mrázek
3a4ecb57d0 Enable high DPI support on OSX 2013-12-31 02:34:00 +01:00
Petr Mrázek
ad7711b87c Fix silly bug with icon not changing on the toolbar when the icon key changes. 2013-12-31 01:49:07 +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
Sky
c44bcfab4b Merge pull request #29 from 02JanDal/java_browse_button 
Make the java browse button look like the other browse buttons
 2013-12-30 06:36:16 -08:00
Sky
8f6d808090 Clarify code style for contributions 2013-12-30 14:24:18 +00:00
Jan Dalheimer
76892c284b Make the java browse button look like the other browse buttons 2013-12-30 15:15:07 +01:00
Sky
d62e175cca Merge pull request #28 from 02JanDal/feature_editor 
Button for opening an editor for the custom.json file
 2013-12-30 06:04:32 -08:00
Jan Dalheimer
76438f6afe Fix spelling mistake 2013-12-30 14:55:55 +01:00
Jan Dalheimer
5d0868a056 Notify the user of any errors 2013-12-30 14:45:59 +01:00
Jan Dalheimer
c01678a3fa Don't use stuff that's new in 5.2 if we don't compile with that 2013-12-30 14:05:53 +01:00
Jan Dalheimer
5a7fc1e123 Use /usr/bin as default on linux 2013-12-30 13:00:55 +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
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
595e4b697e Change TestParseScript path back to what it was. 2013-12-28 04:55:38 +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
30d4f5981d Rearrange logiv for OneSix version change 2013-12-27 12:50:24 +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
449f55c3e6 Fix linux runner script. 2013-12-25 14:43:51 +01:00
Petr Mrázek
0d7b411729 No more windows paths in tests. 2013-12-25 03:25:21 +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
Petr Mrázek
8d0ca72abb Log SSL errors, give common solutions 2013-12-24 23:39:04 +01:00
robotbrainify
b1ec7841e0 Get the updater to display a no update found message. 2013-12-24 16:00:07 -05:00
Sky
027aafc3c1 Tidy status messages a bit 2013-12-23 15:48:26 +00:00
Jan Dalheimer
00822fa0f9 Treat the updater separately 2013-12-23 10:34:43 +01:00
Petr Mrázek
86284196de Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-12-23 00:44:41 +01:00
Petr Mrázek
f402001453 Use the central URL list for forge URLs 2013-12-23 00:43:29 +01:00
Petr Mrázek
56aeaec7d6 Merge branch 'feature_forge_gradle' of https://github.com/02JanDal/MultiMC5 into develop 2013-12-23 00:16:47 +01:00
Jan Dalheimer
9e645f4a37 Support for the new forge gradle repo 2013-12-23 00:12:03 +01:00