summaryrefslogtreecommitdiffstats
path: root/logic/OneSixInstance.cpp
Commit message (Expand)AuthorAgeLines
* Fix FTB-related issues0.3.1Petr Mrázek2014-03-31-0/+11
* Merge branch 'develop' into feature_badgesJan Dalheimer2014-03-10-16/+43
|\
| * Merge remote-tracking branch 'origin/feature_fix_log' into integration_butcheryPetr Mrázek2014-03-09-1/+13
| |\
| * \ Merge remote-tracking branch 'origin/feature_commands' into integration_butcheryPetr Mrázek2014-03-09-0/+5
| |\ \
| | * | Some pre/post related stuffJan Dalheimer2014-03-09-0/+5
| | |/
| * | Improve reporting of version file errors.xPetr Mrázek2014-03-09-5/+12
| * | More code butchery related to version files. No end in sight.Petr Mrázek2014-03-03-8/+11
| * | Remove widgets from logic.Petr Mrázek2014-03-02-3/+3
| * | Reorganize the version-related code.Petr Mrázek2014-03-01-6/+6
| |/
* / Instance badges. Some easter eggs and one for broken so far.Jan Dalheimer2014-03-10-4/+4
|/
* Merge branch 'fix_json_version' into integration_json_and_toolsPetr Mrázek2014-02-24-3/+20
|\
| * Instance flags. Currently used for marking instances as broken. Can later be ...Jan Dalheimer2014-02-17-2/+13
| * Actually remove instances if they fail to loadJan Dalheimer2014-02-17-1/+8
* | Merge branch 'feature_profiling' into integration_json_and_toolsPetr Mrázek2014-02-24-1/+1
|\ \
| * | Underp. Don't depend on OneSix. Nicer "menu" style choosing.Jan Dalheimer2014-02-15-0/+1
| * | Profiler support. Currently JProfiler and JVisualVM are implemented.Jan Dalheimer2014-02-15-1/+0
| |/
* | Copying of FTB instances working againJan Dalheimer2014-02-21-0/+5
* | Don't assume forge for FTB instances. Fix FTB related stuff.Jan Dalheimer2014-02-21-2/+12
* | Use FTB's libraries/ and versions/ folders for non-copied instancesJan Dalheimer2014-02-20-5/+12
|/
* Fix installing forge after liteloader and then removing liteloader. Also form...Jan Dalheimer2014-02-02-5/+5
* Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 in...Petr Mrázek2014-02-01-67/+51
|\
| * Change the OneSix library view. It now shows a list of patches.Jan Dalheimer2014-02-01-2/+3
| * Split parsing/applying. Better error logging. Fix crash.Jan Dalheimer2014-01-27-7/+23
| * Change naming from Derp -> OneSix until the new instance type supports legacyJan Dalheimer2014-01-24-0/+388
| * Derpstances. Everything renamed. Launching does not yet work.Jan Dalheimer2014-01-22-416/+0
* | Offline mode can be used even when online.Petr Mrázek2014-01-27-27/+12
* | Extract native libs in the launcher part.Petr Mrázek2014-01-22-0/+5
|/
* Marginally improve OneSix offline mode launchPetr Mrázek2014-01-18-28/+27
* Fix window title problem on OSX.Petr Mrázek2014-01-12-1/+1
* Replace old launcher part with a shiny new one. No more garbage on the comman...Petr Mrázek2014-01-12-48/+40
* Allow the use of synonyms in settings. Refactor settings.Petr Mrázek2014-01-01-2/+2
* Fix twitchPetr Mrázek2013-12-14-2/+11
* Add support for 1.7.4 user_type (needs testing with legacy accounts)Petr Mrázek2013-12-13-1/+1
* Finish assets update for 1.7.3Petr Mrázek2013-12-10-3/+2
* Merge branch 'feature_assets' into developPetr Mrázek2013-12-08-1/+64
|\
| * More work on new assets system. Works given a properly constructed assets fol...Sky2013-12-08-1/+64
* | Fix offline mode bugsPetr Mrázek2013-12-08-2/+2
* | Finish preliminary offline supportPetr Mrázek2013-12-08-2/+2
* | Offline mode support, part 1Petr Mrázek2013-12-05-2/+2
|/
* Fix (hopefully) library dependency resolution.Petr Mrázek2013-12-01-1/+0
* Detect java bitness on launch, use appropriate librariesPetr Mrázek2013-11-25-27/+5
* Merge branch 'feature_yggdrasil' into developPetr Mrázek2013-11-24-8/+8
|\
| * Nuke and pave the old login systemAndrew2013-11-20-8/+8
* | Prepare for rework of instance launch/updatePetr Mrázek2013-11-24-3/+9
* | Implement user info stub for newest minecraft snapshotPetr Mrázek2013-11-22-0/+2
|/
* Reformat and (slightly) decruft all the things.Petr Mrázek2013-11-04-2/+17
* Hack for Intel graphics drivers on Windows.Petr Mrázek2013-10-31-2/+11
* Fix auth for 13w41aPetr Mrázek2013-10-11-0/+1
* MehPetr Mrázek2013-10-10-2/+13
* Version changing removes any existing version json.Petr Mrázek2013-10-10-1/+10