Dev 2148eaafe5 Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 ... # Conflicts: # project/src/context/ApplicationContext.ts # project/src/context/ContextVariableType.ts # project/src/controllers/QuestController.ts # project/src/di/Container.ts # project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts		2023-11-30 10:20:37 +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 EN locale	2023-11-22 14:29:00 +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-11-30 10:20:37 +00:00
traders	Update quest assort data (includes peacekeeper ammo unlocks for new event quest)	2023-11-28 19:50:40 +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