juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'merge-upstream'

Browse Source 
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
This commit is contained in:
SoftFever
2023-09-30 08:44:32 +08:00
parent 7a7187f9ed 4fd2177625
commit 59bab91da9
579 changed files with 23269 additions and 11097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
localization/i18n/list.txt
View File

@@ -144,4 +144,5 @@ src/slic3r/GUI/BonjourDialog.cpp
src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp
src/slic3r/GUI/PrintHostDialogs.cpp
src/slic3r/GUI/calib_dlg.cpp
src/slic3r/GUI/PhysicalPrinterDialog.cpp
src/slic3r/GUI/PhysicalPrinterDialog.cpp
src/slic3r/Utils/CalibUtils.cpp