3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-02 13:00:28 -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

2
src/slic3r/GUI/SelectMachine.cpp
View file

@ -2781,7 +2781,7 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
is_printing_block = true;
nozzle_diameter = wxString::Format("%.1f", obj_->m_extder_data.extders[0].diameter).ToStdString();
wxString nozzle_in_preset = wxString::Format(_L("Printing high temperature material(%s material) with %s may cause nozzle damage"), filament_type, format_steel_name(obj_->m_extder_data.extders[0].type));
wxString nozzle_in_preset = wxString::Format(_L("Printing high temperature material (%s material) with %s may cause nozzle damage"), filament_type, format_steel_name(obj_->m_extder_data.extders[0].type));
confirm_text.push_back(ConfirmBeforeSendInfo(nozzle_in_preset, ConfirmBeforeSendInfo::InfoLevel::Warning));
}
}