summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
...
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-14-1/+5
|\ \
| * | Expand appropriate column of account selection dialogSky2013-12-14-1/+5
| |/
* / Fix bugs introduced by unit test branchPetr Mrázek2013-12-14-9/+12
|/
* Use ctestPetr Mrázek2013-12-14-8/+6
* Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into developPetr Mrázek2013-12-14-41/+368
|\
| * Tests for the user utilsJan Dalheimer2013-12-02-0/+73
| * Add some new foldersJan Dalheimer2013-12-02-0/+2
| * Fix some bugs that surfacedJan Dalheimer2013-12-02-0/+16
| * Unit testingJan Dalheimer2013-12-02-36/+271
* | Add status shown specifically when downloading assetsSky2013-12-14-0/+1
* | Make the account selection list use checkboxes rather than text for active bo...Sky2013-12-14-3/+39
* | Fix various Dialogs (Titles, License formatting)Orochimarufan2013-12-14-149/+145
* | Fix twitchPetr Mrázek2013-12-14-12/+25
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-12-13-1/+1
|\ \
| * | Fix typoSky2013-12-13-1/+1
* | | Disable some crazy OS X hacks on non-GCC compilersAndrew2013-12-13-0/+6
|/ /
* | Made the run script look for missing dependencies.Andrew2013-12-13-5/+20
* | Merge branch 'develop' of github.com:Drayshak/MultiMC5 into developSky2013-12-13-31/+86
|\ \
| * | Do not log auth crudPetr Mrázek2013-12-13-2/+2
| * | Fix syntax errorPetr Mrázek2013-12-13-9/+7
| * | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-13-1/+9
| |\ \
| | * | Fix updater removing all files.Andrew2013-12-12-1/+9
| * | | Add support for 1.7.4 user_type (needs testing with legacy accounts)Petr Mrázek2013-12-13-19/+58
| * | | Use temporary files for the java checkerPetr Mrázek2013-12-13-7/+13
| |/ /
| * | Include unistd.h in ProcessUtils.hAndrew2013-12-12-0/+4
| * | Remove -Werror from the updater's compile flagsAndrew2013-12-12-1/+1
* | | First sweep moving URLs to a constants fileSky2013-12-13-20/+56
|/ /
* | Make sure adding forced candidates doesn't result in duplicatesSky2013-12-12-7/+5
* | Don't break Linux and OS X builds :(Sky2013-12-12-9/+9
* | Java version list should be sorted, JRE->JDK, 64->32Sky2013-12-12-25/+28
* | Remove QsLog destinations when they are destroyed.Andrew2013-12-11-4/+17
* | Fix console window sticking open derpSky2013-12-11-2/+5
* | Fix checker progress derpSky2013-12-11-1/+1
* | Merge https://github.com/Drayshak/MultiMC5 into developPetr Mrázek2013-12-11-78/+329
|\ \
| * | Better (but unsorted) Java detectionSky2013-12-11-78/+329
* | | Swap https -> http for asset indexesPetr Mrázek2013-12-11-1/+1
* | | Merge branch 'feature_no_firstrun' of https://github.com/robotbrain/MultiMC5 ...Petr Mrázek2013-12-11-1/+14
|\ \ \
| * | | Nuke!robotbrain2013-12-10-1/+0
| * | | Fix my utter derprobotbrainify2013-12-10-59/+1
| * | | Fix I think.robotbrain2013-12-09-0/+1
| * | | Make it update the instance when it creates it, so you can install forgerobotbrain2013-12-09-1/+72
* | | | Do not let the console close while Minecraft is running (prevent return to ma...Petr Mrázek2013-12-10-0/+3
| |/ / |/| |
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-10-16/+21
|\ \ \
| * | | Move fixup_bundle CMake stuff into a separate fileAndrew2013-12-10-16/+21
* | | | Use metacache for minecraft.jar downloadsPetr Mrázek2013-12-10-15/+24
* | | | Nuke.Petr Mrázek2013-12-10-7/+0
|/ / /
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-10-69/+45872
|\| |
| * | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-12-09-40/+83
| |\ \
| * \ \ Merge branch 'feature_updater' into developAndrew2013-12-09-55/+45858
| |\ \ \
| | * \ \ Merge branch 'feature_updater' of github.com:MultiMC/MultiMC5 into feature_up...Petr Mrázek2013-12-07-83/+263
| | |\ \ \