Merge branch 'main' into SoftFever

Browse source

# Conflicts:
#	.github/workflows/build_linux.yml
#	src/slic3r/GUI/GUI_Factories.cpp

...

This commit is contained in:

SoftFever 2023-04-07 11:12:04 +08:00

parent 4446ae86ec 17d6e63cf9

commit 5c9012b967

14 changed files with 9434 additions and 31 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/handy_models/OrcaCube_v2.3mf Normal file

View file

Binary file not shown.