GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 04:35:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2017-06-23 09:57:34 +02:00
commit 217eecccb9
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/Settings/MachineManager.py
View File

@ -1122,7 +1122,7 @@ class MachineManager(QObject):
def createMachineManager(engine=None, script_engine=None):
return MachineManager()
@deprecated #Use ExtruderStack.material = ... and it won't be necessary.
@deprecated("Use ExtruderStack.material = ... and it won't be necessary", "2.7")
def _updateMaterialContainer(self, definition: "DefinitionContainer", stack: "ContainerStack", variant_container: Optional["InstanceContainer"] = None, preferred_material_name: Optional[str] = None):
if not definition.getMetaDataEntry("has_materials"):
return self._empty_material_container

15
resources/themes/cura-dark/theme.json
View File

@ -181,6 +181,19 @@
"convex_hull": [35, 35, 35, 127],
"disallowed_area": [0, 0, 0, 40],
"error_area": [255, 0, 0, 127]
"error_area": [255, 0, 0, 127],
"layerview_ghost": [32, 32, 32, 96],
"layerview_none": [255, 255, 255, 255],
"layerview_inset_0": [155, 0, 0, 255],
"layerview_inset_x": [0, 155, 0, 255],
"layerview_skin": [155, 155, 0, 255],
"layerview_support": [0, 155, 155, 255],
"layerview_skirt": [0, 155, 155, 255],
"layerview_infill": [155, 117, 0, 255],
"layerview_support_infill": [0, 155, 155, 255],
"layerview_move_combing": [0, 0, 155, 255],
"layerview_move_retraction": [77, 77, 155, 255],
"layerview_support_interface": [39, 117, 155, 255]
}
}