summaryrefslogtreecommitdiffstats
path: root/logic
Commit message (Collapse)AuthorAgeLines
* Merge https://github.com/max96at/MultiMC5 into developPetr Mrázek2014-02-14-1/+14
|\
| * Added more possible java paths on OSX.Noah Mayr2014-01-22-1/+14
| |
* | Merge branch 'integration_derpstances_groupview' into developPetr Mrázek2014-02-09-524/+1759
|\ \
| * | Blacklist the FTB voxel pack.Petr Mrázek2014-02-09-0/+2
| | |
| * | Only load instance list twice.Petr Mrázek2014-02-09-3/+9
| | |
| * | Fix crash bug related to messageboxes interrupting model resets in the ↵Petr Mrázek2014-02-08-52/+72
| | | | | | | | | | | | instance list.
| * | Merge branch 'feature_groupview' into integration_derpstances_groupviewPetr Mrázek2014-02-08-7/+5
| |\ \
| | * | Pave.Petr Mrázek2014-02-04-7/+5
| | | |
| * | | Allow overriding the order in which patches are appliedJan Dalheimer2014-02-08-0/+84
| | | |
| * | | Error if a patch file is for a different version of minecraftJan Dalheimer2014-02-08-0/+9
| | | |
| * | | Fix installing forge after liteloader and then removing liteloader. Also ↵Jan Dalheimer2014-02-02-82/+96
| | | | | | | | | | | | | | | | formatting.
| * | | Add a MMC-depend field (soft/hard) for version checkingJan Dalheimer2014-02-02-32/+100
| | | |
| * | | Disable anything related to user.json for now. Will be re-enabled once we ↵Jan Dalheimer2014-02-01-1/+3
| | | | | | | | | | | | | | | | have a gui for it.
| * | | Merge remote-tracking branch 'upstream/feature_derpstances' into ↵Jan Dalheimer2014-02-01-170/+238
| |\ \ \ | | | | | | | | | | | | | | | feature_derpstances
| | * \ \ Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek2014-02-01-465/+1486
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into feature_derpstances Conflicts: gui/dialogs/OneSixModEditDialog.cpp logic/OneSixUpdate.cpp
| * | | | 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-3/+3
| | | |
| * | | Change the OneSix library view. It now shows a list of patches.Jan Dalheimer2014-02-01-12/+116
| | | |
| * | | 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/+13
| | | |
| * | | Split parsing/applying. Better error logging. Fix crash.Jan Dalheimer2014-01-27-327/+814
| | | |
| * | | Fix some stuffJan Dalheimer2014-01-24-4/+4
| | | |
| * | | Change naming from Derp -> OneSix until the new instance type supports legacyJan Dalheimer2014-01-24-767/+321
| | | |
| * | | Forge works now too, and so does forge+liteloaderJan Dalheimer2014-01-23-76/+232
| | | |
| * | | Got liteloader working. Patching more or less worksJan Dalheimer2014-01-22-54/+208
| | | |
| * | | Work towards liteloader support. Fix creating new instanceJan Dalheimer2014-01-22-77/+116
| | | |
| * | | Merge branch 'develop' into feature_derpstancesJan Dalheimer2014-01-22-6/+6
| |\ \ \ | | | |/ | | |/|
| * | | Fix launchingJan Dalheimer2014-01-22-3/+1
| | | |
| * | | Derpstances. Everything renamed. Launching does not yet work.Jan Dalheimer2014-01-22-314/+862
| | | |
* | | | Small tweaks to make things better.Petr Mrázek2014-02-06-13/+38
| |_|/ |/| |
* | | Offline mode can be used even when online.Petr Mrázek2014-01-27-170/+238
| |/ |/| | | | | | | | | Allow the user to pick a player name for offline mode. Big auth refactor. Now using session objects instead of the accounts themselves. Sessions only last for one instance start and hold all the auth and player data.
* | Extract native libs in the launcher part.Petr Mrázek2014-01-22-6/+6
|/
* Fix library path for 64bit nativesPetr Mrázek2014-01-21-1/+1
|
* Update the changelog, version, scale the instance iconPetr Mrázek2014-01-20-0/+18
|
* Scale faces to 64x64Petr Mrázek2014-01-19-1/+1
|
* Merge branch 'fix_tests' of https://github.com/02JanDal/MultiMC5 into developPetr Mrázek2014-01-18-3/+0
|\
| * Get rid of some obsolete functionsJan Dalheimer2014-01-05-3/+0
| |
* | 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.
* | Change the native extraction/loading logic.Petr Mrázek2014-01-18-45/+68
| |
* | Improve Console window output.Orochimarufan2014-01-17-44/+177
| | | | | | | | | | | | | | | | | | -> 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-91/+65
| |
* | 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-9/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui