Merge branch 'main' into dev/p2s-pr

Browse Source

# Conflicts:
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/Utils/CalibUtils.cpp

...

This commit is contained in:

Noisyfox

2025-10-29 21:03:22 +08:00

parent 9b015c9d45 4b7b81a0a2

commit 00122a9de5

37 changed files with 7734 additions and 4811 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

resources/i18n/vi/OrcaSlicer.mo

Binary file not shown.