Merge branch 'develop'

This commit is contained in:
willyb321
2018-07-18 08:13:20 +10:00
4 changed files with 9 additions and 9 deletions

6
dist/index.js vendored
View File

@@ -218,7 +218,7 @@ module.exports = {
}, },
alliance_challenger: { alliance_challenger: {
edID: 128816588, edID: 128816588,
eddbID: 33, eddbID: 34,
properties: { properties: {
name: "Alliance Challenger", name: "Alliance Challenger",
manufacturer: "Lakon", manufacturer: "Lakon",
@@ -2481,9 +2481,9 @@ module.exports = {
}, },
krait_mkii: { krait_mkii: {
edID: 128816567, edID: 128816567,
eddbID: 17, eddbID: 35,
properties: { properties: {
name: "Krait MkII", name: "Krait Mk II",
manufacturer: "Faulcon DeLacy", manufacturer: "Faulcon DeLacy",
class: 2, class: 2,
hullCost: 42409425, hullCost: 42409425,

6
dist/index.json vendored
View File

@@ -326,7 +326,7 @@
}, },
"alliance_challenger": { "alliance_challenger": {
"edID": 128816588, "edID": 128816588,
"eddbID": 33, "eddbID": 34,
"properties": { "properties": {
"name": "Alliance Challenger", "name": "Alliance Challenger",
"manufacturer": "Lakon", "manufacturer": "Lakon",
@@ -3864,9 +3864,9 @@
}, },
"krait_mkii": { "krait_mkii": {
"edID": 128816567, "edID": 128816567,
"eddbID": 17, "eddbID": 35,
"properties": { "properties": {
"name": "Krait MkII", "name": "Krait Mk II",
"manufacturer": "Faulcon DeLacy", "manufacturer": "Faulcon DeLacy",
"class": 2, "class": 2,
"hullCost": 42409425, "hullCost": 42409425,

View File

@@ -1,7 +1,7 @@
{ {
"alliance_challenger": { "alliance_challenger": {
"edID": 128816588, "edID": 128816588,
"eddbID": 33, "eddbID": 34,
"properties": { "properties": {
"name": "Alliance Challenger", "name": "Alliance Challenger",
"manufacturer": "Lakon", "manufacturer": "Lakon",

View File

@@ -1,9 +1,9 @@
{ {
"krait_mkii": { "krait_mkii": {
"edID": 128816567, "edID": 128816567,
"eddbID": 17, "eddbID": 35,
"properties": { "properties": {
"name": "Krait MkII", "name": "Krait Mk II",
"manufacturer": "Faulcon DeLacy", "manufacturer": "Faulcon DeLacy",
"class": 2, "class": 2,
"hullCost": 42409425, "hullCost": 42409425,