summaryrefslogtreecommitdiffstats
path: root/MultiMC.cpp
Commit message (Collapse)AuthorAgeLines
* Underp. Don't depend on OneSix. Nicer "menu" style choosing.Jan Dalheimer2014-02-15-8/+0
|
* Profiler support. Currently JProfiler and JVisualVM are implemented.Jan Dalheimer2014-02-15-2/+23
|
* Fix FTB paths on Windows XProbotbrain2014-02-13-2/+2
|
* Improve Console window output.Orochimarufan2014-01-17-0/+1
| | | | | | | | | -> Log Pre- and Post-Launch command happenings -> Enable the java part to specify the level TODO: fix logging with mc 1.7's log4j logging infrastructure Signed-off-by: Orochimarufan <orochimarufan.x3@gmail.com>
* Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek2014-01-12-13/+17
|\ | | | | | | | | | | | | | | 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-13/+17
| | | | | | | | settings dialog
* | Show Mojang service statuses in status barSky2014-01-12-0/+6
| |
* | Rework version numbering system.Forkk2014-01-07-2/+2
| | | | | | | | Again...
* | Implement proxy settingsForkk2014-01-06-47/+78
| |
* | Merge branch 'updater-tweak' into developPetr Mrázek2014-01-05-11/+12
|\ \
| * | More updater fixagePetr Mrázek2014-01-05-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | Preserve --dir parameter after updating Allow more than one copy of a command line parameter in MultiMC Linux runner script no longer changes current directory, which allows '--dir .' Fixed unit tests, removed the obsolete one (for some legacy updater command line params that were also removed) [fixes 63127704]
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2014-01-05-1/+3
|\ \ \ | |/ / |/| |
| * | Implement changing update channelsForkk2014-01-04-1/+3
| | | | | | | | | | | | | | | Allow the user to select which update channel they would like to download updates from.
* | | Some more updater fixesPetr Mrázek2014-01-05-13/+24
| | | | | | | | | | | | Paths were wrong - still used work directory instead of root
* | | Mess with the updater again.Petr Mrázek2014-01-05-39/+25
|/ /
* / Notifications system. Mainly to be used in case the updater breaks.Jan Dalheimer2014-01-03-0/+5
|/
* Log version, work pathsPetr Mrázek2014-01-03-39/+57
|
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk2014-01-02-105/+190
|\ | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.h
| * Save/restore settings dialog (and instance specific settings) window geometrySky2014-01-02-0/+2
| |
| * 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
| |
| * Allow the use of synonyms in settings. Refactor settings.Petr Mrázek2014-01-01-43/+42
| | | | | | | | Remove a bunch of obsolete/unused code.
| * Refactor icon lists heavilyPetr Mrázek2013-12-31-10/+2
| | | | | | | | | | | | * Icon list now uses a filesystem watcher for updates * Icon folder is user-customizable * All the little details. ALL OF THEM.
| * Notify the user of any errorsJan Dalheimer2013-12-30-4/+4
| |
| * Launch an editor for the custom.json file. Also allow overriding of the ↵Jan Dalheimer2013-12-29-0/+18
| | | | | | | | system default editor
| * Maybe break updater even more?Petr Mrázek2013-12-29-11/+12
| |
| * Set permissions for the updater binary after updating it.Petr Mrázek2013-12-28-1/+6
| |
| * Make FTB instances behave betterPetr Mrázek2013-12-22-61/+69
| | | | | | | | | | | | | | * Do not re-create on every reload * Use the version.json/custom.json logic properly * Should be offline-friendly * FTB instances can be copied, turn into normal instances
| * Initial FTB support. Allows "tracking" of FTB instances.Jan Dalheimer2013-12-21-0/+49
| |
| * Keep the last five logsJan Dalheimer2013-12-21-1/+14
| |
| * Some test madnessPetr Mrázek2013-12-20-1/+1
| |
| * Remove obsolete auto login option.Petr Mrázek2013-12-16-3/+0
| |
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsAndrew2013-12-15-35/+4
|\| | | | | | | | | Conflicts: CMakeLists.txt
| * Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into developPetr Mrázek2013-12-14-35/+4
| |\ | | | | | | | | | | | | Conflicts: MultiMC.cpp
| | * Unit testingJan Dalheimer2013-12-02-30/+4
| | |
* | | Added a system to load news from MultiMC.org's RSSAndrew2013-12-15-0/+5
|/ / | | | | | | Currently it doesn't show it anywhere in the UI. That's next.
* | Add support for 1.7.4 user_type (needs testing with legacy accounts)Petr Mrázek2013-12-13-3/+7
| |
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-10-2/+74
|\ \ | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.cpp
| * | Finish implementing update installation.Andrew2013-12-06-1/+68
| | | | | | | | | | | | Also add the option to update on exit.
| * | Rework the update checking systemAndrew2013-12-04-3/+4
| | |
| * | Renew the updater branchPetr Mrázek2013-12-02-0/+4
| |/ | | | | | | Now with some actual consensus on what the updater will do!
* / Finish assets update for 1.7.3Petr Mrázek2013-12-10-1/+2
|/
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-12-01-0/+4
|\
| * Fix (hopefully) library dependency resolution.Petr Mrázek2013-12-01-0/+3
| | | | | | | | | | | | Installing libs is now enabled, hardcoded. Enable -Wall for all builds. Fix many warnings and latent bugs.
| * Remember the last selected instance and select it on startupJan Dalheimer2013-11-30-0/+1
| |
* | Rework MultiMC's versioning systemAndrew2013-12-01-3/+2
|/
* Fixed compilation errors.Andrew2013-11-28-3/+0
| | | | Yeah... Forgot to recompile everything after deleting those files.
* Merge branch 'feature_yggdrasil' into developPetr Mrázek2013-11-24-0/+7
|\ | | | | | | | | | | | | | | Conflicts: gui/MainWindow.cpp logic/OneSixInstance.h Fix missing session id functionality for legacy and old onesix.
| * Implement saving account list to fileAndrew2013-11-19-0/+1
| | | | | | | | | | Currently it only saves when accounts are added or removed. We'll have to fix this, but we need signals for when account objects change first.
| * Implement loading accounts from list.Andrew2013-11-18-0/+6
| |