summaryrefslogtreecommitdiffstats
path: root/gui
Commit message (Expand)AuthorAgeLines
* Merge branch 'develop' of github.com:Drayshak/MultiMC5 into developSky2013-12-13-2/+2
|\
| * Add support for 1.7.4 user_type (needs testing with legacy accounts)Petr Mrázek2013-12-13-2/+2
* | First sweep moving URLs to a constants fileSky2013-12-13-2/+5
|/
* Fix console window sticking open derpSky2013-12-11-2/+5
* Merge https://github.com/Drayshak/MultiMC5 into developPetr Mrázek2013-12-11-3/+6
|\
| * Better (but unsorted) Java detectionSky2013-12-11-3/+6
* | 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-15/+218
|\|
| * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-12-09-8/+6
| |\
| * \ Merge branch 'feature_updater' into developAndrew2013-12-09-0/+204
| |\ \
| | * | Finish implementing update installation.Andrew2013-12-06-8/+31
| | * | Implement DownloadUpdateTaskAndrew2013-12-05-3/+11
| | * | Rework the update checking systemAndrew2013-12-04-6/+7
| | * | Renew the updater branchPetr Mrázek2013-12-02-0/+168
* | | | Finish assets update for 1.7.3Petr Mrázek2013-12-10-13/+0
* | | | Merge branch 'feature_assets' into developPetr Mrázek2013-12-08-1/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Work on new assets system. Working legacy assets importer, disabled assets do...Sky2013-12-08-1/+5
| | |/ | |/|
* | | Fix offline mode bugsPetr Mrázek2013-12-08-8/+6
| |/ |/|
* | Move pastebin button on the console window to the leftPetr Mrázek2013-12-08-7/+7
* | Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 into...Petr Mrázek2013-12-08-0/+24
|\ \
| * | Open the url direectly.robotbrainify2013-12-06-5/+1
| * | work on pasting instance logsrobotbrainify2013-12-06-0/+28
| |/
* | Finish preliminary offline supportPetr Mrázek2013-12-08-77/+81
* | Offline mode support, part 1Petr Mrázek2013-12-05-18/+16
|/
* Fix (hopefully) library dependency resolution.Petr Mrázek2013-12-01-90/+98
* Fix login and startup logging issuesPetr Mrázek2013-12-01-62/+74
* Remember the last selected instance and select it on startupJan Dalheimer2013-11-30-0/+26
* Fixed compilation errors.Andrew2013-11-28-5/+0
* Nuke dead codeAndrew2013-11-28-463/+0
* Rework the password dialogAndrew2013-11-28-93/+98
* Verify access tokens before launching MinecraftAndrew2013-11-28-7/+241
* Tweak the layout of the accounts buttonAndrew2013-11-28-1/+0
* Add icon for when no default account is selectedAndrew2013-11-28-13/+20
* Add support for "no default account"Sky2013-11-27-8/+24
* Merge remote-tracking branch 'upstream/feature_yggdrasil' into developSky2013-11-27-15/+294
|\
| * Allow setting no default accountAndrew2013-11-27-15/+294
* | Use player face in accounts dropdown, grab all valid account skins on startupSky2013-11-27-14/+21
* | Dropdown for account switchingSky2013-11-27-11/+110
|/
* Nuke skins.json, use nice yggdrasil implementation instead. Grabs all Mojang ...Sky2013-11-27-48/+40
* Move "manage accounts" to right, use player skin when availableSky2013-11-27-42/+47
* Add java checker to the instance settingsPetr Mrázek2013-11-25-27/+110
* Detect java bitness on launch, use appropriate librariesPetr Mrázek2013-11-25-1/+1
* Merge branch 'feature_yggdrasil' into developPetr Mrázek2013-11-24-110/+354
|\
| * Properly implement launching and downloadingAndrew2013-11-22-97/+88
| * Implement removing accounts.Andrew2013-11-22-1/+8