Dev fc606ee540 Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 ...

# Conflicts:
#	project/assets/database/bots/types/assault.json
#	project/assets/database/bots/types/bossknight.json
#	project/assets/database/bots/types/bosszryachiy.json
#	project/assets/database/bots/types/followerzryachiy.json

2023-10-31 19:10:23 +00:00

..

bots

Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0

2023-10-31 19:10:23 +00:00

hideout

0.13.5.0 (!147)

2023-10-10 11:03:20 +00:00

locales

Update JSONs

2023-10-30 22:19:59 +00:00

locations

Update JSONs

2023-10-28 12:20:48 +01: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

Update JSONs

2023-10-30 22:19:59 +00:00

traders

0.13.5.0 (!147)

2023-10-10 11:03:20 +00:00

globals.json

Update JSONs

2023-10-30 22:19:59 +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