Skip to content

Commit c911876

Browse files
authored
Merge branch '3.10.2-dev' into better-random
2 parents 51bffd3 + 6c9e4fd commit c911876

File tree

107 files changed

+123471
-524905
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+123471
-524905
lines changed

.gitattributes

+20-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
# Normalize Line Endings
1+
# Normalize Line Endings.
22
* text=auto eol=lf
33

4-
project/assets/compressed/database/locations.7z filter=lfs diff=lfs merge=lfs -text
4+
# LFS Tracking for large (5MB+) JSON files.
5+
#
6+
# Can be found with the following command:
7+
# find project/assets/database -type f -name "*.json" -size +5M | while read file; do
8+
# git lfs track "$file"
9+
# done
10+
project/assets/database/locations/bigmap/looseLoot.json filter=lfs diff=lfs merge=lfs -text
11+
project/assets/database/locations/laboratory/looseLoot.json filter=lfs diff=lfs merge=lfs -text
12+
project/assets/database/locations/interchange/looseLoot.json filter=lfs diff=lfs merge=lfs -text
13+
project/assets/database/locations/factory4_night/looseLoot.json filter=lfs diff=lfs merge=lfs -text
14+
project/assets/database/locations/shoreline/looseLoot.json filter=lfs diff=lfs merge=lfs -text
15+
project/assets/database/locations/tarkovstreets/looseLoot.json filter=lfs diff=lfs merge=lfs -text
16+
project/assets/database/locations/sandbox/looseLoot.json filter=lfs diff=lfs merge=lfs -text
17+
project/assets/database/locations/sandbox_high/looseLoot.json filter=lfs diff=lfs merge=lfs -text
18+
project/assets/database/locations/lighthouse/looseLoot.json filter=lfs diff=lfs merge=lfs -text
19+
project/assets/database/locations/rezervbase/looseLoot.json filter=lfs diff=lfs merge=lfs -text
20+
project/assets/database/locations/woods/looseLoot.json filter=lfs diff=lfs merge=lfs -text
21+
project/assets/database/locations/factory4_day/looseLoot.json filter=lfs diff=lfs merge=lfs -text
22+
project/assets/database/templates/items.json filter=lfs diff=lfs merge=lfs -text

.github/workflows/run-lint.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414
with:
15-
lfs: true
15+
lfs: false
16+
17+
- name: Checkout LFS
18+
run: git lfs pull
1619

1720
- uses: actions/setup-node@v4
1821
with:

.github/workflows/run-test.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414
with:
15-
lfs: true
15+
lfs: false
16+
17+
- name: Checkout LFS
18+
run: git lfs pull
1619

1720
- uses: actions/setup-node@v4
1821
with:

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
*.exe
33
*.zip
44
*.d.ts
5-
project/assets/database/locations/
65
project/build/
76
project/obj/
87
project/dist/

.lfsconfig

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[lfs]
2+
url = https://lfs.sp-tarkov.com/sp-tarkov/server
3+
locksverify = false

README.md

-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ The following commands are available after the initial setup. Run them with `npm
7272
| `run:profiler` | Run the project in profiler mode. |
7373
| `gen:types` | Generate types for the project. |
7474
| `gen:docs` | Generate documentation for the project. |
75-
| `database:compress` | Compress database files from working directory into archive. |
76-
| `database:decompress` | Decompress database archives into working directory. |
7775

7876
### Debugging
7977

project/assets/compressed/database/locations.7z

-3
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"locations": {},
3+
"paths": [{
4+
"Source": "653e6760052c01c1c805532f",
5+
"Destination": "5714dc692459777137212e12"
6+
}, {
7+
"Source": "5b0fc42d86f7744a585f9105",
8+
"Destination": "5714dc692459777137212e12"
9+
}, {
10+
"Source": "5714dc692459777137212e12",
11+
"Destination": "5714dbc024597771384a510d"
12+
}, {
13+
"Source": "5714dbc024597771384a510d",
14+
"Destination": "56f40101d2720b2a4d8b45d6"
15+
}, {
16+
"Source": "56f40101d2720b2a4d8b45d6",
17+
"Destination": "55f2d3fd4bdc2d5f408b4567"
18+
}, {
19+
"Source": "55f2d3fd4bdc2d5f408b4567",
20+
"Destination": "5704e3c2d2720bac5b8b4567"
21+
}, {
22+
"Source": "5704e3c2d2720bac5b8b4567",
23+
"Destination": "5704e5fad2720bc05b8b4567"
24+
}, {
25+
"Source": "5704e5fad2720bc05b8b4567",
26+
"Destination": "5704e4dad2720bb55b8b4567"
27+
}, {
28+
"Source": "5704e4dad2720bb55b8b4567",
29+
"Destination": "5704e554d2720bac5b8b456e"
30+
}
31+
]
32+
}

0 commit comments

Comments
 (0)