Compare commits

..

3 Commits

Author SHA1 Message Date
willyb321
6d8c74ad3f Merge branch 'release/2.9.12' 2018-04-28 12:15:32 +10:00
willyb321
c140856334 Merge branch 'develop' 2018-04-28 09:57:05 +10:00
willyb321
9ac6427ee0 Merge branch 'release/2.9.11' 2018-04-26 09:20:42 +10:00
6 changed files with 2294 additions and 2612 deletions

1364
dist/index.js vendored

File diff suppressed because it is too large Load Diff

2153
dist/index.json vendored

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1740,11 +1740,6 @@
"Colonel Bris Dekker", "Colonel Bris Dekker",
"Tiana Fortune" "Tiana Fortune"
] ]
},
"4": {
"engineers": [
"Colonel Bris Dekker"
]
} }
} }
} }
@@ -3729,7 +3724,6 @@
"special_dispersal_field", "special_dispersal_field",
"special_phasing_sequence", "special_phasing_sequence",
"special_plasma_slug", "special_plasma_slug",
"special_plasma_slug_cooled",
"special_lock_breaker", "special_lock_breaker",
"special_thermal_conduit", "special_thermal_conduit",
"special_weapon_damage", "special_weapon_damage",
@@ -3951,16 +3945,6 @@
"Marco Qwent", "Marco Qwent",
"The Dweller" "The Dweller"
] ]
},
"4": {
"engineers": [
"The Dweller"
]
},
"5": {
"engineers": [
"The Dweller"
]
} }
} }
}, },
@@ -4056,16 +4040,6 @@
"Marco Qwent", "Marco Qwent",
"The Dweller" "The Dweller"
] ]
},
"4": {
"engineers": [
"The Dweller"
]
},
"5": {
"engineers": [
"The Dweller"
]
} }
} }
}, },
@@ -4091,16 +4065,6 @@
"Marco Qwent", "Marco Qwent",
"The Dweller" "The Dweller"
] ]
},
"4": {
"engineers": [
"The Dweller"
]
},
"5": {
"engineers": [
"The Dweller"
]
} }
} }
} }
@@ -4582,17 +4546,6 @@
"Hera Tani", "Hera Tani",
"Marco Qwent" "Marco Qwent"
] ]
},
"4": {
"engineers": [
"Hera Tani",
"Marco Qwent"
]
},
"5": {
"engineers": [
"Hera Tani"
]
} }
} }
}, },
@@ -5384,7 +5337,6 @@
"kinres", "kinres",
"mass", "mass",
"power", "power",
"optmul",
"shieldboost", "shieldboost",
"thermres" "thermres"
], ],

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "coriolis-data", "name": "coriolis-data",
"version": "2.9.14", "version": "2.9.12",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@@ -1,6 +1,6 @@
{ {
"name": "coriolis-data", "name": "coriolis-data",
"version": "2.9.14", "version": "2.9.12",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/EDCD/coriolis-data" "url": "https://github.com/EDCD/coriolis-data"