From 07ced27b7e9ab6a01768c5d4631ceb8592ef90f4 Mon Sep 17 00:00:00 2001
From: Jeremy <50074087+JB5678@users.noreply.github.com>
Date: Mon, 6 Jan 2025 15:37:09 +1100
Subject: [PATCH 1/3] Update esun.json

Updated ePLA+HS naming to reflect eSun product name, added rest of the colours.

Added ePLA-Silk with all colours.
---
 filaments/esun.json | 178 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 174 insertions(+), 4 deletions(-)

diff --git a/filaments/esun.json b/filaments/esun.json
index cf093d0..b8bf6e7 100644
--- a/filaments/esun.json
+++ b/filaments/esun.json
@@ -206,14 +206,14 @@
             ]
         },
         {
-            "name": "ePLA-HS {color_name}",
+            "name": "ePLA+HS {color_name}",
             "material": "PLA",
             "density": 1.24,
             "weights": [
                 {
                     "weight": 1000,
-                   "spool_weight": 170,
-                   "spool_type": "cardboard"
+                    "spool_weight": 170,
+                    "spool_type": "cardboard"
                 }
             ],
             "diameters": [
@@ -223,6 +223,10 @@
             "extruder_temp": 220,
             "bed_temp": 60,
             "colors": [
+                {
+                    "name": "Beige",
+                    "hex": "e8b99f"
+                },
                 {
                     "name": "Black",
                     "hex": "000000"
@@ -231,17 +235,183 @@
                     "name": "Blue",
                     "hex": "12296f"
                 },
+                {
+                    "name": "Bone White",
+                    "hex": "a88567"
+                },
+                {
+                    "name": "Brown",
+                    "hex": "6a4a3d"
+                },
+                {
+                    "name": "Cold White",
+                    "hex": "efeef3"
+                },
+                {
+                    "name": "Dark Blue",
+                    "hex": "1d2333"
+                },
+                {
+                    "name": "Fire Engine Red",
+                    "hex": "a40f15"
+                },
+                {
+                    "name": "Gold",
+                    "hex": "e39d3e"
+                }
+                {
+                    "name": "Green",
+                    "hex": "4b585e"
+                },
                 {
                     "name": "Grey",
                     "hex": "a6a9ae"
                 },
+                {
+                    "name": "Light Blue",
+                    "hex": "29b9de"
+                },
+                {
+                    "name": "Light Brown",
+                    "hex": "b47f5f"
+                },
+                {
+                    "name": "Magenta",
+                    "hex": "ed5973"
+                },
+                {
+                    "name": "Olive Green",
+                    "hex": "6d6b5e"
+                }
+                {
+                    "name": "Orange",
+                    "hex": "ff5216"
+                },
+                {
+                    "name": "Peak Green",
+                    "hex": "7ac163"
+                },
+                {
+                    "name": "Pine Green",
+                    "hex": "43634e"
+                },
+                {
+                    "name": "Pink",
+                    "hex": "ff7083"
+                },
+                {
+                    "name": "Purple",
+                    "hex": "3b1d4f"
+                },
                 {
                     "name": "Red",
-                    "hex": "ae241a"
+                    "hex": "fe4a3b"
+                },
+                {
+                    "name": "Silver",
+                    "hex": "757376"
+                },
+                {
+                    "name": "Space Blue",
+                    "hex": "5cb5df"
+                },
+                {
+                    "name": "Very Peri",
+                    "hex": "867ec9"
                 },
                 {
                     "name": "White",
                     "hex": "ffffff"
+                },
+                {
+                    "name": "Yellow",
+                    "hex": "fad900"
+                }
+            ]
+        },
+        {
+            "name": "ePLA-Silk {color_name}",
+            "material": "PLA",
+            "density": 1.21,
+            "weights": [
+                {
+                    "weight": 1000,
+                    "spool_weight": 240
+                }
+            ],
+            "diameters": [
+                1.75
+            ],
+            "extruder_temp": 210,
+            "bed_temp": 50,
+            "colors": [
+                {
+                    "name": "Lime",
+                    "hex": "a7e51e"
+                },
+                {
+                    "name": "Jacinth",
+                    "hex": "ee422a"
+                },
+                {
+                    "name": "Green",
+                    "hex": "00cd20"
+                },
+                {
+                    "name": "Gold",
+                    "hex": "e89104"
+                },
+                {
+                    "name": "Dark Yellow",
+                    "hex": "fbb351"
+                },
+                {
+                    "name": "Cyan",
+                    "hex": "0a75c3"
+                },
+                {
+                    "name": "Copper",
+                    "hex": "ee771b"
+                },
+                {
+                    "name": "Bronze",
+                    "hex": "5b5f50"
+                },
+                {
+                    "name": "Blue",
+                    "hex": "0064ee"
+                }
+                {
+                    "name": "Yellow",
+                    "hex": "e1be1a"
+                },
+                {
+                    "name": "White",
+                    "hex": "ffffff"
+                },
+                {
+                    "name": "Violet",
+                    "hex": "fb78bc"
+                },
+                {
+                    "name": "Silver",
+                    "hex": "b1b1b3"
+                },
+                {
+                    "name": "Rose Gold",
+                    "hex": "ed5973"
+                },
+                {
+                    "name": "Red",
+                    "hex": "ff2c30"
+                }
+                {
+                    "name": "Purple",
+                    "hex": "6d22a3"
+                },
+                {
+                    "name": "Pink",
+                    "hex": "ff8fca"
                 }
             ]
         },

From cbf451130c50c0e51449fc9d341e0203afb5ac7f Mon Sep 17 00:00:00 2001
From: Jeremy <50074087+JB5678@users.noreply.github.com>
Date: Mon, 6 Jan 2025 15:42:53 +1100
Subject: [PATCH 2/3] Update esun.json

---
 filaments/esun.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/filaments/esun.json b/filaments/esun.json
index b8bf6e7..c173920 100644
--- a/filaments/esun.json
+++ b/filaments/esun.json
@@ -258,7 +258,7 @@
                 {
                     "name": "Gold",
                     "hex": "e39d3e"
-                }
+                },
                 {
                     "name": "Green",
                     "hex": "4b585e"
@@ -282,7 +282,7 @@
                 {
                     "name": "Olive Green",
                     "hex": "6d6b5e"
-                }
+                },
                 {
                     "name": "Orange",
                     "hex": "ff5216"
@@ -380,7 +380,7 @@
                 {
                     "name": "Blue",
                     "hex": "0064ee"
-                }
+                },
                 {
                     "name": "Yellow",
                     "hex": "e1be1a"
@@ -404,7 +404,7 @@
                 {
                     "name": "Red",
                     "hex": "ff2c30"
-                }
+                },
                 {
                     "name": "Purple",
                     "hex": "6d22a3"

From c5a410f8d48806e948bb1b6a95d9276f9314fe6a Mon Sep 17 00:00:00 2001
From: Jeremy <50074087+JB5678@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:50:44 +1100
Subject: [PATCH 3/3] Update esun.json

Updated ePLA+HS material to PLA+
---
 filaments/esun.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filaments/esun.json b/filaments/esun.json
index c173920..aefa845 100644
--- a/filaments/esun.json
+++ b/filaments/esun.json
@@ -207,7 +207,7 @@
         },
         {
             "name": "ePLA+HS {color_name}",
-            "material": "PLA",
+            "material": "PLA+",
             "density": 1.24,
             "weights": [
                 {