juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Update blacklist

Browse Source 
jira: none
Change-Id: I5ce98aeab6ee1a5b84b35c12c8caf3cf70f30ba6
(cherry picked from commit 7a0b8d91356d3bfb7f3052cc592bca165f844d44)
This commit is contained in:
zhimin.zeng
2025-01-21 12:03:11 +08:00
committed by Noisyfox
parent 65c3a6330a
commit 7ce79938f7
2 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
resources/printers/filaments_blacklist.json
View File

@@ -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"
}
]
}

2
src/slic3r/GUI/DeviceManager.cpp
View File

@@ -7393,7 +7393,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.")}
};