summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* Tweak "More..." to "More news..."Sky2014-01-02-1/+1
|
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk2014-01-02-2/+2
|\
| * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developSky2014-01-02-5/+19
| |\
| * | Don't show extra space in status bar, tweak "none selected" messageSky2014-01-02-2/+2
| | |
* | | Implement the news buttonForkk2014-01-02-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make the news button open the latest news post in the user's web browser. Also remove the webkit dependency. I was planning on using it to display the news in a custom window, but we'll just use the user's browser for now.
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk2014-01-02-2154/+4676
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.h
| * | Merge pull request #32 from 02JanDal/feature_ico_iconsSky2014-01-02-3/+3
| |\ \ | | | | | | | | Make .ico files usable (the plugin is already included)
| | * | Make .ico files usable (the plugin is already included)Jan Dalheimer2014-01-02-3/+3
| |/ /
| * | Merge pull request #31 from max96at/feature_osx_polishPetr Mrázek2014-01-02-2/+2
| |\ \ | | | | | | | | Improved java detection on OSX.
| | * | Removed incomplete osx java detection log messagemax96at2014-01-02-2/+0
| | | |
| | * | Improved java detection on OSX.Noah Mayr2014-01-02-0/+2
| |/ /
| * | Merge pull request #30 from max96at/feature_osx_polishPetr Mrázek2014-01-02-0/+14
| |\ \ | | |/ | |/| Fixed buttons on osx and added .DS_Store to the gitignore file.
| | * Fixed buttons on osx by adding the accessible plugin.Noah Mayr2014-01-02-0/+12
| | |
| | * Added .DS_Store to .gitignore.Noah Mayr2014-01-02-0/+2
| |/
| * Save/restore settings dialog (and instance specific settings) window geometrySky2014-01-02-4/+38
| |
| * More credits tweakingSky2014-01-01-9/+14
| |
| * Tweak update result dialog sizeSky2014-01-01-2/+2
| |
| * ThreadTask for all your ThreadNeedsPetr Mrázek2014-01-01-9/+85
| | | | | | | | Use only when absolutely required.
| * Merge https://github.com/Drayshak/MultiMC5 into developPetr Mrázek2014-01-01-81/+193
| |\
| | * Move assets migration to a task. Needs threading.Sky2014-01-01-81/+193
| | |
| * | Fix issue with PostExitCmd not translating to PostExitCommandPetr Mrázek2014-01-01-1/+1
| |/
| * Enable high-dpi QIcon logicPetr Mrázek2014-01-01-0/+1
| |
| * Remove offending Settings constructor.Petr Mrázek2014-01-01-25/+8
| | | | | | | | Was causing build problems on OSX.
| * Allow the use of synonyms in settings. Refactor settings.Petr Mrázek2014-01-01-639/+228
| | | | | | | | Remove a bunch of obsolete/unused code.
| * Tweak credits in about dialogSky2013-12-31-22/+29
| |
| * Add the redistribution/fork text to the About dialog.Petr Mrázek2013-12-31-4/+37
| |
| * Clarify terms of redistribution and our wishes under the Apache licenseSky2013-12-31-0/+8
| |
| * Enable high DPI support on OSXPetr Mrázek2013-12-31-1/+44
| |
| * Fix silly bug with icon not changing on the toolbar when the icon key changes.Petr Mrázek2013-12-31-2/+0
| |
| * Refactor icon lists heavilyPetr Mrázek2013-12-31-306/+616
| | | | | | | | | | | | * Icon list now uses a filesystem watcher for updates * Icon folder is user-customizable * All the little details. ALL OF THEM.
| * Merge pull request #29 from 02JanDal/java_browse_buttonSky2013-12-30-25/+41
| |\ | | | | | | Make the java browse button look like the other browse buttons
| | * Make the java browse button look like the other browse buttonsJan Dalheimer2013-12-30-25/+41
| | |
| * | Clarify code style for contributionsSky2013-12-30-0/+2
| | |
| * | Merge pull request #28 from 02JanDal/feature_editorSky2013-12-30-5/+133
| |\ \ | | |/ | |/| Button for opening an editor for the custom.json file
| | * Fix spelling mistakeJan Dalheimer2013-12-30-1/+1
| | |
| | * Notify the user of any errorsJan Dalheimer2013-12-30-7/+19
| | |
| | * Don't use stuff that's new in 5.2 if we don't compile with thatJan Dalheimer2013-12-30-5/+5
| | |
| | * Use /usr/bin as default on linuxJan Dalheimer2013-12-30-0/+4
| | |
| | * Launch an editor for the custom.json file. Also allow overriding of the ↵Jan Dalheimer2013-12-29-5/+117
| |/ | | | | | | system default editor
| * Fix various LiteLoader related bugs.Petr Mrázek2013-12-29-4/+20
| |
| * Merge https://github.com/robotbrain/MultiMC5 into developPetr Mrázek2013-12-29-14/+57
| |\
| | * Litemod version info.robotbrainify2013-12-28-14/+57
| | |
| * | Maybe break updater even more?Petr Mrázek2013-12-29-57/+32
| |/
| * Merge branch 'feature_liteloader' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek2013-12-28-0/+177
| |\ | | | | | | | | | into develop
| | * Don't hardcode stuff!!!Jan Dalheimer2013-12-28-26/+87
| | |
| | * LiteLoader supportJan Dalheimer2013-12-28-0/+116
| | |
| * | Set permissions for the updater binary after updating it.Petr Mrázek2013-12-28-1/+12
| |/
| * Change TestParseScript path back to what it was.Petr Mrázek2013-12-28-1/+1
| |
| * Various updater fixesPetr Mrázek2013-12-28-59/+171
| | | | | | | | | | | | | | 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
| * Rearrange logiv for OneSix version changePetr Mrázek2013-12-27-17/+19
| |