MultiMC - Minecraft modpack tooling with Google spyware removed

	Commit message (Collapse)	Author	Age	Lines
*	Merge branch 'develop' into feature_badges	Jan Dalheimer	2014-03-10	-72/+9
\|\ \| \| \| \| \| \| \| \|	Conflicts: logic/OneSixInstance.cpp
\| *	Improve reporting of version file errors.x	Petr Mrázek	2014-03-09	-1/+8
\| \|
\| *	Reorganize the version-related code.	Petr Mrázek	2014-03-01	-1/+1
\| \|
\| *	Remove obsolete OneSixFTBInstanceForge	Petr Mrázek	2014-03-01	-70/+0
\| \|
* \|	Instance badges. Some easter eggs and one for broken so far.	Jan Dalheimer	2014-03-10	-1/+1
\|/
*	Merge branch 'fix_json_version' into integration_json_and_tools	Petr Mrázek	2014-02-24	-0/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: logic/OneSixInstance.cpp logic/OneSixVersionBuilder.cpp Some fixage. Yay for conflicts.
\| *	Instance flags. Currently used for marking instances as broken. Can later be ↵	Jan Dalheimer	2014-02-17	-0/+4
\| \| \| \| \| \| \| \|	used for badges.
* \|	Copying of FTB instances working again	Jan Dalheimer	2014-02-21	-0/+71
\| \|
* \|	Don't assume forge for FTB instances. Fix FTB related stuff.	Jan Dalheimer	2014-02-21	-20/+14
\| \|
* \|	Use FTB's libraries/ and versions/ folders for non-copied instances	Jan Dalheimer	2014-02-20	-0/+9
\|/
*	Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 ↵	Petr Mrázek	2014-02-01	-4/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into feature_derpstances Conflicts: gui/dialogs/OneSixModEditDialog.cpp logic/OneSixUpdate.cpp
\| *	Split parsing/applying. Better error logging. Fix crash.	Jan Dalheimer	2014-01-27	-1/+1
\| \|
\| *	Change naming from Derp -> OneSix until the new instance type supports legacy	Jan Dalheimer	2014-01-24	-0/+123
\| \|
\| *	Derpstances. Everything renamed. Launching does not yet work.	Jan Dalheimer	2014-01-22	-125/+0
\| \|
* \|	Offline mode can be used even when online.	Petr Mrázek	2014-01-27	-3/+3
\|/ \| \| \| \| \|	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.
*	Fix FTB.	Petr Mrázek	2014-01-15	-0/+5
\| \| \| \| \|	Add support of private packs. Fix instance ID problems related to FTB instances.
*	FTB fixage	Petr Mrázek	2013-12-22	-0/+3
\| \| \| \| \|	* Corrected an uninitialized variable that prevented forge list loadinf on Windows * Run the update step twice for FTB instances to ensure forge libs get downloaded
*	Fail if we fail to find the right forge version	Petr Mrázek	2013-12-22	-0/+3
\|
*	Make FTB instances behave better	Petr Mrázek	2013-12-22	-1/+4
\| \| \| \| \| \| \|	* Do not re-create on every reload * Use the version.json/custom.json logic properly * Should be offline-friendly * FTB instances can be copied, turn into normal instances
*	Initial FTB support. Allows "tracking" of FTB instances.	Jan Dalheimer	2013-12-21	-0/+111