3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-29 20:30:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'main' into dev/bbl-network-upd

Browse source 
# Conflicts:
#	src/slic3r/GUI/SelectMachine.cpp
This commit is contained in:
Noisyfox 2025-06-21 10:27:10 +08:00
commit d60fcb0d11
233 changed files with 2205 additions and 1484 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/SendMultiMachinePage.cpp
View file

@ -263,9 +263,6 @@ SendMultiMachinePage::SendMultiMachinePage(Plater* plater)
app_config = get_app_config();
SetBackgroundColour(*wxWHITE);
// icon
std::string icon_path = (boost::format("%1%/images/OrcaSlicerTitle.ico") % resources_dir()).str();
SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);