Dev 77dba80fbd Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 ... # Conflicts: # project/assets/configs/core.json # project/assets/database/locales/global/ch.json # project/assets/database/locales/global/cz.json # project/assets/database/locales/global/en.json # project/assets/database/locales/global/es-mx.json # project/assets/database/locales/global/es.json # project/assets/database/locales/global/fr.json # project/assets/database/locales/global/ge.json # project/assets/database/locales/global/hu.json # project/assets/database/locales/global/it.json # project/assets/database/locales/global/jp.json # project/assets/database/locales/global/kr.json # project/assets/database/locales/global/pl.json # project/assets/database/locales/global/po.json # project/assets/database/locales/global/ru.json # project/assets/database/locales/global/sk.json # project/assets/database/locales/global/tu.json # project/src/controllers/TradeController.ts # project/src/generators/LocationGenerator.ts		2023-12-08 22:20:16 +00:00
..
ArchivedQuests.json	Add Repo	2023-03-03 15:23:46 +00:00
character.json	Add Repo	2023-03-03 15:23:46 +00:00
customization.json	0.13.5.0 (!147)	2023-10-10 11:03:20 +00:00
defaultEquipmentPresets.json	0.13.5.0 (!147)	2023-10-10 11:03:20 +00:00
handbook.json	Update JSONs	2023-11-06 13:12:12 +00:00
items.json	Update JSONs	2023-11-06 13:12:12 +00:00
prices.json	Update flea prices	2023-12-03 11:41:58 +00:00
profiles.json	Fix typo	2023-11-15 11:21:33 +00:00
quests.json	Add event quest: The Punisher - Harvest	2023-11-28 19:03:17 +00:00
repeatableQuests.json	Add additional items to the find and return pool	2023-11-19 14:51:00 +00:00