Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jonathan Harris 2015-06-15 22:04:19 +01:00
commit f24664e4f3

View File

@ -47,8 +47,9 @@
"format" : "date-time"
},
"ships": {
"type" : "array",
"items" : {
"type" : "array",
"uniqueItems" : true,
"items" : {
"oneOf" : [
{
"type" : "object",
@ -59,12 +60,6 @@
"type" : "string",
"minLength" : 1,
"description" : "Must be one of: Sidewinder (128049249), Eagle (128049255), Hauler (128049261), Adder (128049267), Viper (128049273), Cobra Mk III (128049279), Type-6 Transporter (128049285), Type-7 Transporter (128049297), Asp (128049303), Vulture (128049309), Imperial Clipper (128049315), Federal Dropship (128049321), Orca (128049327), Type-9 Heavy (128049333), Python (128049339), Fer-de-Lance (128049351), Anaconda (128049363), DiamondBack Scout (128671217), Imperial Courier (128671223), Diamondback Explorer (128671831)"
},
"fdId":{
"type" : "number",
"multipleOf" : 1.0,
"minimum" : 1,
"description" : "For OCR free tools, this correspond to the frontier ID. See name description."
}
}
}