dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

Merge branch 'master' into singularity

Browse Source 
# Conflicts:
#	eos/effects.py
#	staticdata/fsd_built/dogmaeffects.0.json
#	staticdata/fsd_built/iconids.0.json
#	staticdata/fsd_built/marketgroups.0.json
#	staticdata/fsd_built/types.4.json
#	staticdata/fsd_built/types.5.json
#	staticdata/phobos/metadata.0.json
#	version.yml
This commit is contained in:
DarkPhoenix
2025-11-14 22:13:20 +01:00
parent 7cc4f6ec27 d271515060
commit 977cf61ff5
3 changed files with 252 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
staticdata/fsd_built/typedogma.0.json
View File

@@ -824833,6 +824833,10 @@
"attributeID": 633,
"value": 8.0
},
{
"attributeID": 656,
"value": 20.0
},
{
"attributeID": 659,
"value": 20.0
@@ -824847,7 +824851,7 @@
},
{
"attributeID": 793,
"value": 100.0
"value": 125.0
},
{
"attributeID": 1132,
@@ -824933,6 +824937,10 @@
"attributeID": 2045,
"value": 1.0
},
{
"attributeID": 2070,
"value": 10.0
},
{
"attributeID": 2113,
"value": 1.0
@@ -824966,6 +824974,22 @@
{
"effectID": 5854,
"isDefault": 0
},
{
"effectID": 6299,
"isDefault": 0
},
{
"effectID": 6305,
"isDefault": 0
},
{
"effectID": 12739,
"isDefault": 0
},
{
"effectID": 12740,
"isDefault": 0
}
]
},
@@ -825579,6 +825603,10 @@
"attributeID": 484,
"value": 0.75
},
{
"attributeID": 485,
"value": 20.0
},
{
"attributeID": 511,
"value": 0.0
@@ -825621,7 +825649,7 @@
},
{
"attributeID": 793,
"value": 100.0
"value": 125.0
},
{
"attributeID": 1132,
@@ -825691,6 +825719,10 @@
"attributeID": 1555,
"value": 38.0
},
{
"attributeID": 1623,
"value": 10.0
},
{
"attributeID": 1692,
"value": 4.0
@@ -825740,6 +825772,22 @@
{
"effectID": 5854,
"isDefault": 0
},
{
"effectID": 6281,
"isDefault": 0
},
{
"effectID": 6285,
"isDefault": 0
},
{
"effectID": 6287,
"isDefault": 0
},
{
"effectID": 6291,
"isDefault": 0
}
]
},