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

Fix merge conflicts

Browse Source 
CURA-5496
This commit is contained in:
Lipu Fei 2018-06-25 14:26:11 +02:00
commit 140e38ac1c
8 changed files with 2 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@
"platform": "ultimaker_platform.stl", "platform": "ultimaker_platform.stl",
"has_materials": true, "has_materials": true,
"has_machine_quality": 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"], "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": "machine_extruder_trains":
{ {

1
resources/definitions/ultimaker_original_plus.def.json
View File

@ -10,6 +10,7 @@
"icon": "icon_ultimaker.png", "icon": "icon_ultimaker.png",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "UltimakerPlusbackplate.png", "platform_texture": "UltimakerPlusbackplate.png",
"quality_definition": "ultimaker_original",
"first_start_actions": ["UMOCheckup", "BedLevel"], "first_start_actions": ["UMOCheckup", "BedLevel"],
"supported_actions": ["UMOCheckup", "BedLevel", "UpgradeFirmware"] "supported_actions": ["UMOCheckup", "BedLevel", "UpgradeFirmware"]
}, },

14
resources/quality/ultimaker_original_dual/umo_dual_global_Draft_Quality.inst.cfg
View File

@ -1,14 +0,0 @@
[general]
version = 4
name = Fast
definition = ultimaker_original_dual
[metadata]
setting_version = 5
type = quality
quality_type = draft
weight = -2
global_quality = True
[values]
layer_height = 0.2

14
resources/quality/ultimaker_original_dual/umo_dual_global_Fast_Quality.inst.cfg
View File

@ -1,14 +0,0 @@
[general]
version = 4
name = Normal
definition = ultimaker_original_dual
[metadata]
setting_version = 5
type = quality
quality_type = fast
weight = -1
global_quality = True
[values]
layer_height = 0.15

14
resources/quality/ultimaker_original_dual/umo_dual_global_High_Quality.inst.cfg
View File

@ -1,14 +0,0 @@
[general]
version = 4
name = Extra Fine
definition = ultimaker_original_dual
[metadata]
setting_version = 5
type = quality
quality_type = high
weight = 0
global_quality = True
[values]
layer_height = 0.06

14
resources/quality/ultimaker_original_dual/umo_dual_global_Normal_Quality.inst.cfg
View File

@ -1,14 +0,0 @@
[general]
version = 4
name = Fine
definition = ultimaker_original_dual
[metadata]
setting_version = 5
type = quality
quality_type = normal
weight = 0
global_quality = True
[values]
layer_height = 0.1

14
resources/quality/ultimaker_original_dual/umo_dual_global_Superdraft_Quality.inst.cfg
View File

@ -1,14 +0,0 @@
[general]
version = 4
name = Sprint
definition = ultimaker_original_dual
[metadata]
setting_version = 5
type = quality
quality_type = superdraft
weight = -4
global_quality = True
[values]
layer_height = 0.4

14
resources/quality/ultimaker_original_dual/umo_dual_global_Verydraft_Quality.inst.cfg
View File

@ -1,14 +0,0 @@
[general]
version = 4
name = Extra Fast
definition = ultimaker_original_dual
[metadata]
setting_version = 5
type = quality
quality_type = verydraft
weight = -3
global_quality = True
[values]
layer_height = 0.3