mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-20 07:11:12 -06:00
Fixed conflicts after merge with master
This commit is contained in:
commit
e8d52cfba1
62 changed files with 1946 additions and 1622 deletions
|
@ -20,6 +20,7 @@ variants = 0.4
|
|||
technology = FFF
|
||||
bed_model = ender3_bed.stl
|
||||
bed_texture = ender3.svg
|
||||
default_materials = Creality PLA @ENDER3; Prusament PLA @ENDER3
|
||||
|
||||
# All presets starting with asterisk, for example *common*, are intermediate and they will
|
||||
# not make it into the user interface.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue