summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Show Mojang service statuses in status barSky2014-01-12-0/+314
|
* Merge https://github.com/Drayshak/MultiMC5 into developPetr Mrázek2014-01-11-3/+6
|\
| * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developSky2014-01-11-30/+24
| |\
| * | Show active account skin whilst it's checked for updatesSky2014-01-11-3/+6
| | |
* | | No more generated resources.Petr Mrázek2014-01-11-13/+1
| | |
* | | Harden CacheDownload.Petr Mrázek2014-01-11-25/+41
| |/ |/| | | | | It's now super hard. SRSLY.
* | Make CacheDownload use QSaveFilePetr Mrázek2014-01-10-30/+24
|/
* Add tooltips to Java memory spinboxesSky2014-01-10-1/+19
|
* Hide user properties in the console tooSky2014-01-10-0/+8
|
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developSky2014-01-09-8/+49
|\
| * Make the GitHub link in the about dialog clickableForkk2014-01-08-0/+2
| | | | | | | | Fixes #38
| * Merge branch 'master' into developForkk2014-01-08-2/+4
| |\
| | * Merge branch 'hotfix-0.1.1'0.1.1Forkk2014-01-08-2/+4
| | |\ | | | | | | | | | | | | | | | | This is a quick hotfix to correct the issue tracker URL. Forgot to do so in the last release.
| | | * Change the issue tracker URL to GitHub issuesForkk2014-01-08-2/+4
| | |/ | | | | | | | | | Bump hotfix version number and add an entry in the changelog.
| * | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developForkk2014-01-08-9/+16
| |\ \ | | |/ | |/|
| | * Add logging calls to the java checker.Petr Mrázek2014-01-09-2/+11
| | |
| * | Merge branch 'release-0.1'0.1Forkk2014-01-08-269/+713
| |\ \ | | | | | | | | | | | | Release MultiMC version 0.1.
| | * | Fix the window titleForkk2014-01-08-1/+5
| | | | | | | | | | | | | | | | | | | | The window title now says "MultiMC 5 - Version <version> [on <platform>]"
| | * | Word wrap the update channel description labelForkk2014-01-08-1/+4
| | | | | | | | | | | | | | | | | | | | Previously, channel descriptions that were too long would mess up the dialog.
| | * | Remove lies from the changelogForkk2014-01-08-1/+0
| | | | | | | | | | | | | | | | There wasn't really an Optimus fix. LIES! ALL LIES!
| | * | Make CMake output version type infoForkk2014-01-07-2/+8
| | | |
| | * | Bump minor version number and update changelog.Forkk2014-01-07-1/+17
| | | |
* | | | Add "MB" as a suffix to memory spinboxesSky2014-01-09-1/+19
| |_|/ |/| |
* | | Hopefully fix OSX icon filePetr Mrázek2014-01-08-7/+5
| |/ |/|
* | Add changelog.Forkk2014-01-07-0/+2
| |
* | Merge branch 'new-version-system' into developForkk2014-01-07-76/+188
|\ \
| * \ Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-systemForkk2014-01-07-98/+83
| |\ \ | |/ / |/| |
* | | Deploy jars instead of extracting them at runtime, remove non-working nvidia fixPetr Mrázek2014-01-08-98/+83
| | |
| * | Add information to the about dialog.Forkk2014-01-07-24/+118
| | |
| * | Rework version numbering system.Forkk2014-01-07-52/+70
|/ / | | | | | | Again...
* | Merge pull request #35 from 02JanDal/fix_keep_selectionSky2014-01-07-18/+21
|\ \ | | | | | | Fix instances getting deselected after FTB instances are loaded (or when ever the model is reset, like on a reload)
| * | Fix instances getting deselected after FTB instances are loaded (or whenever ↵Jan Dalheimer2014-01-06-18/+21
| | | | | | | | | | | | the model is reset)
* | | Don't include debugging messages :(Sky2014-01-07-1/+0
| | |
* | | Return a properly sorted list of checked javasSky2014-01-07-4/+11
| | |
* | | Do not log each and every possible update. Only the latest one.Petr Mrázek2014-01-07-2/+2
| | |
* | | Fix proxy settings radio buttons not triggering updates of the proxy settings.Petr Mrázek2014-01-07-6/+18
| | |
* | | Add hack for NvidiaPetr Mrázek2014-01-06-1/+9
| | |
* | | Implement proxy settingsForkk2014-01-06-50/+270
|/ /
* | 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
|/
* Attempt to fix including libxcb on debian.first_release0.0Forkk2014-01-05-1/+1
| | | | Debian puts libxcb in some weird path...
* Remove the $PWD hack and tests that depended on it.Petr Mrázek2014-01-05-24/+10
|
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2014-01-05-0/+3
|\
| * Include xcb libraries in distributed packagesForkk2014-01-05-0/+3
| | | | | | | | Unfortunately, this has become necessary due to Arch Linux's libxcb packages breaking ABI...
* | Meh.Petr Mrázek2014-01-05-2/+5
|/
* Fix tests for masterPetr Mrázek2014-01-05-2/+2
|
* Merge branch 'updater-tweak' into developPetr Mrázek2014-01-05-98/+47
|\
| * More updater fixagePetr Mrázek2014-01-05-98/+47
| | | | | | | | | | | | | | | | 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-38/+173
|\ \ | |/ |/|
| * Prepend a 5 to version strings.Forkk2014-01-04-3/+3
| |