mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-09 06:45:09 -06:00
Merge branch 'master' into libArachne_rebased
Conflicts: resources/definitions/ultimaker2.def.json -> Additions in Arachne around a place where we fixed an enum setting. resources/definitions/ultimaker3.def.json resources/definitions/ultimaker_s3.def.json resources/definitions/ultimaker_s5.def.json
This commit is contained in:
commit
b8ccb32836
342 changed files with 19750 additions and 7653 deletions
|
@ -23,7 +23,6 @@ machine_nozzle_heat_up_speed = 1.6
|
|||
material_print_temperature = =default_material_print_temperature -10
|
||||
material_standby_temperature = 100
|
||||
prime_tower_enable = False
|
||||
roofing_layer_count = 2
|
||||
skin_outline_count = 0
|
||||
skin_overlap = 20
|
||||
speed_layer_0 = =math.ceil(speed_print * 20 / 50)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue