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

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
parent b998ddd1bd 778deab033
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/CalibrationWizard.cpp
View File

@@ -688,7 +688,7 @@ void PressureAdvanceWizard::on_cali_start()
if (curr_obj->get_printer_series() != PrinterSeries::SERIES_X1 && curr_obj->pa_calib_tab.size() >= MAX_PA_HISTORY_RESULTS_NUMS) {
MessageDialog msg_dlg(nullptr, wxString::Format(_L("This machine type can only hold 16 history results per nozzle. "
"You can delete the existing historical results and then start calibration. "
"Or you can continue the calibration, but you cannot create new calibration historical results. \n"
"Or you can continue the calibration, but you cannot create new calibration historical results.\n"
"Do you still want to continue the calibration?"), MAX_PA_HISTORY_RESULTS_NUMS), wxEmptyString, wxICON_WARNING | wxYES | wxCANCEL);
if (msg_dlg.ShowModal() != wxID_YES) {
return;