Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news | Forkk | 2014-01-02 | -2/+2 | |
|\ | |||||
| * | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Sky | 2014-01-02 | -1/+1 | |
| |\ | |||||
| * | | Don't show extra space in status bar, tweak "none selected" message | Sky | 2014-01-02 | -2/+2 | |
| | | | |||||
* | | | Implement the news button | Forkk | 2014-01-02 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_news | Forkk | 2014-01-02 | -167/+594 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.h | ||||
| * | | Make .ico files usable (the plugin is already included) | Jan Dalheimer | 2014-01-02 | -1/+1 | |
| |/ | |||||
| * | Save/restore settings dialog (and instance specific settings) window geometry | Sky | 2014-01-02 | -4/+36 | |
| | | |||||
| * | More credits tweaking | Sky | 2014-01-01 | -9/+14 | |
| | | |||||
| * | ThreadTask for all your ThreadNeeds | Petr Mrázek | 2014-01-01 | -7/+11 | |
| | | | | | | | | Use only when absolutely required. | ||||
| * | Move assets migration to a task. Needs threading. | Sky | 2014-01-01 | -2/+25 | |
| | | |||||
| * | Tweak credits in about dialog | Sky | 2013-12-31 | -22/+29 | |
| | | |||||
| * | Add the redistribution/fork text to the About dialog. | Petr Mrázek | 2013-12-31 | -4/+37 | |
| | | |||||
| * | Fix silly bug with icon not changing on the toolbar when the icon key changes. | Petr Mrázek | 2013-12-31 | -2/+0 | |
| | | |||||
| * | Refactor icon lists heavily | Petr Mrázek | 2013-12-31 | -14/+69 | |
| | | | | | | | | | | | | * 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_button | Sky | 2013-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 buttons | Jan Dalheimer | 2013-12-30 | -25/+41 | |
| | | | |||||
| * | | Fix spelling mistake | Jan Dalheimer | 2013-12-30 | -1/+1 | |
| | | | |||||
| * | | Notify the user of any errors | Jan Dalheimer | 2013-12-30 | -2/+14 | |
| | | | |||||
| * | | Don't use stuff that's new in 5.2 if we don't compile with that | Jan Dalheimer | 2013-12-30 | -5/+5 | |
| | | | |||||
| * | | Use /usr/bin as default on linux | Jan Dalheimer | 2013-12-30 | -0/+4 | |
| | | | |||||
| * | | Launch an editor for the custom.json file. Also allow overriding of the ↵ | Jan Dalheimer | 2013-12-29 | -2/+91 | |
| |/ | | | | | | | system default editor | ||||
| * | Fix various LiteLoader related bugs. | Petr Mrázek | 2013-12-29 | -3/+12 | |
| | | |||||
| * | Don't hardcode stuff!!! | Jan Dalheimer | 2013-12-28 | -1/+11 | |
| | | |||||
| * | LiteLoader support | Jan Dalheimer | 2013-12-28 | -0/+18 | |
| | | |||||
| * | Rearrange logiv for OneSix version change | Petr Mrázek | 2013-12-27 | -17/+19 | |
| | | |||||
| * | Disable/enable mods with checkboxes. Needs testing. | Petr Mrázek | 2013-12-26 | -3/+4 | |
| | | | | | | | | A lot of testing! | ||||
| * | Fix more updater derps. | Petr Mrázek | 2013-12-25 | -5/+9 | |
| | | | | | | | | | | * Updater requires unix style paths on input. * No update notification was getting cloned with every check | ||||
| * | Merge branch 'develop' of https://github.com/robotbrain/MultiMC5 into develop | Petr Mrázek | 2013-12-25 | -1/+4 | |
| |\ | |||||
| | * | Get the updater to display a no update found message. | robotbrainify | 2013-12-24 | -1/+4 | |
| | | | |||||
| * | | Log SSL errors, give common solutions | Petr Mrázek | 2013-12-24 | -5/+38 | |
| |/ | |||||
| * | Fixed updater not restarting MultiMC after update. | ashka | 2013-12-22 | -1/+1 | |
| | | |||||
| * | Show errors when logging in in the account dialog. | Petr Mrázek | 2013-12-22 | -0/+9 | |
| | | |||||
| * | Initial FTB support. Allows "tracking" of FTB instances. | Jan Dalheimer | 2013-12-21 | -0/+121 | |
| | | |||||
| * | Remove OSX hack that never worked anyway | Petr Mrázek | 2013-12-21 | -1/+1 | |
| | | |||||
| * | Remove obsolete auto login option. | Petr Mrázek | 2013-12-16 | -64/+0 | |
| | | |||||
| * | Use monospace font in the console. | Petr Mrázek | 2013-12-16 | -9/+11 | |
| | | | | | | | | Still fugly as all hell, now in a slightly more appropriate style. | ||||
* | | Add news checking system and news toolbar | Forkk | 2014-01-02 | -8/+79 | |
| | | |||||
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news | Andrew | 2013-12-15 | -211/+254 | |
|\| | | | | | | | | | Conflicts: CMakeLists.txt | ||||
| * | Make updates prevented by missing accounts verbose | Petr Mrázek | 2013-12-15 | -4/+19 | |
| | | |||||
| * | Improve group changing, update instance on version change | Petr Mrázek | 2013-12-15 | -58/+86 | |
| | | | | | | | | | | Gives a list of existing groups to choose from. Instances are updated as long as there is at least one valid account. | ||||
| * | Expand appropriate column of account selection dialog | Sky | 2013-12-14 | -1/+5 | |
| | | |||||
| * | Fix various Dialogs (Titles, License formatting) | Orochimarufan | 2013-12-14 | -149/+145 | |
| | | |||||
* | | Added a system to load news from MultiMC.org's RSS | Andrew | 2013-12-15 | -0/+4 | |
|/ | | | | Currently it doesn't show it anywhere in the UI. That's next. | ||||
* | Merge branch 'develop' of github.com:Drayshak/MultiMC5 into develop | Sky | 2013-12-13 | -2/+2 | |
|\ | |||||
| * | Add support for 1.7.4 user_type (needs testing with legacy accounts) | Petr Mrázek | 2013-12-13 | -2/+2 | |
| | | |||||
* | | First sweep moving URLs to a constants file | Sky | 2013-12-13 | -2/+5 | |
|/ | |||||
* | Fix console window sticking open derp | Sky | 2013-12-11 | -2/+5 | |
| | |||||
* | Merge https://github.com/Drayshak/MultiMC5 into develop | Petr Mrázek | 2013-12-11 | -3/+6 | |
|\ | |||||
| * | Better (but unsorted) Java detection | Sky | 2013-12-11 | -3/+6 | |
| | | |||||
* | | Merge branch 'feature_no_firstrun' of https://github.com/robotbrain/MultiMC5 ↵ | Petr Mrázek | 2013-12-11 | -1/+14 | |
|\ \ | | | | | | | | | | into develop |