From 7a0b8d91356d3bfb7f3052cc592bca165f844d44 Mon Sep 17 00:00:00 2001
From: "zhimin.zeng" <zhimin.zeng@bambulab.com>
Date: Tue, 21 Jan 2025 12:03:11 +0800
Subject: [PATCH] FIX: Update blacklist

jira: none
Change-Id: I5ce98aeab6ee1a5b84b35c12c8caf3cf70f30ba6
---
 resources/printers/filaments_blacklist.json | 54 ++++++++++++++++++---
 src/slic3r/GUI/DeviceManager.cpp            |  2 +-
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/resources/printers/filaments_blacklist.json b/resources/printers/filaments_blacklist.json
index 375b3c05b..87dafbddc 100644
--- a/resources/printers/filaments_blacklist.json
+++ b/resources/printers/filaments_blacklist.json
@@ -9,7 +9,7 @@
       "description": "TPU: not supported"
     },
     {
-      "vendor": "Bambulab",
+      "vendor": "Bambu Lab",
       "type": "TPU",
       "action": "prohibition",
       "description": "TPU: not supported"
@@ -20,6 +20,12 @@
       "action": "warning",
       "description": "PVA: flexible"
     },
+    {
+      "vendor": "Bambu Lab",
+      "type": "PVA",
+      "action": "warning",
+      "description": "PVA: flexible"
+    },
     {
       "vendor": "Third Party",
       "type": "PLA-CF",
@@ -45,16 +51,52 @@
       "description": "CF/GF: hard and brittle"
     },
     {
-      "vendor": "Bambulab",
+      "vendor": "Third Party",
       "type": "PET-CF",
-      "action": "prohibition",
-      "description": "Bambu PET-CF/PA6-CF: not supported"
+      "action": "warning",
+      "description": "CF/GF: hard and brittle"
     },
     {
-      "vendor": "Bambulab",
+      "vendor": "Third Party",
+      "type": "PA6-CF",
+      "action": "warning",
+      "description": "CF/GF: hard and brittle"
+    },
+    {
+      "vendor": "Third Party",
+      "type": "PPS-CF",
+      "action": "warning",
+      "description": "CF/GF: hard and brittle"
+    },
+    {
+      "vendor": "Third Party",
+      "type": "PPA-CF",
+      "action": "warning",
+      "description": "CF/GF: hard and brittle"
+    },
+    {
+      "vendor": "Bambu Lab",
+      "type": "PET-CF",
+      "action": "prohibition",
+      "description": "Bambu CF: not supported"
+    },
+    {
+      "vendor": "Bambu Lab",
       "type": "PA6-CF",
       "action": "prohibition",
-      "description": "Bambu PET-CF/PA6-CF: not supported"
+      "description": "Bambu CF: not supported"
+    },
+    {
+      "vendor": "Bambu Lab",
+      "type": "PPS-CF",
+      "action": "prohibition",
+      "description": "Bambu CF: not supported"
+    },
+    {
+      "vendor": "Bambu Lab",
+      "type": "PPA-CF",
+      "action": "prohibition",
+      "description": "Bambu CF: not supported"
     }
   ]
 }
diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index fd630fc89..1ffc8589c 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -7296,7 +7296,7 @@ void DeviceManager::check_filaments_in_blacklist(std::string tag_vendor, std::st
     std::unordered_map<std::string, wxString> blacklist_prompt =
     {
         {"TPU: not supported", _L("TPU is not supported by AMS.")},
-        {"Bambu PET-CF/PA6-CF: not supported",  _L("Bambu PET-CF/PA6-CF is not supported by AMS.")},
+        {"Bambu CF: not supported",  _L("Bambu PET-CF/PA6-CF/PPA-CF/PPS-CF is not supported by AMS.")},
         {"PVA: flexible", _L("Damp PVA will become flexible and get stuck inside AMS,please take care to dry it before use.")},
         {"CF/GF: hard and brittle", _L("CF/GF filaments are hard and brittle, It's easy to break or get stuck in AMS, please use with caution.")}
     };