summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'release-0.2'0.2Petr Mrázek2014-01-20-1590/+5835
|\
| * Update the changelog, version, scale the instance iconPetr Mrázek2014-01-20-6/+36
| |
| * Merge branch 'patch-1' of https://github.com/ACGaming/MultiMC5 into developPetr Mrázek2014-01-19-103/+103
| |\
| | * Complete revision of the German language fileACGaming2014-01-19-103/+103
| | |
| * | Scale faces to 64x64Petr Mrázek2014-01-19-1/+1
| | |
| * | Add 64x64 icon versionsPetr Mrázek2014-01-19-38/+57
| |/
| * Remove 24x24 icons :<Petr Mrázek2014-01-19-11/+0
| |
| * Add more scales to toolbar iconsPetr Mrázek2014-01-19-14/+855
| |
| * Move a bunch of resources into the resources folder.Petr Mrázek2014-01-19-4/+4
| | | | | | | | Also, cat is no longer mysterious. It's just FLUFFY!
| * Use icon theme so we can have more than one icon size per iconPetr Mrázek2014-01-19-112/+953
| |
| * Try to improve status arrows a bitSky2014-01-19-4/+7
| |
| * Force using LF endlines while configuring testsPetr Mrázek2014-01-18-1/+6
| |
| * Merge branch 'fix_tests' of https://github.com/02JanDal/MultiMC5 into developPetr Mrázek2014-01-18-24/+52
| |\
| | * Get rid of some obsolete functionsJan Dalheimer2014-01-05-3/+0
| | |
| | * Unbreak and reactivate the some UpdateChecker testsJan Dalheimer2014-01-05-21/+52
| | |
| * | DERP DERP DERPPetr Mrázek2014-01-18-1/+2
| | | | | | | | | | | | DERP ALERT. DUCK AND COVER!
| * | Fix derp: there is no static QFileInfo::exists in Qt 5.1.1Petr Mrázek2014-01-18-2/+4
| | |
| * | Marginally improve OneSix offline mode launchPetr Mrázek2014-01-18-49/+97
| | | | | | | | | | | | | | | While reconstructing assets, skip files that don't exist. Report missing OneSix native libraries.
| * | Fix settings dialog when offlinePetr Mrázek2014-01-18-0/+4
| | |
| * | Change the native extraction/loading logic.Petr Mrázek2014-01-18-47/+71
| | |
| * | Improve Console window output.Orochimarufan2014-01-17-81/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | -> Log Pre- and Post-Launch command happenings -> Enable the java part to specify the level TODO: fix logging with mc 1.7's log4j logging infrastructure Signed-off-by: Orochimarufan <orochimarufan.x3@gmail.com>
| * | Sort forge versions right. Do not spam the multimc log with mc server status ↵Petr Mrázek2014-01-16-13/+31
| | | | | | | | | | | | stuff.
| * | Fix FTB.Petr Mrázek2014-01-15-34/+54
| | | | | | | | | | | | | | | Add support of private packs. Fix instance ID problems related to FTB instances.
| * | 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 ↵Petr Mrázek2014-01-12-608/+1777
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui
| | * | | Hopefully fix Qt 5.1 compilationJan Dalheimer2014-01-04-1/+1
| | | | |
| | * | | Clean up/update translation code and made language selectable in the ↵Jan Dalheimer2014-01-04-15/+48
| | | | | | | | | | | | | | | | | | | | settings dialog
| | * | | Add xnrand to the translation creditsJan Dalheimer2014-01-04-1/+1
| | | | |
| | * | | Update mmc_de.tsxnrand2014-01-04-88/+88
| | | | | | | | | | | | | | | | | | | | Fixed grammar, improved wording. It's not perfect but definitely better.
| | * | | 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 ↵Petr Mrázek2014-01-12-509/+1157
| | | | | | | | | | | | | | | | | | | | command line.
| * | | | 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
| | |/ / / / | |/| | | | | | | | | | | | | | | | It's now super hard. SRSLY.
| * | | | | 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
| | | | |