summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* 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
| | |\ \
| | | * | Include shellapi.h in the updater on Windows.Andrew2013-12-06-0/+1
| | | * | Added WIN32_LEAN_AND_MEANAndrew2013-12-06-1/+2
| | | * | Finish implementing update installation.Andrew2013-12-06-10/+128
| | | * | Implement update installerAndrew2013-12-05-73/+133
| | * | | Fix build failures on Windows.Petr Mrázek2013-12-07-8/+1
| | |/ /
| | * | Implement DownloadUpdateTaskAndrew2013-12-05-15/+555
| | * | Rework the update checking systemAndrew2013-12-04-176/+394
| | * | Renew the updater branchPetr Mrázek2013-12-02-45/+44913
* | | | Finish assets update for 1.7.3Petr Mrázek2013-12-10-381/+203
* | | | Merge branch 'feature_assets' into developPetr Mrázek2013-12-08-3/+447
|\ \ \ \ | |_|_|/ |/| | |
| * | | More work on new assets system. Works given a properly constructed assets fol...Sky2013-12-08-3/+210
| * | | Work on new assets system. Working legacy assets importer, disabled assets do...Sky2013-12-08-1/+238
| | |/ | |/|
* | | Fix offline mode bugsPetr Mrázek2013-12-08-40/+83
| |/ |/|
* | 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/+136
|\ \
| * | fix revertrobotbrainify2013-12-06-0/+2
| * | revertrobotbrainify2013-12-06-113/+111
| * | Open the url direectly.robotbrainify2013-12-06-12/+3
| * | Fixes to pastingrobotbrainify2013-12-06-4/+5
| * | work on pasting instance logsrobotbrainify2013-12-06-111/+255
| |/
* | Finish preliminary offline supportPetr Mrázek2013-12-08-210/+223
* | Offline mode support, part 1Petr Mrázek2013-12-05-314/+257
|/
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-12-01-563/+778
|\
| * Exclude more debug libs (on OSX), debug builds include debug libs.Petr Mrázek2013-12-01-1/+21
| * Fix (hopefully) library dependency resolution.Petr Mrázek2013-12-01-260/+244
| * Fix private info censorPetr Mrázek2013-12-01-2/+2
| * Fix login and startup logging issuesPetr Mrázek2013-12-01-299/+471
| * Merge https://github.com/brainiac744/MultiMC5 into developPetr Mrázek2013-11-30-1/+1
| |\
| | * Fix OS X packaging problemAnthony Parrott2013-11-29-1/+1
| * | Fix crash when no instances are availableJan Dalheimer2013-11-30-0/+5
| * | Remember the last selected instance and select it on startupJan Dalheimer2013-11-30-4/+38
| |/
* / Rework MultiMC's versioning systemAndrew2013-12-01-31/+46
|/
* Fixed compilation errors.Andrew2013-11-28-8/+0
* Nuke dead codeAndrew2013-11-28-839/+3
* Rework the password dialogAndrew2013-11-28-96/+101
* Verify access tokens before launching MinecraftAndrew2013-11-28-72/+439
* Tweak the layout of the accounts buttonAndrew2013-11-28-1/+0
* Add icon for when no default account is selectedAndrew2013-11-28-64/+90
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_yggdrasilAndrew2013-11-28-0/+1
|\
| * Merge https://github.com/brainiac744/MultiMC5 into developPetr Mrázek2013-11-28-0/+1
| |\
| | * Could reach end of rulesFromJsonV4 method without returning a QListAnthony Parrott2013-11-28-0/+1
| * | Merge https://github.com/Drayshak/MultiMC5 into developPetr Mrázek2013-11-28-27/+153
| |\ \ | | |/ | |/|
* | | Merge branch 'develop' of https://github.com/Drayshak/MultiMC5 into feature_y...Andrew2013-11-28-27/+153
|\ \ \ | |/ / |/| / | |/
| * Add support for "no default account"Sky2013-11-27-9/+29
| * Merge remote-tracking branch 'upstream/feature_yggdrasil' into developSky2013-11-27-18/+313
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:57:51 +0000