GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:46:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse Source
This commit is contained in:
Andreea Scorojitu 2017-11-09 08:47:09 +01:00
commit d6f856e900
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View File

@ -276,12 +276,8 @@ Cura.MachineAction
width: parent.width
wrapMode: Text.WordWrap
text:{
if (base.selectedPrinter == undefined)
{
return "";
}
// The property cluster size does not exist for older UM3 devices.
if(base.selectedPrinter != undefined && base.selectedPrinter.clusterSize == null || base.selectedPrinter.clusterSize == 1)
if(!base.selectedPrinter && (base.selectedPrinter.clusterSize == null || base.selectedPrinter.clusterSize == 1))
{
return "";
}

2
resources/definitions/fdmprinter.def.json
View File

@ -1394,7 +1394,7 @@
"infill_pattern":
{
"label": "Infill Pattern",
"description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, cubic, octet, quarter cubic and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction.",
"description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction.",
"type": "enum",
"options":
{

5
resources/definitions/vertex_delta_k8800.def.json
View File

@ -10,6 +10,9 @@
"author": "Velleman"
},
"overrides": {
"material_diameter": {
"default_value": 1.75,
},
"machine_width": {
"default_value": 200
},
@ -40,7 +43,7 @@
"machine_head_shape_max_y": {
"default_value": 0
},
"machine_nozzle_gantry_distance": {
"gantry_height": {
"default_value": 0
},
"machine_nozzle_offset_x_1": {