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

Merge branch '4.0' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2019-03-04 16:00:56 +01:00
commit 6157cb6f91
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/Settings/ExtrudersModel.py
View File

@ -134,8 +134,8 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
self._updateExtruders() # Since the new extruders may have different properties, update our own model. self._updateExtruders() # Since the new extruders may have different properties, update our own model.
def _onExtruderStackContainersChanged(self, container): def _onExtruderStackContainersChanged(self, container):
# Update when there is an empty container or material change # Update when there is an empty container or material or variant change
if container.getMetaDataEntry("type") == "material" or container.getMetaDataEntry("type") is None: if container.getMetaDataEntry("type") in ["material", "variant", None]:
# The ExtrudersModel needs to be updated when the material-name or -color changes, because the user identifies extruders by material-name # The ExtrudersModel needs to be updated when the material-name or -color changes, because the user identifies extruders by material-name
self._updateExtruders() self._updateExtruders()

3
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View File

@ -221,6 +221,7 @@ Item
height: 18 * screenScaleFactor // TODO: Theme! height: 18 * screenScaleFactor // TODO: Theme!
width: childrenRect.width width: childrenRect.width
visible: !cloudConnection
UM.RecolorImage UM.RecolorImage
{ {
@ -263,4 +264,4 @@ Item
} }
} }
} }
} }

14
resources/bundled_packages/cura.json
View File

@ -1365,7 +1365,7 @@
"package_type": "material", "package_type": "material",
"display_name": "Ultimaker ABS", "display_name": "Ultimaker ABS",
"description": "Example package for material and quality profiles for Ultimaker materials.", "description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1", "package_version": "1.2.2",
"sdk_version": "6.0", "sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/abs", "website": "https://ultimaker.com/products/materials/abs",
"author": { "author": {
@ -1403,7 +1403,7 @@
"package_type": "material", "package_type": "material",
"display_name": "Ultimaker CPE", "display_name": "Ultimaker CPE",
"description": "Example package for material and quality profiles for Ultimaker materials.", "description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1", "package_version": "1.2.2",
"sdk_version": "6.0", "sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/abs", "website": "https://ultimaker.com/products/materials/abs",
"author": { "author": {
@ -1422,7 +1422,7 @@
"package_type": "material", "package_type": "material",
"display_name": "Ultimaker CPE+", "display_name": "Ultimaker CPE+",
"description": "Example package for material and quality profiles for Ultimaker materials.", "description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1", "package_version": "1.2.2",
"sdk_version": "6.0", "sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/cpe", "website": "https://ultimaker.com/products/materials/cpe",
"author": { "author": {
@ -1441,7 +1441,7 @@
"package_type": "material", "package_type": "material",
"display_name": "Ultimaker Nylon", "display_name": "Ultimaker Nylon",
"description": "Example package for material and quality profiles for Ultimaker materials.", "description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1", "package_version": "1.2.2",
"sdk_version": "6.0", "sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/abs", "website": "https://ultimaker.com/products/materials/abs",
"author": { "author": {
@ -1479,7 +1479,7 @@
"package_type": "material", "package_type": "material",
"display_name": "Ultimaker PLA", "display_name": "Ultimaker PLA",
"description": "Example package for material and quality profiles for Ultimaker materials.", "description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1", "package_version": "1.2.2",
"sdk_version": "6.0", "sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/abs", "website": "https://ultimaker.com/products/materials/abs",
"author": { "author": {
@ -1498,7 +1498,7 @@
"package_type": "material", "package_type": "material",
"display_name": "Ultimaker PP", "display_name": "Ultimaker PP",
"description": "Example package for material and quality profiles for Ultimaker materials.", "description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1", "package_version": "1.2.2",
"sdk_version": "6.0", "sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/pp", "website": "https://ultimaker.com/products/materials/pp",
"author": { "author": {
@ -1536,7 +1536,7 @@
"package_type": "material", "package_type": "material",
"display_name": "Ultimaker TPU 95A", "display_name": "Ultimaker TPU 95A",
"description": "Example package for material and quality profiles for Ultimaker materials.", "description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.2.1", "package_version": "1.2.2",
"sdk_version": "6.0", "sdk_version": "6.0",
"website": "https://ultimaker.com/products/materials/tpu-95a", "website": "https://ultimaker.com/products/materials/tpu-95a",
"author": { "author": {