Dev 5eaca29a50 Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 ... # Conflicts: # project/assets/configs/bot.json # project/assets/database/locations/shoreline/base.json # project/assets/database/locations/tarkovstreets/base.json # project/assets/database/templates/handbook.json # project/assets/database/templates/items.json		2023-12-27 16:08:54 +00:00
..
bots	Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0	2023-12-19 17:31:19 +00:00
hideout	Update JSONs	2023-12-27 15:59:43 +00:00
locales	Update JSONs	2023-12-27 15:59:43 +00:00
locations	Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0	2023-12-27 16:08:54 +00: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	Add starter quests	2023-12-27 16:07:12 +00:00
traders	Add mising m1a 10 round mag to peacekeepr l1 assorts table	2023-12-11 16:37:02 +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