diff options
| author | Gabriele Rossetti <gabriele.rossetti@canespa.it> | 2021-05-02 01:45:12 +0300 |
|---|---|---|
| committer | Gabriele Rossetti <gabriele.rossetti@canespa.it> | 2021-05-02 01:53:56 +0300 |
| commit | d8fab4eca8f48a3cefbb7305d1bc060a987a2978 (patch) | |
| tree | 5679430e49b5c2cab4e21cdeab8acd6f6588ca00 /resources/definitions/deltacomb_base.def.json | |
| parent | 6100aea54aece2ce3b69bfb6591744a4ce2e6067 (diff) | |
| parent | fdd4e8f3d9c953a8b8a58d732f3513722b81d76a (diff) | |
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura
Diffstat (limited to 'resources/definitions/deltacomb_base.def.json')
| -rw-r--r-- | resources/definitions/deltacomb_base.def.json | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/resources/definitions/deltacomb_base.def.json b/resources/definitions/deltacomb_base.def.json index 82a3c28bed..4d5840c9ef 100644 --- a/resources/definitions/deltacomb_base.def.json +++ b/resources/definitions/deltacomb_base.def.json @@ -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 }, |