0
0
mirror of https://github.com/sp-tarkov/server.git synced 2025-02-12 15:30:44 -05:00

Merge branch '3.10.5-DEV' (#1028)

This commit is contained in:
DrakiaXYZ 2025-01-04 18:18:46 -08:00 committed by GitHub
commit 035d83910b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 12 deletions

View File

@ -1,5 +1,5 @@
{ {
"sptVersion": "3.10.4", "sptVersion": "3.10.5",
"projectName": "SPT", "projectName": "SPT",
"compatibleTarkovVersion": "0.15.5.33420", "compatibleTarkovVersion": "0.15.5.33420",
"serverName": "SPT Server", "serverName": "SPT Server",

View File

@ -228,13 +228,6 @@
"startTimestamp": 1341615600000, "startTimestamp": 1341615600000,
"endTimestamp": "", "endTimestamp": "",
"yearly": true "yearly": true
},
"674647f38466ebb03408b291": {
"name": "Thats a Great Plan Walter",
"season": "None",
"startTimestamp": 1341615600000,
"endTimestamp": "",
"yearly": false
} }
}, },
"repeatableQuests": [ "repeatableQuests": [

View File

@ -8339,7 +8339,7 @@
{ {
"enabled": true, "enabled": true,
"name": "newyears", "name": "newyears",
"type": "NEW_YEARS", "type": "NEWYEARS",
"startDay": "1", "startDay": "1",
"startMonth": "1", "startMonth": "1",
"endDay": "7", "endDay": "7",
@ -8348,7 +8348,7 @@
{ {
"enabled": true, "enabled": true,
"name": "April fools", "name": "April fools",
"type": "APRIL_FOOLS", "type": "APRILFOOLS",
"startDay": "1", "startDay": "1",
"startMonth": "4", "startMonth": "4",
"endDay": "2", "endDay": "2",

View File

@ -60335,10 +60335,27 @@
"parentId": "", "parentId": "",
"status": [ "status": [
4, 4,
5 5,
7
], ],
"target": "5edac34d0bb72a50635c2bfa", "target": "5edac34d0bb72a50635c2bfa",
"visibilityConditions": [] "visibilityConditions": []
},
{
"availableAfter": 0,
"conditionType": "Quest",
"dispersion": 0,
"dynamicLocale": false,
"globalQuestCounterId": "",
"id": "677260a62c1ea725720d6532",
"index": 1,
"parentId": "",
"status": [
4,
5
],
"target": "5edab4b1218d181e29451435",
"visibilityConditions": []
} }
], ],
"Fail": [] "Fail": []

View File

@ -1,6 +1,6 @@
{ {
"name": "spt-server", "name": "spt-server",
"version": "3.10.4", "version": "3.10.5",
"author": "SPT Server", "author": "SPT Server",
"license": "NCSA", "license": "NCSA",
"main": "obj/bundle.js", "main": "obj/bundle.js",