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 remote-tracking branch 'upstream/main' into dev/p2s-pr

Browse Source 
# Conflicts:
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrePrintChecker.cpp
#	src/slic3r/GUI/StatusPanel.cpp
This commit is contained in:
Noisyfox
2025-11-18 09:17:13 +08:00
parent 5e2a7fbf35 4046e39ff3
commit 760f66d3d7
77 changed files with 1760 additions and 2059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -75,9 +75,9 @@ void SelectMachineDialog::init_machine_bed_types()
if (MACHINE_BED_TYPE_STRING.size() == 0) {
MACHINE_BED_TYPE_STRING = {//_L("Auto"),
_L("Bambu Cool Plate") + " / " + _L("PLA Plate"),
_L("Bamabu Engineering Plate"),
_L("Bamabu Smooth PEI Plate") + "/" + _L("High temperature Plate"),
_L("Bamabu Textured PEI Plate"),
_L("Bambu Engineering Plate"),
_L("Bambu Smooth PEI Plate") + "/" + _L("High temperature Plate"),
_L("Bambu Textured PEI Plate"),
_L("Bambu Cool Plate SuperTack")
};
MachineBedTypeString = {//"auto",