From 20e7294e60ec5660103f1d35559221ffd2614213 Mon Sep 17 00:00:00 2001 From: Steven's Stuff <98369678+StevensStuff@users.noreply.github.com> Date: Mon, 6 Jan 2025 00:51:16 -0500 Subject: [PATCH 1/6] Adding LDO filaments --- filaments/ldo.json | 121 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 filaments/ldo.json diff --git a/filaments/ldo.json b/filaments/ldo.json new file mode 100644 index 0000000..232df50 --- /dev/null +++ b/filaments/ldo.json @@ -0,0 +1,121 @@ +{ + "manufacturer": "LDO", + "filaments": + [ + { + "name": "ABS {color_name}", + "material": "ABS", + "density": 1.06, + "weights": [ + { + "weight": 1000 + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp ": 260, + "bed_temp_range": [ + 90, + 110 + ], + "colors": [ + { + "name": "Dark Teal", + "hex": "00677f" + }, + { + "name": "Black", + "hex": "2D2926" + }, + { + "name": "Stardust Gray", + "hex": "75787B" + }, + { + "name": "Blue", + "hex": "0086d6" + }, + { + "name": "Purple", + "hex": "5F259F" + }, + { + "name": "White", + "hex": "f7f9ef" + }, + { + "name": "Red", + "hex": "C8102E" + }, + { + "name": "Lemon Lime", + "hex": "d6e865" + }, + { + "name": "Light Blue", + "hex": "6ad1e3" + }, + { + "name": "Smoke Gray", + "hex": "75787B" + } + ] + }, + { + "name": "ASA {color_name}", + "material": "ASA", + "density": 1.08, + "weights": [ + { + "weight": 1000 + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp ": 260, + "bed_temp_range": [ + 90, + 110 + ], + "colors": [ + { + "name": "Orange", + "hex": "f93822" + }, + { + "name": "Olive Green", + "hex": "4b5e23" + } + ] + }, + { + "name": "ASA-CF {color_name}", + "material": "ASA", + "density": 1.10, + "weights": [ + { + "weight": 1000 + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp_range": [ + 230, + 260 + ], + "bed_temp_range": [ + 80, + 100 + ], + "colors": [ + { + "name": "Black", + "hex": "2D2926" + } + ] + } + ] +} From 8eeeb3e13d8a071c64053bfa22a5ca1daded4755 Mon Sep 17 00:00:00 2001 From: Steven's Stuff <98369678+StevensStuff@users.noreply.github.com> Date: Mon, 6 Jan 2025 16:34:22 -0500 Subject: [PATCH 2/6] Update ldo.json Removed material type from color name. Added LDO to blue, as that's the name on the label. --- filaments/ldo.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/filaments/ldo.json b/filaments/ldo.json index 232df50..46b3f4b 100644 --- a/filaments/ldo.json +++ b/filaments/ldo.json @@ -3,7 +3,7 @@ "filaments": [ { - "name": "ABS {color_name}", + "name": "{color_name}", "material": "ABS", "density": 1.06, "weights": [ @@ -33,7 +33,7 @@ "hex": "75787B" }, { - "name": "Blue", + "name": "LDO Blue", "hex": "0086d6" }, { @@ -63,7 +63,7 @@ ] }, { - "name": "ASA {color_name}", + "name": "{color_name}", "material": "ASA", "density": 1.08, "weights": [ @@ -91,8 +91,8 @@ ] }, { - "name": "ASA-CF {color_name}", - "material": "ASA", + "name": "{color_name}", + "material": "ASA-CF", "density": 1.10, "weights": [ { From a575c038280e27eaf6e6963f36952028d04a5fc2 Mon Sep 17 00:00:00 2001 From: kellbot Date: Mon, 6 Jan 2025 18:01:32 -0500 Subject: [PATCH 3/6] Added new dual silk color Velvet Eclipse --- filaments/bambulab.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/filaments/bambulab.json b/filaments/bambulab.json index 4305a46..1a1f958 100644 --- a/filaments/bambulab.json +++ b/filaments/bambulab.json @@ -660,6 +660,13 @@ "multi_color_direction": "coaxial", "finish": "glossy", "colors": [ + { + "name": "Velvet Eclipse (Black-Red)", + "hexes": [ + "000000", + "A34342" + ] + }, { "name": "Midnight Blaze (Blue-Red)", "hexes": [ From 5de1c039283ca721d9c2328a169b1fe45944ac47 Mon Sep 17 00:00:00 2001 From: bigwavedave42 Date: Tue, 7 Jan 2025 22:54:45 -0800 Subject: [PATCH 4/6] add hatchbox pla --- filaments/hatchbox.json | 149 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 147 insertions(+), 2 deletions(-) diff --git a/filaments/hatchbox.json b/filaments/hatchbox.json index 93e51b7..30e130b 100644 --- a/filaments/hatchbox.json +++ b/filaments/hatchbox.json @@ -52,8 +52,153 @@ "hex": "9A232D", "translucent": true } - + + ] + }, + { + "name": "{color_name}", + "material": "PLA", + "density": 1.27, + "weights": [ + { + "weight": 1000, + "spool_weight": 251 + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp": 210, + "bed_temp": 60, + "colors": [ + { + "name": "Cool Gray", + "hex": "959494" + }, + { + "name": "Baby Blue", + "hex": "ADD8E6" + }, + { + "name": "Beige", + "hex": "F5F5DC" + }, + { + "name": "Black", + "hex": "000000" + }, + { + "name": "True Blue", + "hex": "0B519E" + }, + { + "name": "Bronze", + "hex": "CD7F32" + }, + { + "name": "Brown", + "hex": "452923" + }, + { + "name": "Copper", + "hex": "B87333" + }, + { + "name": "Gray Blue", + "hex": "6F8FAF" + }, + { + "name": "Green", + "hex": "4CBB17" + }, + { + "name": "Iron Red", + "hex": "79111E" + }, + { + "name": "Light Blue", + "hex": "0096FF" + }, + { + "name": "Light Orange", + "hex": "FFBF00" + }, + { + "name": "Light Purple", + "hex": "BF40BF" + }, + { + "name": "Lime Green", + "hex": "7CFC00" + }, + { + "name": "Midnight Purple", + "hex": "800080" + }, + { + "name": "Mint Green", + "hex": "7FFFD4" + }, + { + "name": "Natural", + "hex": "B6BAB1" + }, + { + "name": "Orange", + "hex": "B6BAB1" + }, + { + "name": "Pastel Green", + "hex": "98FB98" + }, + { + "name": "Peacock Blue", + "hex": "6495ED" + }, + { + "name": "True Pink", + "hex": "DF6786" + }, + { + "name": "Red", + "hex": "AB2A2C" + }, + { + "name": "Silver", + "hex": "8E8D94" + }, + { + "name": "White", + "hex": "E3E5E7" + }, + { + "name": "Yellow", + "hex": "ECD018" + } + ] + }, + { + "name": "Sparkle {color_name}", + "material": "PLA", + "density": 1.27, + "weights": [ + { + "weight": 1000, + "spool_weight": 251 + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp": 210, + "bed_temp": 60, + "pattern": "sparkle", + "colors": [ + { + "name": "Red", + "hex": "79111E" + } ] } ] -} \ No newline at end of file +} From f1012a97d5752814ae4da4ceb91eadae79601809 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Sat, 11 Jan 2025 13:30:10 +0100 Subject: [PATCH 5/6] remove illegal escape sequence --- filaments.schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filaments.schema.json b/filaments.schema.json index 89b03b1..8b71271 100644 --- a/filaments.schema.json +++ b/filaments.schema.json @@ -31,7 +31,7 @@ "material": { "$comment": "Valid materials must be uppercase letters and numbers, optionally separated by + or -. Optionally ends with -CF or -GF followed by a number. Examples: ABS, ABS-CF, PC+ABS, PC+ABS-CF10.", "type": "string", - "pattern": "^[A-Z0-9]+(\\+[A-Z0-9]+)*(\\-(CF\\d{0,2}|GF\\d{0,2}|\\d{2}[AD]))?\\+?$" + "pattern": "^[A-Z0-9]+(\\+[A-Z0-9]+)*(-(CF\\d{0,2}|GF\\d{0,2}|\\d{2}[AD]))?\\+?$" }, "density": { "type": "number", @@ -219,4 +219,4 @@ } } } -} \ No newline at end of file +} From 135f364d635f3da028ba9f6ae7f7c856e952489b Mon Sep 17 00:00:00 2001 From: bigwavedave42 Date: Tue, 7 Jan 2025 22:54:45 -0800 Subject: [PATCH 6/6] add hatchbox pla --- filaments/hatchbox.json | 149 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 147 insertions(+), 2 deletions(-) diff --git a/filaments/hatchbox.json b/filaments/hatchbox.json index 93e51b7..30e130b 100644 --- a/filaments/hatchbox.json +++ b/filaments/hatchbox.json @@ -52,8 +52,153 @@ "hex": "9A232D", "translucent": true } - + + ] + }, + { + "name": "{color_name}", + "material": "PLA", + "density": 1.27, + "weights": [ + { + "weight": 1000, + "spool_weight": 251 + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp": 210, + "bed_temp": 60, + "colors": [ + { + "name": "Cool Gray", + "hex": "959494" + }, + { + "name": "Baby Blue", + "hex": "ADD8E6" + }, + { + "name": "Beige", + "hex": "F5F5DC" + }, + { + "name": "Black", + "hex": "000000" + }, + { + "name": "True Blue", + "hex": "0B519E" + }, + { + "name": "Bronze", + "hex": "CD7F32" + }, + { + "name": "Brown", + "hex": "452923" + }, + { + "name": "Copper", + "hex": "B87333" + }, + { + "name": "Gray Blue", + "hex": "6F8FAF" + }, + { + "name": "Green", + "hex": "4CBB17" + }, + { + "name": "Iron Red", + "hex": "79111E" + }, + { + "name": "Light Blue", + "hex": "0096FF" + }, + { + "name": "Light Orange", + "hex": "FFBF00" + }, + { + "name": "Light Purple", + "hex": "BF40BF" + }, + { + "name": "Lime Green", + "hex": "7CFC00" + }, + { + "name": "Midnight Purple", + "hex": "800080" + }, + { + "name": "Mint Green", + "hex": "7FFFD4" + }, + { + "name": "Natural", + "hex": "B6BAB1" + }, + { + "name": "Orange", + "hex": "B6BAB1" + }, + { + "name": "Pastel Green", + "hex": "98FB98" + }, + { + "name": "Peacock Blue", + "hex": "6495ED" + }, + { + "name": "True Pink", + "hex": "DF6786" + }, + { + "name": "Red", + "hex": "AB2A2C" + }, + { + "name": "Silver", + "hex": "8E8D94" + }, + { + "name": "White", + "hex": "E3E5E7" + }, + { + "name": "Yellow", + "hex": "ECD018" + } + ] + }, + { + "name": "Sparkle {color_name}", + "material": "PLA", + "density": 1.27, + "weights": [ + { + "weight": 1000, + "spool_weight": 251 + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp": 210, + "bed_temp": 60, + "pattern": "sparkle", + "colors": [ + { + "name": "Red", + "hex": "79111E" + } ] } ] -} \ No newline at end of file +}