GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-12 06:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict resolution

Browse Source 
A comma was missing. Also fixed the whitespace in this file, since there were a few tabs mixed in there.
This commit is contained in:
Ghostkeeper 2016-03-04 11:23:35 +01:00
parent a9bd73f32a
commit a785c9a205
No known key found for this signature in database
GPG Key ID: 701948C5954A7385
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
resources/machines/dual_extrusion_printer.json
View File

@ -7,7 +7,6 @@
"visible": false, "visible": false,
"machine_extruder_trains": { "machine_extruder_trains": {
"0": { "0": {
"extruder_nr": { "default": 0 }, "extruder_nr": { "default": 0 },
@ -18,7 +17,7 @@
"extruder_nr": { "default": 1 } "extruder_nr": { "default": 1 }
} }
}, },
"machine_settings": { "machine_settings": {
"machine_use_extruder_offset_to_offset_coords": { "default": false }, "machine_use_extruder_offset_to_offset_coords": { "default": false },
@ -109,7 +108,7 @@
"default": 0, "default": 0,
"min_value": "0", "min_value": "0",
"max_value": "16", "max_value": "16",
"global_only": true "global_only": true
}, },
"support_extruder_nr_layer_0": { "support_extruder_nr_layer_0": {
"label": "First Layer Support Extruder", "label": "First Layer Support Extruder",
@ -118,7 +117,7 @@
"default": 0, "default": 0,
"min_value": "0", "min_value": "0",
"max_value": "16", "max_value": "16",
"global_only": true "global_only": true
}, },
"support_roof_extruder_nr": { "support_roof_extruder_nr": {
"label": "Support Roof Extruder", "label": "Support Roof Extruder",
@ -127,8 +126,8 @@
"default": 0, "default": 0,
"min_value": "0", "min_value": "0",
"max_value": "16", "max_value": "16",
"enabled": "support_roof_enable" "enabled": "support_roof_enable",
"global_only": true "global_only": true
} }
} }
} }
@ -198,7 +197,7 @@
"type": "boolean", "type": "boolean",
"default": false, "default": false,
"enabled": "prime_tower_enable", "enabled": "prime_tower_enable",
"global_only": true "global_only": true
}, },
"multiple_mesh_overlap": { "multiple_mesh_overlap": {
"label": "Dual Extrusion Overlap", "label": "Dual Extrusion Overlap",
@ -209,7 +208,7 @@
"default": 0.15, "default": 0.15,
"min_value": "0", "min_value": "0",
"max_value_warning": "1.0", "max_value_warning": "1.0",
"global_only": true "global_only": true
}, },
"ooze_shield_enabled": { "ooze_shield_enabled": {
"label": "Enable Ooze Shield", "label": "Enable Ooze Shield",
@ -245,7 +244,7 @@
} }
}, },
"material": { "material": {
"settings": { "settings": {
"material_standby_temperature": { "material_standby_temperature": {
"label": "Standby Temperature", "label": "Standby Temperature",
"description": "The temperature of the nozzle when another nozzle is currently used for printing.", "description": "The temperature of the nozzle when another nozzle is currently used for printing.",