viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 2 Pull Requests Packages Projects Releases 3 Wiki Activity

Merge branch 'main' into dev/p2s-pr

Browse Source 
# Conflicts:
#	src/slic3r/GUI/DeviceErrorDialog.cpp
This commit is contained in:
Noisyfox
2025-11-09 12:35:32 +08:00
parent df734857cc 08bd21310c
commit 614612ed38
48 changed files with 3533 additions and 3528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/StatusPanel.cpp
View File

@ -3532,14 +3532,14 @@ void StatusPanel::update_ams_control_state(std::string ams_id, std::string slot_
for (auto ext : obj->GetExtderSystem()->GetExtruders()) {
if (ext.GetSlotNow().ams_id == ams_id && ext.GetSlotNow().slot_id == slot_id)
{
load_error_info = _L("Current slot has alread been loaded");
load_error_info = _L("Current slot has already been loaded");
}
}
} else {
for (auto ext : obj->GetExtderSystem()->GetExtruders()) {
if (ext.GetSlotNow().ams_id == ams_id && ext.GetSlotNow().slot_id == slot_id)
{
load_error_info = _L("Current slot has alread been loaded");
load_error_info = _L("Current slot has already been loaded");
}
}