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
..
bots	Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0	2023-11-30 10:20:37 +00:00
hideout	0.13.5.0 (!147)	2023-10-10 11:03:20 +00:00
locales	Update locales - fixes The Punisher - Harvest quest issue	2023-12-05 13:44:16 +00:00
locations	Merge branch 'master' into 3.8.0	2023-11-16 23:35:11 -05:00
loot	Update map loot JSONs	2023-10-10 20:34:01 +01:00
match	0.13.5.0 (!147)	2023-10-10 11:03:20 +00:00
templates	Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0	2023-12-08 22:20:16 +00:00
traders	Update Skiers questassort data	2023-12-03 10:01:55 +00:00
globals.json	Update JSONs	2023-11-06 13:12:12 +00:00
server.json	Add Repo	2023-03-03 15:23:46 +00:00
settings.json	24605 (!103)	2023-07-07 20:24:42 +00:00