3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix merge conflicts from 3.4

Browse source
This commit is contained in:
Lipu Fei 2018-06-05 09:02:52 +02:00
commit 7f7a195627
13 changed files with 187 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/definitions/ultimaker3.def.json
View file

@ -122,7 +122,7 @@
"raft_jerk": { "value": "jerk_layer_0" },
"raft_margin": { "value": "10" },
"raft_surface_layers": { "value": "1" },
"retraction_amount": { "value": "2" },
"retraction_amount": { "value": "6.5" },
"retraction_count_max": { "value": "10" },
"retraction_extrusion_window": { "value": "1" },
"retraction_hop": { "value": "2" },

2
resources/definitions/ultimaker_s5.def.json
View file

@ -119,7 +119,7 @@
"raft_margin": { "value": "10" },
"raft_speed": { "value": "25" },
"raft_surface_layers": { "value": "1" },
"retraction_amount": { "value": "2" },
"retraction_amount": { "value": "6.5" },
"retraction_count_max": { "value": "10" },
"retraction_extrusion_window": { "value": "1" },
"retraction_hop": { "value": "2" },