Petr Mrázek 1936bd181f Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances
Conflicts:
	gui/dialogs/OneSixModEditDialog.cpp
	logic/OneSixUpdate.cpp
2014-02-01 19:37:16 +01:00
..
2014-01-01 19:21:58 +01:00
2014-02-01 16:26:38 +01:00
2014-01-24 18:17:26 +01:00
2013-11-28 22:05:58 -06:00
2014-01-15 22:49:37 +01:00
2014-01-15 22:49:37 +01:00
2014-02-01 16:26:38 +01:00
2013-12-29 04:17:52 +01:00
2013-12-28 20:28:24 -05:00
2014-01-04 23:45:20 +01:00
2014-02-01 16:26:38 +01:00
2014-01-19 23:05:16 +01:00