summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Fix FTB.Petr Mrázek2014-01-15-34/+54
* Do not use the java checker during instance updatePetr Mrázek2014-01-14-93/+111
* Small fix for stale files getting stuck in the cachePetr Mrázek2014-01-13-5/+11
* Merge branch 'feature_better_launch' into developPetr Mrázek2014-01-12-3/+11
|\
| * Fix window title problem on OSX.Petr Mrázek2014-01-12-3/+11
* | Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 i...Petr Mrázek2014-01-12-608/+1777
|\ \
| * | Hopefully fix Qt 5.1 compilationJan Dalheimer2014-01-04-1/+1
| * | Clean up/update translation code and made language selectable in the settings...Jan Dalheimer2014-01-04-15/+48
| * | Add xnrand to the translation creditsJan Dalheimer2014-01-04-1/+1
| * | Update mmc_de.tsxnrand2014-01-04-88/+88
| * | Du/Sie consistencyJan Dalheimer2014-01-04-5/+5
| * | Update the german translationJan Dalheimer2014-01-04-337/+1465
| * | Fix a few things related to the translationsJan Dalheimer2014-01-04-12/+11
* | | Merge branch 'feature_mojang_status' into developPetr Mrázek2014-01-12-0/+303
|\ \ \
| * | | More space between status itemsSky2014-01-12-4/+4
| * | | More comments removalSky2014-01-12-1/+0
| * | | Remove wrong commentsSky2014-01-12-10/+0
| * | | Show Mojang service statuses in status barSky2014-01-12-0/+314
* | | | Merge branch 'feature_better_launch' into developPetr Mrázek2014-01-12-509/+1157
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Replace old launcher part with a shiny new one. No more garbage on the comman...Petr Mrázek2014-01-12-509/+1157
* | | 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
| |/ / / |/| | |
* | | | 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
| * | | 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
| * | | 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 "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
|/ / /
* | | Merge pull request #35 from 02JanDal/fix_keep_selectionSky2014-01-07-18/+21
|\ \ \