summaryrefslogtreecommitdiffstats
path: root/gui/dialogs/SettingsDialog.ui
Commit message (Collapse)AuthorAgeLines
* Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek2014-01-12-233/+255
|\ | | | | | | | | | | | | | | into develop Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui
| * Clean up/update translation code and made language selectable in the ↵Jan Dalheimer2014-01-04-2/+15
| | | | | | | | settings dialog
* | Add tooltips to Java memory spinboxesSky2014-01-10-1/+10
| |
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developSky2014-01-09-0/+3
|\ \
| * | Word wrap the update channel description labelForkk2014-01-08-1/+4
| | | | | | | | | | | | | | | Previously, channel descriptions that were too long would mess up the dialog.
* | | Add "MB" as a suffix to memory spinboxesSky2014-01-09-1/+10
|/ /
* | Fix proxy settings radio buttons not triggering updates of the proxy settings.Petr Mrázek2014-01-07-2/+15
| |
* | Implement proxy settingsForkk2014-01-06-2/+149
| |
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developForkk2014-01-04-2/+15
|\ \
| * | Fix settings dialog tab ordering againSky2014-01-05-3/+15
| |/
* / Implement changing update channelsForkk2014-01-04-11/+27
|/ | | | | Allow the user to select which update channel they would like to download updates from.
* Refactor icon lists heavilyPetr Mrázek2013-12-31-3/+20
| | | | | | * 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
| |
* | Don't use stuff that's new in 5.2 if we don't compile with thatJan Dalheimer2013-12-30-5/+1
| |
* | Launch an editor for the custom.json file. Also allow overriding of the ↵Jan Dalheimer2013-12-29-2/+32
|/ | | | system default editor
* Initial FTB support. Allows "tracking" of FTB instances.Jan Dalheimer2013-12-21-0/+81
|
* Remove obsolete auto login option.Petr Mrázek2013-12-16-16/+0
|
* Add java checker to the instance settingsPetr Mrázek2013-11-25-14/+14
|
* Prepare for rework of instance launch/updatePetr Mrázek2013-11-24-15/+26
| | | | | | | | | | Added missing licenses Added a Java functionality checker (detects 32/64bit java) Refactor of *Update - no longer based on BaseUpdate, but Task directly Fixed runner script to not derp up on 32bit linux. Could add more detection and error reporting there. Resources are now split into graphics and generated. Generated resources are placed in the build tree and included from there. Used the Java checker in the main settings dialog (TODO: instance settings). Partial support for ${arch}-using libraries - both 32 and 64 variants of ${arch} are downloaded.
* Open on the correct settings tabSky2013-11-06-1/+1
|
* Fix "Auto Login" instance specific setting, tweak UISky2013-11-06-5/+13
|
* Reformat and (slightly) decruft all the things.Petr Mrázek2013-11-04-0/+569