Merge branch 'master-remote' into SoftFever

Browse Source

# Conflicts:
#	src/slic3r/GUI/MediaPlayCtrl.cpp

...

This commit is contained in:

SoftFever

2022-09-13 23:04:58 +08:00

parent e98796b42f 8d4270c917

commit de874acc99

13 changed files with 60 additions and 33 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

2

resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json

File diff suppressed because one or more lines are too long

2

resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json

File diff suppressed because one or more lines are too long

BIN

resources/web/homepage/img/3d_text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 135 KiB After Width:  |  Height:  |  Size: 126 KiB