3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 07:15:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Move "Exclude Materials" metadata to materials"

Browse source
This commit is contained in:
Lipu Fei 2018-07-10 16:27:07 +02:00 • committed by GitHub
parent 33a6c8bb8e
commit 7658ad34e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/definitions/ultimaker.def.json
View file

@ -6,7 +6,8 @@
"author": "Ultimaker",
"manufacturer": "Ultimaker B.V.",
"category": "Ultimaker",
"visible": false
"visible": false,
"exclude_materials": [ "generic_hips", "generic_petg" ]
},
"overrides": {
"machine_max_feedrate_e": {

1
resources/definitions/ultimaker2.def.json
View file

@ -14,6 +14,7 @@
"platform_offset": [9, 0, 0],
"has_materials": false,
"has_machine_quality": true,
"exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"],
"first_start_actions": ["UM2UpgradeSelection"],
"supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"],
"machine_extruder_trains":

1
resources/definitions/ultimaker_original.def.json
View file

@ -12,6 +12,7 @@
"platform": "ultimaker_platform.stl",
"has_materials": true,
"has_machine_quality": true,
"exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"],
"first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"],
"supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"],
"machine_extruder_trains":

1
resources/definitions/ultimaker_original_dual.def.json
View file

@ -13,6 +13,7 @@
"has_materials": true,
"has_machine_quality": true,
"quality_definition": "ultimaker_original",
"exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"],
"machine_extruder_trains":
{
"0": "ultimaker_original_dual_1st",

6
resources/qml/SidebarHeader.qml
View file

@ -1,5 +1,5 @@
//Copyright (c) 2018 Ultimaker B.V.
//Cura is released under the terms of the LGPLv3 or higher.
// Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 1.1
@ -402,7 +402,7 @@ Column
property var valueError: !isMaterialSupported()
property var valueWarning: ! Cura.MachineManager.isActiveQualitySupported
function isMaterialSupported()
function isMaterialSupported ()
{
if (!hasActiveExtruder)
{