3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 07:15:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into PP-1-Improved_print_profiles

Browse source 
# Conflicts:
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
This commit is contained in:
p.kuiper 2021-09-29 17:33:02 +02:00
commit f9f59d0da1
4026 changed files with 4374 additions and 4056 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/variants/ultimaker_s3_bb0.8.inst.cfg
View file

@ -4,7 +4,7 @@ version = 4
definition = ultimaker_s3
[metadata]
setting_version = 17
setting_version = 19
type = variant
hardware_type = nozzle