Mirroring/coriolis-data
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis-data.git synced 2025-12-09 07:33:24 +00:00
Code Issues Projects Releases Wiki Activity

Confict Resolved

Browse Source
This commit is contained in:
Unknown
2017-12-24 16:57:51 +00:00
parent 3bc828140a
commit dfbbad9740
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ships/type_10_defender.json
View File

@@ -10,13 +10,8 @@
"speed": 179, "speed": 179,
"boost": 219, "boost": 219,
"boostEnergy": 19, "boostEnergy": 19,
<<<<<<< HEAD
"baseShieldStrength": 320,
"baseArmour": 1879,
=======
"baseShieldStrength": 320, "baseShieldStrength": 320,
"baseArmour": 580, "baseArmour": 580,
>>>>>>> 5dcfa6b... Final value for baseArmour
"hardness": 75, "hardness": 75,
"hullMass": 1200, "hullMass": 1200,
"masslock": 26, "masslock": 26,