Merge remote-tracking branch 'remote/master' into SoftFever

Browse Source

# Conflicts:
#	resources/profiles/BBL/filament/Bambu PC @BBL X1C.json
#	resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json

...

This commit is contained in:

SoftFever

2022-07-23 20:29:33 +08:00

parent 9af793adea a363daed9b

commit b806df7710

269 changed files with 10330 additions and 32230 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

759

src/slic3r/GUI/GUI_App.cpp

File diff suppressed because it is too large Load Diff