470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5eaca29a50
Server/project/assets/database/locations
History
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
..
bigmap Merge branch 'master' into 3.8.0 2023-11-16 23:35:11 -05:00
develop Add Repo 2023-03-03 15:23:46 +00:00
factory4_day update shoreline and factory 2023-11-02 15:25:40 +00:00
factory4_night update shoreline and factory 2023-11-02 15:25:40 +00:00
hideout 0.13.5.0 (!147) 2023-10-10 11:03:20 +00:00
interchange Merge branch 'master' into 3.8.0 2023-11-16 23:35:11 -05:00
laboratory Update map loot JSONs 2023-10-10 20:34:01 +01:00
lighthouse Update map spawn point data values (missing shoreline) 2023-11-02 15:08:20 +00:00
privatearea Add Repo 2023-03-03 15:23:46 +00:00
rezervbase Merge branch 'master' into 3.8.0 2023-11-16 23:35:11 -05:00
shoreline Update JSONs 2023-12-27 15:59:43 +00:00
suburbs Add Repo 2023-03-03 15:23:46 +00:00
tarkovstreets Update JSONs 2023-12-27 15:59:43 +00:00
terminal Add Repo 2023-03-03 15:23:46 +00:00
town Add Repo 2023-03-03 15:23:46 +00:00
woods Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2023-12-19 17:31:19 +00:00
base.json Add Repo 2023-03-03 15:23:46 +00:00