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
Sky
aa5f2c8120
Merge pull request #32 from 02JanDal/feature_ico_icons
...
Make .ico files usable (the plugin is already included)
2014-01-02 10:16:25 -08:00
Jan Dalheimer
c0b6fd0647
Make .ico files usable (the plugin is already included)
2014-01-02 18:51:40 +01:00
Petr Mrázek
c85789e249
Merge pull request #31 from max96at/feature_osx_polish
...
Improved java detection on OSX.
2014-01-02 08:09:57 -08: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
aed3ddda29
Merge pull request #30 from max96at/feature_osx_polish
...
Fixed buttons on osx and added .DS_Store to the gitignore file.
2014-01-02 06:28:13 -08:00
Noah Mayr
1bdac97af5
Fixed buttons on osx by adding the accessible plugin.
2014-01-02 15:22:57 +01:00
Noah Mayr
4af5bef66f
Added .DS_Store to .gitignore.
2014-01-02 14:15:44 +01:00
Sky
eb4e7d3f67
Save/restore settings dialog (and instance specific settings) window geometry
2014-01-02 02:20:34 +00:00
Sky
7f89da2043
More credits tweaking
2014-01-01 22:35:59 +00:00
Sky
9fbe3a7ccd
Tweak update result dialog size
2014-01-01 20:23:06 +00:00
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
Jan Dalheimer
c47933d95c
Loads of changes and some refactorings
2013-12-31 17:26:36 +01: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
Jan Dalheimer
8cfd0881ac
Progress indicators
2013-12-30 23:39:10 +01:00
Jan Dalheimer
e6be883d14
Fixing more bugs
2013-12-30 23:10:53 +01:00
Jan Dalheimer
1e1b2342f4
Loads of fixes
2013-12-30 18:46:12 +01:00
Jan Dalheimer
4662fbd298
Make the MultiMC delegate fully usable. Dynamic row heights.
2013-12-30 18:45:40 +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
