summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Make the GitHub link in the about dialog clickableForkk2014-01-08-0/+2
* Merge branch 'master' into developForkk2014-01-08-2/+4
|\
| * Merge branch 'hotfix-0.1.1'0.1.1Forkk2014-01-08-2/+4
| |\
| | * Change the issue tracker URL to GitHub issuesForkk2014-01-08-2/+4
| |/
* | 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
| * Hopefully fix OSX icon filePetr Mrázek2014-01-08-7/+5
* | Merge branch 'release-0.1'0.1Forkk2014-01-08-269/+713
|\ \
| * | Fix the window titleForkk2014-01-08-1/+5
| * | Word wrap the update channel description labelForkk2014-01-08-1/+4
| * | Remove lies from the changelogForkk2014-01-08-1/+0
| * | Make CMake output version type infoForkk2014-01-07-2/+8
| * | Bump minor version number and update changelog.Forkk2014-01-07-1/+17
| |/
| * 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
| |/
| * 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
| * | 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
* 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
* | 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
* | 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
| * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developForkk2014-01-04-8/+60
| |\
| | * Fix settings dialog tab ordering againSky2014-01-05-3/+15
| | * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developSky2014-01-05-56/+382
| | |\
| | * | 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-33/+126
* | | | Add an option to force using local updater binary (for updater development)Petr Mrázek2014-01-05-2/+6
* | | | Some more updater fixesPetr Mrázek2014-01-05-68/+82
* | | | Fix logging string derp on OSXPetr Mrázek2014-01-05-1/+1
* | | | Mess with the updater again.Petr Mrázek2014-01-05-161/+119
| |_|/ |/| |
* | | Fix library column stretchingPetr Mrázek2014-01-04-5/+15
* | | Fix mod list checkboxesPetr Mrázek2014-01-04-1/+1
|/ /