Dev 268a9b8abd Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 ... # Conflicts: # project/src/callbacks/BundleCallbacks.ts # project/src/controllers/RepeatableQuestController.ts # project/src/helpers/InRaidHelper.ts # project/src/loaders/PreAkiModLoader.ts		2023-12-15 14:16:15 +00:00
..
bots	Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0	2023-12-15 14:16:15 +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	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