diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2018-06-25 15:26:11 +0300 |
|---|---|---|
| committer | Lipu Fei <lipu.fei815@gmail.com> | 2018-06-25 15:26:13 +0300 |
| commit | 140e38ac1cf1850d1fdf6822e0fd3c0e9e5d93e8 (patch) | |
| tree | e721f980247629d4640a84d8c0f6e065d9e17491 /resources/quality | |
| parent | e8573dfe3bc35d0a201e810ca7ce12f46f6fd760 (diff) | |
| parent | 65f696a14f4255ebd87ec1b3b8e16bd6b8f17510 (diff) | |
Fix merge conflicts
CURA-5496
Diffstat (limited to 'resources/quality')
6 files changed, 0 insertions, 84 deletions
diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_Draft_Quality.inst.cfg deleted file mode 100644 index 11e3656bea..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_Draft_Quality.inst.cfg +++ /dev/null @@ -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 diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_Fast_Quality.inst.cfg deleted file mode 100644 index c4c6a79530..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_Fast_Quality.inst.cfg +++ /dev/null @@ -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 diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_High_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_High_Quality.inst.cfg deleted file mode 100644 index b47210353a..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_High_Quality.inst.cfg +++ /dev/null @@ -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 diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_Normal_Quality.inst.cfg deleted file mode 100644 index e38812b4f2..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_Normal_Quality.inst.cfg +++ /dev/null @@ -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 diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_Superdraft_Quality.inst.cfg deleted file mode 100644 index b671ba7664..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_Superdraft_Quality.inst.cfg +++ /dev/null @@ -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 diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_Verydraft_Quality.inst.cfg deleted file mode 100644 index d38c022c78..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_Verydraft_Quality.inst.cfg +++ /dev/null @@ -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 |