diff --git a/data/novtau/ABS/abs/azure/variant.json b/data/novtau/ABS/abs/azure/variant.json index c664872bbf..56290be858 100644 --- a/data/novtau/ABS/abs/azure/variant.json +++ b/data/novtau/ABS/abs/azure/variant.json @@ -2,5 +2,6 @@ "uuid": "ad1ae98b-f689-4541-b7b2-745eb99d2cc1", "id": "azure", "name": "Azure", - "color_hex": "#1B3596" + "color_hex": "#1B3596", + "discontinued": true } diff --git a/data/novtau/ABS/abs/black/sizes.json b/data/novtau/ABS/abs/black/sizes.json index 6c2ab00352..69ab05e5e6 100644 --- a/data/novtau/ABS/abs/black/sizes.json +++ b/data/novtau/ABS/abs/black/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "2f3ea696-a487-4466-b200-bfc5f7a28ca4", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "2f3ea696-a487-4466-b200-bfc5f7a28ca4" } ] diff --git a/data/novtau/ABS/abs/black/variant.json b/data/novtau/ABS/abs/black/variant.json index 66f31ca14d..8714866d79 100644 --- a/data/novtau/ABS/abs/black/variant.json +++ b/data/novtau/ABS/abs/black/variant.json @@ -1,6 +1,6 @@ { - "uuid": "779bd892-ae3d-4ed3-8a1c-2fa3bc93aa10", "id": "black", "name": "Black", - "color_hex": "#313130" + "color_hex": "#313130", + "uuid": "779bd892-ae3d-4ed3-8a1c-2fa3bc93aa10" } diff --git a/data/novtau/ABS/abs/blue/sizes.json b/data/novtau/ABS/abs/blue/sizes.json index 0ef65fff98..e2aeb302cc 100644 --- a/data/novtau/ABS/abs/blue/sizes.json +++ b/data/novtau/ABS/abs/blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "20df3508-5c9c-419e-829e-ba4fa083f16c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "20df3508-5c9c-419e-829e-ba4fa083f16c" } ] diff --git a/data/novtau/ABS/abs/blue/variant.json b/data/novtau/ABS/abs/blue/variant.json index 8baf5c56f7..718e834a8f 100644 --- a/data/novtau/ABS/abs/blue/variant.json +++ b/data/novtau/ABS/abs/blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "697c4b1c-ff3d-49b1-9ee8-1b276b5a7714", "id": "blue", "name": "Blue", - "color_hex": "#1B3595" + "color_hex": "#1B3595", + "uuid": "697c4b1c-ff3d-49b1-9ee8-1b276b5a7714" } diff --git a/data/novtau/ABS/abs/bronze/sizes.json b/data/novtau/ABS/abs/bronze/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ABS/abs/bronze/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ABS/abs/bronze/variant.json b/data/novtau/ABS/abs/bronze/variant.json new file mode 100644 index 0000000000..3d33a6dc48 --- /dev/null +++ b/data/novtau/ABS/abs/bronze/variant.json @@ -0,0 +1,5 @@ +{ + "id": "bronze", + "name": "Bronze", + "color_hex": "#706747" +} diff --git a/data/novtau/ABS/abs/brown/sizes.json b/data/novtau/ABS/abs/brown/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ABS/abs/brown/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ABS/abs/brown/variant.json b/data/novtau/ABS/abs/brown/variant.json new file mode 100644 index 0000000000..3bedac59d3 --- /dev/null +++ b/data/novtau/ABS/abs/brown/variant.json @@ -0,0 +1,5 @@ +{ + "id": "brown", + "name": "Brown", + "color_hex": "#5D2F2A" +} diff --git a/data/novtau/ABS/abs/filament.json b/data/novtau/ABS/abs/filament.json index ebc39d00c9..3fe1d3cc02 100644 --- a/data/novtau/ABS/abs/filament.json +++ b/data/novtau/ABS/abs/filament.json @@ -1,7 +1,7 @@ { - "uuid": "4eb9e653-3948-402b-9207-dccf54a96c43", "id": "abs", "name": "ABS", "diameter_tolerance": 0.02, - "density": 1.04 + "density": 1.04, + "uuid": "4eb9e653-3948-402b-9207-dccf54a96c43" } diff --git a/data/novtau/ABS/abs/gold/sizes.json b/data/novtau/ABS/abs/gold/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ABS/abs/gold/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ABS/abs/gold/variant.json b/data/novtau/ABS/abs/gold/variant.json new file mode 100644 index 0000000000..83b0b3e83c --- /dev/null +++ b/data/novtau/ABS/abs/gold/variant.json @@ -0,0 +1,5 @@ +{ + "id": "gold", + "name": "Gold", + "color_hex": "#CA872E" +} diff --git a/data/novtau/ABS/abs/gray/sizes.json b/data/novtau/ABS/abs/gray/sizes.json index bbf655634d..4cbba8315a 100644 --- a/data/novtau/ABS/abs/gray/sizes.json +++ b/data/novtau/ABS/abs/gray/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "51995451-6d46-4ead-bcff-2620d93f5c37", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "51995451-6d46-4ead-bcff-2620d93f5c37" } ] diff --git a/data/novtau/ABS/abs/gray/variant.json b/data/novtau/ABS/abs/gray/variant.json index fb4cb68167..f8908a68d9 100644 --- a/data/novtau/ABS/abs/gray/variant.json +++ b/data/novtau/ABS/abs/gray/variant.json @@ -1,6 +1,6 @@ { - "uuid": "035af06d-c053-44ed-be01-10700a8ed3f3", "id": "gray", "name": "Gray", - "color_hex": "#777679" + "color_hex": "#999C9B", + "uuid": "035af06d-c053-44ed-be01-10700a8ed3f3" } diff --git a/data/novtau/ABS/abs/green/sizes.json b/data/novtau/ABS/abs/green/sizes.json index 8e8131e60e..739d46cb59 100644 --- a/data/novtau/ABS/abs/green/sizes.json +++ b/data/novtau/ABS/abs/green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "ed4b1ef5-844a-4760-a4bf-9a4edda63465", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ed4b1ef5-844a-4760-a4bf-9a4edda63465" } ] diff --git a/data/novtau/ABS/abs/green/variant.json b/data/novtau/ABS/abs/green/variant.json index db828a7f67..229993aea9 100644 --- a/data/novtau/ABS/abs/green/variant.json +++ b/data/novtau/ABS/abs/green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "0f6cdf3e-f6b7-4e64-b0ff-f7060dd2427d", "id": "green", "name": "Green", - "color_hex": "#057A41" + "color_hex": "#067940", + "uuid": "0f6cdf3e-f6b7-4e64-b0ff-f7060dd2427d" } diff --git a/data/novtau/ABS/abs/natural/sizes.json b/data/novtau/ABS/abs/natural/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ABS/abs/natural/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ABS/abs/natural/variant.json b/data/novtau/ABS/abs/natural/variant.json new file mode 100644 index 0000000000..fd9d7c323f --- /dev/null +++ b/data/novtau/ABS/abs/natural/variant.json @@ -0,0 +1,5 @@ +{ + "id": "natural", + "name": "Natural", + "color_hex": "#C8BCA1" +} diff --git a/data/novtau/ABS/abs/pale_blue/sizes.json b/data/novtau/ABS/abs/pale_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ABS/abs/pale_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ABS/abs/pale_blue/variant.json b/data/novtau/ABS/abs/pale_blue/variant.json new file mode 100644 index 0000000000..c1b25f0be3 --- /dev/null +++ b/data/novtau/ABS/abs/pale_blue/variant.json @@ -0,0 +1,5 @@ +{ + "id": "pale_blue", + "name": "Pale Blue", + "color_hex": "#6CC1B3" +} diff --git a/data/novtau/ABS/abs/red/sizes.json b/data/novtau/ABS/abs/red/sizes.json index 5c48584974..815f1aa023 100644 --- a/data/novtau/ABS/abs/red/sizes.json +++ b/data/novtau/ABS/abs/red/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "183b7e96-96f4-4a85-b22d-7ade429beef2", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "183b7e96-96f4-4a85-b22d-7ade429beef2" } ] diff --git a/data/novtau/ABS/abs/red/variant.json b/data/novtau/ABS/abs/red/variant.json index 8b4ce38298..e52436eb07 100644 --- a/data/novtau/ABS/abs/red/variant.json +++ b/data/novtau/ABS/abs/red/variant.json @@ -1,6 +1,6 @@ { - "uuid": "6fff54cf-2f55-4d31-aa88-897ddb783072", "id": "red", "name": "Red", - "color_hex": "#D41D23" + "color_hex": "#D91527", + "uuid": "6fff54cf-2f55-4d31-aa88-897ddb783072" } diff --git a/data/novtau/ABS/abs/skin_tone/sizes.json b/data/novtau/ABS/abs/skin_tone/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ABS/abs/skin_tone/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ABS/abs/skin_tone/variant.json b/data/novtau/ABS/abs/skin_tone/variant.json new file mode 100644 index 0000000000..7463ab979d --- /dev/null +++ b/data/novtau/ABS/abs/skin_tone/variant.json @@ -0,0 +1,5 @@ +{ + "id": "skin_tone", + "name": "Skin Tone", + "color_hex": "#DCB289" +} diff --git a/data/novtau/ABS/abs/sky_blue/sizes.json b/data/novtau/ABS/abs/sky_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ABS/abs/sky_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ABS/abs/sky_blue/variant.json b/data/novtau/ABS/abs/sky_blue/variant.json new file mode 100644 index 0000000000..1d87b91d37 --- /dev/null +++ b/data/novtau/ABS/abs/sky_blue/variant.json @@ -0,0 +1,5 @@ +{ + "id": "sky_blue", + "name": "Sky Blue", + "color_hex": "#24A7D1" +} diff --git a/data/novtau/ABS/abs/tangerine_yellow/sizes.json b/data/novtau/ABS/abs/tangerine_yellow/sizes.json index bbf4f8b85c..044e5757ad 100644 --- a/data/novtau/ABS/abs/tangerine_yellow/sizes.json +++ b/data/novtau/ABS/abs/tangerine_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "d57a801f-5b00-44e9-a229-72142a57ae0f", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "d57a801f-5b00-44e9-a229-72142a57ae0f" } ] diff --git a/data/novtau/ABS/abs/tangerine_yellow/variant.json b/data/novtau/ABS/abs/tangerine_yellow/variant.json index f5ba1b36a0..ffe897a295 100644 --- a/data/novtau/ABS/abs/tangerine_yellow/variant.json +++ b/data/novtau/ABS/abs/tangerine_yellow/variant.json @@ -1,6 +1,6 @@ { - "uuid": "1f445512-86a7-4b9a-85f9-0fb1ce011634", "id": "tangerine_yellow", "name": "Tangerine Yellow", - "color_hex": "#E8B20B" + "color_hex": "#E8B20B", + "uuid": "1f445512-86a7-4b9a-85f9-0fb1ce011634" } diff --git a/data/novtau/ABS/abs/white/sizes.json b/data/novtau/ABS/abs/white/sizes.json index 655e4899be..ea90895e6d 100644 --- a/data/novtau/ABS/abs/white/sizes.json +++ b/data/novtau/ABS/abs/white/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "41c06119-e7aa-4f89-a558-3db54f552b97", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "41c06119-e7aa-4f89-a558-3db54f552b97" } ] diff --git a/data/novtau/ABS/abs/white/variant.json b/data/novtau/ABS/abs/white/variant.json index 78ecd0e43a..c4bc5d5fd4 100644 --- a/data/novtau/ABS/abs/white/variant.json +++ b/data/novtau/ABS/abs/white/variant.json @@ -1,6 +1,6 @@ { - "uuid": "8f1ee65f-8046-4319-9cb0-cc29ba09866d", "id": "white", "name": "White", - "color_hex": "#D4D4D6" + "color_hex": "#E3E1D5", + "uuid": "8f1ee65f-8046-4319-9cb0-cc29ba09866d" } diff --git a/data/novtau/ABS/abs/wood_tone/sizes.json b/data/novtau/ABS/abs/wood_tone/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ABS/abs/wood_tone/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ABS/abs/wood_tone/variant.json b/data/novtau/ABS/abs/wood_tone/variant.json new file mode 100644 index 0000000000..9704057b6e --- /dev/null +++ b/data/novtau/ABS/abs/wood_tone/variant.json @@ -0,0 +1,5 @@ +{ + "id": "wood_tone", + "name": "Wood Tone", + "color_hex": "#AE9170" +} diff --git a/data/novtau/ABS/abs_gf/black/sizes.json b/data/novtau/ABS/abs_gf/black/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ABS/abs_gf/black/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ABS/abs_gf/black/variant.json b/data/novtau/ABS/abs_gf/black/variant.json new file mode 100644 index 0000000000..dbb6834d34 --- /dev/null +++ b/data/novtau/ABS/abs_gf/black/variant.json @@ -0,0 +1,9 @@ +{ + "id": "black", + "name": "Black", + "color_hex": "#2C2D2C", + "traits": { + "contains_glass_fiber": true, + "abrasive": true + } +} diff --git a/data/novtau/ABS/abs_gf/filament.json b/data/novtau/ABS/abs_gf/filament.json new file mode 100644 index 0000000000..1b07a3ea05 --- /dev/null +++ b/data/novtau/ABS/abs_gf/filament.json @@ -0,0 +1,6 @@ +{ + "id": "abs_gf", + "name": "ABS-GF", + "diameter_tolerance": 0.02, + "density": 1.04 +} diff --git a/data/novtau/ABS/abs_gf/white/sizes.json b/data/novtau/ABS/abs_gf/white/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ABS/abs_gf/white/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ABS/abs_gf/white/variant.json b/data/novtau/ABS/abs_gf/white/variant.json new file mode 100644 index 0000000000..99cfd61ca6 --- /dev/null +++ b/data/novtau/ABS/abs_gf/white/variant.json @@ -0,0 +1,9 @@ +{ + "id": "white", + "name": "White", + "color_hex": "#CFD0CB", + "traits": { + "contains_glass_fiber": true, + "abrasive": true + } +} diff --git a/data/novtau/ABS/material.json b/data/novtau/ABS/material.json index 08217b89d6..b645a39b43 100644 --- a/data/novtau/ABS/material.json +++ b/data/novtau/ABS/material.json @@ -1,4 +1,4 @@ { - "uuid": "1fd3cb08-184c-4c1d-b66c-1d0ecec5caa9", - "material": "ABS" + "material": "ABS", + "uuid": "1fd3cb08-184c-4c1d-b66c-1d0ecec5caa9" } diff --git a/data/novtau/ASA/asa/army_green/sizes.json b/data/novtau/ASA/asa/army_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ASA/asa/army_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ASA/asa/army_green/variant.json b/data/novtau/ASA/asa/army_green/variant.json new file mode 100644 index 0000000000..98ea9274a2 --- /dev/null +++ b/data/novtau/ASA/asa/army_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "army_green", + "name": "Army Green", + "color_hex": "#6A7047" +} diff --git a/data/novtau/ASA/asa/black/sizes.json b/data/novtau/ASA/asa/black/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ASA/asa/black/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ASA/asa/black/variant.json b/data/novtau/ASA/asa/black/variant.json new file mode 100644 index 0000000000..fd7c3a028f --- /dev/null +++ b/data/novtau/ASA/asa/black/variant.json @@ -0,0 +1,5 @@ +{ + "id": "black", + "name": "Black", + "color_hex": "#2F2F2F" +} diff --git a/data/novtau/ASA/asa/blue/sizes.json b/data/novtau/ASA/asa/blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ASA/asa/blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ASA/asa/blue/variant.json b/data/novtau/ASA/asa/blue/variant.json new file mode 100644 index 0000000000..dca9d67b16 --- /dev/null +++ b/data/novtau/ASA/asa/blue/variant.json @@ -0,0 +1,5 @@ +{ + "id": "blue", + "name": "Blue", + "color_hex": "#379AE1" +} diff --git a/data/novtau/ASA/asa/dark_purple/sizes.json b/data/novtau/ASA/asa/dark_purple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ASA/asa/dark_purple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ASA/asa/dark_purple/variant.json b/data/novtau/ASA/asa/dark_purple/variant.json new file mode 100644 index 0000000000..e8976d8f2b --- /dev/null +++ b/data/novtau/ASA/asa/dark_purple/variant.json @@ -0,0 +1,5 @@ +{ + "id": "dark_purple", + "name": "Dark Purple", + "color_hex": "#502C71" +} diff --git a/data/novtau/ASA/asa/filament.json b/data/novtau/ASA/asa/filament.json new file mode 100644 index 0000000000..a7f612e9d2 --- /dev/null +++ b/data/novtau/ASA/asa/filament.json @@ -0,0 +1,6 @@ +{ + "id": "asa", + "name": "ASA", + "diameter_tolerance": 0.02, + "density": 1.04 +} diff --git a/data/novtau/ASA/asa/gray/sizes.json b/data/novtau/ASA/asa/gray/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ASA/asa/gray/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ASA/asa/gray/variant.json b/data/novtau/ASA/asa/gray/variant.json new file mode 100644 index 0000000000..4e362a45ec --- /dev/null +++ b/data/novtau/ASA/asa/gray/variant.json @@ -0,0 +1,5 @@ +{ + "id": "gray", + "name": "Gray", + "color_hex": "#9E9E9D" +} diff --git a/data/novtau/ASA/asa/green/sizes.json b/data/novtau/ASA/asa/green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ASA/asa/green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ASA/asa/green/variant.json b/data/novtau/ASA/asa/green/variant.json new file mode 100644 index 0000000000..c1db7b2a3e --- /dev/null +++ b/data/novtau/ASA/asa/green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "green", + "name": "Green", + "color_hex": "#21D31E" +} diff --git a/data/novtau/ASA/asa/orange/sizes.json b/data/novtau/ASA/asa/orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ASA/asa/orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ASA/asa/orange/variant.json b/data/novtau/ASA/asa/orange/variant.json new file mode 100644 index 0000000000..486464a87d --- /dev/null +++ b/data/novtau/ASA/asa/orange/variant.json @@ -0,0 +1,5 @@ +{ + "id": "orange", + "name": "Orange", + "color_hex": "#FA5C18" +} diff --git a/data/novtau/ASA/asa/red/sizes.json b/data/novtau/ASA/asa/red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ASA/asa/red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ASA/asa/red/variant.json b/data/novtau/ASA/asa/red/variant.json new file mode 100644 index 0000000000..fb74c8a5eb --- /dev/null +++ b/data/novtau/ASA/asa/red/variant.json @@ -0,0 +1,5 @@ +{ + "id": "red", + "name": "Red", + "color_hex": "#F15865" +} diff --git a/data/novtau/ASA/asa/white/sizes.json b/data/novtau/ASA/asa/white/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ASA/asa/white/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ASA/asa/white/variant.json b/data/novtau/ASA/asa/white/variant.json new file mode 100644 index 0000000000..f4b25aa55d --- /dev/null +++ b/data/novtau/ASA/asa/white/variant.json @@ -0,0 +1,5 @@ +{ + "id": "white", + "name": "White", + "color_hex": "#E2E0DD" +} diff --git a/data/novtau/ASA/asa_cf/black/sizes.json b/data/novtau/ASA/asa_cf/black/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/ASA/asa_cf/black/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/ASA/asa_cf/black/variant.json b/data/novtau/ASA/asa_cf/black/variant.json new file mode 100644 index 0000000000..ddf2e2bfdd --- /dev/null +++ b/data/novtau/ASA/asa_cf/black/variant.json @@ -0,0 +1,9 @@ +{ + "id": "black", + "name": "Black", + "color_hex": "#2D2D2D", + "traits": { + "contains_carbon_fiber": true, + "abrasive": true + } +} diff --git a/data/novtau/ASA/asa_cf/filament.json b/data/novtau/ASA/asa_cf/filament.json new file mode 100644 index 0000000000..1dd315af08 --- /dev/null +++ b/data/novtau/ASA/asa_cf/filament.json @@ -0,0 +1,6 @@ +{ + "id": "asa_cf", + "name": "ASA-CF", + "diameter_tolerance": 0.02, + "density": 1.04 +} diff --git a/data/novtau/ASA/material.json b/data/novtau/ASA/material.json new file mode 100644 index 0000000000..01e9d8f684 --- /dev/null +++ b/data/novtau/ASA/material.json @@ -0,0 +1,3 @@ +{ + "material": "ASA" +} diff --git a/data/novtau/PA6/material.json b/data/novtau/PA6/material.json new file mode 100644 index 0000000000..24bb8a3f6e --- /dev/null +++ b/data/novtau/PA6/material.json @@ -0,0 +1,3 @@ +{ + "material": "PA6" +} diff --git a/data/novtau/PA6/pa6_cf/black/sizes.json b/data/novtau/PA6/pa6_cf/black/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PA6/pa6_cf/black/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PA6/pa6_cf/black/variant.json b/data/novtau/PA6/pa6_cf/black/variant.json new file mode 100644 index 0000000000..afd7fc4f1d --- /dev/null +++ b/data/novtau/PA6/pa6_cf/black/variant.json @@ -0,0 +1,9 @@ +{ + "id": "black", + "name": "Black", + "color_hex": "#2A2A2A", + "traits": { + "contains_carbon_fiber": true, + "abrasive": true + } +} diff --git a/data/novtau/PA6/pa6_cf/filament.json b/data/novtau/PA6/pa6_cf/filament.json new file mode 100644 index 0000000000..a59e7de374 --- /dev/null +++ b/data/novtau/PA6/pa6_cf/filament.json @@ -0,0 +1,6 @@ +{ + "id": "pa6_cf", + "name": "PA6-CF", + "diameter_tolerance": 0.02, + "density": 1.04 +} diff --git a/data/novtau/PC/material.json b/data/novtau/PC/material.json new file mode 100644 index 0000000000..0be39e3432 --- /dev/null +++ b/data/novtau/PC/material.json @@ -0,0 +1,3 @@ +{ + "material": "PC" +} diff --git a/data/novtau/PC/pc/black/sizes.json b/data/novtau/PC/pc/black/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PC/pc/black/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PC/pc/black/variant.json b/data/novtau/PC/pc/black/variant.json new file mode 100644 index 0000000000..b1625c7734 --- /dev/null +++ b/data/novtau/PC/pc/black/variant.json @@ -0,0 +1,5 @@ +{ + "id": "black", + "name": "Black", + "color_hex": "#292929" +} diff --git a/data/novtau/PC/pc/filament.json b/data/novtau/PC/pc/filament.json new file mode 100644 index 0000000000..d979e9b6c1 --- /dev/null +++ b/data/novtau/PC/pc/filament.json @@ -0,0 +1,6 @@ +{ + "id": "pc", + "name": "PC", + "diameter_tolerance": 0.02, + "density": 1.04 +} diff --git a/data/novtau/PC/pc/transparent/sizes.json b/data/novtau/PC/pc/transparent/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PC/pc/transparent/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PC/pc/transparent/variant.json b/data/novtau/PC/pc/transparent/variant.json new file mode 100644 index 0000000000..a604788193 --- /dev/null +++ b/data/novtau/PC/pc/transparent/variant.json @@ -0,0 +1,5 @@ +{ + "id": "transparent", + "name": "Transparent", + "color_hex": "#D9D9DA" +} diff --git a/data/novtau/PC/pc/white/sizes.json b/data/novtau/PC/pc/white/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PC/pc/white/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PC/pc/white/variant.json b/data/novtau/PC/pc/white/variant.json new file mode 100644 index 0000000000..b284021227 --- /dev/null +++ b/data/novtau/PC/pc/white/variant.json @@ -0,0 +1,5 @@ +{ + "id": "white", + "name": "White", + "color_hex": "#CFCDCC" +} diff --git a/data/novtau/PET/material.json b/data/novtau/PET/material.json new file mode 100644 index 0000000000..1d719f28d5 --- /dev/null +++ b/data/novtau/PET/material.json @@ -0,0 +1,3 @@ +{ + "material": "PET" +} diff --git a/data/novtau/PET/pet_cf/black/sizes.json b/data/novtau/PET/pet_cf/black/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PET/pet_cf/black/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PET/pet_cf/black/variant.json b/data/novtau/PET/pet_cf/black/variant.json new file mode 100644 index 0000000000..ddf2e2bfdd --- /dev/null +++ b/data/novtau/PET/pet_cf/black/variant.json @@ -0,0 +1,9 @@ +{ + "id": "black", + "name": "Black", + "color_hex": "#2D2D2D", + "traits": { + "contains_carbon_fiber": true, + "abrasive": true + } +} diff --git a/data/novtau/PET/pet_cf/filament.json b/data/novtau/PET/pet_cf/filament.json new file mode 100644 index 0000000000..0508dee191 --- /dev/null +++ b/data/novtau/PET/pet_cf/filament.json @@ -0,0 +1,6 @@ +{ + "id": "pet_cf", + "name": "PET-CF", + "diameter_tolerance": 0.02, + "density": 1.25 +} diff --git a/data/novtau/PETG/material.json b/data/novtau/PETG/material.json index 01af65b9f3..04bd300992 100644 --- a/data/novtau/PETG/material.json +++ b/data/novtau/PETG/material.json @@ -1,4 +1,4 @@ { - "uuid": "90bafef9-310b-4bc1-9991-309fbb7df3ef", - "material": "PETG" + "material": "PETG", + "uuid": "90bafef9-310b-4bc1-9991-309fbb7df3ef" } diff --git a/data/novtau/PETG/petg_basic/apricot_orange/sizes.json b/data/novtau/PETG/petg_basic/apricot_orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/apricot_orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/apricot_orange/variant.json b/data/novtau/PETG/petg_basic/apricot_orange/variant.json new file mode 100644 index 0000000000..2d50a8a362 --- /dev/null +++ b/data/novtau/PETG/petg_basic/apricot_orange/variant.json @@ -0,0 +1,5 @@ +{ + "id": "apricot_orange", + "name": "Apricot Orange", + "color_hex": "#F8905A" +} diff --git a/data/novtau/PETG/petg_basic/aqua_blue/sizes.json b/data/novtau/PETG/petg_basic/aqua_blue/sizes.json index 024d156392..07a933355b 100644 --- a/data/novtau/PETG/petg_basic/aqua_blue/sizes.json +++ b/data/novtau/PETG/petg_basic/aqua_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "f21bab43-271a-49c6-8e9c-e453ac357463", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "f21bab43-271a-49c6-8e9c-e453ac357463" } ] diff --git a/data/novtau/PETG/petg_basic/aqua_blue/variant.json b/data/novtau/PETG/petg_basic/aqua_blue/variant.json index fa6d93560c..0b155ec8c9 100644 --- a/data/novtau/PETG/petg_basic/aqua_blue/variant.json +++ b/data/novtau/PETG/petg_basic/aqua_blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "16400691-6f1b-47ac-9985-5734fb1640a3", "id": "aqua_blue", "name": "Aqua Blue", - "color_hex": "#9DB3D9" + "color_hex": "#9AB0D5", + "uuid": "16400691-6f1b-47ac-9985-5734fb1640a3" } diff --git a/data/novtau/PETG/petg_basic/black/sizes.json b/data/novtau/PETG/petg_basic/black/sizes.json index 979bf583ca..953cc7f3af 100644 --- a/data/novtau/PETG/petg_basic/black/sizes.json +++ b/data/novtau/PETG/petg_basic/black/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "9f42a7e3-6788-48c2-a0fe-7efe677824f1", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "9f42a7e3-6788-48c2-a0fe-7efe677824f1" } ] diff --git a/data/novtau/PETG/petg_basic/black/variant.json b/data/novtau/PETG/petg_basic/black/variant.json index e02d5b84b8..74a3f871d4 100644 --- a/data/novtau/PETG/petg_basic/black/variant.json +++ b/data/novtau/PETG/petg_basic/black/variant.json @@ -1,6 +1,6 @@ { - "uuid": "61fa3af0-59a8-47b5-a2a9-1cdf5f0f652a", "id": "black", "name": "Black", - "color_hex": "#2C2C2C" + "color_hex": "#2C2C2C", + "uuid": "61fa3af0-59a8-47b5-a2a9-1cdf5f0f652a" } diff --git a/data/novtau/PETG/petg_basic/blue/sizes.json b/data/novtau/PETG/petg_basic/blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/blue/variant.json b/data/novtau/PETG/petg_basic/blue/variant.json new file mode 100644 index 0000000000..d90a8b1ff3 --- /dev/null +++ b/data/novtau/PETG/petg_basic/blue/variant.json @@ -0,0 +1,5 @@ +{ + "id": "blue", + "name": "Blue", + "color_hex": "#1569D6" +} diff --git a/data/novtau/PETG/petg_basic/blush_pink/sizes.json b/data/novtau/PETG/petg_basic/blush_pink/sizes.json index 539ea59210..24333b015c 100644 --- a/data/novtau/PETG/petg_basic/blush_pink/sizes.json +++ b/data/novtau/PETG/petg_basic/blush_pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "5d749c23-b256-457e-94ea-6febc2011421", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "5d749c23-b256-457e-94ea-6febc2011421" } ] diff --git a/data/novtau/PETG/petg_basic/blush_pink/variant.json b/data/novtau/PETG/petg_basic/blush_pink/variant.json index fddf67027d..3eba187592 100644 --- a/data/novtau/PETG/petg_basic/blush_pink/variant.json +++ b/data/novtau/PETG/petg_basic/blush_pink/variant.json @@ -1,6 +1,6 @@ { - "uuid": "ad3b62e6-7d89-4815-ab0a-00dc2770a35f", "id": "blush_pink", "name": "Blush Pink", - "color_hex": "#F3BCC6" + "color_hex": "#F1BAC4", + "uuid": "ad3b62e6-7d89-4815-ab0a-00dc2770a35f" } diff --git a/data/novtau/PETG/petg_basic/bright_green/sizes.json b/data/novtau/PETG/petg_basic/bright_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/bright_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/bright_green/variant.json b/data/novtau/PETG/petg_basic/bright_green/variant.json new file mode 100644 index 0000000000..20f208480a --- /dev/null +++ b/data/novtau/PETG/petg_basic/bright_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "bright_green", + "name": "Bright Green", + "color_hex": "#2CD10C" +} diff --git a/data/novtau/PETG/petg_basic/bright_yellow/sizes.json b/data/novtau/PETG/petg_basic/bright_yellow/sizes.json index 55c0068e69..e5b77edea9 100644 --- a/data/novtau/PETG/petg_basic/bright_yellow/sizes.json +++ b/data/novtau/PETG/petg_basic/bright_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "b59cb3a4-4897-46ba-82f4-7f8197bd4ca1", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "b59cb3a4-4897-46ba-82f4-7f8197bd4ca1" } ] diff --git a/data/novtau/PETG/petg_basic/bright_yellow/variant.json b/data/novtau/PETG/petg_basic/bright_yellow/variant.json index d1a501030b..7341465f71 100644 --- a/data/novtau/PETG/petg_basic/bright_yellow/variant.json +++ b/data/novtau/PETG/petg_basic/bright_yellow/variant.json @@ -1,6 +1,6 @@ { - "uuid": "bf51330b-fc17-4bbc-bd2c-53e226f23cb1", "id": "bright_yellow", "name": "Bright Yellow", - "color_hex": "#F1D22D" + "color_hex": "#F1D22D", + "uuid": "bf51330b-fc17-4bbc-bd2c-53e226f23cb1" } diff --git a/data/novtau/PETG/petg_basic/bronze/sizes.json b/data/novtau/PETG/petg_basic/bronze/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/bronze/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/bronze/variant.json b/data/novtau/PETG/petg_basic/bronze/variant.json new file mode 100644 index 0000000000..95c662be08 --- /dev/null +++ b/data/novtau/PETG/petg_basic/bronze/variant.json @@ -0,0 +1,5 @@ +{ + "id": "bronze", + "name": "Bronze", + "color_hex": "#6F6A44" +} diff --git a/data/novtau/PETG/petg_basic/carrot_orange/sizes.json b/data/novtau/PETG/petg_basic/carrot_orange/sizes.json index dbe8b3c2ba..8018968eb1 100644 --- a/data/novtau/PETG/petg_basic/carrot_orange/sizes.json +++ b/data/novtau/PETG/petg_basic/carrot_orange/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "4f956780-2daa-42b2-9506-dbd92e20a6a3", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "4f956780-2daa-42b2-9506-dbd92e20a6a3" } ] diff --git a/data/novtau/PETG/petg_basic/carrot_orange/variant.json b/data/novtau/PETG/petg_basic/carrot_orange/variant.json index 12f3afc96d..02dbb86417 100644 --- a/data/novtau/PETG/petg_basic/carrot_orange/variant.json +++ b/data/novtau/PETG/petg_basic/carrot_orange/variant.json @@ -1,6 +1,6 @@ { - "uuid": "6aa97202-317d-4707-bad7-8dde96e6f993", "id": "carrot_orange", "name": "Carrot Orange", - "color_hex": "#E5873D" + "color_hex": "#E3863D", + "uuid": "6aa97202-317d-4707-bad7-8dde96e6f993" } diff --git a/data/novtau/PETG/petg_basic/copper/sizes.json b/data/novtau/PETG/petg_basic/copper/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/copper/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/copper/variant.json b/data/novtau/PETG/petg_basic/copper/variant.json new file mode 100644 index 0000000000..3ef034df8e --- /dev/null +++ b/data/novtau/PETG/petg_basic/copper/variant.json @@ -0,0 +1,5 @@ +{ + "id": "copper", + "name": "Copper", + "color_hex": "#542121" +} diff --git a/data/novtau/PETG/petg_basic/coral_pink/sizes.json b/data/novtau/PETG/petg_basic/coral_pink/sizes.json index 63a689eadc..430e38ec29 100644 --- a/data/novtau/PETG/petg_basic/coral_pink/sizes.json +++ b/data/novtau/PETG/petg_basic/coral_pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "f3e87520-c080-4cda-b792-5e78ed2ad0c7", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "f3e87520-c080-4cda-b792-5e78ed2ad0c7" } ] diff --git a/data/novtau/PETG/petg_basic/coral_pink/variant.json b/data/novtau/PETG/petg_basic/coral_pink/variant.json index db05298426..6ce526647d 100644 --- a/data/novtau/PETG/petg_basic/coral_pink/variant.json +++ b/data/novtau/PETG/petg_basic/coral_pink/variant.json @@ -1,6 +1,6 @@ { - "uuid": "f0ba713f-45a1-4886-a71d-7e194989262b", "id": "coral_pink", "name": "Coral Pink", - "color_hex": "#F39AA8" + "color_hex": "#F098A6", + "uuid": "f0ba713f-45a1-4886-a71d-7e194989262b" } diff --git a/data/novtau/PETG/petg_basic/cream_yellow/sizes.json b/data/novtau/PETG/petg_basic/cream_yellow/sizes.json index ec6f271e5d..87b1fed93d 100644 --- a/data/novtau/PETG/petg_basic/cream_yellow/sizes.json +++ b/data/novtau/PETG/petg_basic/cream_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "5275eb0a-0b5e-4aa6-bc42-15de60eb6506", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "5275eb0a-0b5e-4aa6-bc42-15de60eb6506" } ] diff --git a/data/novtau/PETG/petg_basic/cream_yellow/variant.json b/data/novtau/PETG/petg_basic/cream_yellow/variant.json index c1c0520798..fc421afff9 100644 --- a/data/novtau/PETG/petg_basic/cream_yellow/variant.json +++ b/data/novtau/PETG/petg_basic/cream_yellow/variant.json @@ -1,6 +1,6 @@ { - "uuid": "93c5d6e1-c41e-4e6f-a51b-eb74a77e9bb1", "id": "cream_yellow", "name": "Cream Yellow", - "color_hex": "#EAE4A2" + "color_hex": "#E9E3A0", + "uuid": "93c5d6e1-c41e-4e6f-a51b-eb74a77e9bb1" } diff --git a/data/novtau/PETG/petg_basic/cyan/sizes.json b/data/novtau/PETG/petg_basic/cyan/sizes.json index 5927539901..52b486fed3 100644 --- a/data/novtau/PETG/petg_basic/cyan/sizes.json +++ b/data/novtau/PETG/petg_basic/cyan/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "95387d96-2a97-4a34-929e-c4919010c646", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "95387d96-2a97-4a34-929e-c4919010c646" } ] diff --git a/data/novtau/PETG/petg_basic/cyan/variant.json b/data/novtau/PETG/petg_basic/cyan/variant.json index e48b499877..fda0a226de 100644 --- a/data/novtau/PETG/petg_basic/cyan/variant.json +++ b/data/novtau/PETG/petg_basic/cyan/variant.json @@ -1,6 +1,6 @@ { - "uuid": "a47feaa2-15e6-4309-86c9-4727e9c7371c", "id": "cyan", "name": "Cyan", - "color_hex": "#04B8D1" + "color_hex": "#05B7CF", + "uuid": "a47feaa2-15e6-4309-86c9-4727e9c7371c" } diff --git a/data/novtau/PETG/petg_basic/dark_beige/sizes.json b/data/novtau/PETG/petg_basic/dark_beige/sizes.json index dd49613b5b..df9c3db332 100644 --- a/data/novtau/PETG/petg_basic/dark_beige/sizes.json +++ b/data/novtau/PETG/petg_basic/dark_beige/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "3fb268e1-60e1-4b27-9a59-188a1cd57838", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "3fb268e1-60e1-4b27-9a59-188a1cd57838" } ] diff --git a/data/novtau/PETG/petg_basic/dark_beige/variant.json b/data/novtau/PETG/petg_basic/dark_beige/variant.json index 864b0478e4..9a2849bcd8 100644 --- a/data/novtau/PETG/petg_basic/dark_beige/variant.json +++ b/data/novtau/PETG/petg_basic/dark_beige/variant.json @@ -1,6 +1,6 @@ { - "uuid": "da9fd59e-a29f-4606-b4e9-78f2652e4271", "id": "dark_beige", "name": "Dark Beige", - "color_hex": "#BC9268" + "color_hex": "#BC9268", + "uuid": "da9fd59e-a29f-4606-b4e9-78f2652e4271" } diff --git a/data/novtau/PETG/petg_basic/dark_brown/sizes.json b/data/novtau/PETG/petg_basic/dark_brown/sizes.json index ff3fd1a2a6..cab982982d 100644 --- a/data/novtau/PETG/petg_basic/dark_brown/sizes.json +++ b/data/novtau/PETG/petg_basic/dark_brown/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "dfe3879c-2bde-49e7-aa0f-c0a6d256e62d", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "dfe3879c-2bde-49e7-aa0f-c0a6d256e62d" } ] diff --git a/data/novtau/PETG/petg_basic/dark_brown/variant.json b/data/novtau/PETG/petg_basic/dark_brown/variant.json index 53f5c0b14a..7641e5b9f9 100644 --- a/data/novtau/PETG/petg_basic/dark_brown/variant.json +++ b/data/novtau/PETG/petg_basic/dark_brown/variant.json @@ -1,6 +1,6 @@ { - "uuid": "38b65fcc-3e11-4b31-bc64-a981f96e5266", "id": "dark_brown", "name": "Dark Brown", - "color_hex": "#77463B" + "color_hex": "#77463B", + "uuid": "38b65fcc-3e11-4b31-bc64-a981f96e5266" } diff --git a/data/novtau/PETG/petg_basic/dark_gray/sizes.json b/data/novtau/PETG/petg_basic/dark_gray/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/dark_gray/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/dark_gray/variant.json b/data/novtau/PETG/petg_basic/dark_gray/variant.json new file mode 100644 index 0000000000..be2ae5f5e8 --- /dev/null +++ b/data/novtau/PETG/petg_basic/dark_gray/variant.json @@ -0,0 +1,5 @@ +{ + "id": "dark_gray", + "name": "Dark Gray", + "color_hex": "#49494C" +} diff --git a/data/novtau/PETG/petg_basic/dark_green/sizes.json b/data/novtau/PETG/petg_basic/dark_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/dark_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/dark_green/variant.json b/data/novtau/PETG/petg_basic/dark_green/variant.json new file mode 100644 index 0000000000..f46826ccff --- /dev/null +++ b/data/novtau/PETG/petg_basic/dark_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "dark_green", + "name": "Dark Green", + "color_hex": "#0E781E" +} diff --git a/data/novtau/PETG/petg_basic/deep_blue/sizes.json b/data/novtau/PETG/petg_basic/deep_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/deep_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/deep_blue/variant.json b/data/novtau/PETG/petg_basic/deep_blue/variant.json new file mode 100644 index 0000000000..17e9397773 --- /dev/null +++ b/data/novtau/PETG/petg_basic/deep_blue/variant.json @@ -0,0 +1,5 @@ +{ + "id": "deep_blue", + "name": "Deep Blue", + "color_hex": "#2A296B" +} diff --git a/data/novtau/PETG/petg_basic/filament.json b/data/novtau/PETG/petg_basic/filament.json index 59efe54c29..94f7e5dc12 100644 --- a/data/novtau/PETG/petg_basic/filament.json +++ b/data/novtau/PETG/petg_basic/filament.json @@ -1,7 +1,7 @@ { - "uuid": "099eafe4-c315-49a1-8257-b0940349180f", "id": "petg_basic", "name": "PETG Basic", "diameter_tolerance": 0.02, - "density": 1.27 + "density": 1.27, + "uuid": "099eafe4-c315-49a1-8257-b0940349180f" } diff --git a/data/novtau/PETG/petg_basic/fluorescent_red/sizes.json b/data/novtau/PETG/petg_basic/fluorescent_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/fluorescent_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/fluorescent_red/variant.json b/data/novtau/PETG/petg_basic/fluorescent_red/variant.json new file mode 100644 index 0000000000..2b35b73c13 --- /dev/null +++ b/data/novtau/PETG/petg_basic/fluorescent_red/variant.json @@ -0,0 +1,5 @@ +{ + "id": "fluorescent_red", + "name": "Fluorescent Red", + "color_hex": "#F12F48" +} diff --git a/data/novtau/PETG/petg_basic/fluorescent_rose/sizes.json b/data/novtau/PETG/petg_basic/fluorescent_rose/sizes.json index 0d556cecf3..ae5573a16f 100644 --- a/data/novtau/PETG/petg_basic/fluorescent_rose/sizes.json +++ b/data/novtau/PETG/petg_basic/fluorescent_rose/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "cb15afa7-6b77-4ee1-b09a-31c6f4fb08b7", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "cb15afa7-6b77-4ee1-b09a-31c6f4fb08b7" } ] diff --git a/data/novtau/PETG/petg_basic/fluorescent_rose/variant.json b/data/novtau/PETG/petg_basic/fluorescent_rose/variant.json index 4720e021ac..c7c3bf2608 100644 --- a/data/novtau/PETG/petg_basic/fluorescent_rose/variant.json +++ b/data/novtau/PETG/petg_basic/fluorescent_rose/variant.json @@ -1,6 +1,6 @@ { - "uuid": "6b849127-b1f5-4442-b620-374ced53f378", "id": "fluorescent_rose", "name": "Fluorescent Rose", - "color_hex": "#E247A9" + "color_hex": "#E147A7", + "uuid": "6b849127-b1f5-4442-b620-374ced53f378" } diff --git a/data/novtau/PETG/petg_basic/fluorescent_yellow/sizes.json b/data/novtau/PETG/petg_basic/fluorescent_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/fluorescent_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/fluorescent_yellow/variant.json b/data/novtau/PETG/petg_basic/fluorescent_yellow/variant.json new file mode 100644 index 0000000000..ca1c158e30 --- /dev/null +++ b/data/novtau/PETG/petg_basic/fluorescent_yellow/variant.json @@ -0,0 +1,5 @@ +{ + "id": "fluorescent_yellow", + "name": "Fluorescent Yellow", + "color_hex": "#D9E948" +} diff --git a/data/novtau/PETG/petg_basic/fresh_mint/sizes.json b/data/novtau/PETG/petg_basic/fresh_mint/sizes.json index 73719d1164..760f3ccda8 100644 --- a/data/novtau/PETG/petg_basic/fresh_mint/sizes.json +++ b/data/novtau/PETG/petg_basic/fresh_mint/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "e997cd29-ec27-4845-a43a-16bd8a4e713c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "e997cd29-ec27-4845-a43a-16bd8a4e713c" } ] diff --git a/data/novtau/PETG/petg_basic/fresh_mint/variant.json b/data/novtau/PETG/petg_basic/fresh_mint/variant.json index a55adb751c..84762deb06 100644 --- a/data/novtau/PETG/petg_basic/fresh_mint/variant.json +++ b/data/novtau/PETG/petg_basic/fresh_mint/variant.json @@ -1,6 +1,6 @@ { - "uuid": "a660f5bf-7e79-4fef-8c11-6df2693bcecc", "id": "fresh_mint", "name": "Fresh Mint", - "color_hex": "#92B296" + "color_hex": "#82D7D1", + "uuid": "a660f5bf-7e79-4fef-8c11-6df2693bcecc" } diff --git a/data/novtau/PETG/petg_basic/gold/sizes.json b/data/novtau/PETG/petg_basic/gold/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/gold/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/gold/variant.json b/data/novtau/PETG/petg_basic/gold/variant.json new file mode 100644 index 0000000000..a5ca7e1b0d --- /dev/null +++ b/data/novtau/PETG/petg_basic/gold/variant.json @@ -0,0 +1,5 @@ +{ + "id": "gold", + "name": "Gold", + "color_hex": "#BF7E2E" +} diff --git a/data/novtau/PETG/petg_basic/golden_yellow/sizes.json b/data/novtau/PETG/petg_basic/golden_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/golden_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/golden_yellow/variant.json b/data/novtau/PETG/petg_basic/golden_yellow/variant.json new file mode 100644 index 0000000000..3ab387dc5f --- /dev/null +++ b/data/novtau/PETG/petg_basic/golden_yellow/variant.json @@ -0,0 +1,5 @@ +{ + "id": "golden_yellow", + "name": "Golden Yellow", + "color_hex": "#FAC40D" +} diff --git a/data/novtau/PETG/petg_basic/gray/sizes.json b/data/novtau/PETG/petg_basic/gray/sizes.json index 7da57361ad..90e40495f9 100644 --- a/data/novtau/PETG/petg_basic/gray/sizes.json +++ b/data/novtau/PETG/petg_basic/gray/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "cccb9fd6-81b5-4092-99f5-c59a73be1ad7", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "cccb9fd6-81b5-4092-99f5-c59a73be1ad7" } ] diff --git a/data/novtau/PETG/petg_basic/gray/variant.json b/data/novtau/PETG/petg_basic/gray/variant.json index 513e68624b..efa54decd8 100644 --- a/data/novtau/PETG/petg_basic/gray/variant.json +++ b/data/novtau/PETG/petg_basic/gray/variant.json @@ -1,6 +1,6 @@ { - "uuid": "39126902-fee0-4a9c-90bb-47a0afc31729", "id": "gray", "name": "Gray", - "color_hex": "#808084" + "color_hex": "#808084", + "uuid": "39126902-fee0-4a9c-90bb-47a0afc31729" } diff --git a/data/novtau/PETG/petg_basic/green/sizes.json b/data/novtau/PETG/petg_basic/green/sizes.json index fb2cb0216c..b77e724274 100644 --- a/data/novtau/PETG/petg_basic/green/sizes.json +++ b/data/novtau/PETG/petg_basic/green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "21f52659-37be-4f2f-a616-c68157c40560", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "21f52659-37be-4f2f-a616-c68157c40560" } ] diff --git a/data/novtau/PETG/petg_basic/green/variant.json b/data/novtau/PETG/petg_basic/green/variant.json index 40b4b88d75..5c30a76864 100644 --- a/data/novtau/PETG/petg_basic/green/variant.json +++ b/data/novtau/PETG/petg_basic/green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "7f8fb6cf-6c52-4e7e-9f40-12b44f453c00", "id": "green", "name": "Green", - "color_hex": "#107847" + "color_hex": "#117746", + "uuid": "7f8fb6cf-6c52-4e7e-9f40-12b44f453c00" } diff --git a/data/novtau/PETG/petg_basic/green_grape_ice/sizes.json b/data/novtau/PETG/petg_basic/green_grape_ice/sizes.json index 62e04da3e7..4f2c112693 100644 --- a/data/novtau/PETG/petg_basic/green_grape_ice/sizes.json +++ b/data/novtau/PETG/petg_basic/green_grape_ice/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "7e3f2175-3871-4051-b309-5f32c63cdd8b", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "7e3f2175-3871-4051-b309-5f32c63cdd8b" } ] diff --git a/data/novtau/PETG/petg_basic/green_grape_ice/variant.json b/data/novtau/PETG/petg_basic/green_grape_ice/variant.json index 0ac3402992..5dd1a84802 100644 --- a/data/novtau/PETG/petg_basic/green_grape_ice/variant.json +++ b/data/novtau/PETG/petg_basic/green_grape_ice/variant.json @@ -1,6 +1,6 @@ { - "uuid": "6590eb64-c4db-482a-9ebe-940cbd9f1c0a", "id": "green_grape_ice", "name": "Green Grape Ice", - "color_hex": "#B2C9A0" + "color_hex": "#B0C79E", + "uuid": "6590eb64-c4db-482a-9ebe-940cbd9f1c0a" } diff --git a/data/novtau/PETG/petg_basic/ice_blue/sizes.json b/data/novtau/PETG/petg_basic/ice_blue/sizes.json index 61f8a19bca..66ef69dfff 100644 --- a/data/novtau/PETG/petg_basic/ice_blue/sizes.json +++ b/data/novtau/PETG/petg_basic/ice_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "f80f8322-617a-49b1-8477-bff93c976df4", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "f80f8322-617a-49b1-8477-bff93c976df4" } ] diff --git a/data/novtau/PETG/petg_basic/ice_blue/variant.json b/data/novtau/PETG/petg_basic/ice_blue/variant.json index 491c3a4ba8..3b2138c852 100644 --- a/data/novtau/PETG/petg_basic/ice_blue/variant.json +++ b/data/novtau/PETG/petg_basic/ice_blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "95dda1e1-20bd-4da6-8480-18cfaeb1466f", "id": "ice_blue", "name": "Ice Blue", - "color_hex": "#72C6F6" + "color_hex": "#71C4F4", + "uuid": "95dda1e1-20bd-4da6-8480-18cfaeb1466f" } diff --git a/data/novtau/PETG/petg_basic/jade_green/sizes.json b/data/novtau/PETG/petg_basic/jade_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/jade_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/jade_green/variant.json b/data/novtau/PETG/petg_basic/jade_green/variant.json new file mode 100644 index 0000000000..45e1214968 --- /dev/null +++ b/data/novtau/PETG/petg_basic/jade_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "jade_green", + "name": "Jade Green", + "color_hex": "#048B6F" +} diff --git a/data/novtau/PETG/petg_basic/khaki/sizes.json b/data/novtau/PETG/petg_basic/khaki/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/khaki/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/khaki/variant.json b/data/novtau/PETG/petg_basic/khaki/variant.json new file mode 100644 index 0000000000..14533acccc --- /dev/null +++ b/data/novtau/PETG/petg_basic/khaki/variant.json @@ -0,0 +1,5 @@ +{ + "id": "khaki", + "name": "Khaki", + "color_hex": "#AB9C8C" +} diff --git a/data/novtau/PETG/petg_basic/light_lilac/sizes.json b/data/novtau/PETG/petg_basic/light_lilac/sizes.json index e6c5d1e8d6..e7a4e600a6 100644 --- a/data/novtau/PETG/petg_basic/light_lilac/sizes.json +++ b/data/novtau/PETG/petg_basic/light_lilac/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "75104c4c-3d56-4388-b755-e9a50bac841e", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "75104c4c-3d56-4388-b755-e9a50bac841e" } ] diff --git a/data/novtau/PETG/petg_basic/light_lilac/variant.json b/data/novtau/PETG/petg_basic/light_lilac/variant.json index 67069579ab..c2f5eeb240 100644 --- a/data/novtau/PETG/petg_basic/light_lilac/variant.json +++ b/data/novtau/PETG/petg_basic/light_lilac/variant.json @@ -1,6 +1,6 @@ { - "uuid": "b2006849-8e87-43a2-b3af-bea17bd6e847", "id": "light_lilac", "name": "Light Lilac", - "color_hex": "#AC9EC5" + "color_hex": "#AA9DC3", + "uuid": "b2006849-8e87-43a2-b3af-bea17bd6e847" } diff --git a/data/novtau/PETG/petg_basic/light_purple/sizes.json b/data/novtau/PETG/petg_basic/light_purple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/light_purple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/light_purple/variant.json b/data/novtau/PETG/petg_basic/light_purple/variant.json new file mode 100644 index 0000000000..c5fc2fd064 --- /dev/null +++ b/data/novtau/PETG/petg_basic/light_purple/variant.json @@ -0,0 +1,5 @@ +{ + "id": "light_purple", + "name": "Light Purple", + "color_hex": "#9563B6" +} diff --git a/data/novtau/PETG/petg_basic/lime_green/sizes.json b/data/novtau/PETG/petg_basic/lime_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/lime_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/lime_green/variant.json b/data/novtau/PETG/petg_basic/lime_green/variant.json new file mode 100644 index 0000000000..b1d97ba9c3 --- /dev/null +++ b/data/novtau/PETG/petg_basic/lime_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "lime_green", + "name": "Lime Green", + "color_hex": "#46D362" +} diff --git a/data/novtau/PETG/petg_basic/magenta/sizes.json b/data/novtau/PETG/petg_basic/magenta/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/magenta/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/magenta/variant.json b/data/novtau/PETG/petg_basic/magenta/variant.json new file mode 100644 index 0000000000..e880ed359d --- /dev/null +++ b/data/novtau/PETG/petg_basic/magenta/variant.json @@ -0,0 +1,5 @@ +{ + "id": "magenta", + "name": "Magenta", + "color_hex": "#BA1D8A" +} diff --git a/data/novtau/PETG/petg_basic/milk_green/sizes.json b/data/novtau/PETG/petg_basic/milk_green/sizes.json index 4eeb443ae6..153a28ce29 100644 --- a/data/novtau/PETG/petg_basic/milk_green/sizes.json +++ b/data/novtau/PETG/petg_basic/milk_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "01b53df6-4d26-45d3-afde-ca0e5e512848", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "01b53df6-4d26-45d3-afde-ca0e5e512848" } ] diff --git a/data/novtau/PETG/petg_basic/milk_green/variant.json b/data/novtau/PETG/petg_basic/milk_green/variant.json index 1c14519fa8..c592793198 100644 --- a/data/novtau/PETG/petg_basic/milk_green/variant.json +++ b/data/novtau/PETG/petg_basic/milk_green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "f369daac-d98d-4f50-93ba-0423e10e8b39", "id": "milk_green", "name": "Milk Green", - "color_hex": "#A1B291" + "color_hex": "#9EAF8F", + "uuid": "f369daac-d98d-4f50-93ba-0423e10e8b39" } diff --git a/data/novtau/PETG/petg_basic/mint_dream/sizes.json b/data/novtau/PETG/petg_basic/mint_dream/sizes.json index a62025f6ce..ce87a93db5 100644 --- a/data/novtau/PETG/petg_basic/mint_dream/sizes.json +++ b/data/novtau/PETG/petg_basic/mint_dream/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "7c76f932-9a70-4603-82b6-666854e51a56", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "7c76f932-9a70-4603-82b6-666854e51a56" } ] diff --git a/data/novtau/PETG/petg_basic/mint_dream/variant.json b/data/novtau/PETG/petg_basic/mint_dream/variant.json index cfdc0263ee..e6bfb82a65 100644 --- a/data/novtau/PETG/petg_basic/mint_dream/variant.json +++ b/data/novtau/PETG/petg_basic/mint_dream/variant.json @@ -1,6 +1,6 @@ { - "uuid": "9f04d9c8-fb22-4ca1-8a7d-b64b69d2d730", "id": "mint_dream", "name": "Mint Dream", - "color_hex": "#A6CBB2" + "color_hex": "#A5CAB0", + "uuid": "9f04d9c8-fb22-4ca1-8a7d-b64b69d2d730" } diff --git a/data/novtau/PETG/petg_basic/mint_green/sizes.json b/data/novtau/PETG/petg_basic/mint_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/mint_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/mint_green/variant.json b/data/novtau/PETG/petg_basic/mint_green/variant.json new file mode 100644 index 0000000000..a22c85daa7 --- /dev/null +++ b/data/novtau/PETG/petg_basic/mint_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "mint_green", + "name": "Mint Green", + "color_hex": "#5CDEAE" +} diff --git a/data/novtau/PETG/petg_basic/misty_blue/sizes.json b/data/novtau/PETG/petg_basic/misty_blue/sizes.json index 94c1ad1551..36b37cb8a3 100644 --- a/data/novtau/PETG/petg_basic/misty_blue/sizes.json +++ b/data/novtau/PETG/petg_basic/misty_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "77cff4b6-dbb4-4bc4-8a9e-66634d5d1386", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "77cff4b6-dbb4-4bc4-8a9e-66634d5d1386" } ] diff --git a/data/novtau/PETG/petg_basic/misty_blue/variant.json b/data/novtau/PETG/petg_basic/misty_blue/variant.json index a143ba4302..63458f1219 100644 --- a/data/novtau/PETG/petg_basic/misty_blue/variant.json +++ b/data/novtau/PETG/petg_basic/misty_blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "58d4d7ca-a7aa-420a-8f92-e00fe157b90d", "id": "misty_blue", "name": "Misty Blue", - "color_hex": "#2CBDEB" + "color_hex": "#2BBCE9", + "uuid": "58d4d7ca-a7aa-420a-8f92-e00fe157b90d" } diff --git a/data/novtau/PETG/petg_basic/navy_blue/sizes.json b/data/novtau/PETG/petg_basic/navy_blue/sizes.json index 26b4b138eb..c2fa173223 100644 --- a/data/novtau/PETG/petg_basic/navy_blue/sizes.json +++ b/data/novtau/PETG/petg_basic/navy_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "e5886bec-1329-421b-a3de-209e86dde8a3", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "e5886bec-1329-421b-a3de-209e86dde8a3" } ] diff --git a/data/novtau/PETG/petg_basic/navy_blue/variant.json b/data/novtau/PETG/petg_basic/navy_blue/variant.json index 1e1b7e4ca5..2c4bb683c9 100644 --- a/data/novtau/PETG/petg_basic/navy_blue/variant.json +++ b/data/novtau/PETG/petg_basic/navy_blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "62f9aed0-9c1f-4da7-81e6-f66fc45f6e50", "id": "navy_blue", "name": "Navy Blue", - "color_hex": "#0731A9" + "color_hex": "#0731A9", + "uuid": "62f9aed0-9c1f-4da7-81e6-f66fc45f6e50" } diff --git a/data/novtau/PETG/petg_basic/orange/sizes.json b/data/novtau/PETG/petg_basic/orange/sizes.json index ca5661d51d..07a4368bf2 100644 --- a/data/novtau/PETG/petg_basic/orange/sizes.json +++ b/data/novtau/PETG/petg_basic/orange/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "e395d25c-c8db-4f8d-8726-29d847654684", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "e395d25c-c8db-4f8d-8726-29d847654684" } ] diff --git a/data/novtau/PETG/petg_basic/orange/variant.json b/data/novtau/PETG/petg_basic/orange/variant.json index e0ece2109c..842ef16dfd 100644 --- a/data/novtau/PETG/petg_basic/orange/variant.json +++ b/data/novtau/PETG/petg_basic/orange/variant.json @@ -1,6 +1,6 @@ { - "uuid": "d35d1379-d75e-41de-8ca4-e397dd6ff269", "id": "orange", "name": "Orange", - "color_hex": "#D03C26" + "color_hex": "#D03C26", + "uuid": "d35d1379-d75e-41de-8ca4-e397dd6ff269" } diff --git a/data/novtau/PETG/petg_basic/pale_yellow/sizes.json b/data/novtau/PETG/petg_basic/pale_yellow/sizes.json index d7c00b2fca..5b096acdd8 100644 --- a/data/novtau/PETG/petg_basic/pale_yellow/sizes.json +++ b/data/novtau/PETG/petg_basic/pale_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "aac48b76-3ecb-46e9-849b-9c9c2cd3e380", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "aac48b76-3ecb-46e9-849b-9c9c2cd3e380" } ] diff --git a/data/novtau/PETG/petg_basic/pale_yellow/variant.json b/data/novtau/PETG/petg_basic/pale_yellow/variant.json index 4fd56533ef..46447cbdac 100644 --- a/data/novtau/PETG/petg_basic/pale_yellow/variant.json +++ b/data/novtau/PETG/petg_basic/pale_yellow/variant.json @@ -1,6 +1,6 @@ { - "uuid": "f86a2658-eb60-4341-ba45-34f67f2c50d9", "id": "pale_yellow", "name": "Pale Yellow", - "color_hex": "#EFD37C" + "color_hex": "#EDD17B", + "uuid": "f86a2658-eb60-4341-ba45-34f67f2c50d9" } diff --git a/data/novtau/PETG/petg_basic/peach_nude/sizes.json b/data/novtau/PETG/petg_basic/peach_nude/sizes.json index 274fc5fcd2..a878086f70 100644 --- a/data/novtau/PETG/petg_basic/peach_nude/sizes.json +++ b/data/novtau/PETG/petg_basic/peach_nude/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "5ebc9a72-e55c-4e4f-a5f6-201876a44a06", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "5ebc9a72-e55c-4e4f-a5f6-201876a44a06" } ] diff --git a/data/novtau/PETG/petg_basic/peach_nude/variant.json b/data/novtau/PETG/petg_basic/peach_nude/variant.json index 9005aa5463..ce9b3d7fa3 100644 --- a/data/novtau/PETG/petg_basic/peach_nude/variant.json +++ b/data/novtau/PETG/petg_basic/peach_nude/variant.json @@ -1,6 +1,6 @@ { - "uuid": "0d3f21f4-d56f-46af-b028-61e6499dbd1a", "id": "peach_nude", "name": "Peach Nude", - "color_hex": "#ECC5B3" + "color_hex": "#EAC3B1", + "uuid": "0d3f21f4-d56f-46af-b028-61e6499dbd1a" } diff --git a/data/novtau/PETG/petg_basic/peach_pink/sizes.json b/data/novtau/PETG/petg_basic/peach_pink/sizes.json index 17c640f845..8aa0398602 100644 --- a/data/novtau/PETG/petg_basic/peach_pink/sizes.json +++ b/data/novtau/PETG/petg_basic/peach_pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "9300f71d-33a1-4b4c-ae48-24d6230051b2", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "9300f71d-33a1-4b4c-ae48-24d6230051b2" } ] diff --git a/data/novtau/PETG/petg_basic/peach_pink/variant.json b/data/novtau/PETG/petg_basic/peach_pink/variant.json index 99741a63e1..53fd69ba43 100644 --- a/data/novtau/PETG/petg_basic/peach_pink/variant.json +++ b/data/novtau/PETG/petg_basic/peach_pink/variant.json @@ -1,6 +1,6 @@ { - "uuid": "9d8e002e-f01d-4c63-84ab-0b44546eaa96", "id": "peach_pink", "name": "Peach Pink", - "color_hex": "#F3BCC0" + "color_hex": "#F0BABD", + "uuid": "9d8e002e-f01d-4c63-84ab-0b44546eaa96" } diff --git a/data/novtau/PETG/petg_basic/peacock_blue/sizes.json b/data/novtau/PETG/petg_basic/peacock_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/peacock_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/peacock_blue/variant.json b/data/novtau/PETG/petg_basic/peacock_blue/variant.json new file mode 100644 index 0000000000..8c20c0fbf0 --- /dev/null +++ b/data/novtau/PETG/petg_basic/peacock_blue/variant.json @@ -0,0 +1,5 @@ +{ + "id": "peacock_blue", + "name": "Peacock Blue", + "color_hex": "#0999B6" +} diff --git a/data/novtau/PETG/petg_basic/peacock_green/sizes.json b/data/novtau/PETG/petg_basic/peacock_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/peacock_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/peacock_green/variant.json b/data/novtau/PETG/petg_basic/peacock_green/variant.json new file mode 100644 index 0000000000..4c5d907aee --- /dev/null +++ b/data/novtau/PETG/petg_basic/peacock_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "peacock_green", + "name": "Peacock Green", + "color_hex": "#0B756C" +} diff --git a/data/novtau/PETG/petg_basic/peanut_brown/sizes.json b/data/novtau/PETG/petg_basic/peanut_brown/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/peanut_brown/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/peanut_brown/variant.json b/data/novtau/PETG/petg_basic/peanut_brown/variant.json new file mode 100644 index 0000000000..39158feb24 --- /dev/null +++ b/data/novtau/PETG/petg_basic/peanut_brown/variant.json @@ -0,0 +1,5 @@ +{ + "id": "peanut_brown", + "name": "Peanut Brown", + "color_hex": "#C05C17" +} diff --git a/data/novtau/PETG/petg_basic/pine_green/sizes.json b/data/novtau/PETG/petg_basic/pine_green/sizes.json index 9e593c70d4..c4ed0c603b 100644 --- a/data/novtau/PETG/petg_basic/pine_green/sizes.json +++ b/data/novtau/PETG/petg_basic/pine_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "e572e7e4-2f80-4c43-b0db-92eb760b52e8", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "e572e7e4-2f80-4c43-b0db-92eb760b52e8" } ] diff --git a/data/novtau/PETG/petg_basic/pine_green/variant.json b/data/novtau/PETG/petg_basic/pine_green/variant.json index 168f311473..dfed03ac7f 100644 --- a/data/novtau/PETG/petg_basic/pine_green/variant.json +++ b/data/novtau/PETG/petg_basic/pine_green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "b80ab829-4b46-40d4-91fb-6b09a0228534", "id": "pine_green", "name": "Pine Green", - "color_hex": "#364E3A" + "color_hex": "#364E3A", + "uuid": "b80ab829-4b46-40d4-91fb-6b09a0228534" } diff --git a/data/novtau/PETG/petg_basic/pink/sizes.json b/data/novtau/PETG/petg_basic/pink/sizes.json index e08a4355c4..9c8f262940 100644 --- a/data/novtau/PETG/petg_basic/pink/sizes.json +++ b/data/novtau/PETG/petg_basic/pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "7ab5feea-5ab6-4cc0-908f-54ca06625121", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "7ab5feea-5ab6-4cc0-908f-54ca06625121" } ] diff --git a/data/novtau/PETG/petg_basic/pink/variant.json b/data/novtau/PETG/petg_basic/pink/variant.json index 9753152cff..ca3fc606cc 100644 --- a/data/novtau/PETG/petg_basic/pink/variant.json +++ b/data/novtau/PETG/petg_basic/pink/variant.json @@ -1,6 +1,6 @@ { - "uuid": "cf2c5c1a-ded4-4bdc-92fb-bc1a986240c6", "id": "pink", "name": "Pink", - "color_hex": "#D25A86" + "color_hex": "#D05985", + "uuid": "cf2c5c1a-ded4-4bdc-92fb-bc1a986240c6" } diff --git a/data/novtau/PETG/petg_basic/purple/sizes.json b/data/novtau/PETG/petg_basic/purple/sizes.json index 3bfad2146c..2bc2590d80 100644 --- a/data/novtau/PETG/petg_basic/purple/sizes.json +++ b/data/novtau/PETG/petg_basic/purple/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "9ca162fa-2ced-494f-aaf7-d8310ee1759f", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "9ca162fa-2ced-494f-aaf7-d8310ee1759f" } ] diff --git a/data/novtau/PETG/petg_basic/purple/variant.json b/data/novtau/PETG/petg_basic/purple/variant.json index 7374b942d2..57142bf3de 100644 --- a/data/novtau/PETG/petg_basic/purple/variant.json +++ b/data/novtau/PETG/petg_basic/purple/variant.json @@ -1,6 +1,6 @@ { - "uuid": "fce603d4-5d4a-4095-be11-de4e6f00410d", "id": "purple", "name": "Purple", - "color_hex": "#472D5D" + "color_hex": "#462D5C", + "uuid": "fce603d4-5d4a-4095-be11-de4e6f00410d" } diff --git a/data/novtau/PETG/petg_basic/red/sizes.json b/data/novtau/PETG/petg_basic/red/sizes.json index 2bc95684ab..3bfbfee6b5 100644 --- a/data/novtau/PETG/petg_basic/red/sizes.json +++ b/data/novtau/PETG/petg_basic/red/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "2208a2b6-6ff2-44b7-8e5c-d0e99af9354f", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "2208a2b6-6ff2-44b7-8e5c-d0e99af9354f" } ] diff --git a/data/novtau/PETG/petg_basic/red/variant.json b/data/novtau/PETG/petg_basic/red/variant.json index 356203a596..0d91b0fc4a 100644 --- a/data/novtau/PETG/petg_basic/red/variant.json +++ b/data/novtau/PETG/petg_basic/red/variant.json @@ -1,6 +1,6 @@ { - "uuid": "5ada4e68-5062-4a23-90ff-60f22c09e435", "id": "red", "name": "Red", - "color_hex": "#7A0D10" + "color_hex": "#C40413", + "uuid": "5ada4e68-5062-4a23-90ff-60f22c09e435" } diff --git a/data/novtau/PETG/petg_basic/reflex_blue/sizes.json b/data/novtau/PETG/petg_basic/reflex_blue/sizes.json index 099391d160..65b40de985 100644 --- a/data/novtau/PETG/petg_basic/reflex_blue/sizes.json +++ b/data/novtau/PETG/petg_basic/reflex_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "dc56459a-2334-477f-8711-f284709cfd46", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "dc56459a-2334-477f-8711-f284709cfd46" } ] diff --git a/data/novtau/PETG/petg_basic/reflex_blue/variant.json b/data/novtau/PETG/petg_basic/reflex_blue/variant.json index d1b9a4049f..73822a7447 100644 --- a/data/novtau/PETG/petg_basic/reflex_blue/variant.json +++ b/data/novtau/PETG/petg_basic/reflex_blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "512f142e-3405-4be3-84d7-54c4a9af16bb", "id": "reflex_blue", "name": "Reflex Blue", - "color_hex": "#0A84E8" + "color_hex": "#0A84E8", + "uuid": "512f142e-3405-4be3-84d7-54c4a9af16bb" } diff --git a/data/novtau/PETG/petg_basic/sakura_pink/sizes.json b/data/novtau/PETG/petg_basic/sakura_pink/sizes.json index f584aea182..e6f61ff422 100644 --- a/data/novtau/PETG/petg_basic/sakura_pink/sizes.json +++ b/data/novtau/PETG/petg_basic/sakura_pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "b5c37e1e-80f3-4c64-9460-d07f3844bccf", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "b5c37e1e-80f3-4c64-9460-d07f3844bccf" } ] diff --git a/data/novtau/PETG/petg_basic/sakura_pink/variant.json b/data/novtau/PETG/petg_basic/sakura_pink/variant.json index 720db621bb..13c3722b9c 100644 --- a/data/novtau/PETG/petg_basic/sakura_pink/variant.json +++ b/data/novtau/PETG/petg_basic/sakura_pink/variant.json @@ -1,6 +1,6 @@ { - "uuid": "bce1b977-0e3b-474e-8a49-ec0a4c534bee", "id": "sakura_pink", "name": "Sakura Pink", - "color_hex": "#DDAAB7" + "color_hex": "#DCA8B6", + "uuid": "bce1b977-0e3b-474e-8a49-ec0a4c534bee" } diff --git a/data/novtau/PETG/petg_basic/silver/sizes.json b/data/novtau/PETG/petg_basic/silver/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/silver/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/silver/variant.json b/data/novtau/PETG/petg_basic/silver/variant.json new file mode 100644 index 0000000000..eed795f100 --- /dev/null +++ b/data/novtau/PETG/petg_basic/silver/variant.json @@ -0,0 +1,5 @@ +{ + "id": "silver", + "name": "Silver", + "color_hex": "#A1A3A4" +} diff --git a/data/novtau/PETG/petg_basic/skin_tone/sizes.json b/data/novtau/PETG/petg_basic/skin_tone/sizes.json index 9a6291ce78..ab368c21fb 100644 --- a/data/novtau/PETG/petg_basic/skin_tone/sizes.json +++ b/data/novtau/PETG/petg_basic/skin_tone/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "678d5d30-77b0-4a33-8458-19d12aeee91c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "678d5d30-77b0-4a33-8458-19d12aeee91c" } ] diff --git a/data/novtau/PETG/petg_basic/skin_tone/variant.json b/data/novtau/PETG/petg_basic/skin_tone/variant.json index e50064c7da..1a02792005 100644 --- a/data/novtau/PETG/petg_basic/skin_tone/variant.json +++ b/data/novtau/PETG/petg_basic/skin_tone/variant.json @@ -1,6 +1,6 @@ { - "uuid": "c679248d-836d-4c74-a5e8-88fc77949162", "id": "skin_tone", "name": "Skin Tone", - "color_hex": "#E1C7B2" + "color_hex": "#DFC5B0", + "uuid": "c679248d-836d-4c74-a5e8-88fc77949162" } diff --git a/data/novtau/PETG/petg_basic/sky_blue/sizes.json b/data/novtau/PETG/petg_basic/sky_blue/sizes.json index 5517a42a35..975b79f0e6 100644 --- a/data/novtau/PETG/petg_basic/sky_blue/sizes.json +++ b/data/novtau/PETG/petg_basic/sky_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "f9f48801-9b56-49a5-a8b2-4d8808cc89f0", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "f9f48801-9b56-49a5-a8b2-4d8808cc89f0" } ] diff --git a/data/novtau/PETG/petg_basic/sky_blue/variant.json b/data/novtau/PETG/petg_basic/sky_blue/variant.json index a7ab5f5c13..7d6fd4715a 100644 --- a/data/novtau/PETG/petg_basic/sky_blue/variant.json +++ b/data/novtau/PETG/petg_basic/sky_blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "c7cafa81-1570-49cb-94c5-e5d9ad18d967", "id": "sky_blue", "name": "Sky Blue", - "color_hex": "#62BCF8" + "color_hex": "#62BAF5", + "uuid": "c7cafa81-1570-49cb-94c5-e5d9ad18d967" } diff --git a/data/novtau/PETG/petg_basic/soft_green/sizes.json b/data/novtau/PETG/petg_basic/soft_green/sizes.json index b56dcd0ee8..6b3d0aa8df 100644 --- a/data/novtau/PETG/petg_basic/soft_green/sizes.json +++ b/data/novtau/PETG/petg_basic/soft_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "eaf83cb0-558a-48c8-9072-40a697f3a879", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "eaf83cb0-558a-48c8-9072-40a697f3a879" } ] diff --git a/data/novtau/PETG/petg_basic/soft_green/variant.json b/data/novtau/PETG/petg_basic/soft_green/variant.json index ad3edee88c..8b08a20991 100644 --- a/data/novtau/PETG/petg_basic/soft_green/variant.json +++ b/data/novtau/PETG/petg_basic/soft_green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "cb61dc6d-bd30-47cf-8eb7-e980c1f7cae8", "id": "soft_green", "name": "Soft Green", - "color_hex": "#A4BE9D" + "color_hex": "#6AE1F4", + "uuid": "cb61dc6d-bd30-47cf-8eb7-e980c1f7cae8" } diff --git a/data/novtau/PETG/petg_basic/soft_lavender/sizes.json b/data/novtau/PETG/petg_basic/soft_lavender/sizes.json index 88fd16c474..536a77ee0b 100644 --- a/data/novtau/PETG/petg_basic/soft_lavender/sizes.json +++ b/data/novtau/PETG/petg_basic/soft_lavender/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "155c1f2e-23c5-4fbf-b5aa-407b77ebe19b", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "155c1f2e-23c5-4fbf-b5aa-407b77ebe19b" } ] diff --git a/data/novtau/PETG/petg_basic/soft_lavender/variant.json b/data/novtau/PETG/petg_basic/soft_lavender/variant.json index 3a5ee896f8..267d4874f0 100644 --- a/data/novtau/PETG/petg_basic/soft_lavender/variant.json +++ b/data/novtau/PETG/petg_basic/soft_lavender/variant.json @@ -1,6 +1,6 @@ { - "uuid": "71369c3a-e4d2-45b6-8041-9ddad8d03358", "id": "soft_lavender", "name": "Soft Lavender", - "color_hex": "#BAAACE" + "color_hex": "#B7A8CC", + "uuid": "71369c3a-e4d2-45b6-8041-9ddad8d03358" } diff --git a/data/novtau/PETG/petg_basic/sparkle_black/sizes.json b/data/novtau/PETG/petg_basic/sparkle_black/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/sparkle_black/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/sparkle_black/variant.json b/data/novtau/PETG/petg_basic/sparkle_black/variant.json new file mode 100644 index 0000000000..b64a72593d --- /dev/null +++ b/data/novtau/PETG/petg_basic/sparkle_black/variant.json @@ -0,0 +1,5 @@ +{ + "id": "sparkle_black", + "name": "Sparkle Black", + "color_hex": "#343434" +} diff --git a/data/novtau/PETG/petg_basic/taro_purple/sizes.json b/data/novtau/PETG/petg_basic/taro_purple/sizes.json index 87bd167ce1..5a2cf1a9d5 100644 --- a/data/novtau/PETG/petg_basic/taro_purple/sizes.json +++ b/data/novtau/PETG/petg_basic/taro_purple/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "ed35f102-0f9b-4001-8713-973ed167e615", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ed35f102-0f9b-4001-8713-973ed167e615" } ] diff --git a/data/novtau/PETG/petg_basic/taro_purple/variant.json b/data/novtau/PETG/petg_basic/taro_purple/variant.json index 3ffd69afb3..e15745ecf9 100644 --- a/data/novtau/PETG/petg_basic/taro_purple/variant.json +++ b/data/novtau/PETG/petg_basic/taro_purple/variant.json @@ -1,6 +1,6 @@ { - "uuid": "d0729dec-0232-439b-a536-0b909f8424ba", "id": "taro_purple", "name": "Taro Purple", - "color_hex": "#A67BC9" + "color_hex": "#A47AC7", + "uuid": "d0729dec-0232-439b-a536-0b909f8424ba" } diff --git a/data/novtau/PETG/petg_basic/teal_green/sizes.json b/data/novtau/PETG/petg_basic/teal_green/sizes.json index af8fbc578b..12244c4d85 100644 --- a/data/novtau/PETG/petg_basic/teal_green/sizes.json +++ b/data/novtau/PETG/petg_basic/teal_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "1155d19d-703b-4f29-96bd-bcf33a26f3a4", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "1155d19d-703b-4f29-96bd-bcf33a26f3a4" } ] diff --git a/data/novtau/PETG/petg_basic/teal_green/variant.json b/data/novtau/PETG/petg_basic/teal_green/variant.json index c09eb1a812..b8654e49e8 100644 --- a/data/novtau/PETG/petg_basic/teal_green/variant.json +++ b/data/novtau/PETG/petg_basic/teal_green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "25f4b052-8117-4df8-8f4c-d9a36461deff", "id": "teal_green", "name": "Teal Green", - "color_hex": "#3EC1C8" + "color_hex": "#03AD97", + "uuid": "25f4b052-8117-4df8-8f4c-d9a36461deff" } diff --git a/data/novtau/PETG/petg_basic/vermilion_red/sizes.json b/data/novtau/PETG/petg_basic/vermilion_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/vermilion_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/vermilion_red/variant.json b/data/novtau/PETG/petg_basic/vermilion_red/variant.json new file mode 100644 index 0000000000..e54187ba5a --- /dev/null +++ b/data/novtau/PETG/petg_basic/vermilion_red/variant.json @@ -0,0 +1,5 @@ +{ + "id": "vermilion_red", + "name": "Vermilion Red", + "color_hex": "#E6203E" +} diff --git a/data/novtau/PETG/petg_basic/warm_white/sizes.json b/data/novtau/PETG/petg_basic/warm_white/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_basic/warm_white/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_basic/warm_white/variant.json b/data/novtau/PETG/petg_basic/warm_white/variant.json new file mode 100644 index 0000000000..5b8761fb37 --- /dev/null +++ b/data/novtau/PETG/petg_basic/warm_white/variant.json @@ -0,0 +1,5 @@ +{ + "id": "warm_white", + "name": "Warm White", + "color_hex": "#C5B4A0" +} diff --git a/data/novtau/PETG/petg_basic/white/sizes.json b/data/novtau/PETG/petg_basic/white/sizes.json index cd82cf53f9..82f767c1db 100644 --- a/data/novtau/PETG/petg_basic/white/sizes.json +++ b/data/novtau/PETG/petg_basic/white/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "5d4e5ec4-a0c6-4240-a9c2-4031ef0f5823", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "5d4e5ec4-a0c6-4240-a9c2-4031ef0f5823" } ] diff --git a/data/novtau/PETG/petg_basic/white/variant.json b/data/novtau/PETG/petg_basic/white/variant.json index 06d4cb8c72..999f0aea16 100644 --- a/data/novtau/PETG/petg_basic/white/variant.json +++ b/data/novtau/PETG/petg_basic/white/variant.json @@ -1,6 +1,6 @@ { - "uuid": "40a9d762-fb63-4d2f-ab20-d636090c45b2", "id": "white", "name": "White", - "color_hex": "#D5D5D6" + "color_hex": "#D5D5D6", + "uuid": "40a9d762-fb63-4d2f-ab20-d636090c45b2" } diff --git a/data/novtau/PETG/petg_basic/wisteria/sizes.json b/data/novtau/PETG/petg_basic/wisteria/sizes.json index 6096e982c8..90b4d851f9 100644 --- a/data/novtau/PETG/petg_basic/wisteria/sizes.json +++ b/data/novtau/PETG/petg_basic/wisteria/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "9225ead9-53cf-4814-9214-48837c8bfa4a", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "9225ead9-53cf-4814-9214-48837c8bfa4a" } ] diff --git a/data/novtau/PETG/petg_basic/wisteria/variant.json b/data/novtau/PETG/petg_basic/wisteria/variant.json index 94cd6336ff..4e17e16811 100644 --- a/data/novtau/PETG/petg_basic/wisteria/variant.json +++ b/data/novtau/PETG/petg_basic/wisteria/variant.json @@ -1,6 +1,6 @@ { - "uuid": "d3aa1767-b5de-4255-a56e-17745c03098d", "id": "wisteria", "name": "Wisteria", - "color_hex": "#9F84C1" + "color_hex": "#C2ABD3", + "uuid": "d3aa1767-b5de-4255-a56e-17745c03098d" } diff --git a/data/novtau/PETG/petg_basic/wood_tone/sizes.json b/data/novtau/PETG/petg_basic/wood_tone/sizes.json index 89f5e15f84..e7236eaa35 100644 --- a/data/novtau/PETG/petg_basic/wood_tone/sizes.json +++ b/data/novtau/PETG/petg_basic/wood_tone/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "aa581cda-f0f6-4921-80ce-4f1bd989fd66", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "aa581cda-f0f6-4921-80ce-4f1bd989fd66" } ] diff --git a/data/novtau/PETG/petg_basic/wood_tone/variant.json b/data/novtau/PETG/petg_basic/wood_tone/variant.json index 74e28d0997..b130a73f81 100644 --- a/data/novtau/PETG/petg_basic/wood_tone/variant.json +++ b/data/novtau/PETG/petg_basic/wood_tone/variant.json @@ -1,6 +1,6 @@ { - "uuid": "7481f3f1-4389-4862-9bc9-d5e6c5dc6f95", "id": "wood_tone", "name": "Wood Tone", - "color_hex": "#B39476" + "color_hex": "#B09375", + "uuid": "7481f3f1-4389-4862-9bc9-d5e6c5dc6f95" } diff --git a/data/novtau/PETG/petg_basic/yellow/sizes.json b/data/novtau/PETG/petg_basic/yellow/sizes.json index d9e9a353f7..81a66f5176 100644 --- a/data/novtau/PETG/petg_basic/yellow/sizes.json +++ b/data/novtau/PETG/petg_basic/yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "dd9667b1-7a26-454d-87e3-ac0ddfe1bb52", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "dd9667b1-7a26-454d-87e3-ac0ddfe1bb52" } ] diff --git a/data/novtau/PETG/petg_basic/yellow/variant.json b/data/novtau/PETG/petg_basic/yellow/variant.json index b214a806ab..64dd4a2b80 100644 --- a/data/novtau/PETG/petg_basic/yellow/variant.json +++ b/data/novtau/PETG/petg_basic/yellow/variant.json @@ -1,6 +1,6 @@ { - "uuid": "5b959d24-a78b-48e4-a0c8-6966112bb0d5", "id": "yellow", "name": "Yellow", - "color_hex": "#EDC318" + "color_hex": "#EDC318", + "uuid": "5b959d24-a78b-48e4-a0c8-6966112bb0d5" } diff --git a/data/novtau/PETG/petg_cf/black/sizes.json b/data/novtau/PETG/petg_cf/black/sizes.json index 76af2b3f2a..040e16205f 100644 --- a/data/novtau/PETG/petg_cf/black/sizes.json +++ b/data/novtau/PETG/petg_cf/black/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "1e7cf5f7-057f-41c6-a55d-c5e29cdebc77", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "1e7cf5f7-057f-41c6-a55d-c5e29cdebc77" } ] diff --git a/data/novtau/PETG/petg_cf/black/variant.json b/data/novtau/PETG/petg_cf/black/variant.json index ee7c67a988..2ce4f3ff34 100644 --- a/data/novtau/PETG/petg_cf/black/variant.json +++ b/data/novtau/PETG/petg_cf/black/variant.json @@ -1,10 +1,10 @@ { - "uuid": "bcd2957e-e347-413f-98d0-5322e4403019", "id": "black", "name": "Black", "color_hex": "#373737", "traits": { - "abrasive": true, - "contains_carbon_fiber": true - } + "contains_carbon_fiber": true, + "abrasive": true + }, + "uuid": "bcd2957e-e347-413f-98d0-5322e4403019" } diff --git a/data/novtau/PETG/petg_cf/filament.json b/data/novtau/PETG/petg_cf/filament.json index 0f088412f7..a12e623023 100644 --- a/data/novtau/PETG/petg_cf/filament.json +++ b/data/novtau/PETG/petg_cf/filament.json @@ -1,7 +1,7 @@ { - "uuid": "7c05e3e7-cd1c-4c7c-a021-c3cf0acffad5", "id": "petg_cf", "name": "PETG-CF", "diameter_tolerance": 0.02, - "density": 1.25 + "density": 1.25, + "uuid": "7c05e3e7-cd1c-4c7c-a021-c3cf0acffad5" } diff --git a/data/novtau/PETG/petg_cf/gray/sizes.json b/data/novtau/PETG/petg_cf/gray/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_cf/gray/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_cf/gray/variant.json b/data/novtau/PETG/petg_cf/gray/variant.json new file mode 100644 index 0000000000..891dda0006 --- /dev/null +++ b/data/novtau/PETG/petg_cf/gray/variant.json @@ -0,0 +1,9 @@ +{ + "id": "gray", + "name": "Gray", + "color_hex": "#3D4043", + "traits": { + "contains_carbon_fiber": true, + "abrasive": true + } +} diff --git a/data/novtau/PETG/petg_cf/green/sizes.json b/data/novtau/PETG/petg_cf/green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_cf/green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_cf/green/variant.json b/data/novtau/PETG/petg_cf/green/variant.json new file mode 100644 index 0000000000..87cc478ad7 --- /dev/null +++ b/data/novtau/PETG/petg_cf/green/variant.json @@ -0,0 +1,9 @@ +{ + "id": "green", + "name": "Green", + "color_hex": "#1E4D2F", + "traits": { + "contains_carbon_fiber": true, + "abrasive": true + } +} diff --git a/data/novtau/PETG/petg_cf/indigo_blue/sizes.json b/data/novtau/PETG/petg_cf/indigo_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_cf/indigo_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_cf/indigo_blue/variant.json b/data/novtau/PETG/petg_cf/indigo_blue/variant.json new file mode 100644 index 0000000000..a499f9119b --- /dev/null +++ b/data/novtau/PETG/petg_cf/indigo_blue/variant.json @@ -0,0 +1,9 @@ +{ + "id": "indigo_blue", + "name": "Indigo Blue", + "color_hex": "#2A3654", + "traits": { + "contains_carbon_fiber": true, + "abrasive": true + } +} diff --git a/data/novtau/PETG/petg_cf/red/sizes.json b/data/novtau/PETG/petg_cf/red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_cf/red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_cf/red/variant.json b/data/novtau/PETG/petg_cf/red/variant.json new file mode 100644 index 0000000000..a07997622c --- /dev/null +++ b/data/novtau/PETG/petg_cf/red/variant.json @@ -0,0 +1,9 @@ +{ + "id": "red", + "name": "Red", + "color_hex": "#5D1D29", + "traits": { + "contains_carbon_fiber": true, + "abrasive": true + } +} diff --git a/data/novtau/PETG/petg_high_flow/filament.json b/data/novtau/PETG/petg_high_flow/filament.json index e3658a38d3..7e056ed9a2 100644 --- a/data/novtau/PETG/petg_high_flow/filament.json +++ b/data/novtau/PETG/petg_high_flow/filament.json @@ -3,5 +3,6 @@ "id": "petg_high_flow", "name": "PETG High-Flow", "diameter_tolerance": 0.02, - "density": 1.28 + "density": 1.28, + "discontinued": true } diff --git a/data/novtau/PETG/petg_marble/filament.json b/data/novtau/PETG/petg_marble/filament.json index 7244576c5e..d7975d2861 100644 --- a/data/novtau/PETG/petg_marble/filament.json +++ b/data/novtau/PETG/petg_marble/filament.json @@ -1,7 +1,7 @@ { - "uuid": "5614681d-bbe4-4a14-ae5a-2d04589df6df", "id": "petg_marble", "name": "PETG Marble", "diameter_tolerance": 0.02, - "density": 1.27 + "density": 1.27, + "uuid": "5614681d-bbe4-4a14-ae5a-2d04589df6df" } diff --git a/data/novtau/PETG/petg_marble/marble/sizes.json b/data/novtau/PETG/petg_marble/marble/sizes.json index e643222e5c..644926c83c 100644 --- a/data/novtau/PETG/petg_marble/marble/sizes.json +++ b/data/novtau/PETG/petg_marble/marble/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "38c56ebc-5d17-4285-b84d-74c1abf0bcf8", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "38c56ebc-5d17-4285-b84d-74c1abf0bcf8" } ] diff --git a/data/novtau/PETG/petg_marble/marble/variant.json b/data/novtau/PETG/petg_marble/marble/variant.json index 09c31da381..1b3b14ba0b 100644 --- a/data/novtau/PETG/petg_marble/marble/variant.json +++ b/data/novtau/PETG/petg_marble/marble/variant.json @@ -1,9 +1,9 @@ { - "uuid": "b94d73ad-3ee0-40df-9da9-1c87c3383d2d", "id": "marble", "name": "Marble", - "color_hex": "#AEAEB1", + "color_hex": "#B0B0B2", "traits": { "imitates_marble": true - } + }, + "uuid": "b94d73ad-3ee0-40df-9da9-1c87c3383d2d" } diff --git a/data/novtau/PETG/petg_metal/coffee_gold/sizes.json b/data/novtau/PETG/petg_metal/coffee_gold/sizes.json index 8c0056b6ec..de6c4c866d 100644 --- a/data/novtau/PETG/petg_metal/coffee_gold/sizes.json +++ b/data/novtau/PETG/petg_metal/coffee_gold/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "3d292ac5-7c37-4237-8a12-2ce27a6f4ec6", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "3d292ac5-7c37-4237-8a12-2ce27a6f4ec6" } ] diff --git a/data/novtau/PETG/petg_metal/coffee_gold/variant.json b/data/novtau/PETG/petg_metal/coffee_gold/variant.json index 6a53cc024d..840a7b333a 100644 --- a/data/novtau/PETG/petg_metal/coffee_gold/variant.json +++ b/data/novtau/PETG/petg_metal/coffee_gold/variant.json @@ -1,9 +1,9 @@ { - "uuid": "eff12a51-502e-4fa0-895a-e4d7932d3399", "id": "coffee_gold", "name": "Coffee Gold", - "color_hex": "#805C41", + "color_hex": "#7E5C41", "traits": { "imitates_metal": true - } + }, + "uuid": "eff12a51-502e-4fa0-895a-e4d7932d3399" } diff --git a/data/novtau/PETG/petg_metal/filament.json b/data/novtau/PETG/petg_metal/filament.json index 56c7af4a34..d0cd1d39b2 100644 --- a/data/novtau/PETG/petg_metal/filament.json +++ b/data/novtau/PETG/petg_metal/filament.json @@ -1,7 +1,7 @@ { - "uuid": "7388ca46-9e34-46bf-b628-9673c1786c43", "id": "petg_metal", "name": "PETG Metallic", "diameter_tolerance": 0.02, - "density": 1.27 + "density": 1.27, + "uuid": "7388ca46-9e34-46bf-b628-9673c1786c43" } diff --git a/data/novtau/PETG/petg_metal/gold/sizes.json b/data/novtau/PETG/petg_metal/gold/sizes.json index 9f21658a93..9fa9000994 100644 --- a/data/novtau/PETG/petg_metal/gold/sizes.json +++ b/data/novtau/PETG/petg_metal/gold/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "8072dce9-e42d-4318-aeff-ed2fef7b9457", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "8072dce9-e42d-4318-aeff-ed2fef7b9457" } ] diff --git a/data/novtau/PETG/petg_metal/gold/variant.json b/data/novtau/PETG/petg_metal/gold/variant.json index b2cc108165..f1d592a067 100644 --- a/data/novtau/PETG/petg_metal/gold/variant.json +++ b/data/novtau/PETG/petg_metal/gold/variant.json @@ -1,9 +1,9 @@ { - "uuid": "ed2a2242-e341-49c8-a7ff-0baf7d8016ce", "id": "gold", "name": "Gold", - "color_hex": "#A67736", + "color_hex": "#A37636", "traits": { "imitates_metal": true - } + }, + "uuid": "ed2a2242-e341-49c8-a7ff-0baf7d8016ce" } diff --git a/data/novtau/PETG/petg_metal/silver/sizes.json b/data/novtau/PETG/petg_metal/silver/sizes.json index 71195bc56d..cd1554402e 100644 --- a/data/novtau/PETG/petg_metal/silver/sizes.json +++ b/data/novtau/PETG/petg_metal/silver/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "2d91b08d-9425-41a3-ace9-7b64f8833f56", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "2d91b08d-9425-41a3-ace9-7b64f8833f56" } ] diff --git a/data/novtau/PETG/petg_metal/silver/variant.json b/data/novtau/PETG/petg_metal/silver/variant.json index 34a38db948..e41bc2c303 100644 --- a/data/novtau/PETG/petg_metal/silver/variant.json +++ b/data/novtau/PETG/petg_metal/silver/variant.json @@ -1,9 +1,9 @@ { - "uuid": "c2553679-f5fb-4589-98da-0de37c6ce98d", "id": "silver", "name": "Silver", - "color_hex": "#7E8083", + "color_hex": "#7D7F82", "traits": { "imitates_metal": true - } + }, + "uuid": "c2553679-f5fb-4589-98da-0de37c6ce98d" } diff --git a/data/novtau/PETG/petg_multi_color/autumn_blaze/sizes.json b/data/novtau/PETG/petg_multi_color/autumn_blaze/sizes.json index d390239c0c..3d99a086f5 100644 --- a/data/novtau/PETG/petg_multi_color/autumn_blaze/sizes.json +++ b/data/novtau/PETG/petg_multi_color/autumn_blaze/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "ae91f54c-cc8a-474f-98d8-eb59291b702c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ae91f54c-cc8a-474f-98d8-eb59291b702c" } ] diff --git a/data/novtau/PETG/petg_multi_color/autumn_blaze/variant.json b/data/novtau/PETG/petg_multi_color/autumn_blaze/variant.json index 8da744d42f..582d008ee6 100644 --- a/data/novtau/PETG/petg_multi_color/autumn_blaze/variant.json +++ b/data/novtau/PETG/petg_multi_color/autumn_blaze/variant.json @@ -1,12 +1,12 @@ { - "uuid": "f8279314-a0ee-4028-b271-aad7f05fd18c", "id": "autumn_blaze", "name": "Autumn Blaze", "color_hex": [ - "#F89355", - "#D1452C" + "#F69154", + "#CC442B" ], "traits": { "coextruded": true - } + }, + "uuid": "f8279314-a0ee-4028-b271-aad7f05fd18c" } diff --git a/data/novtau/PETG/petg_multi_color/candy_rainbow/sizes.json b/data/novtau/PETG/petg_multi_color/candy_rainbow/sizes.json index 8ab63692cd..527fc26ca8 100644 --- a/data/novtau/PETG/petg_multi_color/candy_rainbow/sizes.json +++ b/data/novtau/PETG/petg_multi_color/candy_rainbow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "c86039c4-39e6-4c9d-9cb3-4f4e90890777", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "c86039c4-39e6-4c9d-9cb3-4f4e90890777" } ] diff --git a/data/novtau/PETG/petg_multi_color/candy_rainbow/variant.json b/data/novtau/PETG/petg_multi_color/candy_rainbow/variant.json index e5c749dfd1..070d9f05c8 100644 --- a/data/novtau/PETG/petg_multi_color/candy_rainbow/variant.json +++ b/data/novtau/PETG/petg_multi_color/candy_rainbow/variant.json @@ -1,12 +1,12 @@ { - "uuid": "945f604c-1da7-4234-a138-052c81c5dfce", "id": "candy_rainbow", "name": "Candy Rainbow", "color_hex": [ - "#5CA5C1", - "#EDBA78" + "#5BA3BF", + "#E9B777" ], "traits": { "coextruded": true - } + }, + "uuid": "945f604c-1da7-4234-a138-052c81c5dfce" } diff --git a/data/novtau/PETG/petg_multi_color/candy_rainbow_mix/sizes.json b/data/novtau/PETG/petg_multi_color/candy_rainbow_mix/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/candy_rainbow_mix/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_multi_color/candy_rainbow_mix/variant.json b/data/novtau/PETG/petg_multi_color/candy_rainbow_mix/variant.json new file mode 100644 index 0000000000..f3845f6390 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/candy_rainbow_mix/variant.json @@ -0,0 +1,12 @@ +{ + "id": "candy_rainbow_mix", + "name": "Candy Rainbow Mix", + "color_hex": [ + "#D868AF", + "#55C89E", + "#E1D172" + ], + "traits": { + "coextruded": true + } +} diff --git a/data/novtau/PETG/petg_multi_color/cosmic_rainbow/sizes.json b/data/novtau/PETG/petg_multi_color/cosmic_rainbow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/cosmic_rainbow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_multi_color/cosmic_rainbow/variant.json b/data/novtau/PETG/petg_multi_color/cosmic_rainbow/variant.json new file mode 100644 index 0000000000..b1240276ec --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/cosmic_rainbow/variant.json @@ -0,0 +1,12 @@ +{ + "id": "cosmic_rainbow", + "name": "Cosmic Rainbow", + "color_hex": [ + "#498CB6", + "#C6A360", + "#A25AAD" + ], + "traits": { + "coextruded": true + } +} diff --git a/data/novtau/PETG/petg_multi_color/filament.json b/data/novtau/PETG/petg_multi_color/filament.json index a6fb8a6734..9374788735 100644 --- a/data/novtau/PETG/petg_multi_color/filament.json +++ b/data/novtau/PETG/petg_multi_color/filament.json @@ -1,7 +1,7 @@ { - "uuid": "6cabcd1e-11ae-4b3a-83df-9e4f7019e3fd", "id": "petg_multi_color", "name": "PETG Multi-Color", "diameter_tolerance": 0.02, - "density": 1.27 + "density": 1.27, + "uuid": "6cabcd1e-11ae-4b3a-83df-9e4f7019e3fd" } diff --git a/data/novtau/PETG/petg_multi_color/macaron/sizes.json b/data/novtau/PETG/petg_multi_color/macaron/sizes.json index d7d895fd4e..50cca2872c 100644 --- a/data/novtau/PETG/petg_multi_color/macaron/sizes.json +++ b/data/novtau/PETG/petg_multi_color/macaron/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "7df88c66-e05b-45d6-b8ef-7d058efc051e", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "7df88c66-e05b-45d6-b8ef-7d058efc051e" } ] diff --git a/data/novtau/PETG/petg_multi_color/macaron/variant.json b/data/novtau/PETG/petg_multi_color/macaron/variant.json index f0c618c6f5..af873fb15e 100644 --- a/data/novtau/PETG/petg_multi_color/macaron/variant.json +++ b/data/novtau/PETG/petg_multi_color/macaron/variant.json @@ -1,12 +1,12 @@ { - "uuid": "8f93f988-94a4-4922-add8-f4da3d6105e2", "id": "macaron", "name": "Macaron", "color_hex": [ - "#E8CFB0", - "#91C8BE" + "#E5CDAE", + "#8FC4BA" ], "traits": { "coextruded": true - } + }, + "uuid": "8f93f988-94a4-4922-add8-f4da3d6105e2" } diff --git a/data/novtau/PETG/petg_multi_color/mini_rainbow/sizes.json b/data/novtau/PETG/petg_multi_color/mini_rainbow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/mini_rainbow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_multi_color/mini_rainbow/variant.json b/data/novtau/PETG/petg_multi_color/mini_rainbow/variant.json new file mode 100644 index 0000000000..f95cee363e --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/mini_rainbow/variant.json @@ -0,0 +1,12 @@ +{ + "id": "mini_rainbow", + "name": "Mini Rainbow", + "color_hex": [ + "#C1679F", + "#51A2D0", + "#D2C067" + ], + "traits": { + "coextruded": true + } +} diff --git a/data/novtau/PETG/petg_multi_color/rainbow_autumn/sizes.json b/data/novtau/PETG/petg_multi_color/rainbow_autumn/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/rainbow_autumn/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_multi_color/rainbow_autumn/variant.json b/data/novtau/PETG/petg_multi_color/rainbow_autumn/variant.json new file mode 100644 index 0000000000..af9be80d88 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/rainbow_autumn/variant.json @@ -0,0 +1,11 @@ +{ + "id": "rainbow_autumn", + "name": "Rainbow Autumn", + "color_hex": [ + "#E565AD", + "#F5A4CE" + ], + "traits": { + "coextruded": true + } +} diff --git a/data/novtau/PETG/petg_multi_color/rainbow_ice_crystal/sizes.json b/data/novtau/PETG/petg_multi_color/rainbow_ice_crystal/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/rainbow_ice_crystal/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_multi_color/rainbow_ice_crystal/variant.json b/data/novtau/PETG/petg_multi_color/rainbow_ice_crystal/variant.json new file mode 100644 index 0000000000..52f099488c --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/rainbow_ice_crystal/variant.json @@ -0,0 +1,11 @@ +{ + "id": "rainbow_ice_crystal", + "name": "Rainbow Ice Crystal", + "color_hex": [ + "#E890B4", + "#FBAECF" + ], + "traits": { + "coextruded": true + } +} diff --git a/data/novtau/PETG/petg_multi_color/rainbow_mist/sizes.json b/data/novtau/PETG/petg_multi_color/rainbow_mist/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/rainbow_mist/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_multi_color/rainbow_mist/variant.json b/data/novtau/PETG/petg_multi_color/rainbow_mist/variant.json new file mode 100644 index 0000000000..2645fc1e11 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/rainbow_mist/variant.json @@ -0,0 +1,12 @@ +{ + "id": "rainbow_mist", + "name": "Rainbow Mist", + "color_hex": [ + "#46A6CF", + "#8C9CDF", + "#779EDA" + ], + "traits": { + "coextruded": true + } +} diff --git a/data/novtau/PETG/petg_multi_color/rainbow_star_sand/sizes.json b/data/novtau/PETG/petg_multi_color/rainbow_star_sand/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/rainbow_star_sand/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_multi_color/rainbow_star_sand/variant.json b/data/novtau/PETG/petg_multi_color/rainbow_star_sand/variant.json new file mode 100644 index 0000000000..6b83063a28 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/rainbow_star_sand/variant.json @@ -0,0 +1,12 @@ +{ + "id": "rainbow_star_sand", + "name": "Rainbow Star Sand", + "color_hex": [ + "#D4C33A", + "#3FCFA0", + "#97CD76" + ], + "traits": { + "coextruded": true + } +} diff --git a/data/novtau/PETG/petg_multi_color/rainbow_summer/sizes.json b/data/novtau/PETG/petg_multi_color/rainbow_summer/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/rainbow_summer/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_multi_color/rainbow_summer/variant.json b/data/novtau/PETG/petg_multi_color/rainbow_summer/variant.json new file mode 100644 index 0000000000..11ea664ede --- /dev/null +++ b/data/novtau/PETG/petg_multi_color/rainbow_summer/variant.json @@ -0,0 +1,11 @@ +{ + "id": "rainbow_summer", + "name": "Rainbow Summer", + "color_hex": [ + "#59C996", + "#53BF86" + ], + "traits": { + "coextruded": true + } +} diff --git a/data/novtau/PETG/petg_multi_color/spring_bloom/sizes.json b/data/novtau/PETG/petg_multi_color/spring_bloom/sizes.json index c27135d174..a4104877cd 100644 --- a/data/novtau/PETG/petg_multi_color/spring_bloom/sizes.json +++ b/data/novtau/PETG/petg_multi_color/spring_bloom/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "c1d6fdc1-4acf-4dd0-a83b-5a476322c98a", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "c1d6fdc1-4acf-4dd0-a83b-5a476322c98a" } ] diff --git a/data/novtau/PETG/petg_multi_color/spring_bloom/variant.json b/data/novtau/PETG/petg_multi_color/spring_bloom/variant.json index c2f8546716..bc15ee0514 100644 --- a/data/novtau/PETG/petg_multi_color/spring_bloom/variant.json +++ b/data/novtau/PETG/petg_multi_color/spring_bloom/variant.json @@ -1,12 +1,12 @@ { - "uuid": "877c0b9e-cd1c-4346-a788-cdbc5306856c", "id": "spring_bloom", "name": "Spring Bloom", "color_hex": [ - "#B0DD73", - "#36BB6E" + "#B0DC73", + "#38B96C" ], "traits": { "coextruded": true - } + }, + "uuid": "877c0b9e-cd1c-4346-a788-cdbc5306856c" } diff --git a/data/novtau/PETG/petg_multi_color/summer_breeze/sizes.json b/data/novtau/PETG/petg_multi_color/summer_breeze/sizes.json index a9113b96f7..c02598764b 100644 --- a/data/novtau/PETG/petg_multi_color/summer_breeze/sizes.json +++ b/data/novtau/PETG/petg_multi_color/summer_breeze/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "f4a11e95-679e-4cbe-9dcd-8ec8141dd1d7", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "f4a11e95-679e-4cbe-9dcd-8ec8141dd1d7" } ] diff --git a/data/novtau/PETG/petg_multi_color/summer_breeze/variant.json b/data/novtau/PETG/petg_multi_color/summer_breeze/variant.json index 94a4f50fcf..31e1cc62da 100644 --- a/data/novtau/PETG/petg_multi_color/summer_breeze/variant.json +++ b/data/novtau/PETG/petg_multi_color/summer_breeze/variant.json @@ -1,12 +1,12 @@ { - "uuid": "4fb85054-a082-4ea0-9b95-a34153233cbd", "id": "summer_breeze", "name": "Summer Breeze", "color_hex": [ - "#ADD5E3", - "#65ABCF" + "#A9D3E2", + "#64A8CC" ], "traits": { "coextruded": true - } + }, + "uuid": "4fb85054-a082-4ea0-9b95-a34153233cbd" } diff --git a/data/novtau/PETG/petg_multi_color/winter_glow/sizes.json b/data/novtau/PETG/petg_multi_color/winter_glow/sizes.json index 81d9545214..0e2e43fc5e 100644 --- a/data/novtau/PETG/petg_multi_color/winter_glow/sizes.json +++ b/data/novtau/PETG/petg_multi_color/winter_glow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "1443997f-92f3-431d-b9eb-457a2783b5c0", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "1443997f-92f3-431d-b9eb-457a2783b5c0" } ] diff --git a/data/novtau/PETG/petg_multi_color/winter_glow/variant.json b/data/novtau/PETG/petg_multi_color/winter_glow/variant.json index c20bc6e413..6a4fdf1cab 100644 --- a/data/novtau/PETG/petg_multi_color/winter_glow/variant.json +++ b/data/novtau/PETG/petg_multi_color/winter_glow/variant.json @@ -1,12 +1,12 @@ { - "uuid": "a69608dd-d8c6-4cb9-9eb8-acd10708d858", "id": "winter_glow", "name": "Winter Glow", "color_hex": [ - "#A7BAF1", - "#6886C8" + "#A7B9EF", + "#6886C3" ], "traits": { "coextruded": true - } + }, + "uuid": "a69608dd-d8c6-4cb9-9eb8-acd10708d858" } diff --git a/data/novtau/PETG/petg_sparkle/blue/variant.json b/data/novtau/PETG/petg_sparkle/blue/variant.json deleted file mode 100644 index f4dd03d4cb..0000000000 --- a/data/novtau/PETG/petg_sparkle/blue/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "866b170d-d829-4ecb-a9e6-01b7320a214e", - "id": "blue", - "name": "Blue", - "color_hex": "#0E59B4", - "traits": { - "glitter": true - } -} diff --git a/data/novtau/PETG/petg_sparkle/filament.json b/data/novtau/PETG/petg_sparkle/filament.json index 0b5cc7b8c3..8de32a4fe3 100644 --- a/data/novtau/PETG/petg_sparkle/filament.json +++ b/data/novtau/PETG/petg_sparkle/filament.json @@ -1,7 +1,7 @@ { - "uuid": "8ee72a9e-cf1a-43f6-ac16-c797f0d06409", "id": "petg_sparkle", "name": "PETG Sparkle", "diameter_tolerance": 0.02, - "density": 1.27 + "density": 1.27, + "uuid": "8ee72a9e-cf1a-43f6-ac16-c797f0d06409" } diff --git a/data/novtau/PETG/petg_sparkle/green/variant.json b/data/novtau/PETG/petg_sparkle/green/variant.json deleted file mode 100644 index f3397772d1..0000000000 --- a/data/novtau/PETG/petg_sparkle/green/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "a9251e04-cb38-4f70-99d1-16fe2447d3d4", - "id": "green", - "name": "Green", - "color_hex": "#91C20F", - "traits": { - "glitter": true - } -} diff --git a/data/novtau/PETG/petg_sparkle/red/variant.json b/data/novtau/PETG/petg_sparkle/red/variant.json deleted file mode 100644 index 7fbd4e4eed..0000000000 --- a/data/novtau/PETG/petg_sparkle/red/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "9fef01ba-1847-4f49-ab47-5f86ab77464b", - "id": "red", - "name": "Red", - "color_hex": "#B32138", - "traits": { - "glitter": true - } -} diff --git a/data/novtau/PETG/petg_sparkle/blue/sizes.json b/data/novtau/PETG/petg_sparkle/sparkle_blue/sizes.json similarity index 69% rename from data/novtau/PETG/petg_sparkle/blue/sizes.json rename to data/novtau/PETG/petg_sparkle/sparkle_blue/sizes.json index 2c43d326b8..6e8baf8e02 100644 --- a/data/novtau/PETG/petg_sparkle/blue/sizes.json +++ b/data/novtau/PETG/petg_sparkle/sparkle_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "6ee22158-32a8-4a3c-b979-a546401ecae9", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "6ee22158-32a8-4a3c-b979-a546401ecae9" } ] diff --git a/data/novtau/PETG/petg_sparkle/sparkle_blue/variant.json b/data/novtau/PETG/petg_sparkle/sparkle_blue/variant.json new file mode 100644 index 0000000000..2bbf4884df --- /dev/null +++ b/data/novtau/PETG/petg_sparkle/sparkle_blue/variant.json @@ -0,0 +1,9 @@ +{ + "id": "sparkle_blue", + "name": "Sparkle Blue", + "color_hex": "#1073BC", + "traits": { + "glitter": true + }, + "uuid": "866b170d-d829-4ecb-a9e6-01b7320a214e" +} diff --git a/data/novtau/PETG/petg_sparkle/red/sizes.json b/data/novtau/PETG/petg_sparkle/sparkle_green/sizes.json similarity index 69% rename from data/novtau/PETG/petg_sparkle/red/sizes.json rename to data/novtau/PETG/petg_sparkle/sparkle_green/sizes.json index 86044b7033..eb3ba236af 100644 --- a/data/novtau/PETG/petg_sparkle/red/sizes.json +++ b/data/novtau/PETG/petg_sparkle/sparkle_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "8fbd8736-2e27-42bc-a2a7-135fc1ed37f0", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "442c5512-06e1-4d4c-9779-f23827dc23d6" } ] diff --git a/data/novtau/PETG/petg_sparkle/sparkle_green/variant.json b/data/novtau/PETG/petg_sparkle/sparkle_green/variant.json new file mode 100644 index 0000000000..7a16992b1d --- /dev/null +++ b/data/novtau/PETG/petg_sparkle/sparkle_green/variant.json @@ -0,0 +1,9 @@ +{ + "id": "sparkle_green", + "name": "Sparkle Green", + "color_hex": "#ADC818", + "traits": { + "glitter": true + }, + "uuid": "a9251e04-cb38-4f70-99d1-16fe2447d3d4" +} diff --git a/data/novtau/PETG/petg_sparkle/green/sizes.json b/data/novtau/PETG/petg_sparkle/sparkle_red/sizes.json similarity index 69% rename from data/novtau/PETG/petg_sparkle/green/sizes.json rename to data/novtau/PETG/petg_sparkle/sparkle_red/sizes.json index 605ecb0a0b..2bee87bda3 100644 --- a/data/novtau/PETG/petg_sparkle/green/sizes.json +++ b/data/novtau/PETG/petg_sparkle/sparkle_red/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "442c5512-06e1-4d4c-9779-f23827dc23d6", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "8fbd8736-2e27-42bc-a2a7-135fc1ed37f0" } ] diff --git a/data/novtau/PETG/petg_sparkle/sparkle_red/variant.json b/data/novtau/PETG/petg_sparkle/sparkle_red/variant.json new file mode 100644 index 0000000000..3e5acf35ed --- /dev/null +++ b/data/novtau/PETG/petg_sparkle/sparkle_red/variant.json @@ -0,0 +1,9 @@ +{ + "id": "sparkle_red", + "name": "Sparkle Red", + "color_hex": "#B93147", + "traits": { + "glitter": true + }, + "uuid": "9fef01ba-1847-4f49-ab47-5f86ab77464b" +} diff --git a/data/novtau/PETG/petg_translucent/blue_green/variant.json b/data/novtau/PETG/petg_translucent/blue_green/variant.json deleted file mode 100644 index 1ebc1292e8..0000000000 --- a/data/novtau/PETG/petg_translucent/blue_green/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "f3bfc3f5-4a91-4a77-b8a6-bbe524ffc07f", - "id": "blue_green", - "name": "Blue-Green", - "color_hex": "#2ABFBA", - "traits": { - "translucent": true - } -} diff --git a/data/novtau/PETG/petg_translucent/blue_white_orange/sizes.json b/data/novtau/PETG/petg_translucent/blue_white_orange/sizes.json deleted file mode 100644 index bb0a6b4b93..0000000000 --- a/data/novtau/PETG/petg_translucent/blue_white_orange/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "4e313ee8-465b-43cf-a668-648fcde7b710", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PETG/petg_translucent/blue_white_orange/variant.json b/data/novtau/PETG/petg_translucent/blue_white_orange/variant.json deleted file mode 100644 index 0f7d305d98..0000000000 --- a/data/novtau/PETG/petg_translucent/blue_white_orange/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "11bd300d-cb3c-4f95-9ee5-d44cf8550efc", - "id": "blue_white_orange", - "name": "Blue-White-Orange", - "color_hex": "#BED5B9", - "traits": { - "translucent": true - } -} diff --git a/data/novtau/PETG/petg_translucent/clear/sizes.json b/data/novtau/PETG/petg_translucent/clear/sizes.json index 28cc30a592..7cf862f9b0 100644 --- a/data/novtau/PETG/petg_translucent/clear/sizes.json +++ b/data/novtau/PETG/petg_translucent/clear/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "8b187ca9-af9c-4e19-9de8-edab8c74ed0a", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "8b187ca9-af9c-4e19-9de8-edab8c74ed0a" } ] diff --git a/data/novtau/PETG/petg_translucent/clear/variant.json b/data/novtau/PETG/petg_translucent/clear/variant.json index c26dfd2f5b..6235a61008 100644 --- a/data/novtau/PETG/petg_translucent/clear/variant.json +++ b/data/novtau/PETG/petg_translucent/clear/variant.json @@ -1,9 +1,9 @@ { - "uuid": "5bec8652-37c0-486c-b953-5e167ad88750", "id": "clear", "name": "Clear", "color_hex": "#CFCDCC", "traits": { "translucent": true - } + }, + "uuid": "5bec8652-37c0-486c-b953-5e167ad88750" } diff --git a/data/novtau/PETG/petg_translucent/dream_crystal/sizes.json b/data/novtau/PETG/petg_translucent/dream_crystal/sizes.json index 94294f7ca2..4aec32deab 100644 --- a/data/novtau/PETG/petg_translucent/dream_crystal/sizes.json +++ b/data/novtau/PETG/petg_translucent/dream_crystal/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "1f707ef9-59ed-420a-a309-7aac6ef7d63b", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "1f707ef9-59ed-420a-a309-7aac6ef7d63b" } ] diff --git a/data/novtau/PETG/petg_translucent/dream_crystal/variant.json b/data/novtau/PETG/petg_translucent/dream_crystal/variant.json index 92c699333b..1843b57c35 100644 --- a/data/novtau/PETG/petg_translucent/dream_crystal/variant.json +++ b/data/novtau/PETG/petg_translucent/dream_crystal/variant.json @@ -1,9 +1,9 @@ { - "uuid": "65f2cf0e-dad8-460a-9715-d09fbbbd971a", "id": "dream_crystal", "name": "Dream Crystal", - "color_hex": "#DDC084", + "color_hex": "#DABD83", "traits": { "translucent": true - } + }, + "uuid": "65f2cf0e-dad8-460a-9715-d09fbbbd971a" } diff --git a/data/novtau/PETG/petg_translucent/filament.json b/data/novtau/PETG/petg_translucent/filament.json index 2293fab173..fdbd33afb5 100644 --- a/data/novtau/PETG/petg_translucent/filament.json +++ b/data/novtau/PETG/petg_translucent/filament.json @@ -1,7 +1,7 @@ { - "uuid": "5e7c3fbf-c6ce-4951-8747-c8a37692a3b4", "id": "petg_translucent", "name": "PETG Translucent", "diameter_tolerance": 0.02, - "density": 1.27 + "density": 1.27, + "uuid": "5e7c3fbf-c6ce-4951-8747-c8a37692a3b4" } diff --git a/data/novtau/PETG/petg_translucent/green_white/sizes.json b/data/novtau/PETG/petg_translucent/green_white/sizes.json deleted file mode 100644 index f25f5cbb04..0000000000 --- a/data/novtau/PETG/petg_translucent/green_white/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "18f3a7dc-74ef-4cd2-973d-2a94a02988c5", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PETG/petg_translucent/green_white/variant.json b/data/novtau/PETG/petg_translucent/green_white/variant.json deleted file mode 100644 index 5d4c399238..0000000000 --- a/data/novtau/PETG/petg_translucent/green_white/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "4a43fa16-6d0c-4966-9558-5a64d9f5791f", - "id": "green_white", - "name": "Green-White", - "color_hex": "#8ED9B1", - "traits": { - "translucent": true - } -} diff --git a/data/novtau/PETG/petg_translucent/iridescent_glaze/sizes.json b/data/novtau/PETG/petg_translucent/iridescent_glaze/sizes.json index b08bb37585..28342a1d55 100644 --- a/data/novtau/PETG/petg_translucent/iridescent_glaze/sizes.json +++ b/data/novtau/PETG/petg_translucent/iridescent_glaze/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "0864b40b-c2e7-4985-a498-8432615a2d16", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "0864b40b-c2e7-4985-a498-8432615a2d16" } ] diff --git a/data/novtau/PETG/petg_translucent/iridescent_glaze/variant.json b/data/novtau/PETG/petg_translucent/iridescent_glaze/variant.json index 3d68afd905..3e85281f04 100644 --- a/data/novtau/PETG/petg_translucent/iridescent_glaze/variant.json +++ b/data/novtau/PETG/petg_translucent/iridescent_glaze/variant.json @@ -1,9 +1,9 @@ { - "uuid": "c20c139d-7acc-49bd-b784-64bd70c32273", "id": "iridescent_glaze", "name": "Iridescent Glaze", - "color_hex": "#E0BB8F", + "color_hex": "#DAB88D", "traits": { "translucent": true - } + }, + "uuid": "c20c139d-7acc-49bd-b784-64bd70c32273" } diff --git a/data/novtau/PETG/petg_translucent/light_blue/sizes.json b/data/novtau/PETG/petg_translucent/light_blue/sizes.json deleted file mode 100644 index 55894d5808..0000000000 --- a/data/novtau/PETG/petg_translucent/light_blue/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "64e56372-a6cb-4a86-b52f-b7bfcfc2140c", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PETG/petg_translucent/light_blue/variant.json b/data/novtau/PETG/petg_translucent/light_blue/variant.json deleted file mode 100644 index 68bfac58b5..0000000000 --- a/data/novtau/PETG/petg_translucent/light_blue/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "fa16e331-378e-4090-bc1a-cb5548ee1018", - "id": "light_blue", - "name": "Light Blue", - "color_hex": "#72D1E5", - "traits": { - "translucent": true - } -} diff --git a/data/novtau/PETG/petg_translucent/pink/sizes.json b/data/novtau/PETG/petg_translucent/pink/sizes.json deleted file mode 100644 index df672c54e3..0000000000 --- a/data/novtau/PETG/petg_translucent/pink/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "3d259e26-fdbf-428d-aaf4-25316bc702c6", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PETG/petg_translucent/pink/variant.json b/data/novtau/PETG/petg_translucent/pink/variant.json deleted file mode 100644 index 2a1fbe0200..0000000000 --- a/data/novtau/PETG/petg_translucent/pink/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "30751f84-66a9-4028-aa95-f0e5ff6135ab", - "id": "pink", - "name": "Pink", - "color_hex": "#EEACC5", - "traits": { - "translucent": true - } -} diff --git a/data/novtau/PETG/petg_translucent/purple/sizes.json b/data/novtau/PETG/petg_translucent/purple/sizes.json deleted file mode 100644 index 2811319b34..0000000000 --- a/data/novtau/PETG/petg_translucent/purple/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "bf969fb2-dc5d-4afc-8dc6-2803dccfab6d", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PETG/petg_translucent/purple/variant.json b/data/novtau/PETG/petg_translucent/purple/variant.json deleted file mode 100644 index 70a382c715..0000000000 --- a/data/novtau/PETG/petg_translucent/purple/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "047dee04-9932-4659-ab81-cc5a0a1e3779", - "id": "purple", - "name": "Purple", - "color_hex": "#B392D2", - "traits": { - "translucent": true - } -} diff --git a/data/novtau/PETG/petg_translucent/teal/sizes.json b/data/novtau/PETG/petg_translucent/teal/sizes.json deleted file mode 100644 index aa8f29e4cf..0000000000 --- a/data/novtau/PETG/petg_translucent/teal/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "5d05b8cd-d06b-4dc0-820c-3d540286960d", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PETG/petg_translucent/teal/variant.json b/data/novtau/PETG/petg_translucent/teal/variant.json deleted file mode 100644 index ba0c4e2fa1..0000000000 --- a/data/novtau/PETG/petg_translucent/teal/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "72742b60-65a9-48e0-bd49-55b008091e2a", - "id": "teal", - "name": "Teal", - "color_hex": "#0BA28A", - "traits": { - "translucent": true - } -} diff --git a/data/novtau/PETG/petg_translucent/translucent_black/sizes.json b/data/novtau/PETG/petg_translucent/translucent_black/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_black/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_black/variant.json b/data/novtau/PETG/petg_translucent/translucent_black/variant.json new file mode 100644 index 0000000000..d4218ff0b7 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_black/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_black", + "name": "Translucent Black", + "color_hex": "#3B3B39", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PETG/petg_translucent/translucent_blue/sizes.json b/data/novtau/PETG/petg_translucent/translucent_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_blue/variant.json b/data/novtau/PETG/petg_translucent/translucent_blue/variant.json new file mode 100644 index 0000000000..c9f5541590 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_blue", + "name": "Translucent Blue", + "color_hex": "#1B64B2", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PETG/petg_translucent/blue_green/sizes.json b/data/novtau/PETG/petg_translucent/translucent_blue_green/sizes.json similarity index 69% rename from data/novtau/PETG/petg_translucent/blue_green/sizes.json rename to data/novtau/PETG/petg_translucent/translucent_blue_green/sizes.json index 3fd7042171..f448742441 100644 --- a/data/novtau/PETG/petg_translucent/blue_green/sizes.json +++ b/data/novtau/PETG/petg_translucent/translucent_blue_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "0d7bca17-5a7f-45e7-a103-13d264c8cb87", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "0d7bca17-5a7f-45e7-a103-13d264c8cb87" } ] diff --git a/data/novtau/PETG/petg_translucent/translucent_blue_green/variant.json b/data/novtau/PETG/petg_translucent/translucent_blue_green/variant.json new file mode 100644 index 0000000000..7091a56edc --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_blue_green/variant.json @@ -0,0 +1,13 @@ +{ + "uuid": "f3bfc3f5-4a91-4a77-b8a6-bbe524ffc07f", + "id": "translucent_blue_green", + "name": "Translucent Blue-Green", + "color_hex": [ + "#0DAAC8", + "#84D893" + ], + "traits": { + "translucent": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PETG/petg_translucent/translucent_blue_white_orange/sizes.json b/data/novtau/PETG/petg_translucent/translucent_blue_white_orange/sizes.json new file mode 100644 index 0000000000..8b3801cf70 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_blue_white_orange/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "4e313ee8-465b-43cf-a668-648fcde7b710" + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_blue_white_orange/variant.json b/data/novtau/PETG/petg_translucent/translucent_blue_white_orange/variant.json new file mode 100644 index 0000000000..cce15d640b --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_blue_white_orange/variant.json @@ -0,0 +1,14 @@ +{ + "uuid": "11bd300d-cb3c-4f95-9ee5-d44cf8550efc", + "id": "translucent_blue_white_orange", + "name": "Translucent Blue-White-Orange", + "color_hex": [ + "#D8E5D7", + "#EAB368", + "#79D8E4" + ], + "traits": { + "translucent": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PETG/petg_translucent/translucent_green/sizes.json b/data/novtau/PETG/petg_translucent/translucent_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_green/variant.json b/data/novtau/PETG/petg_translucent/translucent_green/variant.json new file mode 100644 index 0000000000..508068f3a4 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_green/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_green", + "name": "Translucent Green", + "color_hex": "#6EB937", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PETG/petg_translucent/translucent_green_white/sizes.json b/data/novtau/PETG/petg_translucent/translucent_green_white/sizes.json new file mode 100644 index 0000000000..c9fce496d6 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_green_white/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "18f3a7dc-74ef-4cd2-973d-2a94a02988c5" + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_green_white/variant.json b/data/novtau/PETG/petg_translucent/translucent_green_white/variant.json new file mode 100644 index 0000000000..251e1bd39b --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_green_white/variant.json @@ -0,0 +1,13 @@ +{ + "uuid": "4a43fa16-6d0c-4966-9558-5a64d9f5791f", + "id": "translucent_green_white", + "name": "Translucent Green-White", + "color_hex": [ + "#D6EADC", + "#68CC98" + ], + "traits": { + "translucent": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PETG/petg_translucent/translucent_light_blue/sizes.json b/data/novtau/PETG/petg_translucent/translucent_light_blue/sizes.json new file mode 100644 index 0000000000..c32cbe05ec --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_light_blue/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "64e56372-a6cb-4a86-b52f-b7bfcfc2140c" + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_light_blue/variant.json b/data/novtau/PETG/petg_translucent/translucent_light_blue/variant.json new file mode 100644 index 0000000000..c86eb95f62 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_light_blue/variant.json @@ -0,0 +1,9 @@ +{ + "id": "translucent_light_blue", + "name": "Translucent Light Blue", + "color_hex": "#72D1E5", + "traits": { + "translucent": true + }, + "uuid": "fa16e331-378e-4090-bc1a-cb5548ee1018" +} diff --git a/data/novtau/PETG/petg_translucent/translucent_orange/sizes.json b/data/novtau/PETG/petg_translucent/translucent_orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_orange/variant.json b/data/novtau/PETG/petg_translucent/translucent_orange/variant.json new file mode 100644 index 0000000000..17a8b6c4f0 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_orange/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_orange", + "name": "Translucent Orange", + "color_hex": "#FBA019", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PETG/petg_translucent/translucent_pink/sizes.json b/data/novtau/PETG/petg_translucent/translucent_pink/sizes.json new file mode 100644 index 0000000000..32569d4ca0 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_pink/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "3d259e26-fdbf-428d-aaf4-25316bc702c6" + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_pink/variant.json b/data/novtau/PETG/petg_translucent/translucent_pink/variant.json new file mode 100644 index 0000000000..8212b25a31 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_pink/variant.json @@ -0,0 +1,9 @@ +{ + "id": "translucent_pink", + "name": "Translucent Pink", + "color_hex": "#EEACC5", + "traits": { + "translucent": true + }, + "uuid": "30751f84-66a9-4028-aa95-f0e5ff6135ab" +} diff --git a/data/novtau/PETG/petg_translucent/translucent_purple/sizes.json b/data/novtau/PETG/petg_translucent/translucent_purple/sizes.json new file mode 100644 index 0000000000..be11583dc4 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_purple/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "bf969fb2-dc5d-4afc-8dc6-2803dccfab6d" + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_purple/variant.json b/data/novtau/PETG/petg_translucent/translucent_purple/variant.json new file mode 100644 index 0000000000..26304b66ca --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_purple/variant.json @@ -0,0 +1,9 @@ +{ + "id": "translucent_purple", + "name": "Translucent Purple", + "color_hex": "#B392D2", + "traits": { + "translucent": true + }, + "uuid": "047dee04-9932-4659-ab81-cc5a0a1e3779" +} diff --git a/data/novtau/PETG/petg_translucent/translucent_red/sizes.json b/data/novtau/PETG/petg_translucent/translucent_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_red/variant.json b/data/novtau/PETG/petg_translucent/translucent_red/variant.json new file mode 100644 index 0000000000..416447f646 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_red/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_red", + "name": "Translucent Red", + "color_hex": "#C51B2D", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PETG/petg_translucent/translucent_rose_pink/sizes.json b/data/novtau/PETG/petg_translucent/translucent_rose_pink/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_rose_pink/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_rose_pink/variant.json b/data/novtau/PETG/petg_translucent/translucent_rose_pink/variant.json new file mode 100644 index 0000000000..55d3d5ecf4 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_rose_pink/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_rose_pink", + "name": "Translucent Rose Pink", + "color_hex": "#D67F94", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PETG/petg_translucent/translucent_teal/sizes.json b/data/novtau/PETG/petg_translucent/translucent_teal/sizes.json new file mode 100644 index 0000000000..43f678fbe7 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_teal/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "5d05b8cd-d06b-4dc0-820c-3d540286960d" + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_teal/variant.json b/data/novtau/PETG/petg_translucent/translucent_teal/variant.json new file mode 100644 index 0000000000..eb339f4810 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_teal/variant.json @@ -0,0 +1,9 @@ +{ + "id": "translucent_teal", + "name": "Translucent Teal", + "color_hex": "#1BB19B", + "traits": { + "translucent": true + }, + "uuid": "72742b60-65a9-48e0-bd49-55b008091e2a" +} diff --git a/data/novtau/PETG/petg_translucent/translucent_violet/sizes.json b/data/novtau/PETG/petg_translucent/translucent_violet/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_violet/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_violet/variant.json b/data/novtau/PETG/petg_translucent/translucent_violet/variant.json new file mode 100644 index 0000000000..ceb81175ba --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_violet/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_violet", + "name": "Translucent Violet", + "color_hex": "#A03B92", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PETG/petg_translucent/translucent_yellow/sizes.json b/data/novtau/PETG/petg_translucent/translucent_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PETG/petg_translucent/translucent_yellow/variant.json b/data/novtau/PETG/petg_translucent/translucent_yellow/variant.json new file mode 100644 index 0000000000..15e0257425 --- /dev/null +++ b/data/novtau/PETG/petg_translucent/translucent_yellow/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_yellow", + "name": "Translucent Yellow", + "color_hex": "#C3D93A", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PLA/material.json b/data/novtau/PLA/material.json index 98ace84405..288b443b0d 100644 --- a/data/novtau/PLA/material.json +++ b/data/novtau/PLA/material.json @@ -1,4 +1,4 @@ { - "uuid": "760c9b1f-c499-4d1c-9f66-74e60f2a3868", - "material": "PLA" + "material": "PLA", + "uuid": "760c9b1f-c499-4d1c-9f66-74e60f2a3868" } diff --git a/data/novtau/PLA/pla_basic/apple_green/sizes.json b/data/novtau/PLA/pla_basic/apple_green/sizes.json index 6c2652a7ba..9c0de8fbf0 100644 --- a/data/novtau/PLA/pla_basic/apple_green/sizes.json +++ b/data/novtau/PLA/pla_basic/apple_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "e5181c76-1c86-4396-a3a1-17ae1d745c0f", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "e5181c76-1c86-4396-a3a1-17ae1d745c0f" } ] diff --git a/data/novtau/PLA/pla_basic/apple_green/variant.json b/data/novtau/PLA/pla_basic/apple_green/variant.json index 1daae2c72e..84637245b2 100644 --- a/data/novtau/PLA/pla_basic/apple_green/variant.json +++ b/data/novtau/PLA/pla_basic/apple_green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "f8eb53ed-635c-4839-b3aa-59d263b5c0a2", "id": "apple_green", "name": "Apple Green", - "color_hex": "#A3CF5E" + "color_hex": "#A1CD5D", + "uuid": "f8eb53ed-635c-4839-b3aa-59d263b5c0a2" } diff --git a/data/novtau/PLA/pla_basic/apricot/sizes.json b/data/novtau/PLA/pla_basic/apricot/sizes.json index 38188e5eda..64269570b0 100644 --- a/data/novtau/PLA/pla_basic/apricot/sizes.json +++ b/data/novtau/PLA/pla_basic/apricot/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "46ff48c7-bd11-49e2-b27f-4609c5983192", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "46ff48c7-bd11-49e2-b27f-4609c5983192" } ] diff --git a/data/novtau/PLA/pla_basic/apricot/variant.json b/data/novtau/PLA/pla_basic/apricot/variant.json index 370b7c8439..9c5d19b49f 100644 --- a/data/novtau/PLA/pla_basic/apricot/variant.json +++ b/data/novtau/PLA/pla_basic/apricot/variant.json @@ -1,6 +1,6 @@ { - "uuid": "546e7fac-1d5f-41f1-8b6e-27a322d65dca", "id": "apricot", "name": "Apricot", - "color_hex": "#E7BE79" + "color_hex": "#E4BC78", + "uuid": "546e7fac-1d5f-41f1-8b6e-27a322d65dca" } diff --git a/data/novtau/PLA/pla_basic/aqua_blue/sizes.json b/data/novtau/PLA/pla_basic/aqua_blue/sizes.json index 86c8df8324..c286f4ee63 100644 --- a/data/novtau/PLA/pla_basic/aqua_blue/sizes.json +++ b/data/novtau/PLA/pla_basic/aqua_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "38cff58c-c9b6-4696-946e-737b54607353", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "38cff58c-c9b6-4696-946e-737b54607353" } ] diff --git a/data/novtau/PLA/pla_basic/aqua_blue/variant.json b/data/novtau/PLA/pla_basic/aqua_blue/variant.json index fa7a0b8f8d..27b8047389 100644 --- a/data/novtau/PLA/pla_basic/aqua_blue/variant.json +++ b/data/novtau/PLA/pla_basic/aqua_blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "c0a26078-ab48-4f42-a1a2-8029577bee16", "id": "aqua_blue", "name": "Aqua Blue", - "color_hex": "#A1B4CD" + "color_hex": "#A0B2CB", + "uuid": "c0a26078-ab48-4f42-a1a2-8029577bee16" } diff --git a/data/novtau/PLA/pla_basic/army_green/sizes.json b/data/novtau/PLA/pla_basic/army_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/army_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/army_green/variant.json b/data/novtau/PLA/pla_basic/army_green/variant.json new file mode 100644 index 0000000000..7ad4837e41 --- /dev/null +++ b/data/novtau/PLA/pla_basic/army_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "army_green", + "name": "Army Green", + "color_hex": "#5A7139" +} diff --git a/data/novtau/PLA/pla_basic/beige/sizes.json b/data/novtau/PLA/pla_basic/beige/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/beige/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/beige/variant.json b/data/novtau/PLA/pla_basic/beige/variant.json new file mode 100644 index 0000000000..e9ef3d0807 --- /dev/null +++ b/data/novtau/PLA/pla_basic/beige/variant.json @@ -0,0 +1,5 @@ +{ + "id": "beige", + "name": "Beige", + "color_hex": "#CEBBA1" +} diff --git a/data/novtau/PLA/pla_basic/black/sizes.json b/data/novtau/PLA/pla_basic/black/sizes.json index 5bffc0e901..17efffaf10 100644 --- a/data/novtau/PLA/pla_basic/black/sizes.json +++ b/data/novtau/PLA/pla_basic/black/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "d18f739d-43b7-4ef3-876b-7d2887c52620", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "d18f739d-43b7-4ef3-876b-7d2887c52620" } ] diff --git a/data/novtau/PLA/pla_basic/black/variant.json b/data/novtau/PLA/pla_basic/black/variant.json index 5fa0c69be4..0cbda7bea0 100644 --- a/data/novtau/PLA/pla_basic/black/variant.json +++ b/data/novtau/PLA/pla_basic/black/variant.json @@ -1,6 +1,6 @@ { - "uuid": "15458b3b-1677-44a3-903c-5a7cbc0f02eb", "id": "black", "name": "Black", - "color_hex": "#2F2F2F" + "color_hex": "#2F2F2F", + "uuid": "15458b3b-1677-44a3-903c-5a7cbc0f02eb" } diff --git a/data/novtau/PLA/pla_basic/blue/sizes.json b/data/novtau/PLA/pla_basic/blue/sizes.json index 80eb860ab5..54a6cc02b8 100644 --- a/data/novtau/PLA/pla_basic/blue/sizes.json +++ b/data/novtau/PLA/pla_basic/blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "a24e53c3-30d2-4d95-9859-9dc2ec261b75", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "a24e53c3-30d2-4d95-9859-9dc2ec261b75" } ] diff --git a/data/novtau/PLA/pla_basic/blue/variant.json b/data/novtau/PLA/pla_basic/blue/variant.json index 2125e44c70..2ce7f48287 100644 --- a/data/novtau/PLA/pla_basic/blue/variant.json +++ b/data/novtau/PLA/pla_basic/blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "562ec35e-78d6-45ee-9d20-49a206dc828b", "id": "blue", "name": "Blue", - "color_hex": "#0C9DF1" + "color_hex": "#0C9DF1", + "uuid": "562ec35e-78d6-45ee-9d20-49a206dc828b" } diff --git a/data/novtau/PLA/pla_basic/blush_pink/sizes.json b/data/novtau/PLA/pla_basic/blush_pink/sizes.json index cc330f5e9b..25d527eb54 100644 --- a/data/novtau/PLA/pla_basic/blush_pink/sizes.json +++ b/data/novtau/PLA/pla_basic/blush_pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "858d62cd-0ba0-4f76-8876-30ab878a3dee", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "858d62cd-0ba0-4f76-8876-30ab878a3dee" } ] diff --git a/data/novtau/PLA/pla_basic/blush_pink/variant.json b/data/novtau/PLA/pla_basic/blush_pink/variant.json index ae5fa55602..55b42d4e52 100644 --- a/data/novtau/PLA/pla_basic/blush_pink/variant.json +++ b/data/novtau/PLA/pla_basic/blush_pink/variant.json @@ -1,6 +1,6 @@ { - "uuid": "e985802a-e66d-48e1-bea1-756a98507fb0", "id": "blush_pink", "name": "Blush Pink", - "color_hex": "#E8B6BB" + "color_hex": "#E7B5B9", + "uuid": "e985802a-e66d-48e1-bea1-756a98507fb0" } diff --git a/data/novtau/PLA/pla_basic/brick_red/sizes.json b/data/novtau/PLA/pla_basic/brick_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/brick_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/brick_red/variant.json b/data/novtau/PLA/pla_basic/brick_red/variant.json new file mode 100644 index 0000000000..565c844a48 --- /dev/null +++ b/data/novtau/PLA/pla_basic/brick_red/variant.json @@ -0,0 +1,5 @@ +{ + "id": "brick_red", + "name": "Brick Red", + "color_hex": "#DA6B44" +} diff --git a/data/novtau/PLA/pla_basic/bright_green/sizes.json b/data/novtau/PLA/pla_basic/bright_green/sizes.json index fe9a028feb..f31f7c5787 100644 --- a/data/novtau/PLA/pla_basic/bright_green/sizes.json +++ b/data/novtau/PLA/pla_basic/bright_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "6a8e2309-bd02-485e-8336-ba790da456c0", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "6a8e2309-bd02-485e-8336-ba790da456c0" } ] diff --git a/data/novtau/PLA/pla_basic/bright_green/variant.json b/data/novtau/PLA/pla_basic/bright_green/variant.json index bcfcdbb80a..526c21ac9b 100644 --- a/data/novtau/PLA/pla_basic/bright_green/variant.json +++ b/data/novtau/PLA/pla_basic/bright_green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "0041385a-422c-458a-b774-02f4af69e2ed", "id": "bright_green", "name": "Bright Green", - "color_hex": "#5ECF69" + "color_hex": "#5DCE68", + "uuid": "0041385a-422c-458a-b774-02f4af69e2ed" } diff --git a/data/novtau/PLA/pla_basic/bright_yellow/sizes.json b/data/novtau/PLA/pla_basic/bright_yellow/sizes.json index 5d687d14d0..662efd4883 100644 --- a/data/novtau/PLA/pla_basic/bright_yellow/sizes.json +++ b/data/novtau/PLA/pla_basic/bright_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "db5fb3fc-7fa2-46ac-af07-b831ee793a86", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "db5fb3fc-7fa2-46ac-af07-b831ee793a86" } ] diff --git a/data/novtau/PLA/pla_basic/bright_yellow/variant.json b/data/novtau/PLA/pla_basic/bright_yellow/variant.json index 445d69c7f0..8fb737e655 100644 --- a/data/novtau/PLA/pla_basic/bright_yellow/variant.json +++ b/data/novtau/PLA/pla_basic/bright_yellow/variant.json @@ -1,6 +1,6 @@ { - "uuid": "7dc1fd42-64b9-4019-a291-30a3919bd140", "id": "bright_yellow", "name": "Bright Yellow", - "color_hex": "#EDCB66" + "color_hex": "#EBCA65", + "uuid": "7dc1fd42-64b9-4019-a291-30a3919bd140" } diff --git a/data/novtau/PLA/pla_basic/brown/sizes.json b/data/novtau/PLA/pla_basic/brown/sizes.json index 52538dae73..1d534c3ad8 100644 --- a/data/novtau/PLA/pla_basic/brown/sizes.json +++ b/data/novtau/PLA/pla_basic/brown/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "51f01486-9a35-4138-83a8-00e426c7bc1c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "51f01486-9a35-4138-83a8-00e426c7bc1c" } ] diff --git a/data/novtau/PLA/pla_basic/brown/variant.json b/data/novtau/PLA/pla_basic/brown/variant.json index 4892c6350f..f382804409 100644 --- a/data/novtau/PLA/pla_basic/brown/variant.json +++ b/data/novtau/PLA/pla_basic/brown/variant.json @@ -1,6 +1,6 @@ { - "uuid": "dc40158a-bcdf-4d29-a245-5fdad531ee88", "id": "brown", "name": "Brown", - "color_hex": "#895343" + "color_hex": "#895343", + "uuid": "dc40158a-bcdf-4d29-a245-5fdad531ee88" } diff --git a/data/novtau/PLA/pla_basic/classic_green/sizes.json b/data/novtau/PLA/pla_basic/classic_green/sizes.json index e11a019642..3b5198f646 100644 --- a/data/novtau/PLA/pla_basic/classic_green/sizes.json +++ b/data/novtau/PLA/pla_basic/classic_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "1430291b-7443-42cf-be26-b2c2d6244829", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "1430291b-7443-42cf-be26-b2c2d6244829" } ] diff --git a/data/novtau/PLA/pla_basic/classic_green/variant.json b/data/novtau/PLA/pla_basic/classic_green/variant.json index 664f5ee5f4..1f8b38cab0 100644 --- a/data/novtau/PLA/pla_basic/classic_green/variant.json +++ b/data/novtau/PLA/pla_basic/classic_green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "7d6a3733-d290-4335-ac29-2f37a4b167af", "id": "classic_green", "name": "Classic Green", - "color_hex": "#0BA058" + "color_hex": "#0C9F57", + "uuid": "7d6a3733-d290-4335-ac29-2f37a4b167af" } diff --git a/data/novtau/PLA/pla_basic/cobalt_blue/sizes.json b/data/novtau/PLA/pla_basic/cobalt_blue/sizes.json index 907d962250..e8ad50b50d 100644 --- a/data/novtau/PLA/pla_basic/cobalt_blue/sizes.json +++ b/data/novtau/PLA/pla_basic/cobalt_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "cbc264ae-1629-457b-8973-d3b313ac32b9", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "cbc264ae-1629-457b-8973-d3b313ac32b9" } ] diff --git a/data/novtau/PLA/pla_basic/cobalt_blue/variant.json b/data/novtau/PLA/pla_basic/cobalt_blue/variant.json index e501835e64..54532763a3 100644 --- a/data/novtau/PLA/pla_basic/cobalt_blue/variant.json +++ b/data/novtau/PLA/pla_basic/cobalt_blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "80b5759e-eb03-4075-9258-0d5142be32d7", "id": "cobalt_blue", "name": "Cobalt Blue", - "color_hex": "#0D48CA" + "color_hex": "#0D48CA", + "uuid": "80b5759e-eb03-4075-9258-0d5142be32d7" } diff --git a/data/novtau/PLA/pla_basic/cocoa_brown/sizes.json b/data/novtau/PLA/pla_basic/cocoa_brown/sizes.json index b9f89e09da..5b0215e41c 100644 --- a/data/novtau/PLA/pla_basic/cocoa_brown/sizes.json +++ b/data/novtau/PLA/pla_basic/cocoa_brown/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "a68a896b-854d-41a4-9e46-426155be9b3f", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "a68a896b-854d-41a4-9e46-426155be9b3f" } ] diff --git a/data/novtau/PLA/pla_basic/cocoa_brown/variant.json b/data/novtau/PLA/pla_basic/cocoa_brown/variant.json index d945691d31..061aa4a627 100644 --- a/data/novtau/PLA/pla_basic/cocoa_brown/variant.json +++ b/data/novtau/PLA/pla_basic/cocoa_brown/variant.json @@ -1,6 +1,6 @@ { - "uuid": "215792bc-6ece-4c65-9c71-8b59889b6b26", "id": "cocoa_brown", "name": "Cocoa Brown", - "color_hex": "#A4663C" + "color_hex": "#A4663C", + "uuid": "215792bc-6ece-4c65-9c71-8b59889b6b26" } diff --git a/data/novtau/PLA/pla_basic/copper/sizes.json b/data/novtau/PLA/pla_basic/copper/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/copper/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/copper/variant.json b/data/novtau/PLA/pla_basic/copper/variant.json new file mode 100644 index 0000000000..e505a43af2 --- /dev/null +++ b/data/novtau/PLA/pla_basic/copper/variant.json @@ -0,0 +1,5 @@ +{ + "id": "copper", + "name": "Copper", + "color_hex": "#964D38" +} diff --git a/data/novtau/PLA/pla_basic/coral_pink/sizes.json b/data/novtau/PLA/pla_basic/coral_pink/sizes.json index 8e6871569a..026973c379 100644 --- a/data/novtau/PLA/pla_basic/coral_pink/sizes.json +++ b/data/novtau/PLA/pla_basic/coral_pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "fe7062eb-178f-4f1f-b1a6-a341c1247257", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "fe7062eb-178f-4f1f-b1a6-a341c1247257" } ] diff --git a/data/novtau/PLA/pla_basic/coral_pink/variant.json b/data/novtau/PLA/pla_basic/coral_pink/variant.json index 7ce04352c1..0fab49213d 100644 --- a/data/novtau/PLA/pla_basic/coral_pink/variant.json +++ b/data/novtau/PLA/pla_basic/coral_pink/variant.json @@ -1,6 +1,6 @@ { - "uuid": "2519ef8e-0281-423d-a89b-77b4e3ef2d39", "id": "coral_pink", "name": "Coral Pink", - "color_hex": "#E79488" + "color_hex": "#E59387", + "uuid": "2519ef8e-0281-423d-a89b-77b4e3ef2d39" } diff --git a/data/novtau/PLA/pla_basic/cream_yellow/sizes.json b/data/novtau/PLA/pla_basic/cream_yellow/sizes.json index dea3297de1..0b9ce0f402 100644 --- a/data/novtau/PLA/pla_basic/cream_yellow/sizes.json +++ b/data/novtau/PLA/pla_basic/cream_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "f17c3c85-713a-41a8-86fa-68a74781f427", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "f17c3c85-713a-41a8-86fa-68a74781f427" } ] diff --git a/data/novtau/PLA/pla_basic/cream_yellow/variant.json b/data/novtau/PLA/pla_basic/cream_yellow/variant.json index df82c7e670..736cc343d5 100644 --- a/data/novtau/PLA/pla_basic/cream_yellow/variant.json +++ b/data/novtau/PLA/pla_basic/cream_yellow/variant.json @@ -1,6 +1,6 @@ { - "uuid": "0007f207-2fe3-4255-afaf-9ab2fff07457", "id": "cream_yellow", "name": "Cream Yellow", - "color_hex": "#E9D799" + "color_hex": "#C3D194", + "uuid": "0007f207-2fe3-4255-afaf-9ab2fff07457" } diff --git a/data/novtau/PLA/pla_basic/cyan/sizes.json b/data/novtau/PLA/pla_basic/cyan/sizes.json index 7e2184fe0d..8784aebedf 100644 --- a/data/novtau/PLA/pla_basic/cyan/sizes.json +++ b/data/novtau/PLA/pla_basic/cyan/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "29865cfa-efc7-462d-ab57-fec86a71cd1e", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "29865cfa-efc7-462d-ab57-fec86a71cd1e" } ] diff --git a/data/novtau/PLA/pla_basic/cyan/variant.json b/data/novtau/PLA/pla_basic/cyan/variant.json index eb78dc78d0..016c509177 100644 --- a/data/novtau/PLA/pla_basic/cyan/variant.json +++ b/data/novtau/PLA/pla_basic/cyan/variant.json @@ -1,6 +1,6 @@ { - "uuid": "c21faa1c-f43d-4140-b0b7-3cefde727694", "id": "cyan", "name": "Cyan", - "color_hex": "#0CBCD9" + "color_hex": "#0DBCD8", + "uuid": "c21faa1c-f43d-4140-b0b7-3cefde727694" } diff --git a/data/novtau/PLA/pla_basic/dark_gray/sizes.json b/data/novtau/PLA/pla_basic/dark_gray/sizes.json index e0d1dff0e0..5d48fa26d2 100644 --- a/data/novtau/PLA/pla_basic/dark_gray/sizes.json +++ b/data/novtau/PLA/pla_basic/dark_gray/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "72420a9e-6772-46b7-84bc-b130db8cc591", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "72420a9e-6772-46b7-84bc-b130db8cc591" } ] diff --git a/data/novtau/PLA/pla_basic/dark_gray/variant.json b/data/novtau/PLA/pla_basic/dark_gray/variant.json index 5fffc15e92..df2770d5c9 100644 --- a/data/novtau/PLA/pla_basic/dark_gray/variant.json +++ b/data/novtau/PLA/pla_basic/dark_gray/variant.json @@ -1,6 +1,6 @@ { - "uuid": "bbc4b237-c87d-4bad-af28-b502facf7ec6", "id": "dark_gray", "name": "Dark Gray", - "color_hex": "#4B4C4F" + "color_hex": "#4B4C4F", + "uuid": "bbc4b237-c87d-4bad-af28-b502facf7ec6" } diff --git a/data/novtau/PLA/pla_basic/dark_purple/sizes.json b/data/novtau/PLA/pla_basic/dark_purple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/dark_purple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/dark_purple/variant.json b/data/novtau/PLA/pla_basic/dark_purple/variant.json new file mode 100644 index 0000000000..80a259eca1 --- /dev/null +++ b/data/novtau/PLA/pla_basic/dark_purple/variant.json @@ -0,0 +1,5 @@ +{ + "id": "dark_purple", + "name": "Dark Purple", + "color_hex": "#663F9C" +} diff --git a/data/novtau/PLA/pla_basic/deep_blue/sizes.json b/data/novtau/PLA/pla_basic/deep_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/deep_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/deep_blue/variant.json b/data/novtau/PLA/pla_basic/deep_blue/variant.json new file mode 100644 index 0000000000..4b28014795 --- /dev/null +++ b/data/novtau/PLA/pla_basic/deep_blue/variant.json @@ -0,0 +1,5 @@ +{ + "id": "deep_blue", + "name": "Deep Blue", + "color_hex": "#24234F" +} diff --git a/data/novtau/PLA/pla_basic/filament.json b/data/novtau/PLA/pla_basic/filament.json index 1f5d4caa6b..c0e8175289 100644 --- a/data/novtau/PLA/pla_basic/filament.json +++ b/data/novtau/PLA/pla_basic/filament.json @@ -1,7 +1,7 @@ { - "uuid": "6112e172-f948-44ec-82f9-2fbfbe50768b", "id": "pla_basic", "name": "PLA Basic", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "6112e172-f948-44ec-82f9-2fbfbe50768b" } diff --git a/data/novtau/PLA/pla_basic/fluorescent_green/sizes.json b/data/novtau/PLA/pla_basic/fluorescent_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/fluorescent_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/fluorescent_green/variant.json b/data/novtau/PLA/pla_basic/fluorescent_green/variant.json new file mode 100644 index 0000000000..4402635d51 --- /dev/null +++ b/data/novtau/PLA/pla_basic/fluorescent_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "fluorescent_green", + "name": "Fluorescent Green", + "color_hex": "#B0EA4A" +} diff --git a/data/novtau/PLA/pla_basic/fluorescent_red/sizes.json b/data/novtau/PLA/pla_basic/fluorescent_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/fluorescent_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/fluorescent_red/variant.json b/data/novtau/PLA/pla_basic/fluorescent_red/variant.json new file mode 100644 index 0000000000..f837eef429 --- /dev/null +++ b/data/novtau/PLA/pla_basic/fluorescent_red/variant.json @@ -0,0 +1,5 @@ +{ + "id": "fluorescent_red", + "name": "Fluorescent Red", + "color_hex": "#F64038" +} diff --git a/data/novtau/PLA/pla_basic/fresh_mint/sizes.json b/data/novtau/PLA/pla_basic/fresh_mint/sizes.json index e647d423fa..efbb64303b 100644 --- a/data/novtau/PLA/pla_basic/fresh_mint/sizes.json +++ b/data/novtau/PLA/pla_basic/fresh_mint/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "2fad3e40-adcd-4b4f-85ef-bd55e84b9054", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "2fad3e40-adcd-4b4f-85ef-bd55e84b9054" } ] diff --git a/data/novtau/PLA/pla_basic/fresh_mint/variant.json b/data/novtau/PLA/pla_basic/fresh_mint/variant.json index d1b685fd60..a100278234 100644 --- a/data/novtau/PLA/pla_basic/fresh_mint/variant.json +++ b/data/novtau/PLA/pla_basic/fresh_mint/variant.json @@ -1,6 +1,6 @@ { - "uuid": "8180f976-b141-484b-b092-f4350aac1b70", "id": "fresh_mint", "name": "Fresh Mint", - "color_hex": "#92C3C0" + "color_hex": "#91C1BE", + "uuid": "8180f976-b141-484b-b092-f4350aac1b70" } diff --git a/data/novtau/PLA/pla_basic/gold/sizes.json b/data/novtau/PLA/pla_basic/gold/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/gold/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/gold/variant.json b/data/novtau/PLA/pla_basic/gold/variant.json new file mode 100644 index 0000000000..31dbc38602 --- /dev/null +++ b/data/novtau/PLA/pla_basic/gold/variant.json @@ -0,0 +1,5 @@ +{ + "id": "gold", + "name": "Gold", + "color_hex": "#E3A43D" +} diff --git a/data/novtau/PLA/pla_basic/hot_pink/sizes.json b/data/novtau/PLA/pla_basic/hot_pink/sizes.json deleted file mode 100644 index d9c32bb903..0000000000 --- a/data/novtau/PLA/pla_basic/hot_pink/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "2ffe7b06-f422-48de-a4b8-385cf8c23121", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_basic/hot_pink/variant.json b/data/novtau/PLA/pla_basic/hot_pink/variant.json deleted file mode 100644 index 13bae91915..0000000000 --- a/data/novtau/PLA/pla_basic/hot_pink/variant.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "1210f021-85e9-4211-ae07-2d78e3440f16", - "id": "hot_pink", - "name": "Hot Pink", - "color_hex": "#E0A99F" -} diff --git a/data/novtau/PLA/pla_basic/ice_blue/sizes.json b/data/novtau/PLA/pla_basic/ice_blue/sizes.json index e77dc8f2ed..7a3dbb1ce5 100644 --- a/data/novtau/PLA/pla_basic/ice_blue/sizes.json +++ b/data/novtau/PLA/pla_basic/ice_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "68a15f43-1708-40cb-bbec-c30c00711077", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "68a15f43-1708-40cb-bbec-c30c00711077" } ] diff --git a/data/novtau/PLA/pla_basic/ice_blue/variant.json b/data/novtau/PLA/pla_basic/ice_blue/variant.json index 0968bd7da2..4e9416650c 100644 --- a/data/novtau/PLA/pla_basic/ice_blue/variant.json +++ b/data/novtau/PLA/pla_basic/ice_blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "6ec1db8b-ac6b-455a-8bd8-083df22ba268", "id": "ice_blue", "name": "Ice Blue", - "color_hex": "#98C2D5" + "color_hex": "#6EBBC6", + "uuid": "6ec1db8b-ac6b-455a-8bd8-083df22ba268" } diff --git a/data/novtau/PLA/pla_basic/indigo_purple/sizes.json b/data/novtau/PLA/pla_basic/indigo_purple/sizes.json index b7e445f1e0..63c33fa360 100644 --- a/data/novtau/PLA/pla_basic/indigo_purple/sizes.json +++ b/data/novtau/PLA/pla_basic/indigo_purple/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "3c554059-feeb-49b5-a792-ab53b7bc7657", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "3c554059-feeb-49b5-a792-ab53b7bc7657" } ] diff --git a/data/novtau/PLA/pla_basic/indigo_purple/variant.json b/data/novtau/PLA/pla_basic/indigo_purple/variant.json index bcfbdff2db..c026ebb87d 100644 --- a/data/novtau/PLA/pla_basic/indigo_purple/variant.json +++ b/data/novtau/PLA/pla_basic/indigo_purple/variant.json @@ -1,6 +1,6 @@ { - "uuid": "55342a0d-08e6-48d3-be5a-ddd8fb8dfff5", "id": "indigo_purple", "name": "Indigo Purple", - "color_hex": "#9D76C7" + "color_hex": "#9D76C7", + "uuid": "55342a0d-08e6-48d3-be5a-ddd8fb8dfff5" } diff --git a/data/novtau/PLA/pla_basic/jade_white/sizes.json b/data/novtau/PLA/pla_basic/jade_white/sizes.json index 15131702fe..9c0e71be16 100644 --- a/data/novtau/PLA/pla_basic/jade_white/sizes.json +++ b/data/novtau/PLA/pla_basic/jade_white/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "3616a59a-74e7-4a3c-afd0-07b798bfe2e9", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "3616a59a-74e7-4a3c-afd0-07b798bfe2e9" } ] diff --git a/data/novtau/PLA/pla_basic/jade_white/variant.json b/data/novtau/PLA/pla_basic/jade_white/variant.json index ffc391c40e..9d19380b30 100644 --- a/data/novtau/PLA/pla_basic/jade_white/variant.json +++ b/data/novtau/PLA/pla_basic/jade_white/variant.json @@ -1,6 +1,6 @@ { - "uuid": "11161138-e58c-4a97-a079-639e7a46772b", "id": "jade_white", "name": "Jade White", - "color_hex": "#D8D0C4" + "color_hex": "#D8D0C4", + "uuid": "11161138-e58c-4a97-a079-639e7a46772b" } diff --git a/data/novtau/PLA/pla_basic/light_gray/sizes.json b/data/novtau/PLA/pla_basic/light_gray/sizes.json index 4c20927482..c79827b263 100644 --- a/data/novtau/PLA/pla_basic/light_gray/sizes.json +++ b/data/novtau/PLA/pla_basic/light_gray/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "0c6ae6fb-6701-45eb-861a-8effe30bfa7c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "0c6ae6fb-6701-45eb-861a-8effe30bfa7c" } ] diff --git a/data/novtau/PLA/pla_basic/light_gray/variant.json b/data/novtau/PLA/pla_basic/light_gray/variant.json index 19b187b317..35b9edac77 100644 --- a/data/novtau/PLA/pla_basic/light_gray/variant.json +++ b/data/novtau/PLA/pla_basic/light_gray/variant.json @@ -1,6 +1,6 @@ { - "uuid": "644c655a-dfc1-4c8d-9667-9c23c2f6415f", "id": "light_gray", "name": "Light Gray", - "color_hex": "#949599" + "color_hex": "#949599", + "uuid": "644c655a-dfc1-4c8d-9667-9c23c2f6415f" } diff --git a/data/novtau/PLA/pla_basic/light_lilac/sizes.json b/data/novtau/PLA/pla_basic/light_lilac/sizes.json index 88c3cf6cea..7430effb2b 100644 --- a/data/novtau/PLA/pla_basic/light_lilac/sizes.json +++ b/data/novtau/PLA/pla_basic/light_lilac/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "3e2ef6e3-5456-4476-aca3-25c3238a2cdc", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "3e2ef6e3-5456-4476-aca3-25c3238a2cdc" } ] diff --git a/data/novtau/PLA/pla_basic/light_lilac/variant.json b/data/novtau/PLA/pla_basic/light_lilac/variant.json index 495961f5ea..a159cfc3e6 100644 --- a/data/novtau/PLA/pla_basic/light_lilac/variant.json +++ b/data/novtau/PLA/pla_basic/light_lilac/variant.json @@ -1,6 +1,6 @@ { - "uuid": "a48dda92-7516-4cb4-b6c6-c9a67e9815df", "id": "light_lilac", "name": "Light Lilac", - "color_hex": "#B8A3C7" + "color_hex": "#B5A1C5", + "uuid": "a48dda92-7516-4cb4-b6c6-c9a67e9815df" } diff --git a/data/novtau/PLA/pla_basic/milk_green/sizes.json b/data/novtau/PLA/pla_basic/milk_green/sizes.json index 42fbf15c4c..df9cd58f2c 100644 --- a/data/novtau/PLA/pla_basic/milk_green/sizes.json +++ b/data/novtau/PLA/pla_basic/milk_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "1ec34ecf-13a5-41be-8ba5-572f16bd5bf4", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "1ec34ecf-13a5-41be-8ba5-572f16bd5bf4" } ] diff --git a/data/novtau/PLA/pla_basic/milk_green/variant.json b/data/novtau/PLA/pla_basic/milk_green/variant.json index 561690dbc9..fd9babdc57 100644 --- a/data/novtau/PLA/pla_basic/milk_green/variant.json +++ b/data/novtau/PLA/pla_basic/milk_green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "40b2424a-3aeb-49e2-a526-870d1d90c423", "id": "milk_green", "name": "Milk Green", - "color_hex": "#BDC499" + "color_hex": "#BBC298", + "uuid": "40b2424a-3aeb-49e2-a526-870d1d90c423" } diff --git a/data/novtau/PLA/pla_basic/mint_green/sizes.json b/data/novtau/PLA/pla_basic/mint_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/mint_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/mint_green/variant.json b/data/novtau/PLA/pla_basic/mint_green/variant.json new file mode 100644 index 0000000000..6124d767ed --- /dev/null +++ b/data/novtau/PLA/pla_basic/mint_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "mint_green", + "name": "Mint Green", + "color_hex": "#91D2B4" +} diff --git a/data/novtau/PLA/pla_basic/mistletoe_green/sizes.json b/data/novtau/PLA/pla_basic/mistletoe_green/sizes.json index 382ee2f315..aeb3879f3b 100644 --- a/data/novtau/PLA/pla_basic/mistletoe_green/sizes.json +++ b/data/novtau/PLA/pla_basic/mistletoe_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "b804609c-4343-414a-91d9-1f2e75c6b9a9", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "b804609c-4343-414a-91d9-1f2e75c6b9a9" } ] diff --git a/data/novtau/PLA/pla_basic/mistletoe_green/variant.json b/data/novtau/PLA/pla_basic/mistletoe_green/variant.json index 0a3b10b6f3..e915a44d72 100644 --- a/data/novtau/PLA/pla_basic/mistletoe_green/variant.json +++ b/data/novtau/PLA/pla_basic/mistletoe_green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "57087885-af35-48b3-addd-ebba744dec48", "id": "mistletoe_green", "name": "Mistletoe Green", - "color_hex": "#385840" + "color_hex": "#385840", + "uuid": "57087885-af35-48b3-addd-ebba744dec48" } diff --git a/data/novtau/PLA/pla_basic/misty_blue/sizes.json b/data/novtau/PLA/pla_basic/misty_blue/sizes.json index 76a58a4d9e..d3d0ac3006 100644 --- a/data/novtau/PLA/pla_basic/misty_blue/sizes.json +++ b/data/novtau/PLA/pla_basic/misty_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "c6ed9448-e698-4931-aa3b-fe4e586cb099", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "c6ed9448-e698-4931-aa3b-fe4e586cb099" } ] diff --git a/data/novtau/PLA/pla_basic/misty_blue/variant.json b/data/novtau/PLA/pla_basic/misty_blue/variant.json index 67aab69ce0..2dfe16e78c 100644 --- a/data/novtau/PLA/pla_basic/misty_blue/variant.json +++ b/data/novtau/PLA/pla_basic/misty_blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "dd6ee28b-a407-449c-9e24-3893db74a454", "id": "misty_blue", "name": "Misty Blue", - "color_hex": "#19B7F6" + "color_hex": "#1AB6F4", + "uuid": "dd6ee28b-a407-449c-9e24-3893db74a454" } diff --git a/data/novtau/PLA/pla_basic/orange/sizes.json b/data/novtau/PLA/pla_basic/orange/sizes.json index 567d593461..944bf93f40 100644 --- a/data/novtau/PLA/pla_basic/orange/sizes.json +++ b/data/novtau/PLA/pla_basic/orange/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "efd08331-6a3d-4c8e-95dd-43b08a51645f", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "efd08331-6a3d-4c8e-95dd-43b08a51645f" } ] diff --git a/data/novtau/PLA/pla_basic/orange/variant.json b/data/novtau/PLA/pla_basic/orange/variant.json index d3f706cf71..6f4fc6b6ef 100644 --- a/data/novtau/PLA/pla_basic/orange/variant.json +++ b/data/novtau/PLA/pla_basic/orange/variant.json @@ -1,6 +1,6 @@ { - "uuid": "61e5c560-8943-4eeb-9677-553413a1c429", "id": "orange", "name": "Orange", - "color_hex": "#EF5527" + "color_hex": "#EF5527", + "uuid": "61e5c560-8943-4eeb-9677-553413a1c429" } diff --git a/data/novtau/PLA/pla_basic/pale_yellow/sizes.json b/data/novtau/PLA/pla_basic/pale_yellow/sizes.json index a9f2b65e30..f495710189 100644 --- a/data/novtau/PLA/pla_basic/pale_yellow/sizes.json +++ b/data/novtau/PLA/pla_basic/pale_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "98f77c84-b064-4632-b17f-0078df8aca9c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "98f77c84-b064-4632-b17f-0078df8aca9c" } ] diff --git a/data/novtau/PLA/pla_basic/pale_yellow/variant.json b/data/novtau/PLA/pla_basic/pale_yellow/variant.json index 5b52ca86e8..c678ca01f6 100644 --- a/data/novtau/PLA/pla_basic/pale_yellow/variant.json +++ b/data/novtau/PLA/pla_basic/pale_yellow/variant.json @@ -1,6 +1,6 @@ { - "uuid": "f7fc03b7-bd21-448a-9e1a-c23d9fd591a3", "id": "pale_yellow", "name": "Pale Yellow", - "color_hex": "#E9C97B" + "color_hex": "#E7C779", + "uuid": "f7fc03b7-bd21-448a-9e1a-c23d9fd591a3" } diff --git a/data/novtau/PLA/pla_basic/pantone_9284c_pink/sizes.json b/data/novtau/PLA/pla_basic/pantone_9284c_pink/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/pantone_9284c_pink/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/pantone_9284c_pink/variant.json b/data/novtau/PLA/pla_basic/pantone_9284c_pink/variant.json new file mode 100644 index 0000000000..49ed334a8d --- /dev/null +++ b/data/novtau/PLA/pla_basic/pantone_9284c_pink/variant.json @@ -0,0 +1,5 @@ +{ + "id": "pantone_9284c_pink", + "name": "Pantone 9284C Pink", + "color_hex": "#E9BDD1" +} diff --git a/data/novtau/PLA/pla_basic/peach_pink/sizes.json b/data/novtau/PLA/pla_basic/peach_pink/sizes.json new file mode 100644 index 0000000000..23e1313595 --- /dev/null +++ b/data/novtau/PLA/pla_basic/peach_pink/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "2ffe7b06-f422-48de-a4b8-385cf8c23121" + } +] diff --git a/data/novtau/PLA/pla_basic/peach_pink/variant.json b/data/novtau/PLA/pla_basic/peach_pink/variant.json new file mode 100644 index 0000000000..85621dfb2c --- /dev/null +++ b/data/novtau/PLA/pla_basic/peach_pink/variant.json @@ -0,0 +1,6 @@ +{ + "id": "peach_pink", + "name": "Peach Pink", + "color_hex": "#E0A99F", + "uuid": "1210f021-85e9-4211-ae07-2d78e3440f16" +} diff --git a/data/novtau/PLA/pla_basic/pink/sizes.json b/data/novtau/PLA/pla_basic/pink/sizes.json index 134ce72b9f..5677ab0331 100644 --- a/data/novtau/PLA/pla_basic/pink/sizes.json +++ b/data/novtau/PLA/pla_basic/pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "ad0f168d-ccc8-460f-a433-43763119a2ed", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ad0f168d-ccc8-460f-a433-43763119a2ed" } ] diff --git a/data/novtau/PLA/pla_basic/pink/variant.json b/data/novtau/PLA/pla_basic/pink/variant.json index 19718db085..79d7d83c4c 100644 --- a/data/novtau/PLA/pla_basic/pink/variant.json +++ b/data/novtau/PLA/pla_basic/pink/variant.json @@ -1,6 +1,6 @@ { - "uuid": "76a47598-13a4-4139-9ed5-6caf6d5af741", "id": "pink", "name": "Pink", - "color_hex": "#E96D93" + "color_hex": "#E96D93", + "uuid": "76a47598-13a4-4139-9ed5-6caf6d5af741" } diff --git a/data/novtau/PLA/pla_basic/pumpkin_orange/sizes.json b/data/novtau/PLA/pla_basic/pumpkin_orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/pumpkin_orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/pumpkin_orange/variant.json b/data/novtau/PLA/pla_basic/pumpkin_orange/variant.json new file mode 100644 index 0000000000..9d45862a6b --- /dev/null +++ b/data/novtau/PLA/pla_basic/pumpkin_orange/variant.json @@ -0,0 +1,5 @@ +{ + "id": "pumpkin_orange", + "name": "Pumpkin Orange", + "color_hex": "#F77F12" +} diff --git a/data/novtau/PLA/pla_basic/purple/sizes.json b/data/novtau/PLA/pla_basic/purple/sizes.json index b0796a0f81..00f8c738e0 100644 --- a/data/novtau/PLA/pla_basic/purple/sizes.json +++ b/data/novtau/PLA/pla_basic/purple/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "aa85127f-89ec-498f-be68-0a995a94455c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "aa85127f-89ec-498f-be68-0a995a94455c" } ] diff --git a/data/novtau/PLA/pla_basic/purple/variant.json b/data/novtau/PLA/pla_basic/purple/variant.json index 03c6d43358..c7fe2e1be8 100644 --- a/data/novtau/PLA/pla_basic/purple/variant.json +++ b/data/novtau/PLA/pla_basic/purple/variant.json @@ -1,6 +1,6 @@ { - "uuid": "7bac1d54-7872-4d49-8d87-93c6faf5fe3c", "id": "purple", "name": "Purple", - "color_hex": "#7C4DB1" + "color_hex": "#7C4DB1", + "uuid": "7bac1d54-7872-4d49-8d87-93c6faf5fe3c" } diff --git a/data/novtau/PLA/pla_basic/red/sizes.json b/data/novtau/PLA/pla_basic/red/sizes.json index be68995414..e75ae8ba63 100644 --- a/data/novtau/PLA/pla_basic/red/sizes.json +++ b/data/novtau/PLA/pla_basic/red/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "d61b701a-628c-478f-ba73-78a514140760", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "d61b701a-628c-478f-ba73-78a514140760" } ] diff --git a/data/novtau/PLA/pla_basic/red/variant.json b/data/novtau/PLA/pla_basic/red/variant.json index f933a928e5..af22a11ff7 100644 --- a/data/novtau/PLA/pla_basic/red/variant.json +++ b/data/novtau/PLA/pla_basic/red/variant.json @@ -1,6 +1,6 @@ { - "uuid": "428926e9-9732-4597-8fc4-852fd8372da8", "id": "red", "name": "Red", - "color_hex": "#CD1F21" + "color_hex": "#CD1F21", + "uuid": "428926e9-9732-4597-8fc4-852fd8372da8" } diff --git a/data/novtau/PLA/pla_basic/rose_red/sizes.json b/data/novtau/PLA/pla_basic/rose_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/rose_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/rose_red/variant.json b/data/novtau/PLA/pla_basic/rose_red/variant.json new file mode 100644 index 0000000000..99efa4258f --- /dev/null +++ b/data/novtau/PLA/pla_basic/rose_red/variant.json @@ -0,0 +1,5 @@ +{ + "id": "rose_red", + "name": "Rose Red", + "color_hex": "#F5468F" +} diff --git a/data/novtau/PLA/pla_basic/sakura_pink/sizes.json b/data/novtau/PLA/pla_basic/sakura_pink/sizes.json index 8921d4fd39..af1c5d58bf 100644 --- a/data/novtau/PLA/pla_basic/sakura_pink/sizes.json +++ b/data/novtau/PLA/pla_basic/sakura_pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "a3546f5d-42ef-4284-a107-205ad3ee1266", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "a3546f5d-42ef-4284-a107-205ad3ee1266" } ] diff --git a/data/novtau/PLA/pla_basic/sakura_pink/variant.json b/data/novtau/PLA/pla_basic/sakura_pink/variant.json index 1ccca0fe77..3111fd1da0 100644 --- a/data/novtau/PLA/pla_basic/sakura_pink/variant.json +++ b/data/novtau/PLA/pla_basic/sakura_pink/variant.json @@ -1,6 +1,6 @@ { - "uuid": "9a91bba4-7dbf-4f50-9bc6-d92210459841", "id": "sakura_pink", "name": "Sakura Pink", - "color_hex": "#E5A0AF" + "color_hex": "#E3A0AE", + "uuid": "9a91bba4-7dbf-4f50-9bc6-d92210459841" } diff --git a/data/novtau/PLA/pla_basic/silver/sizes.json b/data/novtau/PLA/pla_basic/silver/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic/silver/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic/silver/variant.json b/data/novtau/PLA/pla_basic/silver/variant.json new file mode 100644 index 0000000000..be3293a07a --- /dev/null +++ b/data/novtau/PLA/pla_basic/silver/variant.json @@ -0,0 +1,5 @@ +{ + "id": "silver", + "name": "Silver", + "color_hex": "#AAABAC" +} diff --git a/data/novtau/PLA/pla_basic/skin_tone/sizes.json b/data/novtau/PLA/pla_basic/skin_tone/sizes.json index 57530051c4..3b58b9ac9c 100644 --- a/data/novtau/PLA/pla_basic/skin_tone/sizes.json +++ b/data/novtau/PLA/pla_basic/skin_tone/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "7ca10226-73b0-4522-a84f-a3a3030b7a4c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "7ca10226-73b0-4522-a84f-a3a3030b7a4c" } ] diff --git a/data/novtau/PLA/pla_basic/skin_tone/variant.json b/data/novtau/PLA/pla_basic/skin_tone/variant.json index 08b4f12782..e47ddb7ec2 100644 --- a/data/novtau/PLA/pla_basic/skin_tone/variant.json +++ b/data/novtau/PLA/pla_basic/skin_tone/variant.json @@ -1,6 +1,6 @@ { - "uuid": "fc95ba09-40ce-4ac6-a0a2-221f7b315ff3", "id": "skin_tone", "name": "Skin Tone", - "color_hex": "#D9BEA7" + "color_hex": "#D7BDA5", + "uuid": "fc95ba09-40ce-4ac6-a0a2-221f7b315ff3" } diff --git a/data/novtau/PLA/pla_basic/sky_blue/sizes.json b/data/novtau/PLA/pla_basic/sky_blue/sizes.json index d8e4b68b0c..f9d70db347 100644 --- a/data/novtau/PLA/pla_basic/sky_blue/sizes.json +++ b/data/novtau/PLA/pla_basic/sky_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "4a9b1d3a-48f6-4a2a-bc9e-cafeccbe573a", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "4a9b1d3a-48f6-4a2a-bc9e-cafeccbe573a" } ] diff --git a/data/novtau/PLA/pla_basic/sky_blue/variant.json b/data/novtau/PLA/pla_basic/sky_blue/variant.json index 9e195771d9..a27e57ad9d 100644 --- a/data/novtau/PLA/pla_basic/sky_blue/variant.json +++ b/data/novtau/PLA/pla_basic/sky_blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "ee721aa6-818a-42cb-b306-1e1bd5060d83", "id": "sky_blue", "name": "Sky Blue", - "color_hex": "#87AECD" + "color_hex": "#85ADCA", + "uuid": "ee721aa6-818a-42cb-b306-1e1bd5060d83" } diff --git a/data/novtau/PLA/pla_basic/soft_lavender/sizes.json b/data/novtau/PLA/pla_basic/soft_lavender/sizes.json index 641ba886b2..153c11849d 100644 --- a/data/novtau/PLA/pla_basic/soft_lavender/sizes.json +++ b/data/novtau/PLA/pla_basic/soft_lavender/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "12ecd7ce-b055-443f-b90e-a87b20763c4b", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "12ecd7ce-b055-443f-b90e-a87b20763c4b" } ] diff --git a/data/novtau/PLA/pla_basic/soft_lavender/variant.json b/data/novtau/PLA/pla_basic/soft_lavender/variant.json index 4ea57290d7..4d7a3701e1 100644 --- a/data/novtau/PLA/pla_basic/soft_lavender/variant.json +++ b/data/novtau/PLA/pla_basic/soft_lavender/variant.json @@ -1,6 +1,6 @@ { - "uuid": "4400e7c2-96b9-4d31-a58b-784fc1e41f84", "id": "soft_lavender", "name": "Soft Lavender", - "color_hex": "#B293BA" + "color_hex": "#B092B9", + "uuid": "4400e7c2-96b9-4d31-a58b-784fc1e41f84" } diff --git a/data/novtau/PLA/pla_basic/turquoise/sizes.json b/data/novtau/PLA/pla_basic/turquoise/sizes.json index 9d99866033..133d8b04de 100644 --- a/data/novtau/PLA/pla_basic/turquoise/sizes.json +++ b/data/novtau/PLA/pla_basic/turquoise/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "125c4c12-1aea-46e6-a5b8-5be4e7ece7fa", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "125c4c12-1aea-46e6-a5b8-5be4e7ece7fa" } ] diff --git a/data/novtau/PLA/pla_basic/turquoise/variant.json b/data/novtau/PLA/pla_basic/turquoise/variant.json index ae62f5e65a..214d1ab727 100644 --- a/data/novtau/PLA/pla_basic/turquoise/variant.json +++ b/data/novtau/PLA/pla_basic/turquoise/variant.json @@ -1,6 +1,6 @@ { - "uuid": "c564dd6f-2c0f-4ce8-b30a-d0a9c8745fe1", "id": "turquoise", "name": "Turquoise", - "color_hex": "#0CBCA9" + "color_hex": "#0DBBA7", + "uuid": "c564dd6f-2c0f-4ce8-b30a-d0a9c8745fe1" } diff --git a/data/novtau/PLA/pla_basic/white/sizes.json b/data/novtau/PLA/pla_basic/white/sizes.json index 358e652b80..3bb1a84b3e 100644 --- a/data/novtau/PLA/pla_basic/white/sizes.json +++ b/data/novtau/PLA/pla_basic/white/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "80e74378-7728-408a-b070-bfd748fbd4d6", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "80e74378-7728-408a-b070-bfd748fbd4d6" } ] diff --git a/data/novtau/PLA/pla_basic/white/variant.json b/data/novtau/PLA/pla_basic/white/variant.json index 605b7b13e9..ad1954430a 100644 --- a/data/novtau/PLA/pla_basic/white/variant.json +++ b/data/novtau/PLA/pla_basic/white/variant.json @@ -1,6 +1,6 @@ { - "uuid": "e462f4f3-c54a-456f-929b-4647a868500a", "id": "white", "name": "White", - "color_hex": "#D8D8D7" + "color_hex": "#D7D7D7", + "uuid": "e462f4f3-c54a-456f-929b-4647a868500a" } diff --git a/data/novtau/PLA/pla_basic/wisteria/sizes.json b/data/novtau/PLA/pla_basic/wisteria/sizes.json index 314743fccf..159d984026 100644 --- a/data/novtau/PLA/pla_basic/wisteria/sizes.json +++ b/data/novtau/PLA/pla_basic/wisteria/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "95a10c2b-4fe5-41f4-8f4d-08f1f2322f10", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "95a10c2b-4fe5-41f4-8f4d-08f1f2322f10" } ] diff --git a/data/novtau/PLA/pla_basic/wisteria/variant.json b/data/novtau/PLA/pla_basic/wisteria/variant.json index 96765c42dc..d820263368 100644 --- a/data/novtau/PLA/pla_basic/wisteria/variant.json +++ b/data/novtau/PLA/pla_basic/wisteria/variant.json @@ -1,6 +1,6 @@ { - "uuid": "e8550c9b-51d4-4c3a-bf05-a0f46b2bc0d0", "id": "wisteria", "name": "Wisteria", - "color_hex": "#B38CCB" + "color_hex": "#B18BC9", + "uuid": "e8550c9b-51d4-4c3a-bf05-a0f46b2bc0d0" } diff --git a/data/novtau/PLA/pla_basic/wood_tone/sizes.json b/data/novtau/PLA/pla_basic/wood_tone/sizes.json index 8d50cc47e0..0a572f3078 100644 --- a/data/novtau/PLA/pla_basic/wood_tone/sizes.json +++ b/data/novtau/PLA/pla_basic/wood_tone/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "230c3b0d-3fed-4139-a3fd-0e6f9bc37860", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "230c3b0d-3fed-4139-a3fd-0e6f9bc37860" } ] diff --git a/data/novtau/PLA/pla_basic/wood_tone/variant.json b/data/novtau/PLA/pla_basic/wood_tone/variant.json index 216fd9486d..7d858c9682 100644 --- a/data/novtau/PLA/pla_basic/wood_tone/variant.json +++ b/data/novtau/PLA/pla_basic/wood_tone/variant.json @@ -1,6 +1,6 @@ { - "uuid": "f33550aa-33c5-4060-b577-388c9e84632f", "id": "wood_tone", "name": "Wood Tone", - "color_hex": "#B69980" + "color_hex": "#B4987F", + "uuid": "f33550aa-33c5-4060-b577-388c9e84632f" } diff --git a/data/novtau/PLA/pla_basic/yellow/sizes.json b/data/novtau/PLA/pla_basic/yellow/sizes.json index 7374d830b7..2ecd410b6d 100644 --- a/data/novtau/PLA/pla_basic/yellow/sizes.json +++ b/data/novtau/PLA/pla_basic/yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "c93aecbb-f7c5-4e83-8b41-986cae8eb363", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "c93aecbb-f7c5-4e83-8b41-986cae8eb363" } ] diff --git a/data/novtau/PLA/pla_basic/yellow/variant.json b/data/novtau/PLA/pla_basic/yellow/variant.json index 4b79646ada..03e6745d12 100644 --- a/data/novtau/PLA/pla_basic/yellow/variant.json +++ b/data/novtau/PLA/pla_basic/yellow/variant.json @@ -1,6 +1,6 @@ { - "uuid": "8e653682-0882-4280-99d6-7fc3bb9e8e4c", "id": "yellow", "name": "Yellow", - "color_hex": "#EAD011" + "color_hex": "#EACF12", + "uuid": "8e653682-0882-4280-99d6-7fc3bb9e8e4c" } diff --git a/data/novtau/PLA/pla_basic_gradient/arctic_whisper/sizes.json b/data/novtau/PLA/pla_basic_gradient/arctic_whisper/sizes.json index 8927e5604f..9a4a19f503 100644 --- a/data/novtau/PLA/pla_basic_gradient/arctic_whisper/sizes.json +++ b/data/novtau/PLA/pla_basic_gradient/arctic_whisper/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "4261f10d-5061-47ad-be00-d3d325dff8e6", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "4261f10d-5061-47ad-be00-d3d325dff8e6" } ] diff --git a/data/novtau/PLA/pla_basic_gradient/arctic_whisper/variant.json b/data/novtau/PLA/pla_basic_gradient/arctic_whisper/variant.json index f552157618..471c0a5dc6 100644 --- a/data/novtau/PLA/pla_basic_gradient/arctic_whisper/variant.json +++ b/data/novtau/PLA/pla_basic_gradient/arctic_whisper/variant.json @@ -1,12 +1,12 @@ { - "uuid": "1850cdd3-813d-4ad5-856e-4220a8b7c850", "id": "arctic_whisper", "name": "Arctic Whisper", "color_hex": [ - "#AEB4E4", - "#4BAEDC" + "#ACB4E3", + "#49A9D6" ], "traits": { "gradual_color_change": true - } + }, + "uuid": "1850cdd3-813d-4ad5-856e-4220a8b7c850" } diff --git a/data/novtau/PLA/pla_basic_gradient/blueberry_bubblegum/sizes.json b/data/novtau/PLA/pla_basic_gradient/blueberry_bubblegum/sizes.json index eb14a3e80a..074eec7308 100644 --- a/data/novtau/PLA/pla_basic_gradient/blueberry_bubblegum/sizes.json +++ b/data/novtau/PLA/pla_basic_gradient/blueberry_bubblegum/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "64664ac0-31ca-4d51-ad6f-8f4a24bac3a3", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "64664ac0-31ca-4d51-ad6f-8f4a24bac3a3" } ] diff --git a/data/novtau/PLA/pla_basic_gradient/blueberry_bubblegum/variant.json b/data/novtau/PLA/pla_basic_gradient/blueberry_bubblegum/variant.json index 353a0949ac..1acc2ec074 100644 --- a/data/novtau/PLA/pla_basic_gradient/blueberry_bubblegum/variant.json +++ b/data/novtau/PLA/pla_basic_gradient/blueberry_bubblegum/variant.json @@ -1,12 +1,12 @@ { - "uuid": "c5d441ce-edcc-47fb-96e9-d123e6babc23", "id": "blueberry_bubblegum", "name": "Blueberry Bubblegum", "color_hex": [ - "#E1B89B", - "#AB8188" + "#E1B79B", + "#AB8385" ], "traits": { "gradual_color_change": true - } + }, + "uuid": "c5d441ce-edcc-47fb-96e9-d123e6babc23" } diff --git a/data/novtau/PLA/pla_basic_gradient/classic_rainbow/sizes.json b/data/novtau/PLA/pla_basic_gradient/classic_rainbow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_basic_gradient/classic_rainbow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_basic_gradient/classic_rainbow/variant.json b/data/novtau/PLA/pla_basic_gradient/classic_rainbow/variant.json new file mode 100644 index 0000000000..598f1d805d --- /dev/null +++ b/data/novtau/PLA/pla_basic_gradient/classic_rainbow/variant.json @@ -0,0 +1,12 @@ +{ + "id": "classic_rainbow", + "name": "Classic Rainbow", + "color_hex": [ + "#4299A4", + "#EA8577", + "#9D77B2" + ], + "traits": { + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_basic_gradient/cotton_candy_cloud/variant.json b/data/novtau/PLA/pla_basic_gradient/cotton_candy_cloud/variant.json index dbe08a2dfd..28490dd7f6 100644 --- a/data/novtau/PLA/pla_basic_gradient/cotton_candy_cloud/variant.json +++ b/data/novtau/PLA/pla_basic_gradient/cotton_candy_cloud/variant.json @@ -6,6 +6,7 @@ "#F2BDC8", "#A3DFF3" ], + "discontinued": true, "traits": { "gradual_color_change": true } diff --git a/data/novtau/PLA/pla_basic_gradient/dusk_glare/sizes.json b/data/novtau/PLA/pla_basic_gradient/dusk_glare/sizes.json index 05902e7573..f1430ac3eb 100644 --- a/data/novtau/PLA/pla_basic_gradient/dusk_glare/sizes.json +++ b/data/novtau/PLA/pla_basic_gradient/dusk_glare/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "51cffc9a-a980-431f-803c-a2a3cc946f0c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "51cffc9a-a980-431f-803c-a2a3cc946f0c" } ] diff --git a/data/novtau/PLA/pla_basic_gradient/dusk_glare/variant.json b/data/novtau/PLA/pla_basic_gradient/dusk_glare/variant.json index 75f1efc636..0c3ba85214 100644 --- a/data/novtau/PLA/pla_basic_gradient/dusk_glare/variant.json +++ b/data/novtau/PLA/pla_basic_gradient/dusk_glare/variant.json @@ -1,12 +1,12 @@ { - "uuid": "5ed969b8-62bc-44da-accc-0c8734544c15", "id": "dusk_glare", "name": "Dusk Glare", "color_hex": [ - "#F69E6A", - "#D36743" + "#F49B67", + "#C76140" ], "traits": { "gradual_color_change": true - } + }, + "uuid": "5ed969b8-62bc-44da-accc-0c8734544c15" } diff --git a/data/novtau/PLA/pla_basic_gradient/filament.json b/data/novtau/PLA/pla_basic_gradient/filament.json index 2750e877b0..efcae16e41 100644 --- a/data/novtau/PLA/pla_basic_gradient/filament.json +++ b/data/novtau/PLA/pla_basic_gradient/filament.json @@ -1,7 +1,7 @@ { - "uuid": "289353ae-42e2-4671-80b0-c2a133e364f1", "id": "pla_basic_gradient", "name": "PLA Basic Gradient", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "289353ae-42e2-4671-80b0-c2a133e364f1" } diff --git a/data/novtau/PLA/pla_basic_gradient/mint_lime/sizes.json b/data/novtau/PLA/pla_basic_gradient/mint_lime/sizes.json index fd29940c84..c633aedebd 100644 --- a/data/novtau/PLA/pla_basic_gradient/mint_lime/sizes.json +++ b/data/novtau/PLA/pla_basic_gradient/mint_lime/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "81bb96de-0f86-40c7-aabb-9b799b000a4a", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "81bb96de-0f86-40c7-aabb-9b799b000a4a" } ] diff --git a/data/novtau/PLA/pla_basic_gradient/mint_lime/variant.json b/data/novtau/PLA/pla_basic_gradient/mint_lime/variant.json index 32c452cee8..6f6e242582 100644 --- a/data/novtau/PLA/pla_basic_gradient/mint_lime/variant.json +++ b/data/novtau/PLA/pla_basic_gradient/mint_lime/variant.json @@ -1,12 +1,12 @@ { - "uuid": "28498f53-6bc1-47dd-a747-4ca9d1df6cf3", "id": "mint_lime", "name": "Mint Lime", "color_hex": [ - "#DDC693", - "#74C8B6" + "#DCC592", + "#74C4B2" ], "traits": { "gradual_color_change": true - } + }, + "uuid": "28498f53-6bc1-47dd-a747-4ca9d1df6cf3" } diff --git a/data/novtau/PLA/pla_basic_gradient/ocean_to_meadow/variant.json b/data/novtau/PLA/pla_basic_gradient/ocean_to_meadow/variant.json index d3f0ae65f7..09278801cb 100644 --- a/data/novtau/PLA/pla_basic_gradient/ocean_to_meadow/variant.json +++ b/data/novtau/PLA/pla_basic_gradient/ocean_to_meadow/variant.json @@ -6,6 +6,7 @@ "#2A9FD1", "#2FC2A9" ], + "discontinued": true, "traits": { "gradual_color_change": true } diff --git a/data/novtau/PLA/pla_basic_gradient/pink_citrus/sizes.json b/data/novtau/PLA/pla_basic_gradient/pink_citrus/sizes.json index c494481b9f..185151e4dd 100644 --- a/data/novtau/PLA/pla_basic_gradient/pink_citrus/sizes.json +++ b/data/novtau/PLA/pla_basic_gradient/pink_citrus/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "89a127e4-7316-4e88-b161-0529e06ab08c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "89a127e4-7316-4e88-b161-0529e06ab08c" } ] diff --git a/data/novtau/PLA/pla_basic_gradient/pink_citrus/variant.json b/data/novtau/PLA/pla_basic_gradient/pink_citrus/variant.json index c3339a4536..b525311cd5 100644 --- a/data/novtau/PLA/pla_basic_gradient/pink_citrus/variant.json +++ b/data/novtau/PLA/pla_basic_gradient/pink_citrus/variant.json @@ -1,12 +1,12 @@ { - "uuid": "405a9f29-53d7-40bc-9159-95a9ac650324", "id": "pink_citrus", "name": "Pink Citrus", "color_hex": [ - "#1EC98C", - "#A1E164" + "#1FC78A", + "#A0DF63" ], "traits": { "gradual_color_change": true - } + }, + "uuid": "405a9f29-53d7-40bc-9159-95a9ac650324" } diff --git a/data/novtau/PLA/pla_basic_gradient/solar_breeze/sizes.json b/data/novtau/PLA/pla_basic_gradient/solar_breeze/sizes.json index aef0f9388c..5e0dc620b5 100644 --- a/data/novtau/PLA/pla_basic_gradient/solar_breeze/sizes.json +++ b/data/novtau/PLA/pla_basic_gradient/solar_breeze/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "27515d33-4da9-46cb-b6bc-d43a8a34a17d", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "27515d33-4da9-46cb-b6bc-d43a8a34a17d" } ] diff --git a/data/novtau/PLA/pla_basic_gradient/solar_breeze/variant.json b/data/novtau/PLA/pla_basic_gradient/solar_breeze/variant.json index 440bdd357e..160c7d3a91 100644 --- a/data/novtau/PLA/pla_basic_gradient/solar_breeze/variant.json +++ b/data/novtau/PLA/pla_basic_gradient/solar_breeze/variant.json @@ -1,12 +1,12 @@ { - "uuid": "ce9da683-0c36-4731-9284-9b6f84cdd69b", "id": "solar_breeze", "name": "Solar Breeze", "color_hex": [ - "#5ABED3", - "#CFC1D0" + "#5CBDD2", + "#CFBFCD" ], "traits": { "gradual_color_change": true - } + }, + "uuid": "ce9da683-0c36-4731-9284-9b6f84cdd69b" } diff --git a/data/novtau/PLA/pla_cf/black/sizes.json b/data/novtau/PLA/pla_cf/black/sizes.json index d70190cc83..b8d5923608 100644 --- a/data/novtau/PLA/pla_cf/black/sizes.json +++ b/data/novtau/PLA/pla_cf/black/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "0035108c-4dba-453f-934c-b6adb20c669c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "0035108c-4dba-453f-934c-b6adb20c669c" } ] diff --git a/data/novtau/PLA/pla_cf/black/variant.json b/data/novtau/PLA/pla_cf/black/variant.json index 5e90c35cdd..a361de2682 100644 --- a/data/novtau/PLA/pla_cf/black/variant.json +++ b/data/novtau/PLA/pla_cf/black/variant.json @@ -1,10 +1,10 @@ { - "uuid": "2b76fabe-53bc-477c-aaea-d8d02e4d3cfa", "id": "black", "name": "Black", "color_hex": "#323A3E", "traits": { - "abrasive": true, - "contains_carbon_fiber": true - } + "contains_carbon_fiber": true, + "abrasive": true + }, + "uuid": "2b76fabe-53bc-477c-aaea-d8d02e4d3cfa" } diff --git a/data/novtau/PLA/pla_cf/brick_red/sizes.json b/data/novtau/PLA/pla_cf/brick_red/sizes.json index d61ce8d6e5..45e553e681 100644 --- a/data/novtau/PLA/pla_cf/brick_red/sizes.json +++ b/data/novtau/PLA/pla_cf/brick_red/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "bbbd1097-c6c6-4161-855c-9196ccf78145", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "bbbd1097-c6c6-4161-855c-9196ccf78145" } ] diff --git a/data/novtau/PLA/pla_cf/brick_red/variant.json b/data/novtau/PLA/pla_cf/brick_red/variant.json index fdb8213110..ef3f24ac67 100644 --- a/data/novtau/PLA/pla_cf/brick_red/variant.json +++ b/data/novtau/PLA/pla_cf/brick_red/variant.json @@ -1,10 +1,10 @@ { - "uuid": "843e604c-f352-4ea9-8875-afe818ee09ed", "id": "brick_red", "name": "Brick Red", "color_hex": "#A94030", "traits": { - "abrasive": true, - "contains_carbon_fiber": true - } + "contains_carbon_fiber": true, + "abrasive": true + }, + "uuid": "843e604c-f352-4ea9-8875-afe818ee09ed" } diff --git a/data/novtau/PLA/pla_cf/filament.json b/data/novtau/PLA/pla_cf/filament.json index 42ec0de8ee..06afda49c2 100644 --- a/data/novtau/PLA/pla_cf/filament.json +++ b/data/novtau/PLA/pla_cf/filament.json @@ -1,7 +1,7 @@ { - "uuid": "c04182a5-f8d3-4be9-864d-485b2601227b", "id": "pla_cf", "name": "PLA-CF", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "c04182a5-f8d3-4be9-864d-485b2601227b" } diff --git a/data/novtau/PLA/pla_cf/gray/sizes.json b/data/novtau/PLA/pla_cf/gray/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_cf/gray/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_cf/gray/variant.json b/data/novtau/PLA/pla_cf/gray/variant.json new file mode 100644 index 0000000000..1ffd163bbe --- /dev/null +++ b/data/novtau/PLA/pla_cf/gray/variant.json @@ -0,0 +1,9 @@ +{ + "id": "gray", + "name": "Gray", + "color_hex": "#6A6A6A", + "traits": { + "contains_carbon_fiber": true, + "abrasive": true + } +} diff --git a/data/novtau/PLA/pla_cf/iris_purple/sizes.json b/data/novtau/PLA/pla_cf/iris_purple/sizes.json index 79e3ebe5c5..4a2294ada4 100644 --- a/data/novtau/PLA/pla_cf/iris_purple/sizes.json +++ b/data/novtau/PLA/pla_cf/iris_purple/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "a6d887a5-8433-4247-bdff-d773d68675e1", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "a6d887a5-8433-4247-bdff-d773d68675e1" } ] diff --git a/data/novtau/PLA/pla_cf/iris_purple/variant.json b/data/novtau/PLA/pla_cf/iris_purple/variant.json index eff0806a0b..d0c251726d 100644 --- a/data/novtau/PLA/pla_cf/iris_purple/variant.json +++ b/data/novtau/PLA/pla_cf/iris_purple/variant.json @@ -1,10 +1,10 @@ { - "uuid": "a9110fa2-fbe9-402a-b0aa-811af26c59a1", "id": "iris_purple", "name": "Iris Purple", "color_hex": "#874CAF", "traits": { - "abrasive": true, - "contains_carbon_fiber": true - } + "contains_carbon_fiber": true, + "abrasive": true + }, + "uuid": "a9110fa2-fbe9-402a-b0aa-811af26c59a1" } diff --git a/data/novtau/PLA/pla_cf/jeans_blue/sizes.json b/data/novtau/PLA/pla_cf/jeans_blue/sizes.json index 45fad791f5..9726be1d88 100644 --- a/data/novtau/PLA/pla_cf/jeans_blue/sizes.json +++ b/data/novtau/PLA/pla_cf/jeans_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "b3ee3f97-5772-407d-8156-ba5bdb3c67a1", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "b3ee3f97-5772-407d-8156-ba5bdb3c67a1" } ] diff --git a/data/novtau/PLA/pla_cf/jeans_blue/variant.json b/data/novtau/PLA/pla_cf/jeans_blue/variant.json index e463b09e3f..47af16be22 100644 --- a/data/novtau/PLA/pla_cf/jeans_blue/variant.json +++ b/data/novtau/PLA/pla_cf/jeans_blue/variant.json @@ -1,10 +1,10 @@ { - "uuid": "38595b14-5dbf-4f68-8b1a-e49f3088b425", "id": "jeans_blue", "name": "Jeans Blue", - "color_hex": "#2550AE", + "color_hex": "#224683", "traits": { - "abrasive": true, - "contains_carbon_fiber": true - } + "contains_carbon_fiber": true, + "abrasive": true + }, + "uuid": "38595b14-5dbf-4f68-8b1a-e49f3088b425" } diff --git a/data/novtau/PLA/pla_cf/lava_gray/sizes.json b/data/novtau/PLA/pla_cf/lava_gray/sizes.json index e0e3b6b7dd..a9b67c20bf 100644 --- a/data/novtau/PLA/pla_cf/lava_gray/sizes.json +++ b/data/novtau/PLA/pla_cf/lava_gray/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "831b5bbf-b0bb-4987-a34c-72890eba43ed", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "831b5bbf-b0bb-4987-a34c-72890eba43ed" } ] diff --git a/data/novtau/PLA/pla_cf/lava_gray/variant.json b/data/novtau/PLA/pla_cf/lava_gray/variant.json index da53db0f59..1bedc0cee6 100644 --- a/data/novtau/PLA/pla_cf/lava_gray/variant.json +++ b/data/novtau/PLA/pla_cf/lava_gray/variant.json @@ -1,10 +1,10 @@ { - "uuid": "1f4ced26-011c-4242-9349-92b77e97e970", "id": "lava_gray", "name": "Lava Gray", "color_hex": "#797D81", "traits": { - "abrasive": true, - "contains_carbon_fiber": true - } + "contains_carbon_fiber": true, + "abrasive": true + }, + "uuid": "1f4ced26-011c-4242-9349-92b77e97e970" } diff --git a/data/novtau/PLA/pla_cf/matcha_green/sizes.json b/data/novtau/PLA/pla_cf/matcha_green/sizes.json index 1fc8a28a18..6061a50812 100644 --- a/data/novtau/PLA/pla_cf/matcha_green/sizes.json +++ b/data/novtau/PLA/pla_cf/matcha_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "9e19f707-9fd1-4d02-aebb-0fdb7364766e", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "9e19f707-9fd1-4d02-aebb-0fdb7364766e" } ] diff --git a/data/novtau/PLA/pla_cf/matcha_green/variant.json b/data/novtau/PLA/pla_cf/matcha_green/variant.json index 6b2164389a..87349ff4b4 100644 --- a/data/novtau/PLA/pla_cf/matcha_green/variant.json +++ b/data/novtau/PLA/pla_cf/matcha_green/variant.json @@ -1,10 +1,10 @@ { - "uuid": "d1863c94-ab55-489d-8e63-e79b3e0fc6fc", "id": "matcha_green", "name": "Matcha Green", - "color_hex": "#186B4F", + "color_hex": "#186A4E", "traits": { - "abrasive": true, - "contains_carbon_fiber": true - } + "contains_carbon_fiber": true, + "abrasive": true + }, + "uuid": "d1863c94-ab55-489d-8e63-e79b3e0fc6fc" } diff --git a/data/novtau/PLA/pla_cf/royal_blue/variant.json b/data/novtau/PLA/pla_cf/royal_blue/variant.json index 5f45b25ade..da4348ec2e 100644 --- a/data/novtau/PLA/pla_cf/royal_blue/variant.json +++ b/data/novtau/PLA/pla_cf/royal_blue/variant.json @@ -3,6 +3,7 @@ "id": "royal_blue", "name": "Royal Blue", "color_hex": "#2550AF", + "discontinued": true, "traits": { "abrasive": true, "contains_carbon_fiber": true diff --git a/data/novtau/PLA/pla_glow/blue/sizes.json b/data/novtau/PLA/pla_glow/blue/sizes.json deleted file mode 100644 index d494d81afd..0000000000 --- a/data/novtau/PLA/pla_glow/blue/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "ae90f159-7195-4649-a1b3-c598899f4a09", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_glow/blue/variant.json b/data/novtau/PLA/pla_glow/blue/variant.json deleted file mode 100644 index 11a4c39012..0000000000 --- a/data/novtau/PLA/pla_glow/blue/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "2d2abf59-46d4-4cda-b37c-e0589b5a9a16", - "id": "blue", - "name": "Glow Blue", - "color_hex": "#6FC9E9", - "traits": { - "glow": true - } -} diff --git a/data/novtau/PLA/pla_glow/filament.json b/data/novtau/PLA/pla_glow/filament.json index 5b17cfd221..e5d6d2ddaa 100644 --- a/data/novtau/PLA/pla_glow/filament.json +++ b/data/novtau/PLA/pla_glow/filament.json @@ -1,7 +1,7 @@ { - "uuid": "f91573fb-4b13-4838-af69-e06c61c5ebcc", "id": "pla_glow", "name": "PLA Glow", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "f91573fb-4b13-4838-af69-e06c61c5ebcc" } diff --git a/data/novtau/PLA/pla_glow/firefly_blue/sizes.json b/data/novtau/PLA/pla_glow/firefly_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/firefly_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/firefly_blue/variant.json b/data/novtau/PLA/pla_glow/firefly_blue/variant.json new file mode 100644 index 0000000000..70cc47855a --- /dev/null +++ b/data/novtau/PLA/pla_glow/firefly_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "firefly_blue", + "name": "Firefly Blue", + "color_hex": "#18BDC7", + "traits": { + "glow": true + } +} diff --git a/data/novtau/PLA/pla_glow/firefly_green/sizes.json b/data/novtau/PLA/pla_glow/firefly_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/firefly_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/firefly_green/variant.json b/data/novtau/PLA/pla_glow/firefly_green/variant.json new file mode 100644 index 0000000000..182d6845b7 --- /dev/null +++ b/data/novtau/PLA/pla_glow/firefly_green/variant.json @@ -0,0 +1,8 @@ +{ + "id": "firefly_green", + "name": "Firefly Green", + "color_hex": "#4DD048", + "traits": { + "glow": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_blue/sizes.json b/data/novtau/PLA/pla_glow/glow_blue/sizes.json new file mode 100644 index 0000000000..53736af261 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_blue/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ae90f159-7195-4649-a1b3-c598899f4a09" + } +] diff --git a/data/novtau/PLA/pla_glow/glow_blue/variant.json b/data/novtau/PLA/pla_glow/glow_blue/variant.json new file mode 100644 index 0000000000..0a1f536689 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_blue/variant.json @@ -0,0 +1,9 @@ +{ + "id": "glow_blue", + "name": "Glow Blue", + "color_hex": "#71C5E7", + "traits": { + "glow": true + }, + "uuid": "2d2abf59-46d4-4cda-b37c-e0589b5a9a16" +} diff --git a/data/novtau/PLA/pla_glow/glow_deep_blue/sizes.json b/data/novtau/PLA/pla_glow/glow_deep_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_deep_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/glow_deep_blue/variant.json b/data/novtau/PLA/pla_glow/glow_deep_blue/variant.json new file mode 100644 index 0000000000..fecd57b967 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_deep_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "glow_deep_blue", + "name": "Glow Deep Blue", + "color_hex": "#17A3ED", + "traits": { + "glow": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_green/sizes.json b/data/novtau/PLA/pla_glow/glow_green/sizes.json new file mode 100644 index 0000000000..185c791552 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_green/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "9bd6022f-f249-4542-955c-0c0f64efec97" + } +] diff --git a/data/novtau/PLA/pla_glow/glow_green/variant.json b/data/novtau/PLA/pla_glow/glow_green/variant.json new file mode 100644 index 0000000000..d4c9189f53 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_green/variant.json @@ -0,0 +1,9 @@ +{ + "id": "glow_green", + "name": "Glow Green", + "color_hex": "#54D387", + "traits": { + "glow": true + }, + "uuid": "628d14aa-f6a3-4c17-a294-fab237865bc4" +} diff --git a/data/novtau/PLA/pla_glow/glow_light_green/sizes.json b/data/novtau/PLA/pla_glow/glow_light_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_light_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/glow_light_green/variant.json b/data/novtau/PLA/pla_glow/glow_light_green/variant.json new file mode 100644 index 0000000000..3a445eaef6 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_light_green/variant.json @@ -0,0 +1,8 @@ +{ + "id": "glow_light_green", + "name": "Glow Light Green", + "color_hex": "#A6EC2A", + "traits": { + "glow": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_natural/sizes.json b/data/novtau/PLA/pla_glow/glow_natural/sizes.json new file mode 100644 index 0000000000..9ac432d404 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_natural/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "3747690d-9972-4942-b097-627fce180dc0" + } +] diff --git a/data/novtau/PLA/pla_glow/glow_natural/variant.json b/data/novtau/PLA/pla_glow/glow_natural/variant.json new file mode 100644 index 0000000000..adbed11bb8 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_natural/variant.json @@ -0,0 +1,9 @@ +{ + "id": "glow_natural", + "name": "Glow Natural", + "color_hex": "#CDD1BE", + "traits": { + "glow": true + }, + "uuid": "2e2f9d14-92e3-4142-bfc6-7e65df6f7dd0" +} diff --git a/data/novtau/PLA/pla_glow/glow_orange/sizes.json b/data/novtau/PLA/pla_glow/glow_orange/sizes.json new file mode 100644 index 0000000000..092801b107 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_orange/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "f80f6026-a109-4762-a83b-2930a983a56a" + } +] diff --git a/data/novtau/PLA/pla_glow/glow_orange/variant.json b/data/novtau/PLA/pla_glow/glow_orange/variant.json new file mode 100644 index 0000000000..7ba29fd62a --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_orange/variant.json @@ -0,0 +1,9 @@ +{ + "id": "glow_orange", + "name": "Glow Orange", + "color_hex": "#EAAA6F", + "traits": { + "glow": true + }, + "uuid": "1625e9da-e190-4c5a-ae70-707aad4c0b9e" +} diff --git a/data/novtau/PLA/pla_glow/glow_purple/sizes.json b/data/novtau/PLA/pla_glow/glow_purple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_purple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/glow_purple/variant.json b/data/novtau/PLA/pla_glow/glow_purple/variant.json new file mode 100644 index 0000000000..30e661cd3b --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_purple/variant.json @@ -0,0 +1,8 @@ +{ + "id": "glow_purple", + "name": "Glow Purple", + "color_hex": "#9878DC", + "traits": { + "glow": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_crystal/sizes.json b/data/novtau/PLA/pla_glow/glow_rainbow_crystal/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_crystal/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_crystal/variant.json b/data/novtau/PLA/pla_glow/glow_rainbow_crystal/variant.json new file mode 100644 index 0000000000..11e4b7e510 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_crystal/variant.json @@ -0,0 +1,14 @@ +{ + "id": "glow_rainbow_crystal", + "name": "Glow Rainbow Crystal", + "color_hex": [ + "#3EC5D5", + "#EB7B6A", + "#9461B1", + "#A4D783" + ], + "traits": { + "glow": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_earth/sizes.json b/data/novtau/PLA/pla_glow/glow_rainbow_earth/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_earth/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_earth/variant.json b/data/novtau/PLA/pla_glow/glow_rainbow_earth/variant.json new file mode 100644 index 0000000000..5a3c6ca2a9 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_earth/variant.json @@ -0,0 +1,13 @@ +{ + "id": "glow_rainbow_earth", + "name": "Glow Rainbow Earth", + "color_hex": [ + "#6E7D4B", + "#9B8352", + "#D4C69E" + ], + "traits": { + "glow": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_no_2/sizes.json b/data/novtau/PLA/pla_glow/glow_rainbow_no_2/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_no_2/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_no_2/variant.json b/data/novtau/PLA/pla_glow/glow_rainbow_no_2/variant.json new file mode 100644 index 0000000000..bf90421607 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_no_2/variant.json @@ -0,0 +1,14 @@ +{ + "id": "glow_rainbow_no_2", + "name": "Glow Rainbow No.2", + "color_hex": [ + "#67AAD6", + "#FBA1DD", + "#965CBB", + "#6776C9" + ], + "traits": { + "glow": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_no_5/sizes.json b/data/novtau/PLA/pla_glow/glow_rainbow_no_5/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_no_5/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_no_5/variant.json b/data/novtau/PLA/pla_glow/glow_rainbow_no_5/variant.json new file mode 100644 index 0000000000..eefeb178c7 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_no_5/variant.json @@ -0,0 +1,13 @@ +{ + "id": "glow_rainbow_no_5", + "name": "Glow Rainbow No.5", + "color_hex": [ + "#D07091", + "#7AD9C8", + "#655CA1" + ], + "traits": { + "glow": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_no_6/sizes.json b/data/novtau/PLA/pla_glow/glow_rainbow_no_6/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_no_6/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_no_6/variant.json b/data/novtau/PLA/pla_glow/glow_rainbow_no_6/variant.json new file mode 100644 index 0000000000..6fe73ced1b --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_no_6/variant.json @@ -0,0 +1,14 @@ +{ + "id": "glow_rainbow_no_6", + "name": "Glow Rainbow No.6", + "color_hex": [ + "#26A5BB", + "#ED7E74", + "#93DD63", + "#45B771" + ], + "traits": { + "glow": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_spectrum/sizes.json b/data/novtau/PLA/pla_glow/glow_rainbow_spectrum/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_spectrum/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/glow_rainbow_spectrum/variant.json b/data/novtau/PLA/pla_glow/glow_rainbow_spectrum/variant.json new file mode 100644 index 0000000000..15077aad60 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_rainbow_spectrum/variant.json @@ -0,0 +1,14 @@ +{ + "id": "glow_rainbow_spectrum", + "name": "Glow Rainbow Spectrum", + "color_hex": [ + "#178DD2", + "#F8C666", + "#40A44C", + "#20D4C2" + ], + "traits": { + "glow": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_sky_blue/sizes.json b/data/novtau/PLA/pla_glow/glow_sky_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_sky_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/glow_sky_blue/variant.json b/data/novtau/PLA/pla_glow/glow_sky_blue/variant.json new file mode 100644 index 0000000000..9dd866b644 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_sky_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "glow_sky_blue", + "name": "Glow Sky Blue", + "color_hex": "#01BAFD", + "traits": { + "glow": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_violet/sizes.json b/data/novtau/PLA/pla_glow/glow_violet/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_violet/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/glow_violet/variant.json b/data/novtau/PLA/pla_glow/glow_violet/variant.json new file mode 100644 index 0000000000..3d1873d608 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_violet/variant.json @@ -0,0 +1,8 @@ +{ + "id": "glow_violet", + "name": "Glow Violet", + "color_hex": "#815CE8", + "traits": { + "glow": true + } +} diff --git a/data/novtau/PLA/pla_glow/glow_yellow/sizes.json b/data/novtau/PLA/pla_glow/glow_yellow/sizes.json new file mode 100644 index 0000000000..35da7872ab --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_yellow/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "e0191d46-f87a-44c5-9a31-bd8c51d638cd" + } +] diff --git a/data/novtau/PLA/pla_glow/glow_yellow/variant.json b/data/novtau/PLA/pla_glow/glow_yellow/variant.json new file mode 100644 index 0000000000..5528bb8275 --- /dev/null +++ b/data/novtau/PLA/pla_glow/glow_yellow/variant.json @@ -0,0 +1,9 @@ +{ + "id": "glow_yellow", + "name": "Glow Yellow", + "color_hex": "#E3F160", + "traits": { + "glow": true + }, + "uuid": "c5ece567-0bcc-47f6-a562-04046aff3d52" +} diff --git a/data/novtau/PLA/pla_glow/green/sizes.json b/data/novtau/PLA/pla_glow/green/sizes.json deleted file mode 100644 index e715497540..0000000000 --- a/data/novtau/PLA/pla_glow/green/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "9bd6022f-f249-4542-955c-0c0f64efec97", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_glow/green/variant.json b/data/novtau/PLA/pla_glow/green/variant.json deleted file mode 100644 index 1da495b01b..0000000000 --- a/data/novtau/PLA/pla_glow/green/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "628d14aa-f6a3-4c17-a294-fab237865bc4", - "id": "green", - "name": "Green", - "color_hex": "#55D489", - "traits": { - "glow": true - } -} diff --git a/data/novtau/PLA/pla_glow/natural/sizes.json b/data/novtau/PLA/pla_glow/natural/sizes.json deleted file mode 100644 index 5b803a28a9..0000000000 --- a/data/novtau/PLA/pla_glow/natural/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "3747690d-9972-4942-b097-627fce180dc0", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_glow/natural/variant.json b/data/novtau/PLA/pla_glow/natural/variant.json deleted file mode 100644 index 8147ee8e8f..0000000000 --- a/data/novtau/PLA/pla_glow/natural/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "2e2f9d14-92e3-4142-bfc6-7e65df6f7dd0", - "id": "natural", - "name": "Natural", - "color_hex": "#CFD3C1", - "traits": { - "glow": true - } -} diff --git a/data/novtau/PLA/pla_glow/orange/sizes.json b/data/novtau/PLA/pla_glow/orange/sizes.json deleted file mode 100644 index 06ada7e00a..0000000000 --- a/data/novtau/PLA/pla_glow/orange/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "f80f6026-a109-4762-a83b-2930a983a56a", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_glow/orange/variant.json b/data/novtau/PLA/pla_glow/orange/variant.json deleted file mode 100644 index cf929bb481..0000000000 --- a/data/novtau/PLA/pla_glow/orange/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "1625e9da-e190-4c5a-ae70-707aad4c0b9e", - "id": "orange", - "name": "Glow Orange", - "color_hex": "#F49474", - "traits": { - "glow": true - } -} diff --git a/data/novtau/PLA/pla_glow/pink/variant.json b/data/novtau/PLA/pla_glow/pink/variant.json index 02bc741932..94d76db705 100644 --- a/data/novtau/PLA/pla_glow/pink/variant.json +++ b/data/novtau/PLA/pla_glow/pink/variant.json @@ -3,6 +3,7 @@ "id": "pink", "name": "Glow Pink", "color_hex": "#F08FA0", + "discontinued": true, "traits": { "glow": true } diff --git a/data/novtau/PLA/pla_glow/white_glow_blue/sizes.json b/data/novtau/PLA/pla_glow/white_glow_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/white_glow_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/white_glow_blue/variant.json b/data/novtau/PLA/pla_glow/white_glow_blue/variant.json new file mode 100644 index 0000000000..2b585de8ea --- /dev/null +++ b/data/novtau/PLA/pla_glow/white_glow_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "white_glow_blue", + "name": "White Glow Blue", + "color_hex": "#0988E5", + "traits": { + "glow": true + } +} diff --git a/data/novtau/PLA/pla_glow/white_glow_rainbow/sizes.json b/data/novtau/PLA/pla_glow/white_glow_rainbow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/white_glow_rainbow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/white_glow_rainbow/variant.json b/data/novtau/PLA/pla_glow/white_glow_rainbow/variant.json new file mode 100644 index 0000000000..cb263a19ce --- /dev/null +++ b/data/novtau/PLA/pla_glow/white_glow_rainbow/variant.json @@ -0,0 +1,15 @@ +{ + "id": "white_glow_rainbow", + "name": "White Glow Rainbow", + "color_hex": [ + "#EDE8D5", + "#20ABBF", + "#F0AA80", + "#A14DD3" + ], + "traits": { + "glow": true, + "gradual_color_change": true, + "illuminescent_color_change": true + } +} diff --git a/data/novtau/PLA/pla_glow/white_glow_red/sizes.json b/data/novtau/PLA/pla_glow/white_glow_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_glow/white_glow_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_glow/white_glow_red/variant.json b/data/novtau/PLA/pla_glow/white_glow_red/variant.json new file mode 100644 index 0000000000..cffd8ce593 --- /dev/null +++ b/data/novtau/PLA/pla_glow/white_glow_red/variant.json @@ -0,0 +1,8 @@ +{ + "id": "white_glow_red", + "name": "White Glow Red", + "color_hex": "#DF3C45", + "traits": { + "glow": true + } +} diff --git a/data/novtau/PLA/pla_glow/yellow/sizes.json b/data/novtau/PLA/pla_glow/yellow/sizes.json deleted file mode 100644 index ba9eee8a22..0000000000 --- a/data/novtau/PLA/pla_glow/yellow/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "e0191d46-f87a-44c5-9a31-bd8c51d638cd", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_glow/yellow/variant.json b/data/novtau/PLA/pla_glow/yellow/variant.json deleted file mode 100644 index c2e2696093..0000000000 --- a/data/novtau/PLA/pla_glow/yellow/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "c5ece567-0bcc-47f6-a562-04046aff3d52", - "id": "yellow", - "name": "Glow Yellow", - "color_hex": "#E7F35F", - "traits": { - "glow": true - } -} diff --git a/data/novtau/PLA/pla_marble/cream_white_marble/sizes.json b/data/novtau/PLA/pla_marble/cream_white_marble/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_marble/cream_white_marble/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_marble/cream_white_marble/variant.json b/data/novtau/PLA/pla_marble/cream_white_marble/variant.json new file mode 100644 index 0000000000..091f66b05d --- /dev/null +++ b/data/novtau/PLA/pla_marble/cream_white_marble/variant.json @@ -0,0 +1,8 @@ +{ + "id": "cream_white_marble", + "name": "Cream White Marble", + "color_hex": "#D0CAC2", + "traits": { + "imitates_marble": true + } +} diff --git a/data/novtau/PLA/pla_marble/filament.json b/data/novtau/PLA/pla_marble/filament.json index fddb4bd0b3..5912bbbb91 100644 --- a/data/novtau/PLA/pla_marble/filament.json +++ b/data/novtau/PLA/pla_marble/filament.json @@ -1,7 +1,7 @@ { - "uuid": "de03f5bf-5e51-4383-9c85-ba67f38f64eb", "id": "pla_marble", "name": "PLA Marble", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "de03f5bf-5e51-4383-9c85-ba67f38f64eb" } diff --git a/data/novtau/PLA/pla_marble/granite_marble/sizes.json b/data/novtau/PLA/pla_marble/granite_marble/sizes.json index d6cee38bd4..a52e4ed5a8 100644 --- a/data/novtau/PLA/pla_marble/granite_marble/sizes.json +++ b/data/novtau/PLA/pla_marble/granite_marble/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "178e8197-ce74-4f5e-93b9-4d7b66e4f23b", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "178e8197-ce74-4f5e-93b9-4d7b66e4f23b" } ] diff --git a/data/novtau/PLA/pla_marble/granite_marble/variant.json b/data/novtau/PLA/pla_marble/granite_marble/variant.json index ed8e33477d..83c9a6af8f 100644 --- a/data/novtau/PLA/pla_marble/granite_marble/variant.json +++ b/data/novtau/PLA/pla_marble/granite_marble/variant.json @@ -1,9 +1,9 @@ { - "uuid": "bad4f8da-6816-42af-b696-6721f3de6d06", "id": "granite_marble", "name": "Granite Marble", - "color_hex": "#A29085", + "color_hex": "#9F8E83", "traits": { "imitates_marble": true - } + }, + "uuid": "bad4f8da-6816-42af-b696-6721f3de6d06" } diff --git a/data/novtau/PLA/pla_marble/red_granite/sizes.json b/data/novtau/PLA/pla_marble/red_granite/sizes.json index 324539a91a..62aec354d2 100644 --- a/data/novtau/PLA/pla_marble/red_granite/sizes.json +++ b/data/novtau/PLA/pla_marble/red_granite/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "031aab12-e2d3-4079-abfe-bb1b6eb6dc2f", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "031aab12-e2d3-4079-abfe-bb1b6eb6dc2f" } ] diff --git a/data/novtau/PLA/pla_marble/red_granite/variant.json b/data/novtau/PLA/pla_marble/red_granite/variant.json index d0924788c0..2ecf8b092f 100644 --- a/data/novtau/PLA/pla_marble/red_granite/variant.json +++ b/data/novtau/PLA/pla_marble/red_granite/variant.json @@ -1,9 +1,9 @@ { - "uuid": "076fad69-70ad-4321-9ecf-b957505c8a99", "id": "red_granite", "name": "Red Granite", "color_hex": "#A53E2C", "traits": { "imitates_marble": true - } + }, + "uuid": "076fad69-70ad-4321-9ecf-b957505c8a99" } diff --git a/data/novtau/PLA/pla_marble/white_marble/sizes.json b/data/novtau/PLA/pla_marble/white_marble/sizes.json index 2e1c36e148..b3d7363fad 100644 --- a/data/novtau/PLA/pla_marble/white_marble/sizes.json +++ b/data/novtau/PLA/pla_marble/white_marble/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "0f9c4eec-b917-4b63-b6f5-1d76da76db53", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "0f9c4eec-b917-4b63-b6f5-1d76da76db53" } ] diff --git a/data/novtau/PLA/pla_marble/white_marble/variant.json b/data/novtau/PLA/pla_marble/white_marble/variant.json index e211144296..0ab7c64a24 100644 --- a/data/novtau/PLA/pla_marble/white_marble/variant.json +++ b/data/novtau/PLA/pla_marble/white_marble/variant.json @@ -1,9 +1,9 @@ { - "uuid": "2a1509a9-5a1e-41e2-980b-ef7bd61ee884", "id": "white_marble", "name": "White Marble", "color_hex": "#C1BFC0", "traits": { "imitates_marble": true - } + }, + "uuid": "2a1509a9-5a1e-41e2-980b-ef7bd61ee884" } diff --git a/data/novtau/PLA/pla_matte/apple_green/sizes.json b/data/novtau/PLA/pla_matte/apple_green/sizes.json deleted file mode 100644 index cc6277450d..0000000000 --- a/data/novtau/PLA/pla_matte/apple_green/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "3dfafa0b-63a7-4724-88c8-dd95a3813523", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/apple_green/variant.json b/data/novtau/PLA/pla_matte/apple_green/variant.json deleted file mode 100644 index 96075b1a82..0000000000 --- a/data/novtau/PLA/pla_matte/apple_green/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "86df06c2-0df7-46b4-ad15-5648c207ecaa", - "id": "apple_green", - "name": "Apple Green", - "color_hex": "#098B4C", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/ash_gray/sizes.json b/data/novtau/PLA/pla_matte/ash_gray/sizes.json deleted file mode 100644 index 760bf988dc..0000000000 --- a/data/novtau/PLA/pla_matte/ash_gray/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "a52a8522-9446-4f92-9e5e-33c7da521b61", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/ash_gray/variant.json b/data/novtau/PLA/pla_matte/ash_gray/variant.json deleted file mode 100644 index f661bf86b6..0000000000 --- a/data/novtau/PLA/pla_matte/ash_gray/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "d9d66036-dff5-4ee0-94e2-ab8e83f38ca9", - "id": "ash_gray", - "name": "Ash Gray", - "color_hex": "#6D6F75", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/bone_white/variant.json b/data/novtau/PLA/pla_matte/bone_white/variant.json index b7ca4fd850..9678b27a25 100644 --- a/data/novtau/PLA/pla_matte/bone_white/variant.json +++ b/data/novtau/PLA/pla_matte/bone_white/variant.json @@ -3,6 +3,7 @@ "id": "bone_white", "name": "Bone White", "color_hex": "#CDCCCC", + "discontinued": true, "traits": { "matte": true } diff --git a/data/novtau/PLA/pla_matte/caramel/sizes.json b/data/novtau/PLA/pla_matte/caramel/sizes.json deleted file mode 100644 index 07e8bc20f8..0000000000 --- a/data/novtau/PLA/pla_matte/caramel/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "147d22ab-26fc-4bb0-9911-c08d15392c83", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/caramel/variant.json b/data/novtau/PLA/pla_matte/caramel/variant.json deleted file mode 100644 index 519d0aa56a..0000000000 --- a/data/novtau/PLA/pla_matte/caramel/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "f9b9e850-d028-4153-ae05-74697cd0ba73", - "id": "caramel", - "name": "Caramel", - "color_hex": "#824132", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/charcoal/sizes.json b/data/novtau/PLA/pla_matte/charcoal/sizes.json deleted file mode 100644 index d4d24fa8fe..0000000000 --- a/data/novtau/PLA/pla_matte/charcoal/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "7a36dc64-6c49-46d7-ba69-bacf3ba7eed2", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/charcoal/variant.json b/data/novtau/PLA/pla_matte/charcoal/variant.json deleted file mode 100644 index 87bcb309ae..0000000000 --- a/data/novtau/PLA/pla_matte/charcoal/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "7fe3beb9-72d5-4c75-b8f0-144cae2f62eb", - "id": "charcoal", - "name": "Charcoal", - "color_hex": "#292929", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/dark_blue/variant.json b/data/novtau/PLA/pla_matte/dark_blue/variant.json index 191a3ac1bc..15362e2a34 100644 --- a/data/novtau/PLA/pla_matte/dark_blue/variant.json +++ b/data/novtau/PLA/pla_matte/dark_blue/variant.json @@ -3,6 +3,7 @@ "id": "dark_blue", "name": "Dark Blue", "color_hex": "#233555", + "discontinued": true, "traits": { "matte": true } diff --git a/data/novtau/PLA/pla_matte/dark_brown/variant.json b/data/novtau/PLA/pla_matte/dark_brown/variant.json index dc3e94082a..d23d1efe6f 100644 --- a/data/novtau/PLA/pla_matte/dark_brown/variant.json +++ b/data/novtau/PLA/pla_matte/dark_brown/variant.json @@ -3,6 +3,7 @@ "id": "dark_brown", "name": "Dark Brown", "color_hex": "#844132", + "discontinued": true, "traits": { "matte": true } diff --git a/data/novtau/PLA/pla_matte/dark_chocolate/variant.json b/data/novtau/PLA/pla_matte/dark_chocolate/variant.json index 27e2b804ca..a59ce3b4d2 100644 --- a/data/novtau/PLA/pla_matte/dark_chocolate/variant.json +++ b/data/novtau/PLA/pla_matte/dark_chocolate/variant.json @@ -3,6 +3,7 @@ "id": "dark_chocolate", "name": "Dark Chocolate", "color_hex": "#493E38", + "discontinued": true, "traits": { "matte": true } diff --git a/data/novtau/PLA/pla_matte/dark_green/variant.json b/data/novtau/PLA/pla_matte/dark_green/variant.json index e3d54f2bee..4891976c5a 100644 --- a/data/novtau/PLA/pla_matte/dark_green/variant.json +++ b/data/novtau/PLA/pla_matte/dark_green/variant.json @@ -3,6 +3,7 @@ "id": "dark_green", "name": "Dark Green", "color_hex": "#414C2D", + "discontinued": true, "traits": { "matte": true } diff --git a/data/novtau/PLA/pla_matte/dark_red/variant.json b/data/novtau/PLA/pla_matte/dark_red/variant.json index 851c2e8ee3..7dc769f85e 100644 --- a/data/novtau/PLA/pla_matte/dark_red/variant.json +++ b/data/novtau/PLA/pla_matte/dark_red/variant.json @@ -3,6 +3,7 @@ "id": "dark_red", "name": "Dark Red", "color_hex": "#D42423", + "discontinued": true, "traits": { "matte": true } diff --git a/data/novtau/PLA/pla_matte/desert_tan/sizes.json b/data/novtau/PLA/pla_matte/desert_tan/sizes.json deleted file mode 100644 index f0f1bd89ab..0000000000 --- a/data/novtau/PLA/pla_matte/desert_tan/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "58396a8f-2c05-435a-b9f8-c776d54343c6", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/desert_tan/variant.json b/data/novtau/PLA/pla_matte/desert_tan/variant.json deleted file mode 100644 index b150087611..0000000000 --- a/data/novtau/PLA/pla_matte/desert_tan/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "a280a2e7-b030-4ac5-be69-2c79e61dfa3b", - "id": "desert_tan", - "name": "Desert Tan", - "color_hex": "#C5A38A", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/filament.json b/data/novtau/PLA/pla_matte/filament.json index 7c790f9de8..325435d414 100644 --- a/data/novtau/PLA/pla_matte/filament.json +++ b/data/novtau/PLA/pla_matte/filament.json @@ -1,7 +1,7 @@ { - "uuid": "3b175a44-ffa1-417e-b7f8-0b6898d547aa", "id": "pla_matte", "name": "PLA Matte", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "3b175a44-ffa1-417e-b7f8-0b6898d547aa" } diff --git a/data/novtau/PLA/pla_matte/grass_green/variant.json b/data/novtau/PLA/pla_matte/grass_green/variant.json index fc1b4d7c24..a7e4d64586 100644 --- a/data/novtau/PLA/pla_matte/grass_green/variant.json +++ b/data/novtau/PLA/pla_matte/grass_green/variant.json @@ -3,6 +3,7 @@ "id": "grass_green", "name": "Grass Green", "color_hex": "#088C4C", + "discontinued": true, "traits": { "matte": true } diff --git a/data/novtau/PLA/pla_matte/ice_blue/sizes.json b/data/novtau/PLA/pla_matte/ice_blue/sizes.json deleted file mode 100644 index a81d9d33c5..0000000000 --- a/data/novtau/PLA/pla_matte/ice_blue/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "6386200f-2592-44e4-9c7a-3e14d7e82bc6", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/ice_blue/variant.json b/data/novtau/PLA/pla_matte/ice_blue/variant.json deleted file mode 100644 index 123eec4808..0000000000 --- a/data/novtau/PLA/pla_matte/ice_blue/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "8d31c2bf-74d6-4c84-8613-7468c7a4dd76", - "id": "ice_blue", - "name": "Ice Blue", - "color_hex": "#0988E0", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/ivory_white/sizes.json b/data/novtau/PLA/pla_matte/ivory_white/sizes.json deleted file mode 100644 index 59a37af0af..0000000000 --- a/data/novtau/PLA/pla_matte/ivory_white/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "fe39d7c7-a394-47ec-a616-c639dd92278d", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/ivory_white/variant.json b/data/novtau/PLA/pla_matte/ivory_white/variant.json deleted file mode 100644 index 80ef70bce7..0000000000 --- a/data/novtau/PLA/pla_matte/ivory_white/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "26d168e5-2ca4-4522-9bc8-e42445bb5619", - "id": "ivory_white", - "name": "Ivory White", - "color_hex": "#CCCAC9", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/latte_brown/sizes.json b/data/novtau/PLA/pla_matte/latte_brown/sizes.json deleted file mode 100644 index 0c4e78e339..0000000000 --- a/data/novtau/PLA/pla_matte/latte_brown/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "e88508e7-1ce2-4b9b-bf5a-f15363c821eb", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/latte_brown/variant.json b/data/novtau/PLA/pla_matte/latte_brown/variant.json deleted file mode 100644 index 3b175c4624..0000000000 --- a/data/novtau/PLA/pla_matte/latte_brown/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "2c9651d1-a5b4-4b8d-9719-39cb2a7178b7", - "id": "latte_brown", - "name": "Latte Brown", - "color_hex": "#C3A288", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/lemon_yellow/sizes.json b/data/novtau/PLA/pla_matte/lemon_yellow/sizes.json deleted file mode 100644 index a84ccd3705..0000000000 --- a/data/novtau/PLA/pla_matte/lemon_yellow/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "c35bc566-0083-4ded-97fa-64a5005adcb2", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/lemon_yellow/variant.json b/data/novtau/PLA/pla_matte/lemon_yellow/variant.json deleted file mode 100644 index 9c5cda8936..0000000000 --- a/data/novtau/PLA/pla_matte/lemon_yellow/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "23f5a568-7189-4bce-8d18-d160121bca4b", - "id": "lemon_yellow", - "name": "Lemon Yellow", - "color_hex": "#E6BE15", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/lilac_purple/sizes.json b/data/novtau/PLA/pla_matte/lilac_purple/sizes.json deleted file mode 100644 index b9b13c109f..0000000000 --- a/data/novtau/PLA/pla_matte/lilac_purple/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "2a9a4dcc-4ab5-42b3-9879-796ea45e6601", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/lilac_purple/variant.json b/data/novtau/PLA/pla_matte/lilac_purple/variant.json deleted file mode 100644 index 822850159d..0000000000 --- a/data/novtau/PLA/pla_matte/lilac_purple/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "e8765041-7fbd-4056-8455-2e8f9a8e3b9c", - "id": "lilac_purple", - "name": "Lilac purple", - "color_hex": "#784EB1", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/mandarin_orange/sizes.json b/data/novtau/PLA/pla_matte/mandarin_orange/sizes.json deleted file mode 100644 index 02d48a0f1c..0000000000 --- a/data/novtau/PLA/pla_matte/mandarin_orange/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "bf1c625a-5f47-4621-b70d-193552c3948d", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/mandarin_orange/variant.json b/data/novtau/PLA/pla_matte/mandarin_orange/variant.json deleted file mode 100644 index edce4c745e..0000000000 --- a/data/novtau/PLA/pla_matte/mandarin_orange/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "93c5803f-e932-42ef-b238-aacd17112427", - "id": "mandarin_orange", - "name": "Mandarin Orange", - "color_hex": "#F35416", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/marine_blue/variant.json b/data/novtau/PLA/pla_matte/marine_blue/variant.json index 550c994cda..6af3fb995a 100644 --- a/data/novtau/PLA/pla_matte/marine_blue/variant.json +++ b/data/novtau/PLA/pla_matte/marine_blue/variant.json @@ -3,6 +3,7 @@ "id": "marine_blue", "name": "Marine Blue", "color_hex": "#1A5F95", + "discontinued": true, "traits": { "matte": true } diff --git a/data/novtau/PLA/pla_matte/matte_apple_green/sizes.json b/data/novtau/PLA/pla_matte/matte_apple_green/sizes.json new file mode 100644 index 0000000000..d1b7b6913c --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_apple_green/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "3dfafa0b-63a7-4724-88c8-dd95a3813523" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_apple_green/variant.json b/data/novtau/PLA/pla_matte/matte_apple_green/variant.json new file mode 100644 index 0000000000..d77f96bd6d --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_apple_green/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_apple_green", + "name": "Matte Apple Green", + "color_hex": "#098A4B", + "traits": { + "matte": true + }, + "uuid": "86df06c2-0df7-46b4-ad15-5648c207ecaa" +} diff --git a/data/novtau/PLA/pla_matte/matte_aqua_blue/sizes.json b/data/novtau/PLA/pla_matte/matte_aqua_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_aqua_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte/matte_aqua_blue/variant.json b/data/novtau/PLA/pla_matte/matte_aqua_blue/variant.json new file mode 100644 index 0000000000..11d202776a --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_aqua_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "matte_aqua_blue", + "name": "Matte Aqua Blue", + "color_hex": "#23A3CE", + "traits": { + "matte": true + } +} diff --git a/data/novtau/PLA/pla_matte/matte_ash_gray/sizes.json b/data/novtau/PLA/pla_matte/matte_ash_gray/sizes.json new file mode 100644 index 0000000000..f6c0215e8f --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_ash_gray/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "a52a8522-9446-4f92-9e5e-33c7da521b61" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_ash_gray/variant.json b/data/novtau/PLA/pla_matte/matte_ash_gray/variant.json new file mode 100644 index 0000000000..f24aeb1a38 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_ash_gray/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_ash_gray", + "name": "Matte Ash Gray", + "color_hex": "#6D6F75", + "traits": { + "matte": true + }, + "uuid": "d9d66036-dff5-4ee0-94e2-ab8e83f38ca9" +} diff --git a/data/novtau/PLA/pla_matte/matte_bone/sizes.json b/data/novtau/PLA/pla_matte/matte_bone/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_bone/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte/matte_bone/variant.json b/data/novtau/PLA/pla_matte/matte_bone/variant.json new file mode 100644 index 0000000000..3af2512a02 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_bone/variant.json @@ -0,0 +1,8 @@ +{ + "id": "matte_bone", + "name": "Matte Bone", + "color_hex": "#C2AC90", + "traits": { + "matte": true + } +} diff --git a/data/novtau/PLA/pla_matte/matte_caramel/sizes.json b/data/novtau/PLA/pla_matte/matte_caramel/sizes.json new file mode 100644 index 0000000000..1ee71fd9e4 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_caramel/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "147d22ab-26fc-4bb0-9911-c08d15392c83" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_caramel/variant.json b/data/novtau/PLA/pla_matte/matte_caramel/variant.json new file mode 100644 index 0000000000..882fc01a08 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_caramel/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_caramel", + "name": "Matte Caramel", + "color_hex": "#A15131", + "traits": { + "matte": true + }, + "uuid": "f9b9e850-d028-4153-ae05-74697cd0ba73" +} diff --git a/data/novtau/PLA/pla_matte/matte_charcoal/sizes.json b/data/novtau/PLA/pla_matte/matte_charcoal/sizes.json new file mode 100644 index 0000000000..cc391fe7c4 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_charcoal/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "7a36dc64-6c49-46d7-ba69-bacf3ba7eed2" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_charcoal/variant.json b/data/novtau/PLA/pla_matte/matte_charcoal/variant.json new file mode 100644 index 0000000000..63c27a81ef --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_charcoal/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_charcoal", + "name": "Matte Charcoal", + "color_hex": "#292929", + "traits": { + "matte": true + }, + "uuid": "7fe3beb9-72d5-4c75-b8f0-144cae2f62eb" +} diff --git a/data/novtau/PLA/pla_matte/matte_deep_pink/sizes.json b/data/novtau/PLA/pla_matte/matte_deep_pink/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_deep_pink/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte/matte_deep_pink/variant.json b/data/novtau/PLA/pla_matte/matte_deep_pink/variant.json new file mode 100644 index 0000000000..b53c91e76d --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_deep_pink/variant.json @@ -0,0 +1,8 @@ +{ + "id": "matte_deep_pink", + "name": "Matte Deep Pink", + "color_hex": "#DF5080", + "traits": { + "matte": true + } +} diff --git a/data/novtau/PLA/pla_matte/matte_desert_tan/sizes.json b/data/novtau/PLA/pla_matte/matte_desert_tan/sizes.json new file mode 100644 index 0000000000..4a5879238d --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_desert_tan/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "58396a8f-2c05-435a-b9f8-c776d54343c6" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_desert_tan/variant.json b/data/novtau/PLA/pla_matte/matte_desert_tan/variant.json new file mode 100644 index 0000000000..613648f151 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_desert_tan/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_desert_tan", + "name": "Matte Desert Tan", + "color_hex": "#C5A38A", + "traits": { + "matte": true + }, + "uuid": "a280a2e7-b030-4ac5-be69-2c79e61dfa3b" +} diff --git a/data/novtau/PLA/pla_matte/matte_ice_blue/sizes.json b/data/novtau/PLA/pla_matte/matte_ice_blue/sizes.json new file mode 100644 index 0000000000..4ac2e7d1be --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_ice_blue/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "6386200f-2592-44e4-9c7a-3e14d7e82bc6" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_ice_blue/variant.json b/data/novtau/PLA/pla_matte/matte_ice_blue/variant.json new file mode 100644 index 0000000000..8c60ae7977 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_ice_blue/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_ice_blue", + "name": "Matte Ice Blue", + "color_hex": "#2B9DE2", + "traits": { + "matte": true + }, + "uuid": "8d31c2bf-74d6-4c84-8613-7468c7a4dd76" +} diff --git a/data/novtau/PLA/pla_matte/matte_ivory_white/sizes.json b/data/novtau/PLA/pla_matte/matte_ivory_white/sizes.json new file mode 100644 index 0000000000..94af06efec --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_ivory_white/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "fe39d7c7-a394-47ec-a616-c639dd92278d" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_ivory_white/variant.json b/data/novtau/PLA/pla_matte/matte_ivory_white/variant.json new file mode 100644 index 0000000000..2c0d3a7417 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_ivory_white/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_ivory_white", + "name": "Matte Ivory White", + "color_hex": "#CCCAC9", + "traits": { + "matte": true + }, + "uuid": "26d168e5-2ca4-4522-9bc8-e42445bb5619" +} diff --git a/data/novtau/PLA/pla_matte/matte_latte_brown/sizes.json b/data/novtau/PLA/pla_matte/matte_latte_brown/sizes.json new file mode 100644 index 0000000000..115a8fc476 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_latte_brown/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "e88508e7-1ce2-4b9b-bf5a-f15363c821eb" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_latte_brown/variant.json b/data/novtau/PLA/pla_matte/matte_latte_brown/variant.json new file mode 100644 index 0000000000..fa3f3f57ba --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_latte_brown/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_latte_brown", + "name": "Matte Latte Brown", + "color_hex": "#C3A288", + "traits": { + "matte": true + }, + "uuid": "2c9651d1-a5b4-4b8d-9719-39cb2a7178b7" +} diff --git a/data/novtau/PLA/pla_matte/matte_lemon_yellow/sizes.json b/data/novtau/PLA/pla_matte/matte_lemon_yellow/sizes.json new file mode 100644 index 0000000000..193625a2c4 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_lemon_yellow/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "c35bc566-0083-4ded-97fa-64a5005adcb2" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_lemon_yellow/variant.json b/data/novtau/PLA/pla_matte/matte_lemon_yellow/variant.json new file mode 100644 index 0000000000..96902a02fd --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_lemon_yellow/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_lemon_yellow", + "name": "Matte Lemon Yellow", + "color_hex": "#E5BD15", + "traits": { + "matte": true + }, + "uuid": "23f5a568-7189-4bce-8d18-d160121bca4b" +} diff --git a/data/novtau/PLA/pla_matte/matte_lilac_purple/sizes.json b/data/novtau/PLA/pla_matte/matte_lilac_purple/sizes.json new file mode 100644 index 0000000000..659430071e --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_lilac_purple/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "2a9a4dcc-4ab5-42b3-9879-796ea45e6601" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_lilac_purple/variant.json b/data/novtau/PLA/pla_matte/matte_lilac_purple/variant.json new file mode 100644 index 0000000000..35d9e803ef --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_lilac_purple/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_lilac_purple", + "name": "Matte Lilac purple", + "color_hex": "#743EA1", + "traits": { + "matte": true + }, + "uuid": "e8765041-7fbd-4056-8455-2e8f9a8e3b9c" +} diff --git a/data/novtau/PLA/pla_matte/matte_mandarin_orange/sizes.json b/data/novtau/PLA/pla_matte/matte_mandarin_orange/sizes.json new file mode 100644 index 0000000000..d48aec0773 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_mandarin_orange/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "bf1c625a-5f47-4621-b70d-193552c3948d" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_mandarin_orange/variant.json b/data/novtau/PLA/pla_matte/matte_mandarin_orange/variant.json new file mode 100644 index 0000000000..101f8728b2 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_mandarin_orange/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_mandarin_orange", + "name": "Matte Mandarin Orange", + "color_hex": "#F35416", + "traits": { + "matte": true + }, + "uuid": "93c5803f-e932-42ef-b238-aacd17112427" +} diff --git a/data/novtau/PLA/pla_matte/matte_mint_green/sizes.json b/data/novtau/PLA/pla_matte/matte_mint_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_mint_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte/matte_mint_green/variant.json b/data/novtau/PLA/pla_matte/matte_mint_green/variant.json new file mode 100644 index 0000000000..d90dec3f4a --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_mint_green/variant.json @@ -0,0 +1,8 @@ +{ + "id": "matte_mint_green", + "name": "Matte Mint Green", + "color_hex": "#8CD5CD", + "traits": { + "matte": true + } +} diff --git a/data/novtau/PLA/pla_matte/matte_nardo_gray/sizes.json b/data/novtau/PLA/pla_matte/matte_nardo_gray/sizes.json new file mode 100644 index 0000000000..fa9268527d --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_nardo_gray/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "8181433d-b94c-49bf-89e8-fdd924e852a7" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_nardo_gray/variant.json b/data/novtau/PLA/pla_matte/matte_nardo_gray/variant.json new file mode 100644 index 0000000000..c48050d1bd --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_nardo_gray/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_nardo_gray", + "name": "Matte Nardo Gray", + "color_hex": "#5C5B5E", + "traits": { + "matte": true + }, + "uuid": "44929657-0726-4e8e-9d88-2eeb8012e8e8" +} diff --git a/data/novtau/PLA/pla_matte/matte_navy_blue/sizes.json b/data/novtau/PLA/pla_matte/matte_navy_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_navy_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte/matte_navy_blue/variant.json b/data/novtau/PLA/pla_matte/matte_navy_blue/variant.json new file mode 100644 index 0000000000..b8ccc58439 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_navy_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "matte_navy_blue", + "name": "Matte Navy Blue", + "color_hex": "#33455E", + "traits": { + "matte": true + } +} diff --git a/data/novtau/PLA/pla_matte/matte_ochre/sizes.json b/data/novtau/PLA/pla_matte/matte_ochre/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_ochre/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte/matte_ochre/variant.json b/data/novtau/PLA/pla_matte/matte_ochre/variant.json new file mode 100644 index 0000000000..104b08a86f --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_ochre/variant.json @@ -0,0 +1,8 @@ +{ + "id": "matte_ochre", + "name": "Matte Ochre", + "color_hex": "#C5A05A", + "traits": { + "matte": true + } +} diff --git a/data/novtau/PLA/pla_matte/matte_olive_green/sizes.json b/data/novtau/PLA/pla_matte/matte_olive_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_olive_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte/matte_olive_green/variant.json b/data/novtau/PLA/pla_matte/matte_olive_green/variant.json new file mode 100644 index 0000000000..94c369c3d3 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_olive_green/variant.json @@ -0,0 +1,8 @@ +{ + "id": "matte_olive_green", + "name": "Matte Olive Green", + "color_hex": "#6D7552", + "traits": { + "matte": true + } +} diff --git a/data/novtau/PLA/pla_matte/matte_sakura_pink/sizes.json b/data/novtau/PLA/pla_matte/matte_sakura_pink/sizes.json new file mode 100644 index 0000000000..bf5944dfcc --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_sakura_pink/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "b505b6a0-3acc-45e4-9f0e-4378a7632b2a" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_sakura_pink/variant.json b/data/novtau/PLA/pla_matte/matte_sakura_pink/variant.json new file mode 100644 index 0000000000..0a16cbff3d --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_sakura_pink/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_sakura_pink", + "name": "Matte Sakura Pink", + "color_hex": "#D78295", + "traits": { + "matte": true + }, + "uuid": "5bd56986-3ad1-46be-9e58-254a3d208fbc" +} diff --git a/data/novtau/PLA/pla_matte/matte_scarlet_red/sizes.json b/data/novtau/PLA/pla_matte/matte_scarlet_red/sizes.json new file mode 100644 index 0000000000..b596eeb45e --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_scarlet_red/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "5845e986-5733-4cbb-b9bb-b687dcf4b377" + } +] diff --git a/data/novtau/PLA/pla_matte/matte_scarlet_red/variant.json b/data/novtau/PLA/pla_matte/matte_scarlet_red/variant.json new file mode 100644 index 0000000000..2e3f8604ff --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_scarlet_red/variant.json @@ -0,0 +1,9 @@ +{ + "id": "matte_scarlet_red", + "name": "Matte Scarlet Red", + "color_hex": "#D22423", + "traits": { + "matte": true + }, + "uuid": "2514024d-9d3b-407f-add5-a5f864affb32" +} diff --git a/data/novtau/PLA/pla_matte/matte_terracotta_red/sizes.json b/data/novtau/PLA/pla_matte/matte_terracotta_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_terracotta_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte/matte_terracotta_red/variant.json b/data/novtau/PLA/pla_matte/matte_terracotta_red/variant.json new file mode 100644 index 0000000000..ad6f6b88a1 --- /dev/null +++ b/data/novtau/PLA/pla_matte/matte_terracotta_red/variant.json @@ -0,0 +1,8 @@ +{ + "id": "matte_terracotta_red", + "name": "Matte Terracotta Red", + "color_hex": "#AE705F", + "traits": { + "matte": true + } +} diff --git a/data/novtau/PLA/pla_matte/nardo_gray/sizes.json b/data/novtau/PLA/pla_matte/nardo_gray/sizes.json deleted file mode 100644 index 71ee8cb184..0000000000 --- a/data/novtau/PLA/pla_matte/nardo_gray/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "8181433d-b94c-49bf-89e8-fdd924e852a7", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/nardo_gray/variant.json b/data/novtau/PLA/pla_matte/nardo_gray/variant.json deleted file mode 100644 index 2ff7a5ddd7..0000000000 --- a/data/novtau/PLA/pla_matte/nardo_gray/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "44929657-0726-4e8e-9d88-2eeb8012e8e8", - "id": "nardo_gray", - "name": "Nardo Gray", - "color_hex": "#5C5B5E", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/plum/variant.json b/data/novtau/PLA/pla_matte/plum/variant.json index 6b203e4426..dffae8e751 100644 --- a/data/novtau/PLA/pla_matte/plum/variant.json +++ b/data/novtau/PLA/pla_matte/plum/variant.json @@ -3,6 +3,7 @@ "id": "plum", "name": "Plum", "color_hex": "#794FB2", + "discontinued": true, "traits": { "matte": true } diff --git a/data/novtau/PLA/pla_matte/sakura_pink/sizes.json b/data/novtau/PLA/pla_matte/sakura_pink/sizes.json deleted file mode 100644 index 178e00cd30..0000000000 --- a/data/novtau/PLA/pla_matte/sakura_pink/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "b505b6a0-3acc-45e4-9f0e-4378a7632b2a", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/sakura_pink/variant.json b/data/novtau/PLA/pla_matte/sakura_pink/variant.json deleted file mode 100644 index 584630ea21..0000000000 --- a/data/novtau/PLA/pla_matte/sakura_pink/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "5bd56986-3ad1-46be-9e58-254a3d208fbc", - "id": "sakura_pink", - "name": "Sakura Pink", - "color_hex": "#D78295", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/scarlet_red/sizes.json b/data/novtau/PLA/pla_matte/scarlet_red/sizes.json deleted file mode 100644 index cee72d2fda..0000000000 --- a/data/novtau/PLA/pla_matte/scarlet_red/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "5845e986-5733-4cbb-b9bb-b687dcf4b377", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte/scarlet_red/variant.json b/data/novtau/PLA/pla_matte/scarlet_red/variant.json deleted file mode 100644 index aaf87db0de..0000000000 --- a/data/novtau/PLA/pla_matte/scarlet_red/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "2514024d-9d3b-407f-add5-a5f864affb32", - "id": "scarlet_red", - "name": "Scarlet Red", - "color_hex": "#D22423", - "traits": { - "matte": true - } -} diff --git a/data/novtau/PLA/pla_matte/sky_blue/variant.json b/data/novtau/PLA/pla_matte/sky_blue/variant.json index 979fe29e1e..f49a680f63 100644 --- a/data/novtau/PLA/pla_matte/sky_blue/variant.json +++ b/data/novtau/PLA/pla_matte/sky_blue/variant.json @@ -3,6 +3,7 @@ "id": "sky_blue", "name": "Sky Blue", "color_hex": "#0989E1", + "discontinued": true, "traits": { "matte": true } diff --git a/data/novtau/PLA/pla_matte/terracotta/variant.json b/data/novtau/PLA/pla_matte/terracotta/variant.json index a7ce5da48b..f86cf228c3 100644 --- a/data/novtau/PLA/pla_matte/terracotta/variant.json +++ b/data/novtau/PLA/pla_matte/terracotta/variant.json @@ -3,6 +3,7 @@ "id": "terracotta", "name": "Terracotta", "color_hex": "#F45516", + "discontinued": true, "traits": { "matte": true } diff --git a/data/novtau/PLA/pla_matte_multi_color/dopamine/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dopamine/sizes.json deleted file mode 100644 index f50b3e56fe..0000000000 --- a/data/novtau/PLA/pla_matte_multi_color/dopamine/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "e6525eb6-5b2d-45ae-9947-7d1bf08de421", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_black_blue/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_black_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_black_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_black_blue/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_black_blue/variant.json new file mode 100644 index 0000000000..119e486f03 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_black_blue/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_black_blue", + "name": "Dual Black-Blue", + "color_hex": [ + "#222428", + "#1650AC" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_black_green/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_black_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_black_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_black_green/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_black_green/variant.json new file mode 100644 index 0000000000..28455595a3 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_black_green/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_black_green", + "name": "Dual Black-Green", + "color_hex": [ + "#222428", + "#257757" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_black_orange/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_black_orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_black_orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_black_orange/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_black_orange/variant.json new file mode 100644 index 0000000000..2962408fd0 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_black_orange/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_black_orange", + "name": "Dual Black-Orange", + "color_hex": [ + "#222428", + "#CC6925" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_black_purple/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_black_purple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_black_purple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_black_purple/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_black_purple/variant.json new file mode 100644 index 0000000000..b27d0e491f --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_black_purple/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_black_purple", + "name": "Dual Black-Purple", + "color_hex": [ + "#222428", + "#813590" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_black_red/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_black_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_black_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_black_red/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_black_red/variant.json new file mode 100644 index 0000000000..1aea3ee6bf --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_black_red/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_black_red", + "name": "Dual Black-Red", + "color_hex": [ + "#222428", + "#B12C23" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_blue_red/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_blue_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_blue_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_blue_red/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_blue_red/variant.json new file mode 100644 index 0000000000..cd8de279bf --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_blue_red/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_blue_red", + "name": "Dual Blue-Red", + "color_hex": [ + "#165FC6", + "#C33E42" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_green_magenta/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_green_magenta/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_green_magenta/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_green_magenta/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_green_magenta/variant.json new file mode 100644 index 0000000000..2ddbc3bb0d --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_green_magenta/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_green_magenta", + "name": "Dual Green-Magenta", + "color_hex": [ + "#6BB66E", + "#A96596" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_pink_yellow/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_pink_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_pink_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_pink_yellow/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_pink_yellow/variant.json new file mode 100644 index 0000000000..03023800ce --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_pink_yellow/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_pink_yellow", + "name": "Dual Pink-Yellow", + "color_hex": [ + "#EA6E83", + "#F2C880" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_purple_green/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_purple_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_purple_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_purple_green/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_purple_green/variant.json new file mode 100644 index 0000000000..9b5c5f1516 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_purple_green/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_purple_green", + "name": "Dual Purple-Green", + "color_hex": [ + "#6D5895", + "#69B875" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_purple_yellow/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_purple_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_purple_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_purple_yellow/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_purple_yellow/variant.json new file mode 100644 index 0000000000..7629a07166 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_purple_yellow/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_purple_yellow", + "name": "Dual Purple-Yellow", + "color_hex": [ + "#E3B653", + "#63428C" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_pink/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_pink/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_pink/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_pink/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_pink/variant.json new file mode 100644 index 0000000000..780ee59490 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_pink/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_sky_blue_pink", + "name": "Dual Sky Blue-Pink", + "color_hex": [ + "#DB8BA9", + "#78A2DC" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_purple/sizes.json b/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_purple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_purple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_purple/variant.json b/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_purple/variant.json new file mode 100644 index 0000000000..b609e881e6 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/dual_sky_blue_purple/variant.json @@ -0,0 +1,12 @@ +{ + "id": "dual_sky_blue_purple", + "name": "Dual Sky Blue-Purple", + "color_hex": [ + "#5E8DC9", + "#9B6CBB" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/filament.json b/data/novtau/PLA/pla_matte_multi_color/filament.json index 4da469a2f1..013162dc30 100644 --- a/data/novtau/PLA/pla_matte_multi_color/filament.json +++ b/data/novtau/PLA/pla_matte_multi_color/filament.json @@ -1,7 +1,7 @@ { - "uuid": "bc01f3f6-2d9a-40e6-bdbf-27807a168ec4", "id": "pla_matte_multi_color", "name": "PLA Matte Multi-Color", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "bc01f3f6-2d9a-40e6-bdbf-27807a168ec4" } diff --git a/data/novtau/PLA/pla_matte_multi_color/macaron/sizes.json b/data/novtau/PLA/pla_matte_multi_color/macaron/sizes.json deleted file mode 100644 index 07f66f8697..0000000000 --- a/data/novtau/PLA/pla_matte_multi_color/macaron/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "22987b51-7313-49b4-a991-47760a51fcf1", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_matte_multi_color/matte_dopamine/sizes.json b/data/novtau/PLA/pla_matte_multi_color/matte_dopamine/sizes.json new file mode 100644 index 0000000000..009fc9d159 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/matte_dopamine/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "e6525eb6-5b2d-45ae-9947-7d1bf08de421" + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/dopamine/variant.json b/data/novtau/PLA/pla_matte_multi_color/matte_dopamine/variant.json similarity index 62% rename from data/novtau/PLA/pla_matte_multi_color/dopamine/variant.json rename to data/novtau/PLA/pla_matte_multi_color/matte_dopamine/variant.json index 936cd97154..dc86222f9d 100644 --- a/data/novtau/PLA/pla_matte_multi_color/dopamine/variant.json +++ b/data/novtau/PLA/pla_matte_multi_color/matte_dopamine/variant.json @@ -1,10 +1,10 @@ { "uuid": "dcec7b3d-2154-49bf-98d9-10067d431823", - "id": "dopamine", - "name": "Dopamine", + "id": "matte_dopamine", + "name": "Matte Dopamine", "color_hex": [ - "#A1CDEA", - "#B398B1" + "#87C9EA", + "#D7A0B3" ], "traits": { "matte": true, diff --git a/data/novtau/PLA/pla_matte_multi_color/matte_macaron/sizes.json b/data/novtau/PLA/pla_matte_multi_color/matte_macaron/sizes.json new file mode 100644 index 0000000000..8f11ccbb97 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/matte_macaron/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "22987b51-7313-49b4-a991-47760a51fcf1" + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/macaron/variant.json b/data/novtau/PLA/pla_matte_multi_color/matte_macaron/variant.json similarity index 62% rename from data/novtau/PLA/pla_matte_multi_color/macaron/variant.json rename to data/novtau/PLA/pla_matte_multi_color/matte_macaron/variant.json index 6d04a93664..07576b46eb 100644 --- a/data/novtau/PLA/pla_matte_multi_color/macaron/variant.json +++ b/data/novtau/PLA/pla_matte_multi_color/matte_macaron/variant.json @@ -1,10 +1,10 @@ { "uuid": "1635e6cc-16fa-444e-918b-187c22afc350", - "id": "macaron", - "name": "Macaron", + "id": "matte_macaron", + "name": "Matte Macaron", "color_hex": [ - "#DFD1A7", - "#84CFBE" + "#E1C08D", + "#6ACFC9" ], "traits": { "matte": true, diff --git a/data/novtau/PLA/pla_matte_multi_color/peach_cream/sizes.json b/data/novtau/PLA/pla_matte_multi_color/peach_cream/sizes.json index 7a401face4..e523c8a5ac 100644 --- a/data/novtau/PLA/pla_matte_multi_color/peach_cream/sizes.json +++ b/data/novtau/PLA/pla_matte_multi_color/peach_cream/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "70c25241-8af1-4faa-836f-67e81778a257", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "70c25241-8af1-4faa-836f-67e81778a257" } ] diff --git a/data/novtau/PLA/pla_matte_multi_color/peach_cream/variant.json b/data/novtau/PLA/pla_matte_multi_color/peach_cream/variant.json index 20c120dc4e..140320cc35 100644 --- a/data/novtau/PLA/pla_matte_multi_color/peach_cream/variant.json +++ b/data/novtau/PLA/pla_matte_multi_color/peach_cream/variant.json @@ -1,13 +1,13 @@ { - "uuid": "2432bc55-213b-4ed7-8a38-614c5a83a7e3", "id": "peach_cream", "name": "Peach Cream", "color_hex": [ - "#F0C8B4", - "#B77A64" + "#EDC7B3", + "#B47963" ], "traits": { "matte": true, "coextruded": true - } + }, + "uuid": "2432bc55-213b-4ed7-8a38-614c5a83a7e3" } diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_apple/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_apple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_apple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_apple/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_apple/variant.json new file mode 100644 index 0000000000..826e4f7868 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_apple/variant.json @@ -0,0 +1,14 @@ +{ + "id": "rainbow_apple", + "name": "Rainbow Apple", + "color_hex": [ + "#E478A2", + "#65C5A1", + "#CDDA71", + "#AD89C3" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_cotton_candy/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_cotton_candy/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_cotton_candy/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_cotton_candy/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_cotton_candy/variant.json new file mode 100644 index 0000000000..60f98235fa --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_cotton_candy/variant.json @@ -0,0 +1,14 @@ +{ + "id": "rainbow_cotton_candy", + "name": "Rainbow Cotton Candy", + "color_hex": [ + "#EBAC83", + "#88BCDA", + "#A972B2", + "#E186A7" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_deep_sea/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_deep_sea/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_deep_sea/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_deep_sea/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_deep_sea/variant.json new file mode 100644 index 0000000000..c71c675696 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_deep_sea/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_deep_sea", + "name": "Rainbow Deep Sea", + "color_hex": [ + "#0AADC7", + "#8B70C0", + "#2662AC" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_dream/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_dream/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_dream/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_dream/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_dream/variant.json new file mode 100644 index 0000000000..40fa251d81 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_dream/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_dream", + "name": "Rainbow Dream", + "color_hex": [ + "#7DE1D4", + "#C5678C", + "#E8DBA6" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_fruit_candy/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_fruit_candy/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_fruit_candy/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_fruit_candy/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_fruit_candy/variant.json new file mode 100644 index 0000000000..fd73ff2f50 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_fruit_candy/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_fruit_candy", + "name": "Rainbow Fruit Candy", + "color_hex": [ + "#0459C4", + "#DB5784", + "#763F99" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_ice_cream/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_ice_cream/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_ice_cream/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_ice_cream/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_ice_cream/variant.json new file mode 100644 index 0000000000..305d9e056f --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_ice_cream/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_ice_cream", + "name": "Rainbow Ice Cream", + "color_hex": [ + "#91D8D5", + "#C8979C", + "#82ACA0" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_lollipop/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_lollipop/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_lollipop/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_lollipop/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_lollipop/variant.json new file mode 100644 index 0000000000..71a3ceae84 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_lollipop/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_lollipop", + "name": "Rainbow Lollipop", + "color_hex": [ + "#EAA479", + "#94CBC3", + "#A1B37A" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_peach/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_peach/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_peach/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_peach/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_peach/variant.json new file mode 100644 index 0000000000..5bab94d760 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_peach/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_peach", + "name": "Rainbow Peach", + "color_hex": [ + "#F59560", + "#36C4B3", + "#96CF74" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_red_blue/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_red_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_red_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_red_blue/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_red_blue/variant.json new file mode 100644 index 0000000000..74ae3a7bc6 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_red_blue/variant.json @@ -0,0 +1,12 @@ +{ + "id": "rainbow_red_blue", + "name": "Rainbow Red-Blue", + "color_hex": [ + "#66BDEB", + "#DF7EAB" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_rice_field/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_rice_field/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_rice_field/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_rice_field/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_rice_field/variant.json new file mode 100644 index 0000000000..eb23ab59ad --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_rice_field/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_rice_field", + "name": "Rainbow Rice Field", + "color_hex": [ + "#95C446", + "#45C291", + "#E0D353" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_sunrise/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_sunrise/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_sunrise/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_sunrise/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_sunrise/variant.json new file mode 100644 index 0000000000..f48f25c04e --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_sunrise/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_sunrise", + "name": "Rainbow Sunrise", + "color_hex": [ + "#EE803E", + "#4D9FB4", + "#C1C87A" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_yellow_green/sizes.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_yellow_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_yellow_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/rainbow_yellow_green/variant.json b/data/novtau/PLA/pla_matte_multi_color/rainbow_yellow_green/variant.json new file mode 100644 index 0000000000..c3bbb1f64b --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/rainbow_yellow_green/variant.json @@ -0,0 +1,12 @@ +{ + "id": "rainbow_yellow_green", + "name": "Rainbow Yellow-Green", + "color_hex": [ + "#D7EB1B", + "#07C4AA" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/spring_bloom/sizes.json b/data/novtau/PLA/pla_matte_multi_color/spring_bloom/sizes.json index 03e80189a3..6499fe10d6 100644 --- a/data/novtau/PLA/pla_matte_multi_color/spring_bloom/sizes.json +++ b/data/novtau/PLA/pla_matte_multi_color/spring_bloom/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "502d065b-e942-423b-899a-d69fe60237e7", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "502d065b-e942-423b-899a-d69fe60237e7" } ] diff --git a/data/novtau/PLA/pla_matte_multi_color/spring_bloom/variant.json b/data/novtau/PLA/pla_matte_multi_color/spring_bloom/variant.json index 4e772b6dd8..c25a929053 100644 --- a/data/novtau/PLA/pla_matte_multi_color/spring_bloom/variant.json +++ b/data/novtau/PLA/pla_matte_multi_color/spring_bloom/variant.json @@ -1,13 +1,13 @@ { - "uuid": "06c94f8e-a7b1-4a42-8f96-e87c4f8bc566", "id": "spring_bloom", "name": "Spring Bloom", "color_hex": [ - "#C8DF9A", - "#8EB061" + "#C7DD99", + "#8DAD62" ], "traits": { "matte": true, "coextruded": true - } + }, + "uuid": "06c94f8e-a7b1-4a42-8f96-e87c4f8bc566" } diff --git a/data/novtau/PLA/pla_matte_multi_color/starlit_dream/sizes.json b/data/novtau/PLA/pla_matte_multi_color/starlit_dream/sizes.json index e4cd5f805a..949d170565 100644 --- a/data/novtau/PLA/pla_matte_multi_color/starlit_dream/sizes.json +++ b/data/novtau/PLA/pla_matte_multi_color/starlit_dream/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "9857909c-80df-47b3-b7a8-2c7d59b29352", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "9857909c-80df-47b3-b7a8-2c7d59b29352" } ] diff --git a/data/novtau/PLA/pla_matte_multi_color/starlit_dream/variant.json b/data/novtau/PLA/pla_matte_multi_color/starlit_dream/variant.json index 7ad3051d99..eca48154bb 100644 --- a/data/novtau/PLA/pla_matte_multi_color/starlit_dream/variant.json +++ b/data/novtau/PLA/pla_matte_multi_color/starlit_dream/variant.json @@ -1,13 +1,13 @@ { - "uuid": "700ca4f2-7c51-4f63-906d-3cf84da56615", "id": "starlit_dream", "name": "Starlit Dream", "color_hex": [ - "#B5D2E2", - "#8099B2" + "#B2D0DF", + "#7E98AF" ], "traits": { "matte": true, "coextruded": true - } + }, + "uuid": "700ca4f2-7c51-4f63-906d-3cf84da56615" } diff --git a/data/novtau/PLA/pla_matte_multi_color/tri_pink_yellow_blue/sizes.json b/data/novtau/PLA/pla_matte_multi_color/tri_pink_yellow_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/tri_pink_yellow_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/tri_pink_yellow_blue/variant.json b/data/novtau/PLA/pla_matte_multi_color/tri_pink_yellow_blue/variant.json new file mode 100644 index 0000000000..1213c35751 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/tri_pink_yellow_blue/variant.json @@ -0,0 +1,13 @@ +{ + "id": "tri_pink_yellow_blue", + "name": "Tri Pink-Yellow-Blue", + "color_hex": [ + "#E3CD6C", + "#6AB9E9", + "#E38292" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_matte_multi_color/tri_red_yellow_blue/sizes.json b/data/novtau/PLA/pla_matte_multi_color/tri_red_yellow_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/tri_red_yellow_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_matte_multi_color/tri_red_yellow_blue/variant.json b/data/novtau/PLA/pla_matte_multi_color/tri_red_yellow_blue/variant.json new file mode 100644 index 0000000000..2e7c7f5a50 --- /dev/null +++ b/data/novtau/PLA/pla_matte_multi_color/tri_red_yellow_blue/variant.json @@ -0,0 +1,13 @@ +{ + "id": "tri_red_yellow_blue", + "name": "Tri Red-Yellow-Blue", + "color_hex": [ + "#E83523", + "#1E65D1", + "#E0C051" + ], + "traits": { + "matte": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_metal/copper_brown_metallic/sizes.json b/data/novtau/PLA/pla_metal/copper_brown_metallic/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_metal/copper_brown_metallic/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_metal/copper_brown_metallic/variant.json b/data/novtau/PLA/pla_metal/copper_brown_metallic/variant.json new file mode 100644 index 0000000000..c6c09a16de --- /dev/null +++ b/data/novtau/PLA/pla_metal/copper_brown_metallic/variant.json @@ -0,0 +1,8 @@ +{ + "id": "copper_brown_metallic", + "name": "Copper Brown Metallic", + "color_hex": "#634738", + "traits": { + "imitates_metal": true + } +} diff --git a/data/novtau/PLA/pla_metal/filament.json b/data/novtau/PLA/pla_metal/filament.json new file mode 100644 index 0000000000..3beca0ffb7 --- /dev/null +++ b/data/novtau/PLA/pla_metal/filament.json @@ -0,0 +1,6 @@ +{ + "id": "pla_metal", + "name": "PLA Metallic", + "diameter_tolerance": 0.02, + "density": 1.24 +} diff --git a/data/novtau/PLA/pla_metal/iron_gray_metallic/sizes.json b/data/novtau/PLA/pla_metal/iron_gray_metallic/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_metal/iron_gray_metallic/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_metal/iron_gray_metallic/variant.json b/data/novtau/PLA/pla_metal/iron_gray_metallic/variant.json new file mode 100644 index 0000000000..2f8b12be3c --- /dev/null +++ b/data/novtau/PLA/pla_metal/iron_gray_metallic/variant.json @@ -0,0 +1,8 @@ +{ + "id": "iron_gray_metallic", + "name": "Iron Gray Metallic", + "color_hex": "#4B4945", + "traits": { + "imitates_metal": true + } +} diff --git a/data/novtau/PLA/pla_metal/steel_gray_metallic/sizes.json b/data/novtau/PLA/pla_metal/steel_gray_metallic/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_metal/steel_gray_metallic/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_metal/steel_gray_metallic/variant.json b/data/novtau/PLA/pla_metal/steel_gray_metallic/variant.json new file mode 100644 index 0000000000..d94707756b --- /dev/null +++ b/data/novtau/PLA/pla_metal/steel_gray_metallic/variant.json @@ -0,0 +1,8 @@ +{ + "id": "steel_gray_metallic", + "name": "Steel Gray Metallic", + "color_hex": "#6C6B6B", + "traits": { + "imitates_metal": true + } +} diff --git a/data/novtau/PLA/pla_pearl/blue/sizes.json b/data/novtau/PLA/pla_pearl/blue/sizes.json deleted file mode 100644 index f4d6d6961a..0000000000 --- a/data/novtau/PLA/pla_pearl/blue/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "de903c27-b034-4036-a549-9840be9a9aa3", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_pearl/blue/variant.json b/data/novtau/PLA/pla_pearl/blue/variant.json deleted file mode 100644 index a3c23e8051..0000000000 --- a/data/novtau/PLA/pla_pearl/blue/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "34a9e4e1-e321-40f1-9a7d-538b9aaa9c8f", - "id": "blue", - "name": "Blue", - "color_hex": "#79D1E6", - "traits": { - "pearlescent": true - } -} diff --git a/data/novtau/PLA/pla_pearl/filament.json b/data/novtau/PLA/pla_pearl/filament.json index c33c7afd2a..c839b48ce8 100644 --- a/data/novtau/PLA/pla_pearl/filament.json +++ b/data/novtau/PLA/pla_pearl/filament.json @@ -1,7 +1,7 @@ { - "uuid": "f935f367-0593-4320-a6df-cda4c16e9481", "id": "pla_pearl", "name": "PLA Pearl", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "f935f367-0593-4320-a6df-cda4c16e9481" } diff --git a/data/novtau/PLA/pla_pearl/green/sizes.json b/data/novtau/PLA/pla_pearl/green/sizes.json deleted file mode 100644 index 9b3d81a488..0000000000 --- a/data/novtau/PLA/pla_pearl/green/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "abf0142b-75f9-4259-ad8a-c23d5d5090dd", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_pearl/green/variant.json b/data/novtau/PLA/pla_pearl/green/variant.json deleted file mode 100644 index 32dcccbb40..0000000000 --- a/data/novtau/PLA/pla_pearl/green/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "55326a1f-abcf-43a0-8078-3329c4d3df68", - "id": "green", - "name": "Green", - "color_hex": "#94CCB9", - "traits": { - "pearlescent": true - } -} diff --git a/data/novtau/PLA/pla_pearl/pearl_blue/sizes.json b/data/novtau/PLA/pla_pearl/pearl_blue/sizes.json new file mode 100644 index 0000000000..90e8f7e180 --- /dev/null +++ b/data/novtau/PLA/pla_pearl/pearl_blue/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "de903c27-b034-4036-a549-9840be9a9aa3" + } +] diff --git a/data/novtau/PLA/pla_pearl/pearl_blue/variant.json b/data/novtau/PLA/pla_pearl/pearl_blue/variant.json new file mode 100644 index 0000000000..faf61ffb35 --- /dev/null +++ b/data/novtau/PLA/pla_pearl/pearl_blue/variant.json @@ -0,0 +1,9 @@ +{ + "id": "pearl_blue", + "name": "Pearl Blue", + "color_hex": "#78CFE4", + "traits": { + "pearlescent": true + }, + "uuid": "34a9e4e1-e321-40f1-9a7d-538b9aaa9c8f" +} diff --git a/data/novtau/PLA/pla_pearl/pearl_green/sizes.json b/data/novtau/PLA/pla_pearl/pearl_green/sizes.json new file mode 100644 index 0000000000..b5810fe719 --- /dev/null +++ b/data/novtau/PLA/pla_pearl/pearl_green/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "abf0142b-75f9-4259-ad8a-c23d5d5090dd" + } +] diff --git a/data/novtau/PLA/pla_pearl/pearl_green/variant.json b/data/novtau/PLA/pla_pearl/pearl_green/variant.json new file mode 100644 index 0000000000..29c0734a7f --- /dev/null +++ b/data/novtau/PLA/pla_pearl/pearl_green/variant.json @@ -0,0 +1,9 @@ +{ + "id": "pearl_green", + "name": "Pearl Green", + "color_hex": "#93CAB7", + "traits": { + "pearlescent": true + }, + "uuid": "55326a1f-abcf-43a0-8078-3329c4d3df68" +} diff --git a/data/novtau/PLA/pla_pearl/pearl_pink/sizes.json b/data/novtau/PLA/pla_pearl/pearl_pink/sizes.json new file mode 100644 index 0000000000..7c4720b7c5 --- /dev/null +++ b/data/novtau/PLA/pla_pearl/pearl_pink/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "3ed67361-0130-4341-a44b-cb99f1f79e86" + } +] diff --git a/data/novtau/PLA/pla_pearl/pearl_pink/variant.json b/data/novtau/PLA/pla_pearl/pearl_pink/variant.json new file mode 100644 index 0000000000..2f1c94128c --- /dev/null +++ b/data/novtau/PLA/pla_pearl/pearl_pink/variant.json @@ -0,0 +1,9 @@ +{ + "id": "pearl_pink", + "name": "Pearl Pink", + "color_hex": "#E38EAA", + "traits": { + "pearlescent": true + }, + "uuid": "ab846129-9f7d-41c3-956d-325e63d68d9d" +} diff --git a/data/novtau/PLA/pla_pearl/pearl_purple/sizes.json b/data/novtau/PLA/pla_pearl/pearl_purple/sizes.json new file mode 100644 index 0000000000..ecce49a984 --- /dev/null +++ b/data/novtau/PLA/pla_pearl/pearl_purple/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "a875a4dd-c5fc-43ef-a747-91e1942c29cf" + } +] diff --git a/data/novtau/PLA/pla_pearl/pearl_purple/variant.json b/data/novtau/PLA/pla_pearl/pearl_purple/variant.json new file mode 100644 index 0000000000..8f23f63114 --- /dev/null +++ b/data/novtau/PLA/pla_pearl/pearl_purple/variant.json @@ -0,0 +1,9 @@ +{ + "id": "pearl_purple", + "name": "Pearl Purple", + "color_hex": "#885CBF", + "traits": { + "pearlescent": true + }, + "uuid": "6b7dded3-58e3-41d3-a290-98a87e9cfb9c" +} diff --git a/data/novtau/PLA/pla_pearl/pearl_yellow/sizes.json b/data/novtau/PLA/pla_pearl/pearl_yellow/sizes.json new file mode 100644 index 0000000000..d318db6156 --- /dev/null +++ b/data/novtau/PLA/pla_pearl/pearl_yellow/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ea0bb6a9-680e-4af4-a4b8-4c8708e67cd7" + } +] diff --git a/data/novtau/PLA/pla_pearl/pearl_yellow/variant.json b/data/novtau/PLA/pla_pearl/pearl_yellow/variant.json new file mode 100644 index 0000000000..1732d0c956 --- /dev/null +++ b/data/novtau/PLA/pla_pearl/pearl_yellow/variant.json @@ -0,0 +1,9 @@ +{ + "id": "pearl_yellow", + "name": "Pearl Yellow", + "color_hex": "#EECC38", + "traits": { + "pearlescent": true + }, + "uuid": "de2fb220-e02b-4c0a-a6cc-4b409c39eaba" +} diff --git a/data/novtau/PLA/pla_pearl/pink/sizes.json b/data/novtau/PLA/pla_pearl/pink/sizes.json deleted file mode 100644 index 9f1ff2a3af..0000000000 --- a/data/novtau/PLA/pla_pearl/pink/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "3ed67361-0130-4341-a44b-cb99f1f79e86", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_pearl/pink/variant.json b/data/novtau/PLA/pla_pearl/pink/variant.json deleted file mode 100644 index 58049a5457..0000000000 --- a/data/novtau/PLA/pla_pearl/pink/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "ab846129-9f7d-41c3-956d-325e63d68d9d", - "id": "pink", - "name": "Pink", - "color_hex": "#E38EAA", - "traits": { - "pearlescent": true - } -} diff --git a/data/novtau/PLA/pla_pearl/purple/sizes.json b/data/novtau/PLA/pla_pearl/purple/sizes.json deleted file mode 100644 index 2cd5792ec4..0000000000 --- a/data/novtau/PLA/pla_pearl/purple/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "a875a4dd-c5fc-43ef-a747-91e1942c29cf", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_pearl/purple/variant.json b/data/novtau/PLA/pla_pearl/purple/variant.json deleted file mode 100644 index 46258ee885..0000000000 --- a/data/novtau/PLA/pla_pearl/purple/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "6b7dded3-58e3-41d3-a290-98a87e9cfb9c", - "id": "purple", - "name": "Purple", - "color_hex": "#8A5DC2", - "traits": { - "pearlescent": true - } -} diff --git a/data/novtau/PLA/pla_pearl/yellow/sizes.json b/data/novtau/PLA/pla_pearl/yellow/sizes.json deleted file mode 100644 index 17b33f6c6f..0000000000 --- a/data/novtau/PLA/pla_pearl/yellow/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "ea0bb6a9-680e-4af4-a4b8-4c8708e67cd7", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_pearl/yellow/variant.json b/data/novtau/PLA/pla_pearl/yellow/variant.json deleted file mode 100644 index 03b586d516..0000000000 --- a/data/novtau/PLA/pla_pearl/yellow/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "de2fb220-e02b-4c0a-a6cc-4b409c39eaba", - "id": "yellow", - "name": "Yellow", - "color_hex": "#EFCE37", - "traits": { - "pearlescent": true - } -} diff --git a/data/novtau/PLA/pla_photochromic/filament.json b/data/novtau/PLA/pla_photochromic/filament.json index fb80bbbf74..9ce2547296 100644 --- a/data/novtau/PLA/pla_photochromic/filament.json +++ b/data/novtau/PLA/pla_photochromic/filament.json @@ -1,7 +1,7 @@ { - "uuid": "9cdfa40f-f6df-4443-99ec-8a3c14ff64a6", "id": "pla_photochromic", "name": "PLA Photochromic", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "9cdfa40f-f6df-4443-99ec-8a3c14ff64a6" } diff --git a/data/novtau/PLA/pla_photochromic/uv_blue/sizes.json b/data/novtau/PLA/pla_photochromic/uv_blue/sizes.json index 5a86cd559f..e30bab6351 100644 --- a/data/novtau/PLA/pla_photochromic/uv_blue/sizes.json +++ b/data/novtau/PLA/pla_photochromic/uv_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "e678fca6-599a-4c4f-ade6-25de62bd6662", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "e678fca6-599a-4c4f-ade6-25de62bd6662" } ] diff --git a/data/novtau/PLA/pla_photochromic/uv_blue/variant.json b/data/novtau/PLA/pla_photochromic/uv_blue/variant.json index 5fa13c9e82..addb51d5eb 100644 --- a/data/novtau/PLA/pla_photochromic/uv_blue/variant.json +++ b/data/novtau/PLA/pla_photochromic/uv_blue/variant.json @@ -2,5 +2,8 @@ "uuid": "609203fb-0490-4e92-b7f6-7fae10a9652b", "id": "uv_blue", "name": "UV Blue", - "color_hex": "#76B1E9" + "color_hex": [ + "#DBE2E7", + "#6CABE5" + ] } diff --git a/data/novtau/PLA/pla_photochromic/uv_purple_red/sizes.json b/data/novtau/PLA/pla_photochromic/uv_purple_red/sizes.json index 03debc4cfc..4d64932517 100644 --- a/data/novtau/PLA/pla_photochromic/uv_purple_red/sizes.json +++ b/data/novtau/PLA/pla_photochromic/uv_purple_red/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "e868d1b2-4b70-459a-8f64-bbe1474d84e9", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "e868d1b2-4b70-459a-8f64-bbe1474d84e9" } ] diff --git a/data/novtau/PLA/pla_photochromic/uv_purple_red/variant.json b/data/novtau/PLA/pla_photochromic/uv_purple_red/variant.json index 4b87df7e3e..31bc1a9577 100644 --- a/data/novtau/PLA/pla_photochromic/uv_purple_red/variant.json +++ b/data/novtau/PLA/pla_photochromic/uv_purple_red/variant.json @@ -2,5 +2,8 @@ "uuid": "b884af85-b7c7-47ec-8a72-58b757230337", "id": "uv_purple_red", "name": "UV Purple-Red", - "color_hex": "#E99BBE" + "color_hex": [ + "#B468D4", + "#EA689E" + ] } diff --git a/data/novtau/PLA/pla_photochromic/uv_red/sizes.json b/data/novtau/PLA/pla_photochromic/uv_red/sizes.json index 1a9404b131..d5b3525765 100644 --- a/data/novtau/PLA/pla_photochromic/uv_red/sizes.json +++ b/data/novtau/PLA/pla_photochromic/uv_red/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "29fcf73b-240b-4f07-8930-b9b3abe2fd42", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "29fcf73b-240b-4f07-8930-b9b3abe2fd42" } ] diff --git a/data/novtau/PLA/pla_photochromic/uv_red/variant.json b/data/novtau/PLA/pla_photochromic/uv_red/variant.json index 92cbf8e5d3..3ebb6bef6c 100644 --- a/data/novtau/PLA/pla_photochromic/uv_red/variant.json +++ b/data/novtau/PLA/pla_photochromic/uv_red/variant.json @@ -2,5 +2,8 @@ "uuid": "27d7e647-bbf6-47f1-91ca-4ef21d58695e", "id": "uv_red", "name": "UV Red", - "color_hex": "#F27B8E" + "color_hex": [ + "#E9D5D4", + "#EC5E76" + ] } diff --git a/data/novtau/PLA/pla_photochromic/uv_white_to_green/sizes.json b/data/novtau/PLA/pla_photochromic/uv_white_to_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_photochromic/uv_white_to_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_photochromic/uv_white_to_green/variant.json b/data/novtau/PLA/pla_photochromic/uv_white_to_green/variant.json new file mode 100644 index 0000000000..db670dbe51 --- /dev/null +++ b/data/novtau/PLA/pla_photochromic/uv_white_to_green/variant.json @@ -0,0 +1,8 @@ +{ + "id": "uv_white_to_green", + "name": "UV White to Green", + "color_hex": [ + "#D5DBCD", + "#6E9D6A" + ] +} diff --git a/data/novtau/PLA/pla_photochromic/uv_white_to_yellow/sizes.json b/data/novtau/PLA/pla_photochromic/uv_white_to_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_photochromic/uv_white_to_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_photochromic/uv_white_to_yellow/variant.json b/data/novtau/PLA/pla_photochromic/uv_white_to_yellow/variant.json new file mode 100644 index 0000000000..4c1f5bb0b1 --- /dev/null +++ b/data/novtau/PLA/pla_photochromic/uv_white_to_yellow/variant.json @@ -0,0 +1,8 @@ +{ + "id": "uv_white_to_yellow", + "name": "UV White to Yellow", + "color_hex": [ + "#EDEBE6", + "#F2DC68" + ] +} diff --git a/data/novtau/PLA/pla_silk_multi_color/aurora_purple/sizes.json b/data/novtau/PLA/pla_silk_multi_color/aurora_purple/sizes.json index aefdcea84b..e43bcdf46e 100644 --- a/data/novtau/PLA/pla_silk_multi_color/aurora_purple/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/aurora_purple/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "2976367a-cd23-4843-aabc-ed62bfac8b07", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "2976367a-cd23-4843-aabc-ed62bfac8b07" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/aurora_purple/variant.json b/data/novtau/PLA/pla_silk_multi_color/aurora_purple/variant.json index 68df563c65..b34cd85af7 100644 --- a/data/novtau/PLA/pla_silk_multi_color/aurora_purple/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/aurora_purple/variant.json @@ -1,13 +1,13 @@ { - "uuid": "a491975b-aefc-4f77-bf27-2581512aec5b", "id": "aurora_purple", "name": "Aurora Purple", "color_hex": [ - "#D2B9B1", - "#6CB7B7" + "#D0B6AF", + "#6CB4B4" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "a491975b-aefc-4f77-bf27-2581512aec5b" } diff --git a/data/novtau/PLA/pla_silk_multi_color/black_blue_purple_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/black_blue_purple_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_blue_purple_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/black_blue_purple_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/black_blue_purple_tri/variant.json new file mode 100644 index 0000000000..5dcf0e2125 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_blue_purple_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "black_blue_purple_tri", + "name": "Black-Blue-Purple Tri", + "color_hex": [ + "#222428", + "#0B4AAB", + "#642B8B" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/black_dark_green_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/black_dark_green_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_dark_green_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/black_dark_green_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/black_dark_green_dual/variant.json new file mode 100644 index 0000000000..085e2b2edd --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_dark_green_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "black_dark_green_dual", + "name": "Black-Dark Green Dual", + "color_hex": [ + "#222428", + "#0C7A50" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/black_gold_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/black_gold_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_gold_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/black_gold_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/black_gold_dual/variant.json new file mode 100644 index 0000000000..432bd3084f --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_gold_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "black_gold_dual", + "name": "Black-Gold Dual", + "color_hex": [ + "#222428", + "#A6791F" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/black_gold_purple_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/black_gold_purple_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_gold_purple_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/black_gold_purple_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/black_gold_purple_tri/variant.json new file mode 100644 index 0000000000..439474ce27 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_gold_purple_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "black_gold_purple_tri", + "name": "Black-Gold-Purple Tri", + "color_hex": [ + "#222428", + "#B0811B", + "#57237A" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/black_purple_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/black_purple_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_purple_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/black_purple_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/black_purple_dual/variant.json new file mode 100644 index 0000000000..93f656e558 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_purple_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "black_purple_dual", + "name": "Black-Purple Dual", + "color_hex": [ + "#222428", + "#773F9A" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/black_red_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/black_red_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_red_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/black_red_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/black_red_dual/variant.json new file mode 100644 index 0000000000..1b5b5b3b5c --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_red_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "black_red_dual", + "name": "Black-Red Dual", + "color_hex": [ + "#222428", + "#98202D" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/black_red_gold_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/black_red_gold_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_red_gold_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/black_red_gold_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/black_red_gold_tri/variant.json new file mode 100644 index 0000000000..b41c982889 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_red_gold_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "black_red_gold_tri", + "name": "Black-Red-Gold Tri", + "color_hex": [ + "#222428", + "#A82215", + "#F3DB7E" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/black_rose_red_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/black_rose_red_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_rose_red_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/black_rose_red_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/black_rose_red_dual/variant.json new file mode 100644 index 0000000000..9b08a43a28 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/black_rose_red_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "black_rose_red_dual", + "name": "Black-Rose Red Dual", + "color_hex": [ + "#222428", + "#9B2A50" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/blue_hawaii/sizes.json b/data/novtau/PLA/pla_silk_multi_color/blue_hawaii/sizes.json index 6043dafcc6..00c45d77e0 100644 --- a/data/novtau/PLA/pla_silk_multi_color/blue_hawaii/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/blue_hawaii/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "da0232de-38c8-4c60-898f-d5ba1d80756c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "da0232de-38c8-4c60-898f-d5ba1d80756c" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/blue_hawaii/variant.json b/data/novtau/PLA/pla_silk_multi_color/blue_hawaii/variant.json index a0827865af..b322cef914 100644 --- a/data/novtau/PLA/pla_silk_multi_color/blue_hawaii/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/blue_hawaii/variant.json @@ -1,13 +1,13 @@ { - "uuid": "3daf44c0-be72-447e-8d73-08e9ac9ddda9", "id": "blue_hawaii", "name": "Blue Hawaii", "color_hex": [ - "#13629B", - "#62BBCC" + "#14619A", + "#62BBCB" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "3daf44c0-be72-447e-8d73-08e9ac9ddda9" } diff --git a/data/novtau/PLA/pla_silk_multi_color/blue_purple_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/blue_purple_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/blue_purple_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/blue_purple_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/blue_purple_dual/variant.json new file mode 100644 index 0000000000..46f5a3f813 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/blue_purple_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "blue_purple_dual", + "name": "Blue-Purple Dual", + "color_hex": [ + "#0C5AC6", + "#6436B3" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/blue_purple_green_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/blue_purple_green_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/blue_purple_green_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/blue_purple_green_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/blue_purple_green_tri/variant.json new file mode 100644 index 0000000000..2e7b60926a --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/blue_purple_green_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "blue_purple_green_tri", + "name": "Blue-Purple-Green Tri", + "color_hex": [ + "#0D679E", + "#168D60", + "#52318A" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/blue_purple_orange_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/blue_purple_orange_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/blue_purple_orange_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/blue_purple_orange_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/blue_purple_orange_tri/variant.json new file mode 100644 index 0000000000..ddfa829b60 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/blue_purple_orange_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "blue_purple_orange_tri", + "name": "Blue-Purple-Orange Tri", + "color_hex": [ + "#1759BD", + "#DB7843", + "#863993" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/blue_silver_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/blue_silver_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/blue_silver_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/blue_silver_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/blue_silver_dual/variant.json new file mode 100644 index 0000000000..4d865c8be4 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/blue_silver_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "blue_silver_dual", + "name": "Blue-Silver Dual", + "color_hex": [ + "#A9ADB5", + "#1B77BF" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/cloud_yellow/sizes.json b/data/novtau/PLA/pla_silk_multi_color/cloud_yellow/sizes.json index 162ef19635..1d7f23b89e 100644 --- a/data/novtau/PLA/pla_silk_multi_color/cloud_yellow/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/cloud_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "cda52b3e-36ac-441c-8ae4-854bd5b3c38b", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "cda52b3e-36ac-441c-8ae4-854bd5b3c38b" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/cloud_yellow/variant.json b/data/novtau/PLA/pla_silk_multi_color/cloud_yellow/variant.json index 1e851ad5ea..69aef27354 100644 --- a/data/novtau/PLA/pla_silk_multi_color/cloud_yellow/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/cloud_yellow/variant.json @@ -1,13 +1,13 @@ { - "uuid": "d4900f01-4f1a-4f03-8e8f-8bcba6ebc2cb", "id": "cloud_yellow", "name": "Cloud Yellow", "color_hex": [ - "#D6B723", - "#F3E16D" + "#D1B321", + "#F1DF68" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "d4900f01-4f1a-4f03-8e8f-8bcba6ebc2cb" } diff --git a/data/novtau/PLA/pla_silk_multi_color/dark_green_purple_yellow_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/dark_green_purple_yellow_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/dark_green_purple_yellow_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/dark_green_purple_yellow_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/dark_green_purple_yellow_tri/variant.json new file mode 100644 index 0000000000..013cd38717 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/dark_green_purple_yellow_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "dark_green_purple_yellow_tri", + "name": "Dark Green-Purple-Yellow Tri", + "color_hex": [ + "#196D51", + "#D2A12D", + "#592871" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/dawn_radiance/sizes.json b/data/novtau/PLA/pla_silk_multi_color/dawn_radiance/sizes.json index 84d1045b98..354848755a 100644 --- a/data/novtau/PLA/pla_silk_multi_color/dawn_radiance/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/dawn_radiance/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "6097d79e-f628-4130-bd1f-911b3a518e8a", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "6097d79e-f628-4130-bd1f-911b3a518e8a" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/dawn_radiance/variant.json b/data/novtau/PLA/pla_silk_multi_color/dawn_radiance/variant.json index a4ab797980..2bea79b93e 100644 --- a/data/novtau/PLA/pla_silk_multi_color/dawn_radiance/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/dawn_radiance/variant.json @@ -1,13 +1,13 @@ { - "uuid": "de354f5e-c41d-4fbd-a1a1-eea6ba88cb1b", "id": "dawn_radiance", "name": "Dawn Radiance", "color_hex": [ - "#DBA7B4", - "#D16A73" + "#E99192", + "#957199" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "de354f5e-c41d-4fbd-a1a1-eea6ba88cb1b" } diff --git a/data/novtau/PLA/pla_silk_multi_color/deep_purple_teal_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/deep_purple_teal_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/deep_purple_teal_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/deep_purple_teal_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/deep_purple_teal_dual/variant.json new file mode 100644 index 0000000000..1433e7fbaa --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/deep_purple_teal_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "deep_purple_teal_dual", + "name": "Deep Purple-Teal Dual", + "color_hex": [ + "#0A899A", + "#531B7D" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/emerald_gold_orange_red_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/emerald_gold_orange_red_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/emerald_gold_orange_red_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/emerald_gold_orange_red_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/emerald_gold_orange_red_tri/variant.json new file mode 100644 index 0000000000..f183c93aca --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/emerald_gold_orange_red_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "emerald_gold_orange_red_tri", + "name": "Emerald-Gold-Orange Red Tri", + "color_hex": [ + "#D18C24", + "#0A6F4C", + "#C01120" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/filament.json b/data/novtau/PLA/pla_silk_multi_color/filament.json index ea005b1759..7c53767924 100644 --- a/data/novtau/PLA/pla_silk_multi_color/filament.json +++ b/data/novtau/PLA/pla_silk_multi_color/filament.json @@ -1,7 +1,7 @@ { - "uuid": "ffe2ab89-664a-4413-bfd1-60a696c29bd3", "id": "pla_silk_multi_color", "name": "PLA Silk Multi-Color", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "ffe2ab89-664a-4413-bfd1-60a696c29bd3" } diff --git a/data/novtau/PLA/pla_silk_multi_color/gilded_rose/sizes.json b/data/novtau/PLA/pla_silk_multi_color/gilded_rose/sizes.json index 3eec928594..535ee42ddf 100644 --- a/data/novtau/PLA/pla_silk_multi_color/gilded_rose/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/gilded_rose/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "c661d9c3-f1ee-4f84-be24-9ce4abbe7863", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "c661d9c3-f1ee-4f84-be24-9ce4abbe7863" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/gilded_rose/variant.json b/data/novtau/PLA/pla_silk_multi_color/gilded_rose/variant.json index cd10b085a7..310edfd0eb 100644 --- a/data/novtau/PLA/pla_silk_multi_color/gilded_rose/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/gilded_rose/variant.json @@ -1,13 +1,13 @@ { - "uuid": "a109553c-3553-4dd0-bfd8-c808205a58b1", "id": "gilded_rose", "name": "Gilded Rose", "color_hex": [ - "#E6A3A9", - "#B15864" + "#E5A5AA", + "#B35E6A" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "a109553c-3553-4dd0-bfd8-c808205a58b1" } diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_blue_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/gold_blue_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_blue_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_blue_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/gold_blue_dual/variant.json new file mode 100644 index 0000000000..368ff817bf --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_blue_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "gold_blue_dual", + "name": "Gold-Blue Dual", + "color_hex": [ + "#B7A134", + "#077AC2" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_blue_purple_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/gold_blue_purple_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_blue_purple_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_blue_purple_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/gold_blue_purple_tri/variant.json new file mode 100644 index 0000000000..5f12519b0d --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_blue_purple_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "gold_blue_purple_tri", + "name": "Gold-Blue-Purple Tri", + "color_hex": [ + "#BF8621", + "#0E73A4", + "#7F40AD" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_copper_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/gold_copper_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_copper_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_copper_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/gold_copper_dual/variant.json new file mode 100644 index 0000000000..de45d75ae2 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_copper_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "gold_copper_dual", + "name": "Gold-Copper Dual", + "color_hex": [ + "#BF391F", + "#F2DA7B" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_green_fuchsia_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/gold_green_fuchsia_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_green_fuchsia_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_green_fuchsia_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/gold_green_fuchsia_tri/variant.json new file mode 100644 index 0000000000..5e89809a2e --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_green_fuchsia_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "gold_green_fuchsia_tri", + "name": "Gold-Green-Fuchsia Tri", + "color_hex": [ + "#B49F22", + "#107C1A", + "#DA2461" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_purple_copper_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/gold_purple_copper_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_purple_copper_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_purple_copper_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/gold_purple_copper_tri/variant.json new file mode 100644 index 0000000000..ef039e545e --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_purple_copper_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "gold_purple_copper_tri", + "name": "Gold-Purple-Copper Tri", + "color_hex": [ + "#D4A146", + "#64316E", + "#A65A38" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_rose_red_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/gold_rose_red_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_rose_red_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_rose_red_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/gold_rose_red_dual/variant.json new file mode 100644 index 0000000000..0951eb5b0e --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_rose_red_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "gold_rose_red_dual", + "name": "Gold-Rose Red Dual", + "color_hex": [ + "#EAB055", + "#D42E58" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_silver_copper_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/gold_silver_copper_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_silver_copper_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_silver_copper_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/gold_silver_copper_tri/variant.json new file mode 100644 index 0000000000..9b5ca0366d --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_silver_copper_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "gold_silver_copper_tri", + "name": "Gold-Silver-Copper Tri", + "color_hex": [ + "#E2C36B", + "#B7B1AA", + "#B5683B" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_silver_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/gold_silver_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_silver_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/gold_silver_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/gold_silver_dual/variant.json new file mode 100644 index 0000000000..7e34e48a5a --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/gold_silver_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "gold_silver_dual", + "name": "Gold-Silver Dual", + "color_hex": [ + "#ABAAAB", + "#A1933F" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/green_purple_copper_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/green_purple_copper_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/green_purple_copper_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/green_purple_copper_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/green_purple_copper_tri/variant.json new file mode 100644 index 0000000000..3f68e2e5f3 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/green_purple_copper_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "green_purple_copper_tri", + "name": "Green-Purple-Copper Tri", + "color_hex": [ + "#85A859", + "#793B71", + "#9F5A31" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/midnight_blaze/sizes.json b/data/novtau/PLA/pla_silk_multi_color/midnight_blaze/sizes.json index bb17b752fc..2c5a74a37a 100644 --- a/data/novtau/PLA/pla_silk_multi_color/midnight_blaze/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/midnight_blaze/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "cb1315db-1a77-4757-ab91-b96000081070", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "cb1315db-1a77-4757-ab91-b96000081070" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/midnight_blaze/variant.json b/data/novtau/PLA/pla_silk_multi_color/midnight_blaze/variant.json index 0cc4da7bfd..06dba128ec 100644 --- a/data/novtau/PLA/pla_silk_multi_color/midnight_blaze/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/midnight_blaze/variant.json @@ -1,13 +1,13 @@ { - "uuid": "9ab3317e-96b6-439a-a6ce-6c66365544a4", "id": "midnight_blaze", "name": "Midnight Blaze", "color_hex": [ - "#492B7B", - "#BD5CA7" + "#482B79", + "#BB5CA5" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "9ab3317e-96b6-439a-a6ce-6c66365544a4" } diff --git a/data/novtau/PLA/pla_silk_multi_color/mystic_magenta/sizes.json b/data/novtau/PLA/pla_silk_multi_color/mystic_magenta/sizes.json index 7234967082..ec8000f03c 100644 --- a/data/novtau/PLA/pla_silk_multi_color/mystic_magenta/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/mystic_magenta/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "c436e174-6828-4493-bad6-3b18587d3757", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "c436e174-6828-4493-bad6-3b18587d3757" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/mystic_magenta/variant.json b/data/novtau/PLA/pla_silk_multi_color/mystic_magenta/variant.json index c4244710ac..783dd4866e 100644 --- a/data/novtau/PLA/pla_silk_multi_color/mystic_magenta/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/mystic_magenta/variant.json @@ -1,13 +1,13 @@ { - "uuid": "c9e8f4be-c4e8-418b-b420-1d0cb158b293", "id": "mystic_magenta", "name": "Mystic Magenta", "color_hex": [ - "#F29EC8", - "#D5639A" + "#F09CC6", + "#CE6195" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "c9e8f4be-c4e8-418b-b420-1d0cb158b293" } diff --git a/data/novtau/PLA/pla_silk_multi_color/neon_city/sizes.json b/data/novtau/PLA/pla_silk_multi_color/neon_city/sizes.json index 48c0ee69ec..0352b7cee3 100644 --- a/data/novtau/PLA/pla_silk_multi_color/neon_city/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/neon_city/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "d5d8d965-fb5f-4f61-8e96-b778a606a22c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "d5d8d965-fb5f-4f61-8e96-b778a606a22c" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/neon_city/variant.json b/data/novtau/PLA/pla_silk_multi_color/neon_city/variant.json index 222bd2d1ef..6ff0aefc52 100644 --- a/data/novtau/PLA/pla_silk_multi_color/neon_city/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/neon_city/variant.json @@ -1,13 +1,13 @@ { - "uuid": "8c7aaa99-122b-4c7e-a924-f8f5f1968258", "id": "neon_city", "name": "Neon City", "color_hex": [ - "#90DCC3", - "#2CAA92" + "#90DBC2", + "#2DA890" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "8c7aaa99-122b-4c7e-a924-f8f5f1968258" } diff --git a/data/novtau/PLA/pla_silk_multi_color/orange_blue_green_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/orange_blue_green_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/orange_blue_green_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/orange_blue_green_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/orange_blue_green_tri/variant.json new file mode 100644 index 0000000000..0740d23737 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/orange_blue_green_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "orange_blue_green_tri", + "name": "Orange-Blue-Green Tri", + "color_hex": [ + "#E89525", + "#0B73B4", + "#60AF36" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/orange_red_purple_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/orange_red_purple_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/orange_red_purple_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/orange_red_purple_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/orange_red_purple_dual/variant.json new file mode 100644 index 0000000000..04e38cccd7 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/orange_red_purple_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "orange_red_purple_dual", + "name": "Orange Red-Purple Dual", + "color_hex": [ + "#DA4522", + "#6D2982" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/phantom_blue/sizes.json b/data/novtau/PLA/pla_silk_multi_color/phantom_blue/sizes.json index 50d5b95711..9c2a127b74 100644 --- a/data/novtau/PLA/pla_silk_multi_color/phantom_blue/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/phantom_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "759c99b4-37f8-4178-8b4e-162c62b30ce0", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "759c99b4-37f8-4178-8b4e-162c62b30ce0" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/phantom_blue/variant.json b/data/novtau/PLA/pla_silk_multi_color/phantom_blue/variant.json index 3fab6242e9..fc2ec54386 100644 --- a/data/novtau/PLA/pla_silk_multi_color/phantom_blue/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/phantom_blue/variant.json @@ -1,5 +1,4 @@ { - "uuid": "e2ecee78-cbd1-4a29-91f0-17929d6a5214", "id": "phantom_blue", "name": "Phantom Blue", "color_hex": [ @@ -9,5 +8,6 @@ "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "e2ecee78-cbd1-4a29-91f0-17929d6a5214" } diff --git a/data/novtau/PLA/pla_silk_multi_color/pomelo_orange/sizes.json b/data/novtau/PLA/pla_silk_multi_color/pomelo_orange/sizes.json index 2706e2f7f1..ea1af96445 100644 --- a/data/novtau/PLA/pla_silk_multi_color/pomelo_orange/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/pomelo_orange/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "744c0c2b-ce5e-4294-baa6-2fbeeb65e17c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "744c0c2b-ce5e-4294-baa6-2fbeeb65e17c" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/pomelo_orange/variant.json b/data/novtau/PLA/pla_silk_multi_color/pomelo_orange/variant.json index e50b1b16db..ec23c9cb28 100644 --- a/data/novtau/PLA/pla_silk_multi_color/pomelo_orange/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/pomelo_orange/variant.json @@ -1,13 +1,13 @@ { - "uuid": "aca39c96-047d-4412-91de-f0171005738b", "id": "pomelo_orange", "name": "Pomelo Orange", "color_hex": [ - "#E6C19F", - "#D19965" + "#E5C09D", + "#C99361" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "aca39c96-047d-4412-91de-f0171005738b" } diff --git a/data/novtau/PLA/pla_silk_multi_color/purple_gold_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/purple_gold_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/purple_gold_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/purple_gold_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/purple_gold_dual/variant.json new file mode 100644 index 0000000000..f392f48e25 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/purple_gold_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "purple_gold_dual", + "name": "Purple-Gold Dual", + "color_hex": [ + "#C99A49", + "#642770" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/purple_green_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/purple_green_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/purple_green_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/purple_green_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/purple_green_dual/variant.json new file mode 100644 index 0000000000..3ca124d289 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/purple_green_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "purple_green_dual", + "name": "Purple-Green Dual", + "color_hex": [ + "#72398A", + "#6FC145" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/purple_orange_teal_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/purple_orange_teal_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/purple_orange_teal_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/purple_orange_teal_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/purple_orange_teal_tri/variant.json new file mode 100644 index 0000000000..5ab5385799 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/purple_orange_teal_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "purple_orange_teal_tri", + "name": "Purple-Orange-Teal Tri", + "color_hex": [ + "#D1773C", + "#3FAAAD", + "#763D93" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/purple_yellow_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/purple_yellow_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/purple_yellow_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/purple_yellow_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/purple_yellow_dual/variant.json new file mode 100644 index 0000000000..0c7431d22a --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/purple_yellow_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "purple_yellow_dual", + "name": "Purple-Yellow Dual", + "color_hex": [ + "#5A3D91", + "#A7B33C" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_blue_white/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_blue_white/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_blue_white/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_blue_white/variant.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_blue_white/variant.json new file mode 100644 index 0000000000..b314dd9306 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_blue_white/variant.json @@ -0,0 +1,12 @@ +{ + "id": "rainbow_blue_white", + "name": "Rainbow Blue-White", + "color_hex": [ + "#D8E6E3", + "#17C8E0" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_cosmos/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_cosmos/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_cosmos/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_cosmos/variant.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_cosmos/variant.json new file mode 100644 index 0000000000..5cdb0687e7 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_cosmos/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_cosmos", + "name": "Rainbow Cosmos", + "color_hex": [ + "#0E78BF", + "#C07850", + "#90499B" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_dragon_palace/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_dragon_palace/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_dragon_palace/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_dragon_palace/variant.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_dragon_palace/variant.json new file mode 100644 index 0000000000..5e401626f0 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_dragon_palace/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_dragon_palace", + "name": "Rainbow Dragon Palace", + "color_hex": [ + "#CF8E34", + "#2B9E95", + "#709A54" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_flower_mountain/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_flower_mountain/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_flower_mountain/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_flower_mountain/variant.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_flower_mountain/variant.json new file mode 100644 index 0000000000..dfb815f0e3 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_flower_mountain/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_flower_mountain", + "name": "Rainbow Flower Mountain", + "color_hex": [ + "#DFA84D", + "#599CC3", + "#8DC368" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_jade_pool/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_jade_pool/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_jade_pool/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_jade_pool/variant.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_jade_pool/variant.json new file mode 100644 index 0000000000..460328dcc8 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_jade_pool/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_jade_pool", + "name": "Rainbow Jade Pool", + "color_hex": [ + "#ECA984", + "#6AAAD1", + "#D27692" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_light_blue_yellow/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_light_blue_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_light_blue_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_light_blue_yellow/variant.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_light_blue_yellow/variant.json new file mode 100644 index 0000000000..52e2a4ae7a --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_light_blue_yellow/variant.json @@ -0,0 +1,12 @@ +{ + "id": "rainbow_light_blue_yellow", + "name": "Rainbow Light Blue-Yellow", + "color_hex": [ + "#38BAD2", + "#D4E564" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_mini/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_mini/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_mini/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_mini/variant.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_mini/variant.json new file mode 100644 index 0000000000..41eced6a14 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_mini/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_mini", + "name": "Rainbow Mini", + "color_hex": [ + "#1EAAC2", + "#C4DB40", + "#BE68B1" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_moon_palace/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_moon_palace/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_moon_palace/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_moon_palace/variant.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_moon_palace/variant.json new file mode 100644 index 0000000000..8403f7246f --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_moon_palace/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_moon_palace", + "name": "Rainbow Moon Palace", + "color_hex": [ + "#3AB0BA", + "#C47EA6", + "#D1C498" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_peach/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_peach/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_peach/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_peach/variant.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_peach/variant.json new file mode 100644 index 0000000000..1f7ee82cc7 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_peach/variant.json @@ -0,0 +1,13 @@ +{ + "id": "rainbow_peach", + "name": "Rainbow Peach", + "color_hex": [ + "#EA7686", + "#3EB2A5", + "#EEB870" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_pink_white/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_pink_white/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_pink_white/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_pink_white/variant.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_pink_white/variant.json new file mode 100644 index 0000000000..9400ebca34 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_pink_white/variant.json @@ -0,0 +1,12 @@ +{ + "id": "rainbow_pink_white", + "name": "Rainbow Pink-White", + "color_hex": [ + "#E8DDDE", + "#F592B8" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_red_gold/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_red_gold/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_red_gold/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rainbow_red_gold/variant.json b/data/novtau/PLA/pla_silk_multi_color/rainbow_red_gold/variant.json new file mode 100644 index 0000000000..527d2f54b6 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rainbow_red_gold/variant.json @@ -0,0 +1,12 @@ +{ + "id": "rainbow_red_gold", + "name": "Rainbow Red-Gold", + "color_hex": [ + "#D82911", + "#EFA342" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/red_blue_green_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/red_blue_green_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/red_blue_green_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/red_blue_green_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/red_blue_green_tri/variant.json new file mode 100644 index 0000000000..4657fa9b55 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/red_blue_green_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "red_blue_green_tri", + "name": "Red-Blue-Green Tri", + "color_hex": [ + "#AA2752", + "#256CA0", + "#53944C" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/red_gold_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/red_gold_dual/sizes.json index 657fdb6fcc..a29e44272b 100644 --- a/data/novtau/PLA/pla_silk_multi_color/red_gold_dual/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/red_gold_dual/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "d51800bb-b48d-423b-8e9b-67a5f376a0cf", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "d51800bb-b48d-423b-8e9b-67a5f376a0cf" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/red_gold_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/red_gold_dual/variant.json index 49a2855aa9..fc5bc05c5d 100644 --- a/data/novtau/PLA/pla_silk_multi_color/red_gold_dual/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/red_gold_dual/variant.json @@ -1,13 +1,13 @@ { - "uuid": "c920a2b6-1002-4634-9070-38d15204e214", "id": "red_gold_dual", "name": "Red-Gold Dual", "color_hex": [ - "#BB3E28", - "#F28F60" + "#B73E27", + "#EF8D60" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "c920a2b6-1002-4634-9070-38d15204e214" } diff --git a/data/novtau/PLA/pla_silk_multi_color/red_gold_purple_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/red_gold_purple_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/red_gold_purple_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/red_gold_purple_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/red_gold_purple_tri/variant.json new file mode 100644 index 0000000000..2555734c91 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/red_gold_purple_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "red_gold_purple_tri", + "name": "Red-Gold-Purple Tri", + "color_hex": [ + "#B92B43", + "#DB9D52", + "#963886" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/red_green_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/red_green_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/red_green_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/red_green_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/red_green_dual/variant.json new file mode 100644 index 0000000000..dbe5ce7113 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/red_green_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "red_green_dual", + "name": "Red-Green Dual", + "color_hex": [ + "#B81E50", + "#5CA432" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/red_purple_green_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/red_purple_green_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/red_purple_green_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/red_purple_green_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/red_purple_green_tri/variant.json new file mode 100644 index 0000000000..5319887ceb --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/red_purple_green_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "red_purple_green_tri", + "name": "Red-Purple-Green Tri", + "color_hex": [ + "#832591", + "#649648", + "#980D45" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/red_yellow_blue_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/red_yellow_blue_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/red_yellow_blue_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/red_yellow_blue_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/red_yellow_blue_tri/variant.json new file mode 100644 index 0000000000..74c2aaadf0 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/red_yellow_blue_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "red_yellow_blue_tri", + "name": "Red-Yellow-Blue Tri", + "color_hex": [ + "#A11D2B", + "#2078BC", + "#C1A720" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/robin_teal/sizes.json b/data/novtau/PLA/pla_silk_multi_color/robin_teal/sizes.json index 6abc8fce4a..25c9f9983e 100644 --- a/data/novtau/PLA/pla_silk_multi_color/robin_teal/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/robin_teal/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "37e7ba0b-14b0-4b04-8097-1262816a4ff9", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "37e7ba0b-14b0-4b04-8097-1262816a4ff9" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/robin_teal/variant.json b/data/novtau/PLA/pla_silk_multi_color/robin_teal/variant.json index a8fe1d5308..a98f9c418e 100644 --- a/data/novtau/PLA/pla_silk_multi_color/robin_teal/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/robin_teal/variant.json @@ -1,5 +1,4 @@ { - "uuid": "37ca5a33-3658-4aed-b21e-80b8f9cc7323", "id": "robin_teal", "name": "Robin Teal", "color_hex": [ @@ -9,5 +8,6 @@ "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "37ca5a33-3658-4aed-b21e-80b8f9cc7323" } diff --git a/data/novtau/PLA/pla_silk_multi_color/rose_red_light_blue_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/rose_red_light_blue_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rose_red_light_blue_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/rose_red_light_blue_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/rose_red_light_blue_dual/variant.json new file mode 100644 index 0000000000..80c5563754 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/rose_red_light_blue_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "rose_red_light_blue_dual", + "name": "Rose Red-Light Blue Dual", + "color_hex": [ + "#C74690", + "#68ABDE" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/scarlet_gold_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/scarlet_gold_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/scarlet_gold_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/scarlet_gold_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/scarlet_gold_dual/variant.json new file mode 100644 index 0000000000..024a251479 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/scarlet_gold_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "scarlet_gold_dual", + "name": "Scarlet-Gold Dual", + "color_hex": [ + "#C40C1C", + "#E69936" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/sky_blue_rose_light_green_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/sky_blue_rose_light_green_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/sky_blue_rose_light_green_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/sky_blue_rose_light_green_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/sky_blue_rose_light_green_tri/variant.json new file mode 100644 index 0000000000..bfd559f99e --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/sky_blue_rose_light_green_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "sky_blue_rose_light_green_tri", + "name": "Sky Blue-Rose-Light Green Tri", + "color_hex": [ + "#4DA3DF", + "#D46DAF", + "#7FD47E" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/south_beach/sizes.json b/data/novtau/PLA/pla_silk_multi_color/south_beach/sizes.json index f7801bc3b5..36aa009611 100644 --- a/data/novtau/PLA/pla_silk_multi_color/south_beach/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/south_beach/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "28bf4523-4a35-4744-aaaa-10d99fc8ec88", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "28bf4523-4a35-4744-aaaa-10d99fc8ec88" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/south_beach/variant.json b/data/novtau/PLA/pla_silk_multi_color/south_beach/variant.json index 04fc2b28b0..5662372ecf 100644 --- a/data/novtau/PLA/pla_silk_multi_color/south_beach/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/south_beach/variant.json @@ -1,13 +1,13 @@ { - "uuid": "85873d2b-baa6-4457-bb54-15175833ac1a", "id": "south_beach", "name": "South Beach", "color_hex": [ - "#D3B9B1", - "#6FAFBD" + "#D0B9B0", + "#6DACBB" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "85873d2b-baa6-4457-bb54-15175833ac1a" } diff --git a/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_dual/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_dual/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_dual/variant.json new file mode 100644 index 0000000000..c0a2cc4611 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_dual/variant.json @@ -0,0 +1,12 @@ +{ + "id": "teal_orange_red_dual", + "name": "Teal-Orange Red Dual", + "color_hex": [ + "#0C7E83", + "#DA6C2F" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_light_yellow_tri/sizes.json b/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_light_yellow_tri/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_light_yellow_tri/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_light_yellow_tri/variant.json b/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_light_yellow_tri/variant.json new file mode 100644 index 0000000000..5c5337e379 --- /dev/null +++ b/data/novtau/PLA/pla_silk_multi_color/teal_orange_red_light_yellow_tri/variant.json @@ -0,0 +1,13 @@ +{ + "id": "teal_orange_red_light_yellow_tri", + "name": "Teal-Orange Red-Light Yellow Tri", + "color_hex": [ + "#08A089", + "#DF5327", + "#EDE068" + ], + "traits": { + "silk": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_silk_multi_color/velvet_eclipse/sizes.json b/data/novtau/PLA/pla_silk_multi_color/velvet_eclipse/sizes.json index 3fe0442e1c..381e3a169d 100644 --- a/data/novtau/PLA/pla_silk_multi_color/velvet_eclipse/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/velvet_eclipse/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "680ccb47-6ce2-4851-9446-b2dd0e284457", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "680ccb47-6ce2-4851-9446-b2dd0e284457" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/velvet_eclipse/variant.json b/data/novtau/PLA/pla_silk_multi_color/velvet_eclipse/variant.json index fd23eaf72c..2c0c75dd01 100644 --- a/data/novtau/PLA/pla_silk_multi_color/velvet_eclipse/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/velvet_eclipse/variant.json @@ -1,13 +1,13 @@ { - "uuid": "8931b825-cdd1-425b-af98-eb8a45e1287c", "id": "velvet_eclipse", "name": "Velvet Eclipse", "color_hex": [ - "#BBA3D9", - "#8A6EAF" + "#BCA4D9", + "#8A70AE" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "8931b825-cdd1-425b-af98-eb8a45e1287c" } diff --git a/data/novtau/PLA/pla_silk_multi_color/yellow_green_dual/sizes.json b/data/novtau/PLA/pla_silk_multi_color/yellow_green_dual/sizes.json index 38ec56497a..065b6fa3a1 100644 --- a/data/novtau/PLA/pla_silk_multi_color/yellow_green_dual/sizes.json +++ b/data/novtau/PLA/pla_silk_multi_color/yellow_green_dual/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "4ef831c9-a7fb-4bf1-a973-75d9c5a88d11", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "4ef831c9-a7fb-4bf1-a973-75d9c5a88d11" } ] diff --git a/data/novtau/PLA/pla_silk_multi_color/yellow_green_dual/variant.json b/data/novtau/PLA/pla_silk_multi_color/yellow_green_dual/variant.json index 9919c3aeee..0b620ba451 100644 --- a/data/novtau/PLA/pla_silk_multi_color/yellow_green_dual/variant.json +++ b/data/novtau/PLA/pla_silk_multi_color/yellow_green_dual/variant.json @@ -1,13 +1,13 @@ { - "uuid": "5e67d14e-3020-4e15-98fd-f1b16178bb43", "id": "yellow_green_dual", "name": "Yellow-Green Dual", "color_hex": [ - "#5CA546", - "#BFD667" + "#5CA346", + "#BED567" ], "traits": { "silk": true, "coextruded": true - } + }, + "uuid": "5e67d14e-3020-4e15-98fd-f1b16178bb43" } diff --git a/data/novtau/PLA/pla_silk_plus/baby_blue/sizes.json b/data/novtau/PLA/pla_silk_plus/baby_blue/sizes.json index 26b4c1d12d..3306b24568 100644 --- a/data/novtau/PLA/pla_silk_plus/baby_blue/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/baby_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "d76a2b83-1a1a-414d-9ace-9afa609d5bd1", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "d76a2b83-1a1a-414d-9ace-9afa609d5bd1" } ] diff --git a/data/novtau/PLA/pla_silk_plus/baby_blue/variant.json b/data/novtau/PLA/pla_silk_plus/baby_blue/variant.json index 8697d81c1e..cd17ebb1dd 100644 --- a/data/novtau/PLA/pla_silk_plus/baby_blue/variant.json +++ b/data/novtau/PLA/pla_silk_plus/baby_blue/variant.json @@ -1,9 +1,9 @@ { - "uuid": "82b2396a-c7ae-4496-a7fc-da31bf7c5868", "id": "baby_blue", "name": "Baby Blue", - "color_hex": "#0491EE", + "color_hex": "#0690EC", "traits": { "silk": true - } + }, + "uuid": "82b2396a-c7ae-4496-a7fc-da31bf7c5868" } diff --git a/data/novtau/PLA/pla_silk_plus/blue/sizes.json b/data/novtau/PLA/pla_silk_plus/blue/sizes.json index 376a5ab22c..f8d68dc337 100644 --- a/data/novtau/PLA/pla_silk_plus/blue/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "62eab42c-58f5-46b9-8faf-319e287d39d8", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "62eab42c-58f5-46b9-8faf-319e287d39d8" } ] diff --git a/data/novtau/PLA/pla_silk_plus/blue/variant.json b/data/novtau/PLA/pla_silk_plus/blue/variant.json index 7ebafeec9b..6ac5f45112 100644 --- a/data/novtau/PLA/pla_silk_plus/blue/variant.json +++ b/data/novtau/PLA/pla_silk_plus/blue/variant.json @@ -1,9 +1,9 @@ { - "uuid": "429715d4-194d-44b3-849e-249f603f370f", "id": "blue", "name": "Blue", "color_hex": "#0248CA", "traits": { "silk": true - } + }, + "uuid": "429715d4-194d-44b3-849e-249f603f370f" } diff --git a/data/novtau/PLA/pla_silk_plus/candy_green/sizes.json b/data/novtau/PLA/pla_silk_plus/candy_green/sizes.json index c04caa002b..948011ec41 100644 --- a/data/novtau/PLA/pla_silk_plus/candy_green/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/candy_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "06e6cd06-3efa-41c8-8f76-6ce1809f2245", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "06e6cd06-3efa-41c8-8f76-6ce1809f2245" } ] diff --git a/data/novtau/PLA/pla_silk_plus/candy_green/variant.json b/data/novtau/PLA/pla_silk_plus/candy_green/variant.json index 425a57d020..e359f321cc 100644 --- a/data/novtau/PLA/pla_silk_plus/candy_green/variant.json +++ b/data/novtau/PLA/pla_silk_plus/candy_green/variant.json @@ -1,9 +1,9 @@ { - "uuid": "581eb799-7765-41f1-8be6-0d0e3e42d55b", "id": "candy_green", "name": "Candy Green", - "color_hex": "#089359", + "color_hex": "#099258", "traits": { "silk": true - } + }, + "uuid": "581eb799-7765-41f1-8be6-0d0e3e42d55b" } diff --git a/data/novtau/PLA/pla_silk_plus/candy_red/sizes.json b/data/novtau/PLA/pla_silk_plus/candy_red/sizes.json index 36569f12bd..9d7aaeb27c 100644 --- a/data/novtau/PLA/pla_silk_plus/candy_red/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/candy_red/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "ca550573-c3a6-434d-8247-441ccf907184", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ca550573-c3a6-434d-8247-441ccf907184" } ] diff --git a/data/novtau/PLA/pla_silk_plus/candy_red/variant.json b/data/novtau/PLA/pla_silk_plus/candy_red/variant.json index bc50f9ce94..3f619e0fb1 100644 --- a/data/novtau/PLA/pla_silk_plus/candy_red/variant.json +++ b/data/novtau/PLA/pla_silk_plus/candy_red/variant.json @@ -1,9 +1,9 @@ { - "uuid": "646b81cb-9972-4cc6-8c97-25f732fe9804", "id": "candy_red", "name": "Candy Red", "color_hex": "#BD3138", "traits": { "silk": true - } + }, + "uuid": "646b81cb-9972-4cc6-8c97-25f732fe9804" } diff --git a/data/novtau/PLA/pla_silk_plus/champagne/sizes.json b/data/novtau/PLA/pla_silk_plus/champagne/sizes.json index cf724f75b5..f2d6791dc7 100644 --- a/data/novtau/PLA/pla_silk_plus/champagne/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/champagne/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "34b71270-7f26-4e94-be1d-367c3c82915c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "34b71270-7f26-4e94-be1d-367c3c82915c" } ] diff --git a/data/novtau/PLA/pla_silk_plus/champagne/variant.json b/data/novtau/PLA/pla_silk_plus/champagne/variant.json index 8333e445f1..60583d543d 100644 --- a/data/novtau/PLA/pla_silk_plus/champagne/variant.json +++ b/data/novtau/PLA/pla_silk_plus/champagne/variant.json @@ -1,9 +1,9 @@ { - "uuid": "34081f22-2de4-4f0a-b2fb-7b0c67ba4e87", "id": "champagne", "name": "Champagne", "color_hex": "#C28934", "traits": { "silk": true - } + }, + "uuid": "34081f22-2de4-4f0a-b2fb-7b0c67ba4e87" } diff --git a/data/novtau/PLA/pla_silk_plus/christmas_green/sizes.json b/data/novtau/PLA/pla_silk_plus/christmas_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/christmas_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_plus/christmas_green/variant.json b/data/novtau/PLA/pla_silk_plus/christmas_green/variant.json new file mode 100644 index 0000000000..7ae568b061 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/christmas_green/variant.json @@ -0,0 +1,8 @@ +{ + "id": "christmas_green", + "name": "Christmas Green", + "color_hex": "#077A48", + "traits": { + "silk": true + } +} diff --git a/data/novtau/PLA/pla_silk_plus/cyan_blue/sizes.json b/data/novtau/PLA/pla_silk_plus/cyan_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/cyan_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_plus/cyan_blue/variant.json b/data/novtau/PLA/pla_silk_plus/cyan_blue/variant.json new file mode 100644 index 0000000000..cd8c836273 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/cyan_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "cyan_blue", + "name": "Cyan Blue", + "color_hex": "#349AE5", + "traits": { + "silk": true + } +} diff --git a/data/novtau/PLA/pla_silk_plus/dark_gold/sizes.json b/data/novtau/PLA/pla_silk_plus/dark_gold/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/dark_gold/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_plus/dark_gold/variant.json b/data/novtau/PLA/pla_silk_plus/dark_gold/variant.json new file mode 100644 index 0000000000..7801b62c64 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/dark_gold/variant.json @@ -0,0 +1,8 @@ +{ + "id": "dark_gold", + "name": "Dark Gold", + "color_hex": "#65503A", + "traits": { + "silk": true + } +} diff --git a/data/novtau/PLA/pla_silk_plus/filament.json b/data/novtau/PLA/pla_silk_plus/filament.json index d4fa19da03..ccfb2d4a1a 100644 --- a/data/novtau/PLA/pla_silk_plus/filament.json +++ b/data/novtau/PLA/pla_silk_plus/filament.json @@ -1,7 +1,7 @@ { - "uuid": "33fa3526-0fff-4188-acd4-5ca657097fb4", "id": "pla_silk_plus", "name": "PLA Silk+", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "33fa3526-0fff-4188-acd4-5ca657097fb4" } diff --git a/data/novtau/PLA/pla_silk_plus/gold/sizes.json b/data/novtau/PLA/pla_silk_plus/gold/sizes.json index 75f3a6af09..363b2c3157 100644 --- a/data/novtau/PLA/pla_silk_plus/gold/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/gold/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "a00bb15e-4556-4304-8dc8-1f962d1e48d4", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "a00bb15e-4556-4304-8dc8-1f962d1e48d4" } ] diff --git a/data/novtau/PLA/pla_silk_plus/gold/variant.json b/data/novtau/PLA/pla_silk_plus/gold/variant.json index a062bd11a2..3f6b56f4d7 100644 --- a/data/novtau/PLA/pla_silk_plus/gold/variant.json +++ b/data/novtau/PLA/pla_silk_plus/gold/variant.json @@ -1,9 +1,9 @@ { - "uuid": "52f987c8-c203-41e1-8248-9531b0b8d9a2", "id": "gold", "name": "Gold", - "color_hex": "#E7AE13", + "color_hex": "#E5AD14", "traits": { "silk": true - } + }, + "uuid": "52f987c8-c203-41e1-8248-9531b0b8d9a2" } diff --git a/data/novtau/PLA/pla_silk_plus/light_pink/sizes.json b/data/novtau/PLA/pla_silk_plus/light_pink/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/light_pink/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_plus/light_pink/variant.json b/data/novtau/PLA/pla_silk_plus/light_pink/variant.json new file mode 100644 index 0000000000..2eccd86f3b --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/light_pink/variant.json @@ -0,0 +1,8 @@ +{ + "id": "light_pink", + "name": "Light Pink", + "color_hex": "#F4AAB8", + "traits": { + "silk": true + } +} diff --git a/data/novtau/PLA/pla_silk_plus/light_silver/sizes.json b/data/novtau/PLA/pla_silk_plus/light_silver/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/light_silver/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_plus/light_silver/variant.json b/data/novtau/PLA/pla_silk_plus/light_silver/variant.json new file mode 100644 index 0000000000..74abccefea --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/light_silver/variant.json @@ -0,0 +1,8 @@ +{ + "id": "light_silver", + "name": "Light Silver", + "color_hex": "#A2A1A0", + "traits": { + "silk": true + } +} diff --git a/data/novtau/PLA/pla_silk_plus/mint/variant.json b/data/novtau/PLA/pla_silk_plus/mint/variant.json index fc862402b6..2ccfc2a387 100644 --- a/data/novtau/PLA/pla_silk_plus/mint/variant.json +++ b/data/novtau/PLA/pla_silk_plus/mint/variant.json @@ -3,6 +3,7 @@ "id": "mint", "name": "Mint", "color_hex": "#07955A", + "discontinued": true, "traits": { "silk": true } diff --git a/data/novtau/PLA/pla_silk_plus/ocean_blue/sizes.json b/data/novtau/PLA/pla_silk_plus/ocean_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/ocean_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_plus/ocean_blue/variant.json b/data/novtau/PLA/pla_silk_plus/ocean_blue/variant.json new file mode 100644 index 0000000000..35098a0e8b --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/ocean_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "ocean_blue", + "name": "Ocean Blue", + "color_hex": "#129DD8", + "traits": { + "silk": true + } +} diff --git a/data/novtau/PLA/pla_silk_plus/orange/sizes.json b/data/novtau/PLA/pla_silk_plus/orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_plus/orange/variant.json b/data/novtau/PLA/pla_silk_plus/orange/variant.json new file mode 100644 index 0000000000..85046a5b9c --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/orange/variant.json @@ -0,0 +1,8 @@ +{ + "id": "orange", + "name": "Orange", + "color_hex": "#F88429", + "traits": { + "silk": true + } +} diff --git a/data/novtau/PLA/pla_silk_plus/pink/sizes.json b/data/novtau/PLA/pla_silk_plus/pink/sizes.json index decd9279f2..8ce921b57e 100644 --- a/data/novtau/PLA/pla_silk_plus/pink/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "d51b891e-e648-4abe-b0b0-09d5e1e1fcba", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "d51b891e-e648-4abe-b0b0-09d5e1e1fcba" } ] diff --git a/data/novtau/PLA/pla_silk_plus/pink/variant.json b/data/novtau/PLA/pla_silk_plus/pink/variant.json index cff3097464..25584972c2 100644 --- a/data/novtau/PLA/pla_silk_plus/pink/variant.json +++ b/data/novtau/PLA/pla_silk_plus/pink/variant.json @@ -1,9 +1,9 @@ { - "uuid": "b43623c3-31a5-4003-902f-10cd28d97a60", "id": "pink", "name": "Pink", "color_hex": "#D98097", "traits": { "silk": true - } + }, + "uuid": "b43623c3-31a5-4003-902f-10cd28d97a60" } diff --git a/data/novtau/PLA/pla_silk_plus/purple/sizes.json b/data/novtau/PLA/pla_silk_plus/purple/sizes.json index 85df0ce275..83332af536 100644 --- a/data/novtau/PLA/pla_silk_plus/purple/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/purple/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "91b6617d-3f26-4a3b-9e5a-8eaa5d907455", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "91b6617d-3f26-4a3b-9e5a-8eaa5d907455" } ] diff --git a/data/novtau/PLA/pla_silk_plus/purple/variant.json b/data/novtau/PLA/pla_silk_plus/purple/variant.json index f2a5b79f05..ba46d1cd7c 100644 --- a/data/novtau/PLA/pla_silk_plus/purple/variant.json +++ b/data/novtau/PLA/pla_silk_plus/purple/variant.json @@ -1,9 +1,9 @@ { - "uuid": "297bef14-ebaa-4d98-b072-c2bb75d0803a", "id": "purple", "name": "Purple", "color_hex": "#9D43AD", "traits": { "silk": true - } + }, + "uuid": "297bef14-ebaa-4d98-b072-c2bb75d0803a" } diff --git a/data/novtau/PLA/pla_silk_plus/rose_gold/sizes.json b/data/novtau/PLA/pla_silk_plus/rose_gold/sizes.json index 24ebee269a..79ab6499c1 100644 --- a/data/novtau/PLA/pla_silk_plus/rose_gold/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/rose_gold/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "d1362d3f-fa6c-4034-ab11-3ab58c3d9de5", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "d1362d3f-fa6c-4034-ab11-3ab58c3d9de5" } ] diff --git a/data/novtau/PLA/pla_silk_plus/rose_gold/variant.json b/data/novtau/PLA/pla_silk_plus/rose_gold/variant.json index 11a1dd8d64..0e9e7f12dd 100644 --- a/data/novtau/PLA/pla_silk_plus/rose_gold/variant.json +++ b/data/novtau/PLA/pla_silk_plus/rose_gold/variant.json @@ -1,9 +1,9 @@ { - "uuid": "30b21c3a-dd41-4f46-a6eb-aff957057d9a", "id": "rose_gold", "name": "Rose Gold", "color_hex": "#B15E44", "traits": { "silk": true - } + }, + "uuid": "30b21c3a-dd41-4f46-a6eb-aff957057d9a" } diff --git a/data/novtau/PLA/pla_silk_plus/silk_black/sizes.json b/data/novtau/PLA/pla_silk_plus/silk_black/sizes.json index 0346d469b0..ce597bc4a1 100644 --- a/data/novtau/PLA/pla_silk_plus/silk_black/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/silk_black/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "ca5c4cb4-fe5e-4d9b-84f2-06cbe60527f8", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ca5c4cb4-fe5e-4d9b-84f2-06cbe60527f8" } ] diff --git a/data/novtau/PLA/pla_silk_plus/silk_black/variant.json b/data/novtau/PLA/pla_silk_plus/silk_black/variant.json index c22e725568..78e1d7a980 100644 --- a/data/novtau/PLA/pla_silk_plus/silk_black/variant.json +++ b/data/novtau/PLA/pla_silk_plus/silk_black/variant.json @@ -1,9 +1,9 @@ { - "uuid": "eeeee517-dd47-4680-94fe-df930a1648fe", "id": "silk_black", "name": "Silk Black", "color_hex": "#2B2B2B", "traits": { "silk": true - } + }, + "uuid": "eeeee517-dd47-4680-94fe-df930a1648fe" } diff --git a/data/novtau/PLA/pla_silk_plus/silk_bronze/sizes.json b/data/novtau/PLA/pla_silk_plus/silk_bronze/sizes.json index 02671a2965..51ebeda3c1 100644 --- a/data/novtau/PLA/pla_silk_plus/silk_bronze/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/silk_bronze/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "e54d311a-353c-4ab6-a2d9-e8e4040d6d59", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "e54d311a-353c-4ab6-a2d9-e8e4040d6d59" } ] diff --git a/data/novtau/PLA/pla_silk_plus/silk_bronze/variant.json b/data/novtau/PLA/pla_silk_plus/silk_bronze/variant.json index 08479b53da..7045d4a840 100644 --- a/data/novtau/PLA/pla_silk_plus/silk_bronze/variant.json +++ b/data/novtau/PLA/pla_silk_plus/silk_bronze/variant.json @@ -1,9 +1,9 @@ { - "uuid": "804c82f9-c7fb-463f-9e3e-1fe205042ac3", "id": "silk_bronze", "name": "Silk Bronze", - "color_hex": "#877F4F", + "color_hex": "#867E4E", "traits": { "silk": true - } + }, + "uuid": "804c82f9-c7fb-463f-9e3e-1fe205042ac3" } diff --git a/data/novtau/PLA/pla_silk_plus/silk_rose_red/sizes.json b/data/novtau/PLA/pla_silk_plus/silk_rose_red/sizes.json index 43f0e13766..d69414ea14 100644 --- a/data/novtau/PLA/pla_silk_plus/silk_rose_red/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/silk_rose_red/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "ee737e1c-9aea-4eb1-9387-8da63a784152", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ee737e1c-9aea-4eb1-9387-8da63a784152" } ] diff --git a/data/novtau/PLA/pla_silk_plus/silk_rose_red/variant.json b/data/novtau/PLA/pla_silk_plus/silk_rose_red/variant.json index 961bbfcdc4..5e66066b56 100644 --- a/data/novtau/PLA/pla_silk_plus/silk_rose_red/variant.json +++ b/data/novtau/PLA/pla_silk_plus/silk_rose_red/variant.json @@ -1,9 +1,9 @@ { - "uuid": "4d33e2a7-0169-4380-878d-3eb5f2c391c5", "id": "silk_rose_red", "name": "Silk Rose Red", - "color_hex": "#D3356A", + "color_hex": "#D03569", "traits": { "silk": true - } + }, + "uuid": "4d33e2a7-0169-4380-878d-3eb5f2c391c5" } diff --git a/data/novtau/PLA/pla_silk_plus/silk_yellow/sizes.json b/data/novtau/PLA/pla_silk_plus/silk_yellow/sizes.json index ba4a1fbc8e..726a0db2e1 100644 --- a/data/novtau/PLA/pla_silk_plus/silk_yellow/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/silk_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "2fabdbe8-e06a-472e-b869-f5cd61d71c93", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "2fabdbe8-e06a-472e-b869-f5cd61d71c93" } ] diff --git a/data/novtau/PLA/pla_silk_plus/silk_yellow/variant.json b/data/novtau/PLA/pla_silk_plus/silk_yellow/variant.json index 7f8f62af11..329a9d4f8c 100644 --- a/data/novtau/PLA/pla_silk_plus/silk_yellow/variant.json +++ b/data/novtau/PLA/pla_silk_plus/silk_yellow/variant.json @@ -1,9 +1,9 @@ { - "uuid": "63fcbcec-e3d8-46cc-9e9b-d412b0427517", "id": "silk_yellow", "name": "Silk Yellow", - "color_hex": "#E6B815", + "color_hex": "#E4B716", "traits": { "silk": true - } + }, + "uuid": "63fcbcec-e3d8-46cc-9e9b-d412b0427517" } diff --git a/data/novtau/PLA/pla_silk_plus/silver/sizes.json b/data/novtau/PLA/pla_silk_plus/silver/sizes.json index b183f064c7..60ddf8026f 100644 --- a/data/novtau/PLA/pla_silk_plus/silver/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/silver/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "c12572e4-71b0-4fb5-a973-e72248fd0382", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "c12572e4-71b0-4fb5-a973-e72248fd0382" } ] diff --git a/data/novtau/PLA/pla_silk_plus/silver/variant.json b/data/novtau/PLA/pla_silk_plus/silver/variant.json index 4a709ef37e..8dff7418ff 100644 --- a/data/novtau/PLA/pla_silk_plus/silver/variant.json +++ b/data/novtau/PLA/pla_silk_plus/silver/variant.json @@ -1,9 +1,9 @@ { - "uuid": "1c984818-f397-491a-83d7-1fbc3fbfd611", "id": "silver", "name": "Silver", "color_hex": "#969699", "traits": { "silk": true - } + }, + "uuid": "1c984818-f397-491a-83d7-1fbc3fbfd611" } diff --git a/data/novtau/PLA/pla_silk_plus/titan_gray/variant.json b/data/novtau/PLA/pla_silk_plus/titan_gray/variant.json index a571d76c62..82f1cc1a1b 100644 --- a/data/novtau/PLA/pla_silk_plus/titan_gray/variant.json +++ b/data/novtau/PLA/pla_silk_plus/titan_gray/variant.json @@ -3,6 +3,7 @@ "id": "titan_gray", "name": "Titan Gray", "color_hex": "#97979B", + "discontinued": true, "traits": { "silk": true } diff --git a/data/novtau/PLA/pla_silk_plus/turquoise/sizes.json b/data/novtau/PLA/pla_silk_plus/turquoise/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/turquoise/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_plus/turquoise/variant.json b/data/novtau/PLA/pla_silk_plus/turquoise/variant.json new file mode 100644 index 0000000000..fa97ea31b4 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/turquoise/variant.json @@ -0,0 +1,8 @@ +{ + "id": "turquoise", + "name": "Turquoise", + "color_hex": "#2BC8D4", + "traits": { + "silk": true + } +} diff --git a/data/novtau/PLA/pla_silk_plus/vermilion_red/sizes.json b/data/novtau/PLA/pla_silk_plus/vermilion_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/vermilion_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_silk_plus/vermilion_red/variant.json b/data/novtau/PLA/pla_silk_plus/vermilion_red/variant.json new file mode 100644 index 0000000000..9d986af58b --- /dev/null +++ b/data/novtau/PLA/pla_silk_plus/vermilion_red/variant.json @@ -0,0 +1,8 @@ +{ + "id": "vermilion_red", + "name": "Vermilion Red", + "color_hex": "#E52428", + "traits": { + "silk": true + } +} diff --git a/data/novtau/PLA/pla_silk_plus/white/sizes.json b/data/novtau/PLA/pla_silk_plus/white/sizes.json index 6be44cf2c5..05e02c0219 100644 --- a/data/novtau/PLA/pla_silk_plus/white/sizes.json +++ b/data/novtau/PLA/pla_silk_plus/white/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "12ff40a1-6a54-48a2-92a8-a7827ad41313", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "12ff40a1-6a54-48a2-92a8-a7827ad41313" } ] diff --git a/data/novtau/PLA/pla_silk_plus/white/variant.json b/data/novtau/PLA/pla_silk_plus/white/variant.json index d99bf52ed3..9a7c53ed4f 100644 --- a/data/novtau/PLA/pla_silk_plus/white/variant.json +++ b/data/novtau/PLA/pla_silk_plus/white/variant.json @@ -1,9 +1,9 @@ { - "uuid": "e1ece71a-2366-46fe-8796-22564d59ce8c", "id": "white", "name": "White", "color_hex": "#D5D5D4", "traits": { "silk": true - } + }, + "uuid": "e1ece71a-2366-46fe-8796-22564d59ce8c" } diff --git a/data/novtau/PLA/pla_sparkle/black_green_sparkle/sizes.json b/data/novtau/PLA/pla_sparkle/black_green_sparkle/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/black_green_sparkle/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_sparkle/black_green_sparkle/variant.json b/data/novtau/PLA/pla_sparkle/black_green_sparkle/variant.json new file mode 100644 index 0000000000..ede0cbb6e6 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/black_green_sparkle/variant.json @@ -0,0 +1,8 @@ +{ + "id": "black_green_sparkle", + "name": "Black Green Sparkle", + "color_hex": "#2B382F", + "traits": { + "glitter": true + } +} diff --git a/data/novtau/PLA/pla_sparkle/blue_gold_sparkle/sizes.json b/data/novtau/PLA/pla_sparkle/blue_gold_sparkle/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/blue_gold_sparkle/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_sparkle/blue_gold_sparkle/variant.json b/data/novtau/PLA/pla_sparkle/blue_gold_sparkle/variant.json new file mode 100644 index 0000000000..22747a1a68 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/blue_gold_sparkle/variant.json @@ -0,0 +1,8 @@ +{ + "id": "blue_gold_sparkle", + "name": "Blue Gold Sparkle", + "color_hex": "#2B679A", + "traits": { + "glitter": true + } +} diff --git a/data/novtau/PLA/pla_sparkle/classic_gold_sparkle/sizes.json b/data/novtau/PLA/pla_sparkle/classic_gold_sparkle/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/classic_gold_sparkle/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_sparkle/classic_gold_sparkle/variant.json b/data/novtau/PLA/pla_sparkle/classic_gold_sparkle/variant.json new file mode 100644 index 0000000000..3769f793c0 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/classic_gold_sparkle/variant.json @@ -0,0 +1,8 @@ +{ + "id": "classic_gold_sparkle", + "name": "Classic Gold Sparkle", + "color_hex": "#CB8B23", + "traits": { + "glitter": true + } +} diff --git a/data/novtau/PLA/pla_sparkle/crimson_red_sparkle/sizes.json b/data/novtau/PLA/pla_sparkle/crimson_red_sparkle/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/crimson_red_sparkle/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_sparkle/crimson_red_sparkle/variant.json b/data/novtau/PLA/pla_sparkle/crimson_red_sparkle/variant.json new file mode 100644 index 0000000000..d7afe39a29 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/crimson_red_sparkle/variant.json @@ -0,0 +1,8 @@ +{ + "id": "crimson_red_sparkle", + "name": "Crimson Red Sparkle", + "color_hex": "#9D2317", + "traits": { + "glitter": true + } +} diff --git a/data/novtau/PLA/pla_sparkle/filament.json b/data/novtau/PLA/pla_sparkle/filament.json new file mode 100644 index 0000000000..b36f6ca372 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/filament.json @@ -0,0 +1,6 @@ +{ + "id": "pla_sparkle", + "name": "PLA Sparkle", + "diameter_tolerance": 0.02, + "density": 1.24 +} diff --git a/data/novtau/PLA/pla_sparkle/onyx_black_sparkle/sizes.json b/data/novtau/PLA/pla_sparkle/onyx_black_sparkle/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/onyx_black_sparkle/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_sparkle/onyx_black_sparkle/variant.json b/data/novtau/PLA/pla_sparkle/onyx_black_sparkle/variant.json new file mode 100644 index 0000000000..e5399e47bf --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/onyx_black_sparkle/variant.json @@ -0,0 +1,8 @@ +{ + "id": "onyx_black_sparkle", + "name": "Onyx Black Sparkle", + "color_hex": "#252525", + "traits": { + "glitter": true + } +} diff --git a/data/novtau/PLA/pla_sparkle/slate_gray_sparkle/sizes.json b/data/novtau/PLA/pla_sparkle/slate_gray_sparkle/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/slate_gray_sparkle/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_sparkle/slate_gray_sparkle/variant.json b/data/novtau/PLA/pla_sparkle/slate_gray_sparkle/variant.json new file mode 100644 index 0000000000..d7c324dbc5 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/slate_gray_sparkle/variant.json @@ -0,0 +1,8 @@ +{ + "id": "slate_gray_sparkle", + "name": "Slate Gray Sparkle", + "color_hex": "#76807E", + "traits": { + "glitter": true + } +} diff --git a/data/novtau/PLA/pla_sparkle/white_gold_sparkle/sizes.json b/data/novtau/PLA/pla_sparkle/white_gold_sparkle/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/white_gold_sparkle/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_sparkle/white_gold_sparkle/variant.json b/data/novtau/PLA/pla_sparkle/white_gold_sparkle/variant.json new file mode 100644 index 0000000000..cef7e9a5a0 --- /dev/null +++ b/data/novtau/PLA/pla_sparkle/white_gold_sparkle/variant.json @@ -0,0 +1,8 @@ +{ + "id": "white_gold_sparkle", + "name": "White Gold Sparkle", + "color_hex": "#DBBE9E", + "traits": { + "glitter": true + } +} diff --git a/data/novtau/PLA/pla_thermochromic/blue_to_purple/sizes.json b/data/novtau/PLA/pla_thermochromic/blue_to_purple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_thermochromic/blue_to_purple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_thermochromic/blue_to_purple/variant.json b/data/novtau/PLA/pla_thermochromic/blue_to_purple/variant.json new file mode 100644 index 0000000000..5398da16e1 --- /dev/null +++ b/data/novtau/PLA/pla_thermochromic/blue_to_purple/variant.json @@ -0,0 +1,11 @@ +{ + "id": "blue_to_purple", + "name": "Blue to Purple", + "color_hex": [ + "#3762B4", + "#8F53BB" + ], + "traits": { + "temperature_color_change": true + } +} diff --git a/data/novtau/PLA/pla_thermochromic/dual_purple_green_to_pink_yellow/sizes.json b/data/novtau/PLA/pla_thermochromic/dual_purple_green_to_pink_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_thermochromic/dual_purple_green_to_pink_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_thermochromic/dual_purple_green_to_pink_yellow/variant.json b/data/novtau/PLA/pla_thermochromic/dual_purple_green_to_pink_yellow/variant.json new file mode 100644 index 0000000000..24cd908836 --- /dev/null +++ b/data/novtau/PLA/pla_thermochromic/dual_purple_green_to_pink_yellow/variant.json @@ -0,0 +1,14 @@ +{ + "id": "dual_purple_green_to_pink_yellow", + "name": "Dual Purple-Green to Pink-Yellow", + "color_hex": [ + "#8548B8", + "#6EC468", + "#DE688D", + "#E9D66B" + ], + "traits": { + "temperature_color_change": true, + "coextruded": true + } +} diff --git a/data/novtau/PLA/pla_thermochromic/filament.json b/data/novtau/PLA/pla_thermochromic/filament.json index 23148c429a..9b18042bc7 100644 --- a/data/novtau/PLA/pla_thermochromic/filament.json +++ b/data/novtau/PLA/pla_thermochromic/filament.json @@ -1,7 +1,7 @@ { - "uuid": "92931c40-d0bc-48bf-b769-7582a7a66645", "id": "pla_thermochromic", "name": "PLA Thermochromic", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "92931c40-d0bc-48bf-b769-7582a7a66645" } diff --git a/data/novtau/PLA/pla_thermochromic/green_to_yellow/sizes.json b/data/novtau/PLA/pla_thermochromic/green_to_yellow/sizes.json index 9ac11af8b7..9ea74ba1e6 100644 --- a/data/novtau/PLA/pla_thermochromic/green_to_yellow/sizes.json +++ b/data/novtau/PLA/pla_thermochromic/green_to_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "9687c06f-5679-4b3a-936c-49056c84505d", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "9687c06f-5679-4b3a-936c-49056c84505d" } ] diff --git a/data/novtau/PLA/pla_thermochromic/green_to_yellow/variant.json b/data/novtau/PLA/pla_thermochromic/green_to_yellow/variant.json index 051a2a0bb7..e84ff2ba6a 100644 --- a/data/novtau/PLA/pla_thermochromic/green_to_yellow/variant.json +++ b/data/novtau/PLA/pla_thermochromic/green_to_yellow/variant.json @@ -2,7 +2,10 @@ "uuid": "c278da73-cf6c-453e-8dd2-65420cc4bab8", "id": "green_to_yellow", "name": "Green to Yellow", - "color_hex": "#A0C65C", + "color_hex": [ + "#88AD44", + "#D3CC37" + ], "traits": { "temperature_color_change": true } diff --git a/data/novtau/PLA/pla_thermochromic/orange_to_yellow/sizes.json b/data/novtau/PLA/pla_thermochromic/orange_to_yellow/sizes.json index d258671087..5c635f2fce 100644 --- a/data/novtau/PLA/pla_thermochromic/orange_to_yellow/sizes.json +++ b/data/novtau/PLA/pla_thermochromic/orange_to_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "3dee97e5-4a6e-441f-a6a0-7f599447d6a9", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "3dee97e5-4a6e-441f-a6a0-7f599447d6a9" } ] diff --git a/data/novtau/PLA/pla_thermochromic/orange_to_yellow/variant.json b/data/novtau/PLA/pla_thermochromic/orange_to_yellow/variant.json index 15cf05b557..b8dd8a2241 100644 --- a/data/novtau/PLA/pla_thermochromic/orange_to_yellow/variant.json +++ b/data/novtau/PLA/pla_thermochromic/orange_to_yellow/variant.json @@ -2,7 +2,10 @@ "uuid": "3ed2d894-8d20-4882-8e63-cabf22fe9bde", "id": "orange_to_yellow", "name": "Orange to Yellow", - "color_hex": "#EAB252", + "color_hex": [ + "#E77A3B", + "#E1C545" + ], "traits": { "temperature_color_change": true } diff --git a/data/novtau/PLA/pla_thermochromic/purple_to_blue/sizes.json b/data/novtau/PLA/pla_thermochromic/purple_to_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_thermochromic/purple_to_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_thermochromic/purple_to_blue/variant.json b/data/novtau/PLA/pla_thermochromic/purple_to_blue/variant.json new file mode 100644 index 0000000000..0512d4f83e --- /dev/null +++ b/data/novtau/PLA/pla_thermochromic/purple_to_blue/variant.json @@ -0,0 +1,11 @@ +{ + "id": "purple_to_blue", + "name": "Purple to Blue", + "color_hex": [ + "#3258B5", + "#65378C" + ], + "traits": { + "temperature_color_change": true + } +} diff --git a/data/novtau/PLA/pla_thermochromic/purple_to_pink/sizes.json b/data/novtau/PLA/pla_thermochromic/purple_to_pink/sizes.json index 85b4dfd9a0..12e4a41cda 100644 --- a/data/novtau/PLA/pla_thermochromic/purple_to_pink/sizes.json +++ b/data/novtau/PLA/pla_thermochromic/purple_to_pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "fd32e39b-6fca-4ab0-94a8-66a4bda9d469", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "fd32e39b-6fca-4ab0-94a8-66a4bda9d469" } ] diff --git a/data/novtau/PLA/pla_thermochromic/purple_to_pink/variant.json b/data/novtau/PLA/pla_thermochromic/purple_to_pink/variant.json index f0a7534e2f..33133c9758 100644 --- a/data/novtau/PLA/pla_thermochromic/purple_to_pink/variant.json +++ b/data/novtau/PLA/pla_thermochromic/purple_to_pink/variant.json @@ -2,7 +2,10 @@ "uuid": "cd3daaf9-b7b1-4e83-b144-ba12e0354b92", "id": "purple_to_pink", "name": "Purple to Pink", - "color_hex": "#C767C2", + "color_hex": [ + "#8A45B9", + "#D96DAE" + ], "traits": { "temperature_color_change": true } diff --git a/data/novtau/PLA/pla_thermochromic/yellow_to_green/sizes.json b/data/novtau/PLA/pla_thermochromic/yellow_to_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_thermochromic/yellow_to_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_thermochromic/yellow_to_green/variant.json b/data/novtau/PLA/pla_thermochromic/yellow_to_green/variant.json new file mode 100644 index 0000000000..1e8bc509fe --- /dev/null +++ b/data/novtau/PLA/pla_thermochromic/yellow_to_green/variant.json @@ -0,0 +1,11 @@ +{ + "id": "yellow_to_green", + "name": "Yellow to Green", + "color_hex": [ + "#DCE342", + "#6FB830" + ], + "traits": { + "temperature_color_change": true + } +} diff --git a/data/novtau/PLA/pla_tough_plus/black/sizes.json b/data/novtau/PLA/pla_tough_plus/black/sizes.json index 54047a2d90..71329200ea 100644 --- a/data/novtau/PLA/pla_tough_plus/black/sizes.json +++ b/data/novtau/PLA/pla_tough_plus/black/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "491560e0-c1e2-421d-bbe2-1acdde97a4dc", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "491560e0-c1e2-421d-bbe2-1acdde97a4dc" } ] diff --git a/data/novtau/PLA/pla_tough_plus/black/variant.json b/data/novtau/PLA/pla_tough_plus/black/variant.json index 529452979b..a26b877b7c 100644 --- a/data/novtau/PLA/pla_tough_plus/black/variant.json +++ b/data/novtau/PLA/pla_tough_plus/black/variant.json @@ -1,6 +1,6 @@ { - "uuid": "b720ff5d-90a5-4b33-af5d-a53338b77ecb", "id": "black", "name": "Black", - "color_hex": "#262626" + "color_hex": "#2A2A2A", + "uuid": "b720ff5d-90a5-4b33-af5d-a53338b77ecb" } diff --git a/data/novtau/PLA/pla_tough_plus/blue/sizes.json b/data/novtau/PLA/pla_tough_plus/blue/sizes.json index eee05fb34b..a21abc5c91 100644 --- a/data/novtau/PLA/pla_tough_plus/blue/sizes.json +++ b/data/novtau/PLA/pla_tough_plus/blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "d2b48430-6c29-4db9-b5ba-57e06a9c4e60", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "d2b48430-6c29-4db9-b5ba-57e06a9c4e60" } ] diff --git a/data/novtau/PLA/pla_tough_plus/blue/variant.json b/data/novtau/PLA/pla_tough_plus/blue/variant.json index 0403b91b0e..285ee16be8 100644 --- a/data/novtau/PLA/pla_tough_plus/blue/variant.json +++ b/data/novtau/PLA/pla_tough_plus/blue/variant.json @@ -1,6 +1,6 @@ { - "uuid": "d2a3ba40-5d62-454b-933d-da1382d11208", "id": "blue", "name": "Blue", - "color_hex": "#0C4AD5" + "color_hex": "#0D49D1", + "uuid": "d2a3ba40-5d62-454b-933d-da1382d11208" } diff --git a/data/novtau/PLA/pla_tough_plus/bone_white/sizes.json b/data/novtau/PLA/pla_tough_plus/bone_white/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/bone_white/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_tough_plus/bone_white/variant.json b/data/novtau/PLA/pla_tough_plus/bone_white/variant.json new file mode 100644 index 0000000000..0ef0ccc50c --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/bone_white/variant.json @@ -0,0 +1,5 @@ +{ + "id": "bone_white", + "name": "Bone White", + "color_hex": "#D9CAAD" +} diff --git a/data/novtau/PLA/pla_tough_plus/brown/sizes.json b/data/novtau/PLA/pla_tough_plus/brown/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/brown/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_tough_plus/brown/variant.json b/data/novtau/PLA/pla_tough_plus/brown/variant.json new file mode 100644 index 0000000000..4312a46509 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/brown/variant.json @@ -0,0 +1,5 @@ +{ + "id": "brown", + "name": "Brown", + "color_hex": "#A57E60" +} diff --git a/data/novtau/PLA/pla_tough_plus/cyan/variant.json b/data/novtau/PLA/pla_tough_plus/cyan/variant.json index ecbdf33ad5..b2756bf39e 100644 --- a/data/novtau/PLA/pla_tough_plus/cyan/variant.json +++ b/data/novtau/PLA/pla_tough_plus/cyan/variant.json @@ -2,5 +2,6 @@ "uuid": "af732764-6619-4a1a-a73a-2cde5154345e", "id": "cyan", "name": "Cyan", - "color_hex": "#0C9EDA" + "color_hex": "#0C9EDA", + "discontinued": true } diff --git a/data/novtau/PLA/pla_tough_plus/dark_green/sizes.json b/data/novtau/PLA/pla_tough_plus/dark_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/dark_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_tough_plus/dark_green/variant.json b/data/novtau/PLA/pla_tough_plus/dark_green/variant.json new file mode 100644 index 0000000000..aa2d48b711 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/dark_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "dark_green", + "name": "Dark Green", + "color_hex": "#6FAD74" +} diff --git a/data/novtau/PLA/pla_tough_plus/filament.json b/data/novtau/PLA/pla_tough_plus/filament.json index 4881bb2eb8..91c6ce53c5 100644 --- a/data/novtau/PLA/pla_tough_plus/filament.json +++ b/data/novtau/PLA/pla_tough_plus/filament.json @@ -1,7 +1,7 @@ { - "uuid": "324d4b0b-8727-41d1-af61-3cf7b4d9e6bc", "id": "pla_tough_plus", "name": "PLA Tough+", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "324d4b0b-8727-41d1-af61-3cf7b4d9e6bc" } diff --git a/data/novtau/PLA/pla_tough_plus/golden_yellow/sizes.json b/data/novtau/PLA/pla_tough_plus/golden_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/golden_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_tough_plus/golden_yellow/variant.json b/data/novtau/PLA/pla_tough_plus/golden_yellow/variant.json new file mode 100644 index 0000000000..0f1df68c92 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/golden_yellow/variant.json @@ -0,0 +1,5 @@ +{ + "id": "golden_yellow", + "name": "Golden Yellow", + "color_hex": "#D7A64A" +} diff --git a/data/novtau/PLA/pla_tough_plus/gray/sizes.json b/data/novtau/PLA/pla_tough_plus/gray/sizes.json index 83e9e397d4..d813507e2b 100644 --- a/data/novtau/PLA/pla_tough_plus/gray/sizes.json +++ b/data/novtau/PLA/pla_tough_plus/gray/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "b21e933b-6232-4bb5-b258-3643196feeb9", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "b21e933b-6232-4bb5-b258-3643196feeb9" } ] diff --git a/data/novtau/PLA/pla_tough_plus/gray/variant.json b/data/novtau/PLA/pla_tough_plus/gray/variant.json index 5de42caeba..d9c0e115bf 100644 --- a/data/novtau/PLA/pla_tough_plus/gray/variant.json +++ b/data/novtau/PLA/pla_tough_plus/gray/variant.json @@ -1,6 +1,6 @@ { - "uuid": "69d5e6b6-4a6f-48ab-9556-28c1fcedee4b", "id": "gray", "name": "Gray", - "color_hex": "#858689" + "color_hex": "#737375", + "uuid": "69d5e6b6-4a6f-48ab-9556-28c1fcedee4b" } diff --git a/data/novtau/PLA/pla_tough_plus/green/sizes.json b/data/novtau/PLA/pla_tough_plus/green/sizes.json index 408fbd2705..3b6274712a 100644 --- a/data/novtau/PLA/pla_tough_plus/green/sizes.json +++ b/data/novtau/PLA/pla_tough_plus/green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "dca936db-5868-44b2-a957-8555ffe25621", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "dca936db-5868-44b2-a957-8555ffe25621" } ] diff --git a/data/novtau/PLA/pla_tough_plus/green/variant.json b/data/novtau/PLA/pla_tough_plus/green/variant.json index a6e242b864..0ab312d7a3 100644 --- a/data/novtau/PLA/pla_tough_plus/green/variant.json +++ b/data/novtau/PLA/pla_tough_plus/green/variant.json @@ -1,6 +1,6 @@ { - "uuid": "f796e188-d565-42ce-b467-58673293685c", "id": "green", "name": "Green", - "color_hex": "#05A053" + "color_hex": "#069E53", + "uuid": "f796e188-d565-42ce-b467-58673293685c" } diff --git a/data/novtau/PLA/pla_tough_plus/lake_blue/sizes.json b/data/novtau/PLA/pla_tough_plus/lake_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/lake_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_tough_plus/lake_blue/variant.json b/data/novtau/PLA/pla_tough_plus/lake_blue/variant.json new file mode 100644 index 0000000000..b7412ba232 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/lake_blue/variant.json @@ -0,0 +1,5 @@ +{ + "id": "lake_blue", + "name": "Lake Blue", + "color_hex": "#477691" +} diff --git a/data/novtau/PLA/pla_tough_plus/light_blue/sizes.json b/data/novtau/PLA/pla_tough_plus/light_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/light_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_tough_plus/light_blue/variant.json b/data/novtau/PLA/pla_tough_plus/light_blue/variant.json new file mode 100644 index 0000000000..32cc3a5053 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/light_blue/variant.json @@ -0,0 +1,5 @@ +{ + "id": "light_blue", + "name": "Light Blue", + "color_hex": "#64AAEB" +} diff --git a/data/novtau/PLA/pla_tough_plus/light_pink/sizes.json b/data/novtau/PLA/pla_tough_plus/light_pink/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/light_pink/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_tough_plus/light_pink/variant.json b/data/novtau/PLA/pla_tough_plus/light_pink/variant.json new file mode 100644 index 0000000000..861e2e1bde --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/light_pink/variant.json @@ -0,0 +1,5 @@ +{ + "id": "light_pink", + "name": "Light Pink", + "color_hex": "#F9B1C8" +} diff --git a/data/novtau/PLA/pla_tough_plus/mint_green/sizes.json b/data/novtau/PLA/pla_tough_plus/mint_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/mint_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_tough_plus/mint_green/variant.json b/data/novtau/PLA/pla_tough_plus/mint_green/variant.json new file mode 100644 index 0000000000..8ff32284dd --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/mint_green/variant.json @@ -0,0 +1,5 @@ +{ + "id": "mint_green", + "name": "Mint Green", + "color_hex": "#73DFD5" +} diff --git a/data/novtau/PLA/pla_tough_plus/orange/sizes.json b/data/novtau/PLA/pla_tough_plus/orange/sizes.json index acd872b686..30c83329c8 100644 --- a/data/novtau/PLA/pla_tough_plus/orange/sizes.json +++ b/data/novtau/PLA/pla_tough_plus/orange/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "80276f5a-6d60-4c92-9e60-bdd066d1bf20", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "80276f5a-6d60-4c92-9e60-bdd066d1bf20" } ] diff --git a/data/novtau/PLA/pla_tough_plus/orange/variant.json b/data/novtau/PLA/pla_tough_plus/orange/variant.json index 18c3989348..7e549a71c1 100644 --- a/data/novtau/PLA/pla_tough_plus/orange/variant.json +++ b/data/novtau/PLA/pla_tough_plus/orange/variant.json @@ -1,6 +1,6 @@ { - "uuid": "69848610-573a-49c8-b424-0dde94659975", "id": "orange", "name": "Orange", - "color_hex": "#F05D16" + "color_hex": "#E8601D", + "uuid": "69848610-573a-49c8-b424-0dde94659975" } diff --git a/data/novtau/PLA/pla_tough_plus/pantone_107c_yellow/sizes.json b/data/novtau/PLA/pla_tough_plus/pantone_107c_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/pantone_107c_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_tough_plus/pantone_107c_yellow/variant.json b/data/novtau/PLA/pla_tough_plus/pantone_107c_yellow/variant.json new file mode 100644 index 0000000000..446a8a008d --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/pantone_107c_yellow/variant.json @@ -0,0 +1,5 @@ +{ + "id": "pantone_107c_yellow", + "name": "Pantone 107C Yellow", + "color_hex": "#F7E109" +} diff --git a/data/novtau/PLA/pla_tough_plus/pink/sizes.json b/data/novtau/PLA/pla_tough_plus/pink/sizes.json index 7bd9837c22..626ccee762 100644 --- a/data/novtau/PLA/pla_tough_plus/pink/sizes.json +++ b/data/novtau/PLA/pla_tough_plus/pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "4bdeb616-bdd9-4da5-9d6e-1780b4192f93", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "4bdeb616-bdd9-4da5-9d6e-1780b4192f93" } ] diff --git a/data/novtau/PLA/pla_tough_plus/pink/variant.json b/data/novtau/PLA/pla_tough_plus/pink/variant.json index deb9cb2a03..cb0eb51472 100644 --- a/data/novtau/PLA/pla_tough_plus/pink/variant.json +++ b/data/novtau/PLA/pla_tough_plus/pink/variant.json @@ -1,6 +1,6 @@ { - "uuid": "93db9dac-045a-49a4-b4a6-5b67bf675aab", "id": "pink", "name": "Pink", - "color_hex": "#F06290" + "color_hex": "#EE618E", + "uuid": "93db9dac-045a-49a4-b4a6-5b67bf675aab" } diff --git a/data/novtau/PLA/pla_tough_plus/purple/sizes.json b/data/novtau/PLA/pla_tough_plus/purple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/purple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_tough_plus/purple/variant.json b/data/novtau/PLA/pla_tough_plus/purple/variant.json new file mode 100644 index 0000000000..2d81977818 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/purple/variant.json @@ -0,0 +1,5 @@ +{ + "id": "purple", + "name": "Purple", + "color_hex": "#C836AB" +} diff --git a/data/novtau/PLA/pla_tough_plus/red/sizes.json b/data/novtau/PLA/pla_tough_plus/red/sizes.json index 2c22046377..c7b207602e 100644 --- a/data/novtau/PLA/pla_tough_plus/red/sizes.json +++ b/data/novtau/PLA/pla_tough_plus/red/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "d6325bd7-127f-43cd-a6bf-2d22443adf89", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "d6325bd7-127f-43cd-a6bf-2d22443adf89" } ] diff --git a/data/novtau/PLA/pla_tough_plus/red/variant.json b/data/novtau/PLA/pla_tough_plus/red/variant.json index cc43b1eb15..d971434bd8 100644 --- a/data/novtau/PLA/pla_tough_plus/red/variant.json +++ b/data/novtau/PLA/pla_tough_plus/red/variant.json @@ -1,6 +1,6 @@ { - "uuid": "211e3bd2-6267-46d1-893c-e4d7baa4361e", "id": "red", "name": "Red", - "color_hex": "#D72025" + "color_hex": "#D42025", + "uuid": "211e3bd2-6267-46d1-893c-e4d7baa4361e" } diff --git a/data/novtau/PLA/pla_tough_plus/silver/sizes.json b/data/novtau/PLA/pla_tough_plus/silver/sizes.json index 966aab0222..a3bdaa37f2 100644 --- a/data/novtau/PLA/pla_tough_plus/silver/sizes.json +++ b/data/novtau/PLA/pla_tough_plus/silver/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "1027b267-7886-4692-b106-1200f123c4b0", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "1027b267-7886-4692-b106-1200f123c4b0" } ] diff --git a/data/novtau/PLA/pla_tough_plus/silver/variant.json b/data/novtau/PLA/pla_tough_plus/silver/variant.json index 3d8965c91f..dccb33cb7f 100644 --- a/data/novtau/PLA/pla_tough_plus/silver/variant.json +++ b/data/novtau/PLA/pla_tough_plus/silver/variant.json @@ -1,6 +1,6 @@ { - "uuid": "fbda914e-5fd7-4be4-8f1c-ccdf1cc3a44d", "id": "silver", "name": "Silver", - "color_hex": "#999999" + "color_hex": "#6C6D6D", + "uuid": "fbda914e-5fd7-4be4-8f1c-ccdf1cc3a44d" } diff --git a/data/novtau/PLA/pla_tough_plus/skin_tone/sizes.json b/data/novtau/PLA/pla_tough_plus/skin_tone/sizes.json index a858d8ccc8..ebcf3441de 100644 --- a/data/novtau/PLA/pla_tough_plus/skin_tone/sizes.json +++ b/data/novtau/PLA/pla_tough_plus/skin_tone/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "2533c3cf-5641-47e6-924f-63b05ecc3b55", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "2533c3cf-5641-47e6-924f-63b05ecc3b55" } ] diff --git a/data/novtau/PLA/pla_tough_plus/skin_tone/variant.json b/data/novtau/PLA/pla_tough_plus/skin_tone/variant.json index ce7b87746e..1480312b83 100644 --- a/data/novtau/PLA/pla_tough_plus/skin_tone/variant.json +++ b/data/novtau/PLA/pla_tough_plus/skin_tone/variant.json @@ -1,6 +1,6 @@ { - "uuid": "57cbd8cc-687a-470c-99c9-278a826de1c8", "id": "skin_tone", "name": "Skin Tone", - "color_hex": "#DFC2AB" + "color_hex": "#DEC1A9", + "uuid": "57cbd8cc-687a-470c-99c9-278a826de1c8" } diff --git a/data/novtau/PLA/pla_tough_plus/white/sizes.json b/data/novtau/PLA/pla_tough_plus/white/sizes.json index 046abfd2c4..6a4bfdcbae 100644 --- a/data/novtau/PLA/pla_tough_plus/white/sizes.json +++ b/data/novtau/PLA/pla_tough_plus/white/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "1fa18e6c-486d-49dc-9b98-44882c5c1b1d", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "1fa18e6c-486d-49dc-9b98-44882c5c1b1d" } ] diff --git a/data/novtau/PLA/pla_tough_plus/white/variant.json b/data/novtau/PLA/pla_tough_plus/white/variant.json index 1327d10e07..3695c9d44a 100644 --- a/data/novtau/PLA/pla_tough_plus/white/variant.json +++ b/data/novtau/PLA/pla_tough_plus/white/variant.json @@ -1,6 +1,6 @@ { - "uuid": "c9d60a30-282d-45b9-8a36-ca6015c9b7fd", "id": "white", "name": "White", - "color_hex": "#E3DCD0" + "color_hex": "#A69986", + "uuid": "c9d60a30-282d-45b9-8a36-ca6015c9b7fd" } diff --git a/data/novtau/PLA/pla_tough_plus/wood_tone/sizes.json b/data/novtau/PLA/pla_tough_plus/wood_tone/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/wood_tone/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_tough_plus/wood_tone/variant.json b/data/novtau/PLA/pla_tough_plus/wood_tone/variant.json new file mode 100644 index 0000000000..0dbdcaa47c --- /dev/null +++ b/data/novtau/PLA/pla_tough_plus/wood_tone/variant.json @@ -0,0 +1,5 @@ +{ + "id": "wood_tone", + "name": "Wood Tone", + "color_hex": "#D0AA6F" +} diff --git a/data/novtau/PLA/pla_tough_plus/yellow/sizes.json b/data/novtau/PLA/pla_tough_plus/yellow/sizes.json index 34330cd595..8eb2aaf687 100644 --- a/data/novtau/PLA/pla_tough_plus/yellow/sizes.json +++ b/data/novtau/PLA/pla_tough_plus/yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "77567e8a-667b-477d-b810-63892cc5147d", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "77567e8a-667b-477d-b810-63892cc5147d" } ] diff --git a/data/novtau/PLA/pla_tough_plus/yellow/variant.json b/data/novtau/PLA/pla_tough_plus/yellow/variant.json index 4c688d3446..20bc7c87a9 100644 --- a/data/novtau/PLA/pla_tough_plus/yellow/variant.json +++ b/data/novtau/PLA/pla_tough_plus/yellow/variant.json @@ -1,6 +1,6 @@ { - "uuid": "e053e736-08fb-4a21-a778-310e0b66aa14", "id": "yellow", "name": "Yellow", - "color_hex": "#F1B812" + "color_hex": "#F1BB24", + "uuid": "e053e736-08fb-4a21-a778-310e0b66aa14" } diff --git a/data/novtau/PLA/pla_translucent/blue/sizes.json b/data/novtau/PLA/pla_translucent/blue/sizes.json index aef90fcbf0..8d95293821 100644 --- a/data/novtau/PLA/pla_translucent/blue/sizes.json +++ b/data/novtau/PLA/pla_translucent/blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "27d405d3-d713-4fab-a86b-929a475a1e99", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "27d405d3-d713-4fab-a86b-929a475a1e99" } ] diff --git a/data/novtau/PLA/pla_translucent/blue/variant.json b/data/novtau/PLA/pla_translucent/blue/variant.json index 4a5970f719..cd089bed31 100644 --- a/data/novtau/PLA/pla_translucent/blue/variant.json +++ b/data/novtau/PLA/pla_translucent/blue/variant.json @@ -1,9 +1,9 @@ { - "uuid": "70531cdc-b11f-4dcb-87c0-cf18afaec46b", "id": "blue", "name": "Blue", "color_hex": "#1188F2", "traits": { "translucent": true - } + }, + "uuid": "70531cdc-b11f-4dcb-87c0-cf18afaec46b" } diff --git a/data/novtau/PLA/pla_translucent/blue_white_orange/sizes.json b/data/novtau/PLA/pla_translucent/blue_white_orange/sizes.json deleted file mode 100644 index bb1825258f..0000000000 --- a/data/novtau/PLA/pla_translucent/blue_white_orange/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "668e1ae9-fb4a-4f01-bd10-52928280dfe5", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_translucent/blue_white_orange/variant.json b/data/novtau/PLA/pla_translucent/blue_white_orange/variant.json deleted file mode 100644 index 490e1abd29..0000000000 --- a/data/novtau/PLA/pla_translucent/blue_white_orange/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "4c1a079f-d9ce-4641-84f1-053394389ee7", - "id": "blue_white_orange", - "name": "Blue-White-Orange", - "color_hex": "#D5CB9F", - "traits": { - "translucent": true - } -} diff --git a/data/novtau/PLA/pla_translucent/cherry_pink/sizes.json b/data/novtau/PLA/pla_translucent/cherry_pink/sizes.json index e4040090c8..64b77d65ba 100644 --- a/data/novtau/PLA/pla_translucent/cherry_pink/sizes.json +++ b/data/novtau/PLA/pla_translucent/cherry_pink/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "f3118024-d56a-49fa-87f5-32860a154210", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "f3118024-d56a-49fa-87f5-32860a154210" } ] diff --git a/data/novtau/PLA/pla_translucent/cherry_pink/variant.json b/data/novtau/PLA/pla_translucent/cherry_pink/variant.json index 9923c6c2bc..2afc7ebbd6 100644 --- a/data/novtau/PLA/pla_translucent/cherry_pink/variant.json +++ b/data/novtau/PLA/pla_translucent/cherry_pink/variant.json @@ -1,9 +1,9 @@ { - "uuid": "48effb70-a559-40ad-a762-fc80461e8d3f", "id": "cherry_pink", "name": "Cherry Pink", "color_hex": "#F68090", "traits": { "translucent": true - } + }, + "uuid": "48effb70-a559-40ad-a762-fc80461e8d3f" } diff --git a/data/novtau/PLA/pla_translucent/clear/sizes.json b/data/novtau/PLA/pla_translucent/clear/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/clear/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/clear/variant.json b/data/novtau/PLA/pla_translucent/clear/variant.json new file mode 100644 index 0000000000..43b2300bda --- /dev/null +++ b/data/novtau/PLA/pla_translucent/clear/variant.json @@ -0,0 +1,8 @@ +{ + "id": "clear", + "name": "Clear", + "color_hex": "#C9C9CA", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_green/sizes.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_green/sizes.json index 695f70e8f9..278060cdc2 100644 --- a/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_green/sizes.json +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_green/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "42121aed-201e-458b-8c2f-3d8c46b9bb9f", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "42121aed-201e-458b-8c2f-3d8c46b9bb9f" } ] diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_phantom/sizes.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_phantom/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_phantom/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_phantom/variant.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_phantom/variant.json new file mode 100644 index 0000000000..cedee7dc9a --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_phantom/variant.json @@ -0,0 +1,13 @@ +{ + "id": "crystal_rainbow_blue_phantom", + "name": "Crystal Rainbow Blue Phantom", + "color_hex": [ + "#63B1E0", + "#B384D0", + "#8C98DF" + ], + "traits": { + "translucent": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_purple/sizes.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_purple/sizes.json index a6081bf235..230562c53e 100644 --- a/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_purple/sizes.json +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_purple/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "74076aab-bae3-432e-b485-859825e3e49f", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "74076aab-bae3-432e-b485-859825e3e49f" } ] diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_purple_yellow/sizes.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_purple_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_purple_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_purple_yellow/variant.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_purple_yellow/variant.json new file mode 100644 index 0000000000..7802ecb672 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_blue_purple_yellow/variant.json @@ -0,0 +1,13 @@ +{ + "id": "crystal_rainbow_blue_purple_yellow", + "name": "Crystal Rainbow Blue-Purple-Yellow", + "color_hex": [ + "#59B0E7", + "#F0BE65", + "#C47CBB" + ], + "traits": { + "translucent": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_green/sizes.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_green/variant.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_green/variant.json new file mode 100644 index 0000000000..c870cd9b80 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_green/variant.json @@ -0,0 +1,12 @@ +{ + "id": "crystal_rainbow_green", + "name": "Crystal Rainbow Green", + "color_hex": [ + "#6ED2B0", + "#A5E8C5" + ], + "traits": { + "translucent": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_orange/sizes.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_orange/variant.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_orange/variant.json new file mode 100644 index 0000000000..4104b0ec51 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_orange/variant.json @@ -0,0 +1,13 @@ +{ + "id": "crystal_rainbow_orange", + "name": "Crystal Rainbow Orange", + "color_hex": [ + "#FA828E", + "#F59E45", + "#FCE058" + ], + "traits": { + "translucent": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_pink/sizes.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_pink/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_pink/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_pink/variant.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_pink/variant.json new file mode 100644 index 0000000000..2101efeb30 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_pink/variant.json @@ -0,0 +1,12 @@ +{ + "id": "crystal_rainbow_pink", + "name": "Crystal Rainbow Pink", + "color_hex": [ + "#F47E96", + "#FAD2D8" + ], + "traits": { + "translucent": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_pink_green_orange/sizes.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_pink_green_orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_pink_green_orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_pink_green_orange/variant.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_pink_green_orange/variant.json new file mode 100644 index 0000000000..f857569641 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_pink_green_orange/variant.json @@ -0,0 +1,13 @@ +{ + "id": "crystal_rainbow_pink_green_orange", + "name": "Crystal Rainbow Pink-Green-Orange", + "color_hex": [ + "#3BCA9B", + "#EF9C2B", + "#F277A2" + ], + "traits": { + "translucent": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_pink_yellow/sizes.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_pink_yellow/sizes.json index 27309d27e6..697e4fff89 100644 --- a/data/novtau/PLA/pla_translucent/crystal_rainbow_pink_yellow/sizes.json +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_pink_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "6d72b6ac-994c-49a0-93ab-8901095c4e64", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "6d72b6ac-994c-49a0-93ab-8901095c4e64" } ] diff --git a/data/novtau/PLA/pla_translucent/crystal_rainbow_red_yellow_blue/sizes.json b/data/novtau/PLA/pla_translucent/crystal_rainbow_red_yellow_blue/sizes.json index 3bf832ac4d..837b5cd6f0 100644 --- a/data/novtau/PLA/pla_translucent/crystal_rainbow_red_yellow_blue/sizes.json +++ b/data/novtau/PLA/pla_translucent/crystal_rainbow_red_yellow_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "ffcbd738-8ee1-43c5-8102-2ed54cc87bdf", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ffcbd738-8ee1-43c5-8102-2ed54cc87bdf" } ] diff --git a/data/novtau/PLA/pla_translucent/filament.json b/data/novtau/PLA/pla_translucent/filament.json index 65216194aa..89de7fc9ac 100644 --- a/data/novtau/PLA/pla_translucent/filament.json +++ b/data/novtau/PLA/pla_translucent/filament.json @@ -1,7 +1,7 @@ { - "uuid": "4c71d870-ae13-4fb8-9425-8d69a8e2cfb3", "id": "pla_translucent", "name": "PLA Translucent", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "4c71d870-ae13-4fb8-9425-8d69a8e2cfb3" } diff --git a/data/novtau/PLA/pla_translucent/green/sizes.json b/data/novtau/PLA/pla_translucent/green/sizes.json deleted file mode 100644 index 2b8e668c79..0000000000 --- a/data/novtau/PLA/pla_translucent/green/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "984f5fa0-7156-40ef-b95f-9af25a3f431a", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_translucent/green/variant.json b/data/novtau/PLA/pla_translucent/green/variant.json deleted file mode 100644 index 6d6cb3afba..0000000000 --- a/data/novtau/PLA/pla_translucent/green/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "8285f885-394c-427b-858c-2921d750c336", - "id": "green", - "name": "Green", - "color_hex": "#15BCB3", - "traits": { - "translucent": true - } -} diff --git a/data/novtau/PLA/pla_translucent/ice_blue/sizes.json b/data/novtau/PLA/pla_translucent/ice_blue/sizes.json index 092114ea03..634c4896a3 100644 --- a/data/novtau/PLA/pla_translucent/ice_blue/sizes.json +++ b/data/novtau/PLA/pla_translucent/ice_blue/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "b9798345-24d8-440d-ba10-3bb79d5646b9", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "b9798345-24d8-440d-ba10-3bb79d5646b9" } ] diff --git a/data/novtau/PLA/pla_translucent/ice_blue/variant.json b/data/novtau/PLA/pla_translucent/ice_blue/variant.json index 511cbe1fbc..982c15406c 100644 --- a/data/novtau/PLA/pla_translucent/ice_blue/variant.json +++ b/data/novtau/PLA/pla_translucent/ice_blue/variant.json @@ -1,9 +1,9 @@ { - "uuid": "b0f1b3a7-87db-4566-b944-bc011827b71d", "id": "ice_blue", "name": "Ice Blue", "color_hex": "#84CFDF", "traits": { "translucent": true - } + }, + "uuid": "b0f1b3a7-87db-4566-b944-bc011827b71d" } diff --git a/data/novtau/PLA/pla_translucent/lavender/sizes.json b/data/novtau/PLA/pla_translucent/lavender/sizes.json index 8cba551d8e..d419a86219 100644 --- a/data/novtau/PLA/pla_translucent/lavender/sizes.json +++ b/data/novtau/PLA/pla_translucent/lavender/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "347d6b59-4d74-44c0-bc40-89ba7318f39b", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "347d6b59-4d74-44c0-bc40-89ba7318f39b" } ] diff --git a/data/novtau/PLA/pla_translucent/lavender/variant.json b/data/novtau/PLA/pla_translucent/lavender/variant.json index 0ae19e76aa..29c7a67954 100644 --- a/data/novtau/PLA/pla_translucent/lavender/variant.json +++ b/data/novtau/PLA/pla_translucent/lavender/variant.json @@ -1,9 +1,9 @@ { - "uuid": "74f03ad6-e9a2-4091-995f-d2d5ac6617c9", "id": "lavender", "name": "Lavender", - "color_hex": "#925BD2", + "color_hex": "#BC9FCF", "traits": { "translucent": true - } + }, + "uuid": "74f03ad6-e9a2-4091-995f-d2d5ac6617c9" } diff --git a/data/novtau/PLA/pla_translucent/light_jade/sizes.json b/data/novtau/PLA/pla_translucent/light_jade/sizes.json index 7b11ab8eb7..c4621d2c5f 100644 --- a/data/novtau/PLA/pla_translucent/light_jade/sizes.json +++ b/data/novtau/PLA/pla_translucent/light_jade/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "93f94aa2-1d66-4091-9045-eebd3756db87", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "93f94aa2-1d66-4091-9045-eebd3756db87" } ] diff --git a/data/novtau/PLA/pla_translucent/light_jade/variant.json b/data/novtau/PLA/pla_translucent/light_jade/variant.json index 59ca8ff50c..f01f67a0a9 100644 --- a/data/novtau/PLA/pla_translucent/light_jade/variant.json +++ b/data/novtau/PLA/pla_translucent/light_jade/variant.json @@ -1,9 +1,9 @@ { - "uuid": "0b9ccb72-7688-4dfa-9aff-358b783e0686", "id": "light_jade", "name": "Light Jade", - "color_hex": "#80D6AF", + "color_hex": "#7FD6AF", "traits": { "translucent": true - } + }, + "uuid": "0b9ccb72-7688-4dfa-9aff-358b783e0686" } diff --git a/data/novtau/PLA/pla_translucent/mellow_yellow/sizes.json b/data/novtau/PLA/pla_translucent/mellow_yellow/sizes.json index 3b0d4b11f8..0e3ac847b9 100644 --- a/data/novtau/PLA/pla_translucent/mellow_yellow/sizes.json +++ b/data/novtau/PLA/pla_translucent/mellow_yellow/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "d1619e54-d0e1-474c-83ab-ba6dafce2526", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "d1619e54-d0e1-474c-83ab-ba6dafce2526" } ] diff --git a/data/novtau/PLA/pla_translucent/mellow_yellow/variant.json b/data/novtau/PLA/pla_translucent/mellow_yellow/variant.json index c912af18f3..95d0bda473 100644 --- a/data/novtau/PLA/pla_translucent/mellow_yellow/variant.json +++ b/data/novtau/PLA/pla_translucent/mellow_yellow/variant.json @@ -1,9 +1,9 @@ { - "uuid": "9469eef5-8c58-49cb-b54c-13ce11aef0a7", "id": "mellow_yellow", "name": "Mellow Yellow", - "color_hex": "#E8C33E", + "color_hex": "#E7C33E", "traits": { "translucent": true - } + }, + "uuid": "9469eef5-8c58-49cb-b54c-13ce11aef0a7" } diff --git a/data/novtau/PLA/pla_translucent/orange/sizes.json b/data/novtau/PLA/pla_translucent/orange/sizes.json index ea08945ef2..f286c19560 100644 --- a/data/novtau/PLA/pla_translucent/orange/sizes.json +++ b/data/novtau/PLA/pla_translucent/orange/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "1470466c-bdd0-4254-9e1a-7a8ec9f9f4d8", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "1470466c-bdd0-4254-9e1a-7a8ec9f9f4d8" } ] diff --git a/data/novtau/PLA/pla_translucent/orange/variant.json b/data/novtau/PLA/pla_translucent/orange/variant.json index 5f7b8c013d..ae0286b2bd 100644 --- a/data/novtau/PLA/pla_translucent/orange/variant.json +++ b/data/novtau/PLA/pla_translucent/orange/variant.json @@ -1,9 +1,9 @@ { - "uuid": "8dee861a-8e62-4bea-a71b-4e1911d9bc98", "id": "orange", "name": "Orange", - "color_hex": "#E9C53F", + "color_hex": "#C93D27", "traits": { "translucent": true - } + }, + "uuid": "8dee861a-8e62-4bea-a71b-4e1911d9bc98" } diff --git a/data/novtau/PLA/pla_translucent/pink_white/sizes.json b/data/novtau/PLA/pla_translucent/pink_white/sizes.json deleted file mode 100644 index ddbebc14e7..0000000000 --- a/data/novtau/PLA/pla_translucent/pink_white/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "ad14e754-793e-462f-a531-8182c3b51267", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_translucent/pink_white/variant.json b/data/novtau/PLA/pla_translucent/pink_white/variant.json deleted file mode 100644 index 96403a20f0..0000000000 --- a/data/novtau/PLA/pla_translucent/pink_white/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "4c3e36d8-6dc0-49a0-99f9-2f28850a87d0", - "id": "pink_white", - "name": "Pink-White", - "color_hex": "#E5A4B9", - "traits": { - "translucent": true - } -} diff --git a/data/novtau/PLA/pla_translucent/purple/sizes.json b/data/novtau/PLA/pla_translucent/purple/sizes.json index 721de4ab96..b3184f3b1e 100644 --- a/data/novtau/PLA/pla_translucent/purple/sizes.json +++ b/data/novtau/PLA/pla_translucent/purple/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "20f43a75-049d-4459-a62b-e4587887d8aa", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "20f43a75-049d-4459-a62b-e4587887d8aa" } ] diff --git a/data/novtau/PLA/pla_translucent/purple/variant.json b/data/novtau/PLA/pla_translucent/purple/variant.json index cf4569457c..5de2d507d0 100644 --- a/data/novtau/PLA/pla_translucent/purple/variant.json +++ b/data/novtau/PLA/pla_translucent/purple/variant.json @@ -1,9 +1,9 @@ { - "uuid": "e1bf3aaf-e5ec-4c17-b3b9-08397ce425f9", "id": "purple", "name": "Purple", "color_hex": "#905ACF", "traits": { "translucent": true - } + }, + "uuid": "e1bf3aaf-e5ec-4c17-b3b9-08397ce425f9" } diff --git a/data/novtau/PLA/pla_translucent/red/sizes.json b/data/novtau/PLA/pla_translucent/red/sizes.json index 97714eb20f..2aa82f56d0 100644 --- a/data/novtau/PLA/pla_translucent/red/sizes.json +++ b/data/novtau/PLA/pla_translucent/red/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "522e2d19-f0e1-4c7a-ac4d-d8782ba4f9e8", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "522e2d19-f0e1-4c7a-ac4d-d8782ba4f9e8" } ] diff --git a/data/novtau/PLA/pla_translucent/red/variant.json b/data/novtau/PLA/pla_translucent/red/variant.json index 18d93935d2..627bd53f7d 100644 --- a/data/novtau/PLA/pla_translucent/red/variant.json +++ b/data/novtau/PLA/pla_translucent/red/variant.json @@ -1,9 +1,9 @@ { - "uuid": "02b4c307-f853-4e23-9172-2597d8026105", "id": "red", "name": "Red", - "color_hex": "#F78293", + "color_hex": "#AB1D21", "traits": { "translucent": true - } + }, + "uuid": "02b4c307-f853-4e23-9172-2597d8026105" } diff --git a/data/novtau/PLA/pla_translucent/teal/sizes.json b/data/novtau/PLA/pla_translucent/teal/sizes.json index 236ce2bce9..821b9e9c06 100644 --- a/data/novtau/PLA/pla_translucent/teal/sizes.json +++ b/data/novtau/PLA/pla_translucent/teal/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "645f4e47-b7f3-4f83-860a-e28c8999b3e1", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "645f4e47-b7f3-4f83-860a-e28c8999b3e1" } ] diff --git a/data/novtau/PLA/pla_translucent/teal/variant.json b/data/novtau/PLA/pla_translucent/teal/variant.json index 7e396ade68..c881a4ecc7 100644 --- a/data/novtau/PLA/pla_translucent/teal/variant.json +++ b/data/novtau/PLA/pla_translucent/teal/variant.json @@ -1,9 +1,9 @@ { - "uuid": "bee90ec0-3e5a-4c98-84ae-3699decd20ba", "id": "teal", "name": "Teal", "color_hex": "#39C8BF", "traits": { "translucent": true - } + }, + "uuid": "bee90ec0-3e5a-4c98-84ae-3699decd20ba" } diff --git a/data/novtau/PLA/pla_translucent/translucent_black/sizes.json b/data/novtau/PLA/pla_translucent/translucent_black/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_black/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/translucent_black/variant.json b/data/novtau/PLA/pla_translucent/translucent_black/variant.json new file mode 100644 index 0000000000..8a967b8e01 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_black/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_black", + "name": "Translucent Black", + "color_hex": "#343434", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PLA/pla_translucent/translucent_blue_white_orange/sizes.json b/data/novtau/PLA/pla_translucent/translucent_blue_white_orange/sizes.json new file mode 100644 index 0000000000..8f145fa965 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_blue_white_orange/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "668e1ae9-fb4a-4f01-bd10-52928280dfe5" + } +] diff --git a/data/novtau/PLA/pla_translucent/translucent_blue_white_orange/variant.json b/data/novtau/PLA/pla_translucent/translucent_blue_white_orange/variant.json new file mode 100644 index 0000000000..9b7304fa3a --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_blue_white_orange/variant.json @@ -0,0 +1,14 @@ +{ + "uuid": "4c1a079f-d9ce-4641-84f1-053394389ee7", + "id": "translucent_blue_white_orange", + "name": "Translucent Blue-White-Orange", + "color_hex": [ + "#D1DFCE", + "#EDB55D", + "#52C1D6" + ], + "traits": { + "translucent": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_translucent/translucent_deep_blue/sizes.json b/data/novtau/PLA/pla_translucent/translucent_deep_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_deep_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/translucent_deep_blue/variant.json b/data/novtau/PLA/pla_translucent/translucent_deep_blue/variant.json new file mode 100644 index 0000000000..1b03cb6241 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_deep_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_deep_blue", + "name": "Translucent Deep Blue", + "color_hex": "#1D439B", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PLA/pla_translucent/translucent_green/sizes.json b/data/novtau/PLA/pla_translucent/translucent_green/sizes.json new file mode 100644 index 0000000000..5723a6cb90 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_green/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "984f5fa0-7156-40ef-b95f-9af25a3f431a" + } +] diff --git a/data/novtau/PLA/pla_translucent/translucent_green/variant.json b/data/novtau/PLA/pla_translucent/translucent_green/variant.json new file mode 100644 index 0000000000..077609ef90 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_green/variant.json @@ -0,0 +1,9 @@ +{ + "id": "translucent_green", + "name": "Translucent Green", + "color_hex": "#17BAB2", + "traits": { + "translucent": true + }, + "uuid": "8285f885-394c-427b-858c-2921d750c336" +} diff --git a/data/novtau/PLA/pla_translucent/translucent_lime_green/sizes.json b/data/novtau/PLA/pla_translucent/translucent_lime_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_lime_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/translucent_lime_green/variant.json b/data/novtau/PLA/pla_translucent/translucent_lime_green/variant.json new file mode 100644 index 0000000000..6749eacd90 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_lime_green/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_lime_green", + "name": "Translucent Lime Green", + "color_hex": "#6CC23F", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PLA/pla_translucent/translucent_mint/sizes.json b/data/novtau/PLA/pla_translucent/translucent_mint/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_mint/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/translucent_mint/variant.json b/data/novtau/PLA/pla_translucent/translucent_mint/variant.json new file mode 100644 index 0000000000..01c290ac4c --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_mint/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_mint", + "name": "Translucent Mint", + "color_hex": "#8DD8C4", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PLA/pla_translucent/translucent_pink_white/sizes.json b/data/novtau/PLA/pla_translucent/translucent_pink_white/sizes.json new file mode 100644 index 0000000000..2f883c57f5 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_pink_white/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ad14e754-793e-462f-a531-8182c3b51267" + } +] diff --git a/data/novtau/PLA/pla_translucent/translucent_pink_white/variant.json b/data/novtau/PLA/pla_translucent/translucent_pink_white/variant.json new file mode 100644 index 0000000000..90814754b1 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_pink_white/variant.json @@ -0,0 +1,13 @@ +{ + "uuid": "4c3e36d8-6dc0-49a0-99f9-2f28850a87d0", + "id": "translucent_pink_white", + "name": "Translucent Pink-White", + "color_hex": [ + "#E3D2D4", + "#E096AF" + ], + "traits": { + "translucent": true, + "gradual_color_change": true + } +} diff --git a/data/novtau/PLA/pla_translucent/translucent_purple/sizes.json b/data/novtau/PLA/pla_translucent/translucent_purple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_purple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/translucent_purple/variant.json b/data/novtau/PLA/pla_translucent/translucent_purple/variant.json new file mode 100644 index 0000000000..4961071560 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_purple/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_purple", + "name": "Translucent Purple", + "color_hex": "#6C2F88", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PLA/pla_translucent/translucent_smoke_gray/sizes.json b/data/novtau/PLA/pla_translucent/translucent_smoke_gray/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_smoke_gray/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/translucent_smoke_gray/variant.json b/data/novtau/PLA/pla_translucent/translucent_smoke_gray/variant.json new file mode 100644 index 0000000000..ef6ada9b18 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_smoke_gray/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_smoke_gray", + "name": "Translucent Smoke Gray", + "color_hex": "#9C9D9E", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PLA/pla_translucent/translucent_yellow_green/sizes.json b/data/novtau/PLA/pla_translucent/translucent_yellow_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_yellow_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_translucent/translucent_yellow_green/variant.json b/data/novtau/PLA/pla_translucent/translucent_yellow_green/variant.json new file mode 100644 index 0000000000..61714330d8 --- /dev/null +++ b/data/novtau/PLA/pla_translucent/translucent_yellow_green/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_yellow_green", + "name": "Translucent Yellow-Green", + "color_hex": "#B7DC37", + "traits": { + "translucent": true + } +} diff --git a/data/novtau/PLA/pla_wood/black_walnut/sizes.json b/data/novtau/PLA/pla_wood/black_walnut/sizes.json index 726758c6b0..2d5e93d61f 100644 --- a/data/novtau/PLA/pla_wood/black_walnut/sizes.json +++ b/data/novtau/PLA/pla_wood/black_walnut/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "1185d406-cb31-4075-8899-248cf17facad", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "1185d406-cb31-4075-8899-248cf17facad" } ] diff --git a/data/novtau/PLA/pla_wood/black_walnut/variant.json b/data/novtau/PLA/pla_wood/black_walnut/variant.json index b38b56f6c3..a4da94f984 100644 --- a/data/novtau/PLA/pla_wood/black_walnut/variant.json +++ b/data/novtau/PLA/pla_wood/black_walnut/variant.json @@ -1,9 +1,9 @@ { - "uuid": "278dfc5a-b9c7-4d25-9dc2-c5b91641b2ad", "id": "black_walnut", "name": "Black Walnut", - "color_hex": "#69473A", + "color_hex": "#49322A", "traits": { "contains_wood": true - } + }, + "uuid": "278dfc5a-b9c7-4d25-9dc2-c5b91641b2ad" } diff --git a/data/novtau/PLA/pla_wood/black_wood/sizes.json b/data/novtau/PLA/pla_wood/black_wood/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_wood/black_wood/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_wood/black_wood/variant.json b/data/novtau/PLA/pla_wood/black_wood/variant.json new file mode 100644 index 0000000000..0a7d0fd62c --- /dev/null +++ b/data/novtau/PLA/pla_wood/black_wood/variant.json @@ -0,0 +1,8 @@ +{ + "id": "black_wood", + "name": "Black Wood", + "color_hex": "#404040", + "traits": { + "contains_wood": true + } +} diff --git a/data/novtau/PLA/pla_wood/cherry_wood/sizes.json b/data/novtau/PLA/pla_wood/cherry_wood/sizes.json new file mode 100644 index 0000000000..95ea7141de --- /dev/null +++ b/data/novtau/PLA/pla_wood/cherry_wood/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "dcff381d-9ac5-4923-8a19-0dc5cf70928c" + } +] diff --git a/data/novtau/PLA/pla_wood/cherry_wood/variant.json b/data/novtau/PLA/pla_wood/cherry_wood/variant.json new file mode 100644 index 0000000000..b683683b07 --- /dev/null +++ b/data/novtau/PLA/pla_wood/cherry_wood/variant.json @@ -0,0 +1,9 @@ +{ + "id": "cherry_wood", + "name": "Cherry Wood", + "color_hex": "#774737", + "traits": { + "contains_wood": true + }, + "uuid": "a190bc59-eebe-42a7-a626-d9ee39f0714a" +} diff --git a/data/novtau/PLA/pla_wood/classic_birch/sizes.json b/data/novtau/PLA/pla_wood/classic_birch/sizes.json index c566afd1c4..497752b27d 100644 --- a/data/novtau/PLA/pla_wood/classic_birch/sizes.json +++ b/data/novtau/PLA/pla_wood/classic_birch/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "f519cd6c-1749-453d-8ef1-8a71a37469e6", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "f519cd6c-1749-453d-8ef1-8a71a37469e6" } ] diff --git a/data/novtau/PLA/pla_wood/classic_birch/variant.json b/data/novtau/PLA/pla_wood/classic_birch/variant.json index 51072e2e77..a0aa6d2ce4 100644 --- a/data/novtau/PLA/pla_wood/classic_birch/variant.json +++ b/data/novtau/PLA/pla_wood/classic_birch/variant.json @@ -1,9 +1,9 @@ { - "uuid": "39a1e1c4-a7d3-4f0e-8560-aec5ee64e3c3", "id": "classic_birch", "name": "Classic Birch", - "color_hex": "#BD9A7A", + "color_hex": "#BB9979", "traits": { "contains_wood": true - } + }, + "uuid": "39a1e1c4-a7d3-4f0e-8560-aec5ee64e3c3" } diff --git a/data/novtau/PLA/pla_wood/clay_brown/sizes.json b/data/novtau/PLA/pla_wood/clay_brown/sizes.json deleted file mode 100644 index 92bd4364ef..0000000000 --- a/data/novtau/PLA/pla_wood/clay_brown/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "ae42334f-14fd-4aec-bc11-df6636d59be8", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_wood/clay_brown/variant.json b/data/novtau/PLA/pla_wood/clay_brown/variant.json deleted file mode 100644 index 6c9acd955c..0000000000 --- a/data/novtau/PLA/pla_wood/clay_brown/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "f16209bd-9a59-40f6-8d13-4034fb7a4be9", - "id": "clay_brown", - "name": "Clay Brown", - "color_hex": "#6A4839", - "traits": { - "contains_wood": true - } -} diff --git a/data/novtau/PLA/pla_wood/filament.json b/data/novtau/PLA/pla_wood/filament.json index e5fe8bbe23..e01792a455 100644 --- a/data/novtau/PLA/pla_wood/filament.json +++ b/data/novtau/PLA/pla_wood/filament.json @@ -1,7 +1,7 @@ { - "uuid": "48303cfd-e786-460b-910f-7d93322cc08f", "id": "pla_wood", "name": "PLA Wood", "diameter_tolerance": 0.02, - "density": 1.24 + "density": 1.24, + "uuid": "48303cfd-e786-460b-910f-7d93322cc08f" } diff --git a/data/novtau/PLA/pla_wood/light_wood/sizes.json b/data/novtau/PLA/pla_wood/light_wood/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_wood/light_wood/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_wood/light_wood/variant.json b/data/novtau/PLA/pla_wood/light_wood/variant.json new file mode 100644 index 0000000000..0044554590 --- /dev/null +++ b/data/novtau/PLA/pla_wood/light_wood/variant.json @@ -0,0 +1,8 @@ +{ + "id": "light_wood", + "name": "Light Wood", + "color_hex": "#C6AA89", + "traits": { + "contains_wood": true + } +} diff --git a/data/novtau/PLA/pla_wood/mahogany/sizes.json b/data/novtau/PLA/pla_wood/mahogany/sizes.json new file mode 100644 index 0000000000..d49118f1a7 --- /dev/null +++ b/data/novtau/PLA/pla_wood/mahogany/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "ae42334f-14fd-4aec-bc11-df6636d59be8" + } +] diff --git a/data/novtau/PLA/pla_wood/mahogany/variant.json b/data/novtau/PLA/pla_wood/mahogany/variant.json new file mode 100644 index 0000000000..903bcc76e4 --- /dev/null +++ b/data/novtau/PLA/pla_wood/mahogany/variant.json @@ -0,0 +1,9 @@ +{ + "id": "mahogany", + "name": "Mahogany", + "color_hex": "#C16C5D", + "traits": { + "contains_wood": true + }, + "uuid": "f16209bd-9a59-40f6-8d13-4034fb7a4be9" +} diff --git a/data/novtau/PLA/pla_wood/ochre_yellow/sizes.json b/data/novtau/PLA/pla_wood/ochre_yellow/sizes.json deleted file mode 100644 index 7975bee1f2..0000000000 --- a/data/novtau/PLA/pla_wood/ochre_yellow/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "aa907189-0ec0-4904-a58c-64e2bf8f0046", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_wood/ochre_yellow/variant.json b/data/novtau/PLA/pla_wood/ochre_yellow/variant.json deleted file mode 100644 index 6b615f7683..0000000000 --- a/data/novtau/PLA/pla_wood/ochre_yellow/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "a0f9d38e-7b8a-495a-8f44-bfdc665fb3f7", - "id": "ochre_yellow", - "name": "Ochre Yellow", - "color_hex": "#B46031", - "traits": { - "contains_wood": true - } -} diff --git a/data/novtau/PLA/pla_wood/olive_wood/sizes.json b/data/novtau/PLA/pla_wood/olive_wood/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_wood/olive_wood/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_wood/olive_wood/variant.json b/data/novtau/PLA/pla_wood/olive_wood/variant.json new file mode 100644 index 0000000000..5987622bb8 --- /dev/null +++ b/data/novtau/PLA/pla_wood/olive_wood/variant.json @@ -0,0 +1,8 @@ +{ + "id": "olive_wood", + "name": "Olive Wood", + "color_hex": "#706D50", + "traits": { + "contains_wood": true + } +} diff --git a/data/novtau/PLA/pla_wood/rosewood/sizes.json b/data/novtau/PLA/pla_wood/rosewood/sizes.json index 45c290d0bd..e33307f6bf 100644 --- a/data/novtau/PLA/pla_wood/rosewood/sizes.json +++ b/data/novtau/PLA/pla_wood/rosewood/sizes.json @@ -1,12 +1,12 @@ [ { - "uuid": "dcff381d-9ac5-4923-8a19-0dc5cf70928c", "filament_weight": 1000, "diameter": 1.75, - "container_material": "plastic", "empty_spool_weight": 145, - "container_width": 66, + "container_material": "plastic", "container_outer_diameter": 200, - "container_hole_diameter": 54 + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "16c4ca98-39f1-4d09-ae3a-e4d79d051bc1" } ] diff --git a/data/novtau/PLA/pla_wood/rosewood/variant.json b/data/novtau/PLA/pla_wood/rosewood/variant.json index f4a82322f9..0b08ce327e 100644 --- a/data/novtau/PLA/pla_wood/rosewood/variant.json +++ b/data/novtau/PLA/pla_wood/rosewood/variant.json @@ -1,9 +1,9 @@ { - "uuid": "da57cba2-91cb-445a-904b-3d94f8529193", "id": "rosewood", "name": "Rosewood", - "color_hex": "#794737", + "color_hex": "#7A5243", "traits": { "contains_wood": true - } + }, + "uuid": "da57cba2-91cb-445a-904b-3d94f8529193" } diff --git a/data/novtau/PLA/pla_wood/rust_brown/sizes.json b/data/novtau/PLA/pla_wood/rust_brown/sizes.json new file mode 100644 index 0000000000..9d4da1491d --- /dev/null +++ b/data/novtau/PLA/pla_wood/rust_brown/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "aa907189-0ec0-4904-a58c-64e2bf8f0046" + } +] diff --git a/data/novtau/PLA/pla_wood/rust_brown/variant.json b/data/novtau/PLA/pla_wood/rust_brown/variant.json new file mode 100644 index 0000000000..c4fe3e8a59 --- /dev/null +++ b/data/novtau/PLA/pla_wood/rust_brown/variant.json @@ -0,0 +1,9 @@ +{ + "id": "rust_brown", + "name": "Rust Brown", + "color_hex": "#B46031", + "traits": { + "contains_wood": true + }, + "uuid": "a0f9d38e-7b8a-495a-8f44-bfdc665fb3f7" +} diff --git a/data/novtau/PLA/pla_wood/tone/sizes.json b/data/novtau/PLA/pla_wood/tone/sizes.json deleted file mode 100644 index ea2a304d29..0000000000 --- a/data/novtau/PLA/pla_wood/tone/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "70b0ce98-0625-45a6-bc23-6e78f0c9d622", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_wood/tone/variant.json b/data/novtau/PLA/pla_wood/tone/variant.json deleted file mode 100644 index 73058a8a72..0000000000 --- a/data/novtau/PLA/pla_wood/tone/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "3528c4d2-45c4-4b01-9a35-6582de21462c", - "id": "tone", - "name": "Tone", - "color_hex": "#BB9778", - "traits": { - "contains_wood": true - } -} diff --git a/data/novtau/PLA/pla_wood/white_oak/sizes.json b/data/novtau/PLA/pla_wood/white_oak/sizes.json deleted file mode 100644 index 34245726b6..0000000000 --- a/data/novtau/PLA/pla_wood/white_oak/sizes.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "uuid": "16c4ca98-39f1-4d09-ae3a-e4d79d051bc1", - "filament_weight": 1000, - "diameter": 1.75, - "container_material": "plastic", - "empty_spool_weight": 145, - "container_width": 66, - "container_outer_diameter": 200, - "container_hole_diameter": 54 - } -] diff --git a/data/novtau/PLA/pla_wood/white_oak/variant.json b/data/novtau/PLA/pla_wood/white_oak/variant.json deleted file mode 100644 index 09f4a41993..0000000000 --- a/data/novtau/PLA/pla_wood/white_oak/variant.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "uuid": "a190bc59-eebe-42a7-a626-d9ee39f0714a", - "id": "white_oak", - "name": "White Oak", - "color_hex": "#BA9878", - "traits": { - "contains_wood": true - } -} diff --git a/data/novtau/PLA/pla_wood/white_pine/sizes.json b/data/novtau/PLA/pla_wood/white_pine/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_wood/white_pine/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_wood/white_pine/variant.json b/data/novtau/PLA/pla_wood/white_pine/variant.json new file mode 100644 index 0000000000..039c0ea6cc --- /dev/null +++ b/data/novtau/PLA/pla_wood/white_pine/variant.json @@ -0,0 +1,8 @@ +{ + "id": "white_pine", + "name": "White Pine", + "color_hex": "#B49E82", + "traits": { + "contains_wood": true + } +} diff --git a/data/novtau/PLA/pla_wood/wood_tone/sizes.json b/data/novtau/PLA/pla_wood/wood_tone/sizes.json new file mode 100644 index 0000000000..db3c0dd914 --- /dev/null +++ b/data/novtau/PLA/pla_wood/wood_tone/sizes.json @@ -0,0 +1,12 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66, + "uuid": "70b0ce98-0625-45a6-bc23-6e78f0c9d622" + } +] diff --git a/data/novtau/PLA/pla_wood/wood_tone/variant.json b/data/novtau/PLA/pla_wood/wood_tone/variant.json new file mode 100644 index 0000000000..65d2509880 --- /dev/null +++ b/data/novtau/PLA/pla_wood/wood_tone/variant.json @@ -0,0 +1,9 @@ +{ + "id": "wood_tone", + "name": "Wood Tone", + "color_hex": "#B99677", + "traits": { + "contains_wood": true + }, + "uuid": "3528c4d2-45c4-4b01-9a35-6582de21462c" +} diff --git a/data/novtau/PLA/pla_wood/yellow_rosewood/sizes.json b/data/novtau/PLA/pla_wood/yellow_rosewood/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/PLA/pla_wood/yellow_rosewood/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/PLA/pla_wood/yellow_rosewood/variant.json b/data/novtau/PLA/pla_wood/yellow_rosewood/variant.json new file mode 100644 index 0000000000..6ab561ed03 --- /dev/null +++ b/data/novtau/PLA/pla_wood/yellow_rosewood/variant.json @@ -0,0 +1,8 @@ +{ + "id": "yellow_rosewood", + "name": "Yellow Rosewood", + "color_hex": "#C28D5D", + "traits": { + "contains_wood": true + } +} diff --git a/data/novtau/TPU/material.json b/data/novtau/TPU/material.json new file mode 100644 index 0000000000..dc8652e26d --- /dev/null +++ b/data/novtau/TPU/material.json @@ -0,0 +1,3 @@ +{ + "material": "TPU" +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/black/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/black/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/black/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/black/variant.json b/data/novtau/TPU/tpu_95a_high_flow/black/variant.json new file mode 100644 index 0000000000..fd4a29bbe5 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/black/variant.json @@ -0,0 +1,8 @@ +{ + "id": "black", + "name": "Black", + "color_hex": "#2C2C2B", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/caramel/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/caramel/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/caramel/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/caramel/variant.json b/data/novtau/TPU/tpu_95a_high_flow/caramel/variant.json new file mode 100644 index 0000000000..ba7a0bff4c --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/caramel/variant.json @@ -0,0 +1,8 @@ +{ + "id": "caramel", + "name": "Caramel", + "color_hex": "#C68C4E", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/clear/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/clear/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/clear/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/clear/variant.json b/data/novtau/TPU/tpu_95a_high_flow/clear/variant.json new file mode 100644 index 0000000000..b2f73b9229 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/clear/variant.json @@ -0,0 +1,8 @@ +{ + "id": "clear", + "name": "Clear", + "color_hex": "#DBD8D3", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/cyan_blue/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/cyan_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/cyan_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/cyan_blue/variant.json b/data/novtau/TPU/tpu_95a_high_flow/cyan_blue/variant.json new file mode 100644 index 0000000000..6006232e77 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/cyan_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "cyan_blue", + "name": "Cyan Blue", + "color_hex": "#11D9E3", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/filament.json b/data/novtau/TPU/tpu_95a_high_flow/filament.json new file mode 100644 index 0000000000..f801571c56 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/filament.json @@ -0,0 +1,6 @@ +{ + "id": "tpu_95a_high_flow", + "name": "TPU-95A High-Flow", + "diameter_tolerance": 0.02, + "density": 1.24 +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/gold/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/gold/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/gold/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/gold/variant.json b/data/novtau/TPU/tpu_95a_high_flow/gold/variant.json new file mode 100644 index 0000000000..b55a263138 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/gold/variant.json @@ -0,0 +1,8 @@ +{ + "id": "gold", + "name": "Gold", + "color_hex": "#F3BC3E", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/gray/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/gray/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/gray/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/gray/variant.json b/data/novtau/TPU/tpu_95a_high_flow/gray/variant.json new file mode 100644 index 0000000000..f0f25bf811 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/gray/variant.json @@ -0,0 +1,8 @@ +{ + "id": "gray", + "name": "Gray", + "color_hex": "#7B7D7F", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/green/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/green/variant.json b/data/novtau/TPU/tpu_95a_high_flow/green/variant.json new file mode 100644 index 0000000000..b28c39c061 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/green/variant.json @@ -0,0 +1,8 @@ +{ + "id": "green", + "name": "Green", + "color_hex": "#1FD520", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/light_brown/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/light_brown/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/light_brown/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/light_brown/variant.json b/data/novtau/TPU/tpu_95a_high_flow/light_brown/variant.json new file mode 100644 index 0000000000..096b50fb36 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/light_brown/variant.json @@ -0,0 +1,8 @@ +{ + "id": "light_brown", + "name": "Light Brown", + "color_hex": "#D8991F", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/light_pink/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/light_pink/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/light_pink/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/light_pink/variant.json b/data/novtau/TPU/tpu_95a_high_flow/light_pink/variant.json new file mode 100644 index 0000000000..86a88525f4 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/light_pink/variant.json @@ -0,0 +1,8 @@ +{ + "id": "light_pink", + "name": "Light Pink", + "color_hex": "#FBA3BE", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/mango_yellow/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/mango_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/mango_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/mango_yellow/variant.json b/data/novtau/TPU/tpu_95a_high_flow/mango_yellow/variant.json new file mode 100644 index 0000000000..77f5ee307c --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/mango_yellow/variant.json @@ -0,0 +1,8 @@ +{ + "id": "mango_yellow", + "name": "Mango Yellow", + "color_hex": "#FCB522", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/orange_red/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/orange_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/orange_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/orange_red/variant.json b/data/novtau/TPU/tpu_95a_high_flow/orange_red/variant.json new file mode 100644 index 0000000000..5415ccd9aa --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/orange_red/variant.json @@ -0,0 +1,8 @@ +{ + "id": "orange_red", + "name": "Orange Red", + "color_hex": "#FA463C", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/pantone_7514c_skin_tone/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/pantone_7514c_skin_tone/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/pantone_7514c_skin_tone/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/pantone_7514c_skin_tone/variant.json b/data/novtau/TPU/tpu_95a_high_flow/pantone_7514c_skin_tone/variant.json new file mode 100644 index 0000000000..5302b1a28a --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/pantone_7514c_skin_tone/variant.json @@ -0,0 +1,8 @@ +{ + "id": "pantone_7514c_skin_tone", + "name": "Pantone 7514C Skin Tone", + "color_hex": "#E6BE9B", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/pink_purple/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/pink_purple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/pink_purple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/pink_purple/variant.json b/data/novtau/TPU/tpu_95a_high_flow/pink_purple/variant.json new file mode 100644 index 0000000000..ca494f18a6 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/pink_purple/variant.json @@ -0,0 +1,8 @@ +{ + "id": "pink_purple", + "name": "Pink Purple", + "color_hex": "#EA52CA", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/red/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/red/variant.json b/data/novtau/TPU/tpu_95a_high_flow/red/variant.json new file mode 100644 index 0000000000..dccc7ce0c6 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/red/variant.json @@ -0,0 +1,8 @@ +{ + "id": "red", + "name": "Red", + "color_hex": "#FA4D54", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/silver/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/silver/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/silver/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/silver/variant.json b/data/novtau/TPU/tpu_95a_high_flow/silver/variant.json new file mode 100644 index 0000000000..78f50ee99e --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/silver/variant.json @@ -0,0 +1,8 @@ +{ + "id": "silver", + "name": "Silver", + "color_hex": "#9E9FA0", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/skin_tone/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/skin_tone/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/skin_tone/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/skin_tone/variant.json b/data/novtau/TPU/tpu_95a_high_flow/skin_tone/variant.json new file mode 100644 index 0000000000..f007f65e14 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/skin_tone/variant.json @@ -0,0 +1,8 @@ +{ + "id": "skin_tone", + "name": "Skin Tone", + "color_hex": "#FACAA8", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/starry_blue/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/starry_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/starry_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/starry_blue/variant.json b/data/novtau/TPU/tpu_95a_high_flow/starry_blue/variant.json new file mode 100644 index 0000000000..2c5efc57fc --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/starry_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "starry_blue", + "name": "Starry Blue", + "color_hex": "#5A68C0", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_blue/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_blue/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_blue/variant.json new file mode 100644 index 0000000000..ca4fb8d2a7 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_blue/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_blue", + "name": "Translucent Blue", + "color_hex": "#0F60D6", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_coral_orange/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_coral_orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_coral_orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_coral_orange/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_coral_orange/variant.json new file mode 100644 index 0000000000..ab2b24d346 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_coral_orange/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_coral_orange", + "name": "Translucent Coral Orange", + "color_hex": "#F95A50", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_emerald/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_emerald/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_emerald/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_emerald/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_emerald/variant.json new file mode 100644 index 0000000000..4e44fde7ea --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_emerald/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_emerald", + "name": "Translucent Emerald", + "color_hex": "#038F42", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_gray/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_gray/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_gray/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_gray/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_gray/variant.json new file mode 100644 index 0000000000..edd2e85fdd --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_gray/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_gray", + "name": "Translucent Gray", + "color_hex": "#8D8D8D", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_green/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_green/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_green/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_green/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_green/variant.json new file mode 100644 index 0000000000..04585b7d03 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_green/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_green", + "name": "Translucent Green", + "color_hex": "#25D106", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_orange/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_orange/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_orange/variant.json new file mode 100644 index 0000000000..e4d3f70b36 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_orange/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_orange", + "name": "Translucent Orange", + "color_hex": "#FA992B", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_pink/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_pink/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_pink/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_pink/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_pink/variant.json new file mode 100644 index 0000000000..6883219509 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_pink/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_pink", + "name": "Translucent Pink", + "color_hex": "#F66BA8", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_purple/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_purple/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_purple/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_purple/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_purple/variant.json new file mode 100644 index 0000000000..7598b97d2a --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_purple/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_purple", + "name": "Translucent Purple", + "color_hex": "#B135A4", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_red/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_red/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_red/variant.json new file mode 100644 index 0000000000..e16f70c49e --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_red/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_red", + "name": "Translucent Red", + "color_hex": "#D7122B", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_teal/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_teal/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_teal/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_teal/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_teal/variant.json new file mode 100644 index 0000000000..cb6c3a10cc --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_teal/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_teal", + "name": "Translucent Teal", + "color_hex": "#048CA6", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_violet/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_violet/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_violet/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_violet/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_violet/variant.json new file mode 100644 index 0000000000..c7ac883898 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_violet/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_violet", + "name": "Translucent Violet", + "color_hex": "#5C4DB8", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_yellow/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/translucent_yellow/variant.json b/data/novtau/TPU/tpu_95a_high_flow/translucent_yellow/variant.json new file mode 100644 index 0000000000..cc7ecb4797 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/translucent_yellow/variant.json @@ -0,0 +1,8 @@ +{ + "id": "translucent_yellow", + "name": "Translucent Yellow", + "color_hex": "#F7EF0D", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/white/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/white/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/white/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/white/variant.json b/data/novtau/TPU/tpu_95a_high_flow/white/variant.json new file mode 100644 index 0000000000..d0a1296bc4 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/white/variant.json @@ -0,0 +1,8 @@ +{ + "id": "white", + "name": "White", + "color_hex": "#E8E7E8", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_95a_high_flow/yellow/sizes.json b/data/novtau/TPU/tpu_95a_high_flow/yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_95a_high_flow/yellow/variant.json b/data/novtau/TPU/tpu_95a_high_flow/yellow/variant.json new file mode 100644 index 0000000000..9c1a5c06d8 --- /dev/null +++ b/data/novtau/TPU/tpu_95a_high_flow/yellow/variant.json @@ -0,0 +1,8 @@ +{ + "id": "yellow", + "name": "Yellow", + "color_hex": "#EAEA0F", + "traits": { + "high_flow": true + } +} diff --git a/data/novtau/TPU/tpu_flexible/black/sizes.json b/data/novtau/TPU/tpu_flexible/black/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/black/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/black/variant.json b/data/novtau/TPU/tpu_flexible/black/variant.json new file mode 100644 index 0000000000..b3a233b954 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/black/variant.json @@ -0,0 +1,5 @@ +{ + "id": "black", + "name": "Black", + "color_hex": "#2A2A2A" +} diff --git a/data/novtau/TPU/tpu_flexible/blue/sizes.json b/data/novtau/TPU/tpu_flexible/blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/blue/variant.json b/data/novtau/TPU/tpu_flexible/blue/variant.json new file mode 100644 index 0000000000..c3886a845a --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/blue/variant.json @@ -0,0 +1,5 @@ +{ + "id": "blue", + "name": "Blue", + "color_hex": "#0F3F91" +} diff --git a/data/novtau/TPU/tpu_flexible/clear/sizes.json b/data/novtau/TPU/tpu_flexible/clear/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/clear/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/clear/variant.json b/data/novtau/TPU/tpu_flexible/clear/variant.json new file mode 100644 index 0000000000..c71d4eab2d --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/clear/variant.json @@ -0,0 +1,5 @@ +{ + "id": "clear", + "name": "Clear", + "color_hex": "#C4C6C7" +} diff --git a/data/novtau/TPU/tpu_flexible/filament.json b/data/novtau/TPU/tpu_flexible/filament.json new file mode 100644 index 0000000000..1993735077 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/filament.json @@ -0,0 +1,6 @@ +{ + "id": "tpu_flexible", + "name": "TPU Flexible", + "diameter_tolerance": 0.02, + "density": 1.24 +} diff --git a/data/novtau/TPU/tpu_flexible/flesh/sizes.json b/data/novtau/TPU/tpu_flexible/flesh/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/flesh/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/flesh/variant.json b/data/novtau/TPU/tpu_flexible/flesh/variant.json new file mode 100644 index 0000000000..42e0e1ace7 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/flesh/variant.json @@ -0,0 +1,5 @@ +{ + "id": "flesh", + "name": "Flesh", + "color_hex": "#C4A172" +} diff --git a/data/novtau/TPU/tpu_flexible/neon_orange/sizes.json b/data/novtau/TPU/tpu_flexible/neon_orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/neon_orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/neon_orange/variant.json b/data/novtau/TPU/tpu_flexible/neon_orange/variant.json new file mode 100644 index 0000000000..58a9c1a3eb --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/neon_orange/variant.json @@ -0,0 +1,5 @@ +{ + "id": "neon_orange", + "name": "Neon Orange", + "color_hex": "#ED4526" +} diff --git a/data/novtau/TPU/tpu_flexible/quicksilver/sizes.json b/data/novtau/TPU/tpu_flexible/quicksilver/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/quicksilver/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/quicksilver/variant.json b/data/novtau/TPU/tpu_flexible/quicksilver/variant.json new file mode 100644 index 0000000000..d9e7578c49 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/quicksilver/variant.json @@ -0,0 +1,5 @@ +{ + "id": "quicksilver", + "name": "Quicksilver", + "color_hex": "#3D444A" +} diff --git a/data/novtau/TPU/tpu_flexible/red/sizes.json b/data/novtau/TPU/tpu_flexible/red/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/red/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/red/variant.json b/data/novtau/TPU/tpu_flexible/red/variant.json new file mode 100644 index 0000000000..7f4ae375f7 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/red/variant.json @@ -0,0 +1,5 @@ +{ + "id": "red", + "name": "Red", + "color_hex": "#A7252D" +} diff --git a/data/novtau/TPU/tpu_flexible/translucent_blue/sizes.json b/data/novtau/TPU/tpu_flexible/translucent_blue/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/translucent_blue/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/translucent_blue/variant.json b/data/novtau/TPU/tpu_flexible/translucent_blue/variant.json new file mode 100644 index 0000000000..bbbb4141fb --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/translucent_blue/variant.json @@ -0,0 +1,5 @@ +{ + "id": "translucent_blue", + "name": "Translucent Blue", + "color_hex": "#137AAF" +} diff --git a/data/novtau/TPU/tpu_flexible/translucent_orange/sizes.json b/data/novtau/TPU/tpu_flexible/translucent_orange/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/translucent_orange/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/translucent_orange/variant.json b/data/novtau/TPU/tpu_flexible/translucent_orange/variant.json new file mode 100644 index 0000000000..486802277a --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/translucent_orange/variant.json @@ -0,0 +1,5 @@ +{ + "id": "translucent_orange", + "name": "Translucent Orange", + "color_hex": "#D76028" +} diff --git a/data/novtau/TPU/tpu_flexible/translucent_pink/sizes.json b/data/novtau/TPU/tpu_flexible/translucent_pink/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/translucent_pink/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/translucent_pink/variant.json b/data/novtau/TPU/tpu_flexible/translucent_pink/variant.json new file mode 100644 index 0000000000..4ac32fb5b8 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/translucent_pink/variant.json @@ -0,0 +1,5 @@ +{ + "id": "translucent_pink", + "name": "Translucent Pink", + "color_hex": "#E0479A" +} diff --git a/data/novtau/TPU/tpu_flexible/translucent_yellow/sizes.json b/data/novtau/TPU/tpu_flexible/translucent_yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/translucent_yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/translucent_yellow/variant.json b/data/novtau/TPU/tpu_flexible/translucent_yellow/variant.json new file mode 100644 index 0000000000..3f84bdba5d --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/translucent_yellow/variant.json @@ -0,0 +1,5 @@ +{ + "id": "translucent_yellow", + "name": "Translucent Yellow", + "color_hex": "#BFD82D" +} diff --git a/data/novtau/TPU/tpu_flexible/yellow/sizes.json b/data/novtau/TPU/tpu_flexible/yellow/sizes.json new file mode 100644 index 0000000000..64ae763463 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/yellow/sizes.json @@ -0,0 +1,11 @@ +[ + { + "filament_weight": 1000, + "diameter": 1.75, + "empty_spool_weight": 145, + "container_material": "plastic", + "container_outer_diameter": 200, + "container_hole_diameter": 54, + "container_width": 66 + } +] diff --git a/data/novtau/TPU/tpu_flexible/yellow/variant.json b/data/novtau/TPU/tpu_flexible/yellow/variant.json new file mode 100644 index 0000000000..0eac7306c2 --- /dev/null +++ b/data/novtau/TPU/tpu_flexible/yellow/variant.json @@ -0,0 +1,5 @@ +{ + "id": "yellow", + "name": "Yellow", + "color_hex": "#EFD53A" +}