summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Fix installing forge after liteloader and then removing liteloader. Also form...Jan Dalheimer2014-02-02-82/+96
* Add a MMC-depend field (soft/hard) for version checkingJan Dalheimer2014-02-02-32/+351
* Disable anything related to user.json for now. Will be re-enabled once we hav...Jan Dalheimer2014-02-01-37/+4
* Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derp...Jan Dalheimer2014-02-01-304/+665
|\
| * Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 in...Petr Mrázek2014-02-01-591/+1581
| |\
| * | Add 'empty text' to all the version selection dialogs.Petr Mrázek2014-01-29-29/+252
| * | Offline mode can be used even when online.Petr Mrázek2014-01-27-276/+415
* | | Fix some bugs that got uncovered while trying to get liteloader 1.7 to workJan Dalheimer2014-02-01-1/+12
| |/ |/|
* | Fix a bugJan Dalheimer2014-02-01-6/+15
* | Change the OneSix library view. It now shows a list of patches.Jan Dalheimer2014-02-01-49/+183
* | custom.json overrides all. For user patching there now is instance.jsonJan Dalheimer2014-01-28-42/+65
* | Fix library orderingJan Dalheimer2014-01-27-29/+17
* | Have the libraries tab show tweaker mods instead of librariesJan Dalheimer2014-01-27-43/+23
* | Split parsing/applying. Better error logging. Fix crash.Jan Dalheimer2014-01-27-329/+816
* | Merge branch 'develop' into feature_derpstancesJan Dalheimer2014-01-24-1/+3
|\|
| * Hotfix 0.2.1 for twitch.0.2.1Petr Mrázek2014-01-22-1/+3
* | Fix some stuffJan Dalheimer2014-01-24-4/+4
* | 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