4 Commits

Author	SHA1	Message	Date
ebaydayz	69091965a1	Merge new MultiPlayerSetup and autojoin	2016-03-30 17:01:28 -04:00
ebaydayz	732c2fe5a0	Cleanup some merge conflicts	2016-03-04 14:29:49 -05:00
ebaydayz	e660704f97	Add journal and preliminary strings for crafting ... The journal is now functional. Preliminary strings are added for the 1.8.7 crafting system, but it is disabled for now. I've messaged @marceldev89 (ziellos2k) and @AlbyBDPK on the DayZ forums to ask permission to use fn_updateCraftUI, player_checkRecipe and player_craftItemGUI. Are you guys okay with us including these in DayZ Epoch 1.0.6?	2016-03-03 20:11:11 -05:00
Florian Kinder	ad22c7df04	Updated Displays ... Disabled new gear system	2014-02-18 23:51:38 +01:00