Merge remote-tracking branch 'origin/PP-1-Improved_print_profiles' into PP-1-Improved_print_profiles

# Conflicts:
#	resources/definitions/ultimaker3.def.json
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
This commit is contained in:
p.kuiper 2021-10-12 09:09:05 +02:00
commit fb645a2454
2 changed files with 1 additions and 1 deletions

View file

@ -140,7 +140,6 @@
"raft_margin": { "value": "10" },
"raft_surface_layers": { "value": "1" },
"retraction_amount": { "value": "6.5" },
"retraction_combing": { "value": "'no_outer_surfaces'", "default_value": "'no_outer_surfaces'" },
"retraction_count_max": { "value": "10" },
"retraction_extrusion_window": { "value": "1" },
"retraction_hop": { "value": "2" },

View file

@ -118,6 +118,7 @@
"default_material_print_temperature": { "value": "200" },
"material_standby_temperature": { "value": "100" },
"multiple_mesh_overlap": { "value": "0" },
"optimize_wall_printing_order": { "value": "True" },
"prime_tower_enable": { "value": "True" },
"raft_airgap": { "value": "0" },
"raft_base_speed": { "value": "20" },