summaryrefslogtreecommitdiffstats
path: root/gui
Commit message (Expand)AuthorAgeLines
* Merge branch 'feature_better_launch' into developPetr Mrázek2014-01-12-13/+46
|\
| * Replace old launcher part with a shiny new one. No more garbage on the comman...Petr Mrázek2014-01-12-13/+46
* | Show active account skin whilst it's checked for updatesSky2014-01-11-3/+6
* | Add tooltips to Java memory spinboxesSky2014-01-10-1/+19
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developSky2014-01-09-2/+11
|\ \
| * | Make the GitHub link in the about dialog clickableForkk2014-01-08-0/+2
| * | Change the issue tracker URL to GitHub issuesForkk2014-01-08-1/+1
| * | Fix the window titleForkk2014-01-08-1/+5
| * | Word wrap the update channel description labelForkk2014-01-08-1/+4
| |/
* / Add "MB" as a suffix to memory spinboxesSky2014-01-09-1/+19
|/
* Add information to the about dialog.Forkk2014-01-07-24/+102
* Merge pull request #35 from 02JanDal/fix_keep_selectionSky2014-01-07-18/+21
|\
| * Fix instances getting deselected after FTB instances are loaded (or whenever ...Jan Dalheimer2014-01-06-18/+21
* | Fix proxy settings radio buttons not triggering updates of the proxy settings.Petr Mrázek2014-01-07-6/+18
* | Implement proxy settingsForkk2014-01-06-3/+187
|/
* Implement console window tray icon, console window hiding, better scrollingPetr Mrázek2014-01-06-27/+96
* Scroll console window for <= lines above the bottom instead of the very bottom.Petr Mrázek2014-01-06-2/+1
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2014-01-05-30/+162
|\
| * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developForkk2014-01-04-7/+59
| |\
| | * Fix settings dialog tab ordering againSky2014-01-05-3/+15
| | * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developSky2014-01-05-5/+78
| | |\
| | * | Implement the beloved right click context menu. Just a copy of the instance t...Sky2014-01-05-0/+29
| * | | Implement changing update channelsForkk2014-01-04-28/+118
* | | | Some more updater fixesPetr Mrázek2014-01-05-2/+6
| |_|/ |/| |
* | | Fix library column stretchingPetr Mrázek2014-01-04-5/+15
|/ /
* | Explicitly set the close button to be the default buttonJan Dalheimer2014-01-03-0/+1
* | Add the option to disable a certain messageJan Dalheimer2014-01-03-2/+6
* | Notifications system. Mainly to be used in case the updater breaks.Jan Dalheimer2014-01-03-0/+58
|/
* Clean out old assets stuff, fix button hitbox regressionSky2014-01-02-39/+0
* 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-1/+1
| |\
| * | Don't show extra space in status bar, tweak "none selected" messageSky2014-01-02-2/+2
* | | Implement the news buttonForkk2014-01-02-0/+12
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk2014-01-02-167/+594
|\ \ \ | | |/ | |/|
| * | Make .ico files usable (the plugin is already included)Jan Dalheimer2014-01-02-1/+1
| |/
| * Save/restore settings dialog (and instance specific settings) window geometrySky2014-01-02-4/+36
| * More credits tweakingSky2014-01-01-9/+14
| * ThreadTask for all your ThreadNeedsPetr Mrázek2014-01-01-7/+11
| * Move assets migration to a task. Needs threading.Sky2014-01-01-2/+25
| * 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
| * 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-14/+69
| * Merge pull request #29 from 02JanDal/java_browse_buttonSky2013-12-30-25/+41
| |\
| | * Make the java browse button look like the other browse buttonsJan Dalheimer2013-12-30-25/+41
| * | Fix spelling mistakeJan Dalheimer2013-12-30-1/+1
| * | Notify the user of any errorsJan Dalheimer2013-12-30-2/+14
| * | 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