summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Change naming from Derp -> OneSix until the new instance type supports legacyJan Dalheimer2014-01-24-821/+375
* Forge works now too, and so does forge+liteloaderJan Dalheimer2014-01-23-81/+245
* Got liteloader working. Patching more or less worksJan Dalheimer2014-01-22-54/+208
* Work towards liteloader support. Fix creating new instanceJan Dalheimer2014-01-22-81/+120
* Merge branch 'develop' into feature_derpstancesJan Dalheimer2014-01-22-51/+139
|\
| * Extract native libs in the launcher part.Petr Mrázek2014-01-22-51/+139
* | Fix launchingJan Dalheimer2014-01-22-3/+1
* | Derpstances. Everything renamed. Launching does not yet work.Jan Dalheimer2014-01-22-457/+918
|/
* Fix library path for 64bit nativesPetr Mrázek2014-01-21-1/+1
* 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
| * 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
| * | 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
| * | 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
| * | Sort forge versions right. Do not spam the multimc log with mc server status ...Petr Mrázek2014-01-16-13/+31
| * | 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
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |