Fixed conflicts after merge with master

This commit is contained in:
Enrico Turri 2020-01-17 14:16:12 +01:00
commit e8d52cfba1
62 changed files with 1946 additions and 1622 deletions

View file

@ -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.