Merge branch 'develop'

This commit is contained in:
willyb321
2018-12-08 10:24:11 +11:00
3 changed files with 12 additions and 12 deletions

8
dist/index.js vendored
View File

@@ -3022,16 +3022,16 @@ module.exports = {
manufacturer: "Zorgon Peterson",
class: 2,
hullCost: 55866341,
speed: 310,
boost: 380,
boostEnergy: 10,
speed: 300,
boost: 370,
boostEnergy: 19,
baseShieldStrength: 270,
heatCapacity: 165,
baseArmour: 230,
hardness: 65,
hullMass: 250,
masslock: 12,
pipSpeed: .048387096774194,
pipSpeed: .047297297297297,
pitch: 27,
roll: 80,
yaw: 10,

8
dist/index.json vendored
View File

@@ -4643,16 +4643,16 @@
"manufacturer": "Zorgon Peterson",
"class": 2,
"hullCost": 55866341,
"speed": 310,
"boost": 380,
"boostEnergy": 10,
"speed": 300,
"boost": 370,
"boostEnergy": 19,
"baseShieldStrength": 270,
"heatCapacity": 165,
"baseArmour": 230,
"hardness": 65,
"hullMass": 250,
"masslock": 12,
"pipSpeed": 0.048387096774194,
"pipSpeed": 0.047297297297297,
"pitch": 27,
"roll": 80,
"yaw": 10,

View File

@@ -7,16 +7,16 @@
"manufacturer": "Zorgon Peterson",
"class": 2,
"hullCost": 55866341,
"speed": 310,
"boost": 380,
"boostEnergy": 10,
"speed": 300,
"boost": 370,
"boostEnergy": 19,
"baseShieldStrength": 270,
"heatCapacity": 165,
"baseArmour": 230,
"hardness": 65,
"hullMass": 250,
"masslock": 12,
"pipSpeed": 0.048387096774194,
"pipSpeed": 0.047297297297297,
"pitch": 27,
"roll": 80,
"yaw": 10,