Merge branch '3.6'

This commit is contained in:
Ghostkeeper 2018-10-29 13:19:16 +01:00
commit 6df0d1a85d
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276

View File

@ -1238,6 +1238,25 @@
}
}
},
"UltimakerBAM": {
"package_info": {
"package_id": "UltimakerBAM",
"package_type": "material",
"display_name": "Ultimaker Breakaway",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/breakaway",
"author": {
"author_id": "Ultimaker",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
"description": "Professional 3D printing made accessible.",
"support_website": "https://ultimaker.com/en/resources/troubleshooting/materials"
}
}
},
"UltimakerCPE": {
"package_info": {
"package_id": "UltimakerCPE",
@ -1257,6 +1276,25 @@
}
}
},
"UltimakerCPEP": {
"package_info": {
"package_id": "UltimakerCPEP",
"package_type": "material",
"display_name": "Ultimaker CPE+",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/cpe",
"author": {
"author_id": "Ultimaker",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
"description": "Professional 3D printing made accessible.",
"support_website": "https://ultimaker.com/en/resources/troubleshooting/materials"
}
}
},
"UltimakerNylon": {
"package_info": {
"package_id": "UltimakerNylon",
@ -1314,6 +1352,25 @@
}
}
},
"UltimakerPP": {
"package_info": {
"package_id": "UltimakerPP",
"package_type": "material",
"display_name": "Ultimaker PP",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/pp",
"author": {
"author_id": "Ultimaker",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
"description": "Professional 3D printing made accessible.",
"support_website": "https://ultimaker.com/en/resources/troubleshooting/materials"
}
}
},
"UltimakerPVA": {
"package_info": {
"package_id": "UltimakerPVA",
@ -1333,6 +1390,44 @@
}
}
},
"UltimakerTPU": {
"package_info": {
"package_id": "UltimakerTPU",
"package_type": "material",
"display_name": "Ultimaker TPU 95A",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/tpu-95a",
"author": {
"author_id": "Ultimaker",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
"description": "Professional 3D printing made accessible.",
"support_website": "https://ultimaker.com/en/resources/troubleshooting/materials"
}
}
},
"UltimakerTPLA": {
"package_info": {
"package_id": "UltimakerTPLA",
"package_type": "material",
"display_name": "Ultimaker Tough PLA",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/tough-pla",
"author": {
"author_id": "Ultimaker",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
"description": "Professional 3D printing made accessible.",
"support_website": "https://ultimaker.com/en/resources/troubleshooting/materials"
}
}
},
"VertexDeltaABS": {
"package_info": {
"package_id": "VertexDeltaABS",