From 78cc00a96fdaad52643d70ffc2fa8f0f13f43c77 Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Thu, 26 Dec 2024 16:59:16 +0000 Subject: [PATCH 1/6] Added Fillamentum - Everybody's Magenta PLA Extrafill --- filaments/fillamentum.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/filaments/fillamentum.json b/filaments/fillamentum.json index 37c3a28..1b3f91a 100644 --- a/filaments/fillamentum.json +++ b/filaments/fillamentum.json @@ -161,6 +161,10 @@ { "name": "Cobalt Blue", "hex": "283355" + }, + { + "name": "Everybody's Magenta", + "hex": "E1337E" } ] } From 87f62bca475a7000eb1512ea9ac0a3642c7ca126 Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Thu, 26 Dec 2024 17:11:24 +0000 Subject: [PATCH 2/6] Corrected PETG glowex to correct values --- filaments/extrudr.json | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/filaments/extrudr.json b/filaments/extrudr.json index 73db418..ed166f1 100644 --- a/filaments/extrudr.json +++ b/filaments/extrudr.json @@ -1008,11 +1008,6 @@ "name": "Neon Green", "hex": "00BB2D" }, - { - "name": "glowEx", - "hex": "00BB2D", - "glow": true - }, { "name": "White", "hex": "F4F4F4" @@ -1099,6 +1094,36 @@ } ] }, + { + "name": "{color_name}", + "material": "PETG", + "density": 1.3, + "weights": [ + { + "weight": 800.0, + "spool_weight": 260.0, + "spool_type": "plastic" + }, + { + "weight": 2500.0, + "spool_weight": 600.0, + "spool_type": "plastic" + } + ], + "diameters": [ + 1.75, + 2.85 + ], + "extruder_temp": 230, + "bed_temp": 70, + "colors": [ + { + "name": "glowEx", + "hex": "00BB2D", + "glow": true + } + ] + }, { "name": "X - {color_name}", "material": "PETG-CF", From eb0d8fce921fa56b8512ee06a904eec43f2352e0 Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Thu, 26 Dec 2024 17:12:23 +0000 Subject: [PATCH 3/6] Update extrudr.json --- filaments/extrudr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filaments/extrudr.json b/filaments/extrudr.json index ed166f1..a8f0e35 100644 --- a/filaments/extrudr.json +++ b/filaments/extrudr.json @@ -1097,7 +1097,7 @@ { "name": "{color_name}", "material": "PETG", - "density": 1.3, + "density": 1.29, "weights": [ { "weight": 800.0, From 2f36b0514b0e0d42dab343797053fdea56237a5c Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Thu, 26 Dec 2024 17:30:29 +0000 Subject: [PATCH 4/6] Added FlashForge PLA Filaments --- filaments/flashforge.json | 228 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 filaments/flashforge.json diff --git a/filaments/flashforge.json b/filaments/flashforge.json new file mode 100644 index 0000000..fd2dcb0 --- /dev/null +++ b/filaments/flashforge.json @@ -0,0 +1,228 @@ +{ + "manufacturer": "FlashForge", + "filaments": [ + { + "name": "PLA - {color_name}", + "material": "PLA", + "density": 1.24, + "weights": [ + { + "weight": 500.0, + "spool_weight": 142.0 + }, + { + "weight": 1000.0, + "spool_weight": 170.0 + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp": 210, + "bed_temp": 60, + "colors": [ + { + "name": "Black", + "hex": "0B0203" + }, + { + "name": "White", + "hex": "FFFFFF" + }, + { + "name": "Natural", + "hex": "E7E7E7" + }, + { + "name": "Gray", + "hex": "515F6C" + }, + { + "name": "Skin", + "hex": "D4B48F" + }, + { + "name": "Red", + "hex": "D92818" + }, + { + "name": "Blue", + "hex": "172788" + }, + { + "name": "Yellow", + "hex": "FED212" + }, + { + "name": "Green", + "hex": "149732" + }, + { + "name": "Orange", + "hex": "F08400" + }, + { + "name": "Silver", + "hex": "8C9091" + }, + { + "name": "Light Green", + "hex": "8AC54B" + }, + { + "name": "Pink", + "hex": "F3B4CD" + }, + { + "name": "Purple", + "hex": "50248B" + }, + { + "name": "Brown", + "hex": "984304" + }, + { + "name": "Gold", + "hex": "8D834E" + } + ] + }, + { + "name": "Starter PLA - {color_name}", + "material": "PLA", + "density": 1.24, + "weights": [ + { + "weight": 250.0, + "spool_weight": 142.0 + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp": 210, + "bed_temp": 60, + "colors": [ + { + "name": "Red", + "hex": "D92818", + "translucent": true + } + ] + }, + { + "name": "PLA Pro - {color_name}", + "material": "PLA", + "density": 1.24, + "weights": [ + { + "weight": 1000, + "spool_weight": 120 + } + ], + "diameters": [ + 1.75 + ], + "extruder_temp": 210, + "bed_temp": 60, + "colors": [ + { + "name": "Natural", + "hex": "E7E7E7" + }, + { + "name": "White", + "hex": "FFFFFF" + }, + { + "name": "Cool White", + "hex": "F6F5FA" + }, + { + "name": "Black", + "hex": "0B0203" + }, + { + "name": "Gray", + "hex": "9EACAC" + }, + { + "name": "Silver Gray", + "hex": "A2A7A7" + }, + { + "name": "Silver", + "hex": "BBBDBD" + }, + { + "name": "Skin", + "hex": "E7CEA2" + }, + { + "name": "Yellow", + "hex": "FED212" + }, + { + "name": "Green", + "hex": "149732" + }, + { + "name": "Light Blue", + "hex": "00A3E0" + }, + { + "name": "Blue", + "hex": "172788" + }, + { + "name": "Red", + "hex": "D90C18" + }, + { + "name": "Light Yellow", + "hex": "E4E63F" + }, + { + "name": "Rose", + "hex": "BC4997" + }, + { + "name": "Pink", + "hex": "F3B4CD" + }, + { + "name": "Purple", + "hex": "5C3E93" + }, + { + "name": "Orange", + "hex": "EC6C01" + }, + { + "name": "Light Green", + "hex": "91C536" + }, + { + "name": "Gold", + "hex": "CFA74C" + }, + { + "name": "Brown", + "hex": "984304" + }, + { + "name": "Light Red", + "hex": "DB2F2B" + }, + { + "name": "Traffic Red", + "hex": "B32124" + }, + { + "name": "Light Orange", + "hex": "F08400" + } + ] + } + ] +} From 08036d5a539e8d6f35d48545ca19dee4de28d3e9 Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Thu, 26 Dec 2024 17:31:46 +0000 Subject: [PATCH 5/6] Update flashforge.json --- filaments/flashforge.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/filaments/flashforge.json b/filaments/flashforge.json index fd2dcb0..69c01c6 100644 --- a/filaments/flashforge.json +++ b/filaments/flashforge.json @@ -4,7 +4,7 @@ { "name": "PLA - {color_name}", "material": "PLA", - "density": 1.24, + "density": 1.25, "weights": [ { "weight": 500.0, @@ -90,7 +90,7 @@ { "name": "Starter PLA - {color_name}", "material": "PLA", - "density": 1.24, + "density": 1.25, "weights": [ { "weight": 250.0, @@ -113,7 +113,7 @@ { "name": "PLA Pro - {color_name}", "material": "PLA", - "density": 1.24, + "density": 1.25, "weights": [ { "weight": 1000, From e9d149b730b30c76a97a94b8aa9c03b0de0d4970 Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Thu, 26 Dec 2024 18:04:36 +0000 Subject: [PATCH 6/6] Added PolyLite non Pro filaments --- filaments/polymaker.json | 146 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/filaments/polymaker.json b/filaments/polymaker.json index 9c5c941..ec621f5 100644 --- a/filaments/polymaker.json +++ b/filaments/polymaker.json @@ -1012,6 +1012,152 @@ } ] }, + { + "name": "PolyLite\u2122 PLA {color_name}", + "material": "PLA", + "density": 1.17, + "weights": [ + { + "weight": 1000.0, + "spool_weight": 140.0, + "spool_type": "cardboard" + }, + { + "weight": 1000.0, + "spool_weight": 250.0, + "spool_type": "plastic" + }, + { + "weight": 3000.0, + "spool_weight": 425.0, + "spool_type": "cardboard" + }, + { + "weight": 5000.0, + "spool_weight": 819.0, + "spool_type": "plastic" + } + ], + "diameters": [ + 1.75, + 2.85 + ], + "extruder_temp_range": [ + 190, + 230 + ], + "bed_temp_range": [ + 25, + 60 + ], + "colors": [ + { + "name": "Black", + "hex": "08090D" + }, + { + "name": "Steel Grey", + "hex": "616469" + }, + { + "name": "Grey", + "hex": "8C9099" + }, + { + "name": "Purple", + "hex": "6C47B2" + }, + { + "name": "Magenta", + "hex": "F2306E" + }, + { + "name": "Pink", + "hex": "F2306E" + }, + { + "name": "Wine Red", + "hex": "E0191E" + }, + { + "name": "Red", + "hex": "E72F1D" + }, + { + "name": "Brown", + "hex": "55331A" + }, + { + "name": "White", + "hex": "E2DEDB" + }, + { + "name": "Orange", + "hex": "F67405" + }, + { + "name": "Cream", + "hex": "E5C8A2" + }, + { + "name": "Beige", + "hex": "C6AD74" + }, + { + "name": "Yellow", + "hex": "F3B400" + }, + { + "name": "Lemon Yellow", + "hex": "F1D335" + }, + + { + "name": "Natural", + "hex": "E8E6D0" + }, + { + "name": "Olive Green", + "hex": "857C00" + }, + { + "name": "Lime Green", + "hex": "DEDE00" + }, + { + "name": "Jungle Green", + "hex": "446B20" + }, + { + "name": "Green", + "hex": "06924D" + }, + { + "name": "Polymaker Teal", + "hex": "4CC0C7" + }, + { + "name": "Aqua Blue", + "hex": "39B9DB" + }, + { + "name": "Stone Blue", + "hex": "40719A" + }, + { + "name": "Azure Blue", + "hex": "0066D9" + }, + { + "name": "Blue", + "hex": "003776" + }, + { + "name": "Dark Blue", + "hex": "041B3D" + } + ] + }, { "name": "Polymaker PC-ABS {color_name}", "material": "PC",