mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-24 23:23:57 -06:00
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura
This commit is contained in:
commit
18b5855a1c
1 changed files with 0 additions and 4 deletions
|
@ -68,11 +68,7 @@
|
|||
"travel_avoid_distance": { "value": "1" },
|
||||
"retraction_hop_only_when_collides": { "value": "1" },
|
||||
|
||||
<<<<<<< HEAD
|
||||
"switch_extruder_retraction_amount": { "default_value": 5, "value": "5" },
|
||||
=======
|
||||
"switch_extruder_retraction_amount": { "default_value": 5 },
|
||||
>>>>>>> 825e9932b... - Deltacomb : Full supporto for dual extruders
|
||||
"switch_extruder_retraction_speeds": { "default_value": 70 },
|
||||
|
||||
"top_bottom_thickness": { "default_value": 0.8 },
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue