Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion data/easyprint/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "EasyPrint",
"website": "https://primacreator.com/",
"logo": "logo.png",
"origin": "SW"
"origin": "SW",
"manufacturer": "primacreator"
}
3 changes: 2 additions & 1 deletion data/fiberon/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "Fiberon",
"website": "https://fiberon.polymaker.com/",
"logo": "logo.svg",
"origin": "CN"
"origin": "CN",
"manufacturer": "polymaker"
}
3 changes: 2 additions & 1 deletion data/jessie/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "Jessie",
"website": "https://www.printedsolid.com/",
"logo": "logo.png",
"origin": "US"
"origin": "US",
"manufacturer": "printedsolid"
}
4 changes: 2 additions & 2 deletions data/panchroma/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"name": "Panchroma",
"website": "https://polymaker.com/panchroma/",
"logo": "logo.png",
"origin": "CN"
}
"origin": "CN",
"manufacturer": "polymaker"
3 changes: 2 additions & 1 deletion data/polyflex/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "PolyFlex",
"website": "https://polymaker.com/",
"logo": "logo.svg",
"origin": "CN"
"origin": "CN",
"manufacturer": "polymaker"
}
3 changes: 2 additions & 1 deletion data/polylite/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "PolyLite",
"website": "https://polymaker.com/",
"logo": "logo.svg",
"origin": "CN"
"origin": "CN",
"manufacturer": "polymaker"
}
3 changes: 2 additions & 1 deletion data/polymax/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "PolyMax",
"website": "https://polymaker.com/",
"logo": "logo.svg",
"origin": "CN"
"origin": "CN",
"manufacturer": "polymaker"
}
3 changes: 2 additions & 1 deletion data/polymide/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "PolyMide",
"website": "https://polymaker.com/",
"logo": "logo.svg",
"origin": "CN"
"origin": "CN",
"manufacturer": "polymaker"
}
3 changes: 2 additions & 1 deletion data/polysonic/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "PolySonic",
"website": "https://polymaker.com/",
"logo": "logo.svg",
"origin": "CN"
"origin": "CN",
"manufacturer": "polymaker"
}
3 changes: 2 additions & 1 deletion data/primaselect/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "PrimaSelect",
"website": "https://primacreator.com/",
"logo": "logo.png",
"origin": "SW"
"origin": "SW",
"manufacturer": "primacreator"
}
3 changes: 2 additions & 1 deletion data/primavalue/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "PrimaValue",
"website": "https://primacreator.com/",
"logo": "logo.png",
"origin": "SW"
"origin": "SW",
"manufacturer": "primacreator"
}
3 changes: 2 additions & 1 deletion data/professional_lab/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "Professional LAB",
"website": "https://print-imagine.com/",
"logo": "logo.png",
"origin": "PL"
"origin": "PL",
"manufacturer": "smartprint"
}
3 changes: 2 additions & 1 deletion data/the_filament/brand.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "The Filament",
"website": "https://spectrumfilaments.com/en/brand/the-filament-en/",
"logo": "logo.png",
"origin": "PL"
"origin": "PL",
"manufacturer": "spectrum"
}
Empty file modified ofd.sh
100644 → 100755
Empty file.
8 changes: 7 additions & 1 deletion schemas/brand_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
},
"id": {
"maxLength": 1000,
"pattern": "^[a-z0-9+]+(_[a-z0-9+]+)*$"
"pattern": "^[a-z0-9+]+(_[a-z0-9+]+)*$",
"type": "string"
},
"logo": {
"pattern": "^logo\\.(png|jpg|svg)$"
Expand Down Expand Up @@ -46,6 +47,11 @@
"type": "string",
"description": "The source of the data, like another DB or company",
"$ref": "#/definitions/string_limit"
},
"manufacturer": {
"type": "string",
"description": "The brand id of the parent manufacturer, for product lines sold under a different name",
"$ref": "#/definitions/id"
}
},
"required": [
Expand Down