From 3e7963ff0fa98bc7d9e6c48380c861472bd634dc Mon Sep 17 00:00:00 2001 From: kitokirisaki Date: Mon, 30 Mar 2026 14:14:36 +0200 Subject: [PATCH 1/5] Fix invalid extruder_temp key names in ldo, esun, and Numakers - ldo.json: remove trailing space from "extruder_temp " (ABS and ASA entries) - esun.json: fix typo "extruder_temp_rang" -> "extruder_temp_range" - Numakers.json: fix casing "extruder_temp_Range" -> "extruder_temp_range" --- filaments/Numakers.json | 2 +- filaments/esun.json | 2 +- filaments/ldo.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/filaments/Numakers.json b/filaments/Numakers.json index 6259a615..7ef55e0e 100644 --- a/filaments/Numakers.json +++ b/filaments/Numakers.json @@ -330,7 +330,7 @@ "diameters": [ 1.75 ], - "extruder_temp_Range": [ + "extruder_temp_range": [ 210, 240 ], diff --git a/filaments/esun.json b/filaments/esun.json index 37ce9a90..dd4251b9 100644 --- a/filaments/esun.json +++ b/filaments/esun.json @@ -1070,7 +1070,7 @@ "diameters": [ 1.75 ], - "extruder_temp_rang": [230, 270], + "extruder_temp_range": [230, 270], "bed_temp_range": [100, 115], "colors": [ {"name": "Black", "hex": "000000"}, diff --git a/filaments/ldo.json b/filaments/ldo.json index 46b3f4b6..27ad8907 100644 --- a/filaments/ldo.json +++ b/filaments/ldo.json @@ -14,7 +14,7 @@ "diameters": [ 1.75 ], - "extruder_temp ": 260, + "extruder_temp": 260, "bed_temp_range": [ 90, 110 @@ -74,7 +74,7 @@ "diameters": [ 1.75 ], - "extruder_temp ": 260, + "extruder_temp": 260, "bed_temp_range": [ 90, 110 From 573b71abca9a7ce314f5ba6ced0c3360f94240dc Mon Sep 17 00:00:00 2001 From: kitokirisaki Date: Mon, 30 Mar 2026 14:14:36 +0200 Subject: [PATCH 2/5] Add ASA-X and ABS-T as valid material variants - Add ASA-X to materials.json as a distinct non-trademarked material - Update filaments.schema.json pattern to allow -X and -T single-letter variant suffixes, matching ASA-X and ABS-T --- filaments.schema.json | 4 ++-- materials.json | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/filaments.schema.json b/filaments.schema.json index 16f66a29..39970f7e 100644 --- a/filaments.schema.json +++ b/filaments.schema.json @@ -29,9 +29,9 @@ "pattern": "\\{" }, "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.", + "$comment": "Valid materials must be uppercase letters and numbers, optionally separated by + or -. Optionally ends with -CF or -GF followed by a number, or a single-letter variant suffix (-X, -T). Examples: ABS, ABS-CF, ABS-T, ASA-X, 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]|X|T))?\\+?$" }, "density": { "type": "number", diff --git a/materials.json b/materials.json index fae35e7d..24138623 100644 --- a/materials.json +++ b/materials.json @@ -63,6 +63,10 @@ "material": "ASA", "density": 1.05 }, + { + "material": "ASA-X", + "density": 1.11 + }, { "material": "Polypropylene (PP)", "density": 0.9 From dd683693bfcbfb86fd53621f65cc3b4b6f2a6e45 Mon Sep 17 00:00:00 2001 From: kitokirisaki Date: Mon, 30 Mar 2026 14:42:46 +0200 Subject: [PATCH 3/5] Add REDLINE FILAMENT with ASA-X filament and 14 colors - New manufacturer: REDLINE FILAMENT GmbH - ASA-X filament with 12 standard colors (RAL-converted to hex) and 2 glitter variants (Glitzer Eisengrau, Glitzer Oxidrot) --- filaments/redlinefilament.json | 86 ++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 filaments/redlinefilament.json diff --git a/filaments/redlinefilament.json b/filaments/redlinefilament.json new file mode 100644 index 00000000..7e49ddbf --- /dev/null +++ b/filaments/redlinefilament.json @@ -0,0 +1,86 @@ +{ + "manufacturer": "REDLINE FILAMENT", + "filaments": [ + { + "name": "{color_name}", + "material": "ASA-X", + "density": 1.11, + "weights": [ + { + "weight": 1000, + "spool_weight": 155, + "spool_type": "cardboard" + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp_range": [ + 235, + 255 + ], + "bed_temp_range": [ + 80, + 90 + ], + "colors": [ + { + "name": "Schwarz", + "hex": "1e1e1e" + }, + { + "name": "Weiß", + "hex": "f4f4f4" + }, + { + "name": "Rot", + "hex": "cc2529" + }, + { + "name": "Dunkelblau", + "hex": "20214f" + }, + { + "name": "Eisengrau", + "hex": "4e5965" + }, + { + "name": "Hellgrau", + "hex": "d7d7d7" + }, + { + "name": "Verkehrsblau", + "hex": "2271b3" + }, + { + "name": "Apfelgrün", + "hex": "57a639" + }, + { + "name": "Blattgrün", + "hex": "4d7c43" + }, + { + "name": "Dunkelsilber", + "hex": "9a9697" + }, + { + "name": "Orange", + "hex": "f3752b" + }, + { + "name": "Gelb", + "hex": "fad201" + }, + { + "name": "Glitzer Eisengau", + "hex": "535a5e" + }, + { + "name": "Glitzer Oxidrot", + "hex": "911e1e" + } + ] + } + ] +} From 4c019314ab208c2c16fc74928ad632caaa4b128c Mon Sep 17 00:00:00 2001 From: kitokirisaki Date: Mon, 30 Mar 2026 15:08:35 +0200 Subject: [PATCH 4/5] Add PLA filament and update ASA-X for REDLINE FILAMENT - Add PLA with 50 colors (RAL, Pantone, and approximated hex values) - Add extruder_temp 255 to ASA-X based on real-world print settings - Add sparkle pattern to Glitzer Eisengrau and Glitzer Oxidrot --- filaments/redlinefilament.json | 146 ++++++++++++++++++++------------- 1 file changed, 90 insertions(+), 56 deletions(-) diff --git a/filaments/redlinefilament.json b/filaments/redlinefilament.json index 7e49ddbf..7f6fc283 100644 --- a/filaments/redlinefilament.json +++ b/filaments/redlinefilament.json @@ -1,6 +1,81 @@ { "manufacturer": "REDLINE FILAMENT", "filaments": [ + { + "name": "{color_name}", + "material": "PLA", + "density": 1.25, + "weights": [ + { + "weight": 1000, + "spool_weight": 155, + "spool_type": "cardboard" + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp_range": [ + 195, + 215 + ], + "bed_temp_range": [ + 0, + 60 + ], + "colors": [ + {"name": "Beige", "hex": "c2b078"}, + {"name": "Maisgelb", "hex": "e3a500"}, + {"name": "Elfenbein", "hex": "e6d2b5"}, + {"name": "Schwefelgelb", "hex": "f5d033"}, + {"name": "Gelb", "hex": "fad201"}, + {"name": "Goldbraun", "hex": "a38c15"}, + {"name": "Bronzegold", "hex": "9f8932"}, + {"name": "Gelborange", "hex": "f0a500"}, + {"name": "Hellorange", "hex": "ed760e"}, + {"name": "Orange", "hex": "f3752b"}, + {"name": "Weinrot (Braunrot)", "hex": "412227"}, + {"name": "Rot", "hex": "cc2529"}, + {"name": "Orientrot", "hex": "763420"}, + {"name": "Lila", "hex": "8d7598"}, + {"name": "Magenta", "hex": "c63678"}, + {"name": "Lavendel", "hex": "a5154a"}, + {"name": "Dunkelblau", "hex": "20214f"}, + {"name": "Kobaltblau", "hex": "1d1f5b"}, + {"name": "Himmelblau", "hex": "2271b3"}, + {"name": "Islandblau", "hex": "6daedd", "translucent": true}, + {"name": "Taubenblau", "hex": "6d8099"}, + {"name": "Wasserblau", "hex": "358698"}, + {"name": "Blattgrün", "hex": "4d7c43"}, + {"name": "Dunkelgrün", "hex": "1e6b4a"}, + {"name": "Apfelgrün", "hex": "36b336"}, + {"name": "Olivgrün", "hex": "3f4030"}, + {"name": "Leichtes Grün", "hex": "a8d8cb"}, + {"name": "Grau", "hex": "7e8b92"}, + {"name": "Khaki", "hex": "6a5f31"}, + {"name": "Eisengrau", "hex": "4e5965"}, + {"name": "Hellgrau", "hex": "d7d7d7"}, + {"name": "Kupferbraun", "hex": "8e402a"}, + {"name": "Braun", "hex": "59351f"}, + {"name": "Beigebraun", "hex": "7b5141"}, + {"name": "Crem Weiß (Perlweiß)", "hex": "fdf4e3"}, + {"name": "Weiß", "hex": "f4f4f4"}, + {"name": "Silber", "hex": "a5a5a5"}, + {"name": "Schwarz", "hex": "1e1e1e"}, + {"name": "Neon Grün", "hex": "00b140", "translucent": true}, + {"name": "Neon Pink", "hex": "fe17a2"}, + {"name": "Neon Orange", "hex": "fe5000", "translucent": true}, + {"name": "Leichtes Blau", "hex": "74b2dd"}, + {"name": "Neon Gelb", "hex": "d4ed47", "translucent": true}, + {"name": "Gelbgold", "hex": "c9a96e"}, + {"name": "Neon Transparent", "hex": "b8d4e8", "translucent": true}, + {"name": "Leichtes Pink", "hex": "f9c4ba"}, + {"name": "Blau", "hex": "1b4f8a"}, + {"name": "Natur Transparent", "hex": "e8e4d8", "translucent": true}, + {"name": "Glow in the Dark (Grün)", "hex": "c8e04a", "glow": true}, + {"name": "Glow in the Dark (Blau)", "hex": "5bb8f5", "glow": true} + ] + }, { "name": "{color_name}", "material": "ASA-X", @@ -15,6 +90,7 @@ "diameters": [ 1.75 ], + "extruder_temp": 255, "extruder_temp_range": [ 235, 255 @@ -24,62 +100,20 @@ 90 ], "colors": [ - { - "name": "Schwarz", - "hex": "1e1e1e" - }, - { - "name": "Weiß", - "hex": "f4f4f4" - }, - { - "name": "Rot", - "hex": "cc2529" - }, - { - "name": "Dunkelblau", - "hex": "20214f" - }, - { - "name": "Eisengrau", - "hex": "4e5965" - }, - { - "name": "Hellgrau", - "hex": "d7d7d7" - }, - { - "name": "Verkehrsblau", - "hex": "2271b3" - }, - { - "name": "Apfelgrün", - "hex": "57a639" - }, - { - "name": "Blattgrün", - "hex": "4d7c43" - }, - { - "name": "Dunkelsilber", - "hex": "9a9697" - }, - { - "name": "Orange", - "hex": "f3752b" - }, - { - "name": "Gelb", - "hex": "fad201" - }, - { - "name": "Glitzer Eisengau", - "hex": "535a5e" - }, - { - "name": "Glitzer Oxidrot", - "hex": "911e1e" - } + {"name": "Schwarz", "hex": "1e1e1e"}, + {"name": "Weiß", "hex": "f4f4f4"}, + {"name": "Rot", "hex": "cc2529"}, + {"name": "Dunkelblau", "hex": "20214f"}, + {"name": "Eisengrau", "hex": "4e5965"}, + {"name": "Hellgrau", "hex": "d7d7d7"}, + {"name": "Verkehrsblau", "hex": "2271b3"}, + {"name": "Apfelgrün", "hex": "57a639"}, + {"name": "Blattgrün", "hex": "4d7c43"}, + {"name": "Dunkelsilber", "hex": "9a9697"}, + {"name": "Orange", "hex": "f3752b"}, + {"name": "Gelb", "hex": "fad201"}, + {"name": "Glitzer Eisengau", "hex": "535a5e", "pattern": "sparkle"}, + {"name": "Glitzer Oxidrot", "hex": "911e1e", "pattern": "sparkle"} ] } ] From 8cd0efed2f160b71f4769bbe6e27e93f18b3d393 Mon Sep 17 00:00:00 2001 From: Julian Date: Tue, 31 Mar 2026 17:58:56 +0200 Subject: [PATCH 5/5] Update density of redline filament from 1.25 to 1.24 --- filaments/redlinefilament.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filaments/redlinefilament.json b/filaments/redlinefilament.json index 7f6fc283..f4532eee 100644 --- a/filaments/redlinefilament.json +++ b/filaments/redlinefilament.json @@ -4,7 +4,7 @@ { "name": "{color_name}", "material": "PLA", - "density": 1.25, + "density": 1.24, "weights": [ { "weight": 1000,