| Commit message (Expand) | Author | Age | Lines |
* | Fix stuff. Make sure different ways of aborting profiling work. | Jan Dalheimer | 2014-02-16 | -2/+40 |
* | Fix a few bugs in profilers. | Petr Mrázek | 2014-02-16 | -3/+27 |
* | Underp. Don't depend on OneSix. Nicer "menu" style choosing. | Jan Dalheimer | 2014-02-15 | -15/+44 |
* | Another attempt at fixing windows build | Jan Dalheimer | 2014-02-15 | -4/+8 |
* | Try to be cross-platform | Jan Dalheimer | 2014-02-15 | -1/+15 |
* | Underp and fix some stuff. Works nicer now. | Jan Dalheimer | 2014-02-15 | -5/+1 |
* | Profiler support. Currently JProfiler and JVisualVM are implemented. | Jan Dalheimer | 2014-02-15 | -1/+202 |
* | Merge https://github.com/max96at/MultiMC5 into develop | Petr Mrázek | 2014-02-14 | -1/+14 |
|\ |
|
| * | Added more possible java paths on OSX. | Noah Mayr | 2014-01-22 | -1/+14 |
* | | Merge branch 'integration_derpstances_groupview' into develop | Petr Mrázek | 2014-02-09 | -524/+1759 |
|\ \ |
|
| * | | Blacklist the FTB voxel pack. | Petr Mrázek | 2014-02-09 | -0/+2 |
| * | | Only load instance list twice. | Petr Mrázek | 2014-02-09 | -3/+9 |
| * | | Fix crash bug related to messageboxes interrupting model resets in the instan... | Petr Mrázek | 2014-02-08 | -52/+72 |
| * | | Merge branch 'feature_groupview' into integration_derpstances_groupview | Petr Mrázek | 2014-02-08 | -7/+5 |
| |\ \ |
|
| | * | | Pave. | Petr Mrázek | 2014-02-04 | -7/+5 |
| * | | | Allow overriding the order in which patches are applied | Jan Dalheimer | 2014-02-08 | -0/+84 |
| * | | | Error if a patch file is for a different version of minecraft | Jan Dalheimer | 2014-02-08 | -0/+9 |
| * | | | Fix installing forge after liteloader and then removing liteloader. Also form... | Jan Dalheimer | 2014-02-02 | -82/+96 |
| * | | | Add a MMC-depend field (soft/hard) for version checking | Jan Dalheimer | 2014-02-02 | -32/+100 |
| * | | | Disable anything related to user.json for now. Will be re-enabled once we hav... | Jan Dalheimer | 2014-02-01 | -1/+3 |
| * | | | Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derp... | Jan Dalheimer | 2014-02-01 | -170/+238 |
| |\ \ \ |
|
| | * \ \ | Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 in... | Petr Mrázek | 2014-02-01 | -465/+1486 |
| | |\ \ \
| | | |/ /
| | |/| | |
|
| * | | | | Fix some bugs that got uncovered while trying to get liteloader 1.7 to work | Jan Dalheimer | 2014-02-01 | -1/+12 |
| | |/ /
| |/| | |
|
| * | | | Fix a bug | Jan Dalheimer | 2014-02-01 | -3/+3 |
| * | | | Change the OneSix library view. It now shows a list of patches. | Jan Dalheimer | 2014-02-01 | -12/+116 |
| * | | | custom.json overrides all. For user patching there now is instance.json | Jan Dalheimer | 2014-01-28 | -42/+65 |
| * | | | Fix library ordering | Jan Dalheimer | 2014-01-27 | -29/+17 |
| * | | | Have the libraries tab show tweaker mods instead of libraries | Jan Dalheimer | 2014-01-27 | -43/+13 |
| * | | | Split parsing/applying. Better error logging. Fix crash. | Jan Dalheimer | 2014-01-27 | -327/+814 |
| * | | | Fix some stuff | Jan Dalheimer | 2014-01-24 | -4/+4 |
| * | | | Change naming from Derp -> OneSix until the new instance type supports legacy | Jan Dalheimer | 2014-01-24 | -767/+321 |
| * | | | Forge works now too, and so does forge+liteloader | Jan Dalheimer | 2014-01-23 | -76/+232 |
| * | | | Got liteloader working. Patching more or less works | Jan Dalheimer | 2014-01-22 | -54/+208 |
| * | | | Work towards liteloader support. Fix creating new instance | Jan Dalheimer | 2014-01-22 | -77/+116 |
| * | | | Merge branch 'develop' into feature_derpstances | Jan Dalheimer | 2014-01-22 | -6/+6 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Fix launching | Jan Dalheimer | 2014-01-22 | -3/+1 |
| * | | | Derpstances. Everything renamed. Launching does not yet work. | Jan Dalheimer | 2014-01-22 | -314/+862 |
* | | | | Small tweaks to make things better. | Petr Mrázek | 2014-02-06 | -13/+38 |
| |_|/
|/| | |
|
* | | | Offline mode can be used even when online. | Petr Mrázek | 2014-01-27 | -170/+238 |
| |/
|/| |
|
* | | Extract native libs in the launcher part. | Petr Mrázek | 2014-01-22 | -6/+6 |
|/ |
|
* | Fix library path for 64bit natives | Petr Mrázek | 2014-01-21 | -1/+1 |
* | Update the changelog, version, scale the instance icon | Petr Mrázek | 2014-01-20 | -0/+18 |
* | Scale faces to 64x64 | Petr Mrázek | 2014-01-19 | -1/+1 |
* | Merge branch 'fix_tests' of https://github.com/02JanDal/MultiMC5 into develop | Petr Mrázek | 2014-01-18 | -3/+0 |
|\ |
|
| * | Get rid of some obsolete functions | Jan Dalheimer | 2014-01-05 | -3/+0 |
* | | DERP DERP DERP | Petr Mrázek | 2014-01-18 | -1/+2 |
* | | Fix derp: there is no static QFileInfo::exists in Qt 5.1.1 | Petr Mrázek | 2014-01-18 | -2/+4 |
* | | Marginally improve OneSix offline mode launch | Petr Mrázek | 2014-01-18 | -49/+97 |
* | | Change the native extraction/loading logic. | Petr Mrázek | 2014-01-18 | -45/+68 |
* | | Improve Console window output. | Orochimarufan | 2014-01-17 | -44/+177 |