3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-23 21:05:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'main' into dev/bbl-network-upd

Browse source 
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
This commit is contained in:
Noisyfox 2025-05-17 00:22:09 +08:00
commit 05a0703120
538 changed files with 40311 additions and 4069 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/slic3r/GUI/DeviceManager.cpp
View file

@ -3184,7 +3184,8 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
if (jj.contains("errno")) {
if (jj["errno"].is_number()) {
if (jj["errno"].get<int>() == -2) {
wxString text = _L("The current chamber temperature or the target chamber temperature exceeds 45\u2103.In order to avoid extruder clogging,low temperature filament(PLA/PETG/TPU) is not allowed to be loaded.");
wxString text = _L("The current chamber temperature or the target chamber temperature exceeds 45\u2103. "
"In order to avoid extruder clogging, low temperature filament (PLA/PETG/TPU) is not allowed to be loaded.");
GUI::wxGetApp().push_notification(text);
}
}
@ -3196,10 +3197,12 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
if (jj["errno"].is_number()) {
wxString text;
if (jj["errno"].get<int>() == -2) {
text = _L("Low temperature filament(PLA/PETG/TPU) is loaded in the extruder.In order to avoid extruder clogging,it is not allowed to set the chamber temperature above 45\u2103.");
text = _L("Low temperature filament (PLA/PETG/TPU) is loaded in the extruder. "
"In order to avoid extruder clogging, it is not allowed to set the chamber temperature above 45\u2103.");
}
else if (jj["errno"].get<int>() == -4) {
text = _L("When you set the chamber temperature below 40\u2103, the chamber temperature control will not be activated. And the target chamber temperature will automatically be set to 0\u2103.");
text = _L("When you set the chamber temperature below 40\u2103, the chamber temperature control will not be activated. "
"And the target chamber temperature will automatically be set to 0\u2103.");
}
if(!text.empty()){
#if __WXOSX__
@ -6668,7 +6671,7 @@ void DeviceManager::check_filaments_in_blacklist(std::string tag_vendor, std::st
{
{"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.")},
{"PVA: flexible", _L("Damp PVA will become flexible and get stuck inside AMS,please take care to dry it before use.")},
{"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.")}
};