Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemco Burema <r.burema@ultimaker.com>2022-09-21 09:09:40 +0300
committerRemco Burema <r.burema@ultimaker.com>2022-09-21 09:09:40 +0300
commit836764a237063c5e2e8a226f6ede3f1a790b6c13 (patch)
tree37c80d1f57e7996ea8b60eb5ed9fb2f512ff23a1 /resources
parentd8f304ca4964236b325498bc2881e3bb35d5729c (diff)
Revert "Auto generated print profiles. They settings will be reordered and some of the profile names have changed with the "" - Experimental" tag if the isExperimental flag was set."
This reverts commit 4785371f26b0722c2abf585b43054ed5baacb41a.
Diffstat (limited to 'resources')
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg2
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg11
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg11
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg11
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg11
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg11
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg25
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg25
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg8
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg8
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg10
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg8
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg10
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg10
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg12
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg10
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg11
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg11
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg9
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg12
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg13
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg12
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg10
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg26
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg25
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg8
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg10
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg5
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg8
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg10
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg8
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg6
-rw-r--r--resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg4
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg7
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg7
203 files changed, 636 insertions, 425 deletions
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg
index 21b37abac1..694f4f1591 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s3
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = fast
+intent_category = visual
material = generic_abs
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg
index 898c8e3112..3874bc0cce 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s3
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = high
+intent_category = visual
material = generic_abs
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg
index fd4cda4565..bf3dcdc208 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s3
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = normal
+intent_category = visual
material = generic_abs
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg
index e465f40ed2..2c9b008765 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s3
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = fast
+intent_category = visual
material = generic_pla
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg
index c50fa33475..64a25cd046 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s3
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = high
+intent_category = visual
material = generic_pla
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg
index 15f4d17fad..5b9177f803 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s3
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = normal
+intent_category = visual
material = generic_pla
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg
index 3afd626d8e..d9c514676d 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s3
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = fast
+intent_category = visual
material = generic_tough_pla
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg
index 2ef6dc756a..05b6b33857 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s3
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = high
+intent_category = visual
material = generic_tough_pla
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg
index fd0e3499e5..a7e1e2f83e 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s3
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = normal
+intent_category = visual
material = generic_tough_pla
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg
index dec4e9a252..e6d8d67c8b 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s5
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = fast
+intent_category = visual
material = generic_abs
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg
index 9df38c762d..4d7510de6d 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s5
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = high
+intent_category = visual
material = generic_abs
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg
index a9578315ff..a0778dcb25 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s5
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = normal
+intent_category = visual
material = generic_abs
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg
index db38a543f4..35bb47e546 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s5
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = fast
+intent_category = visual
material = generic_pla
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg
index e0e9dab04d..5d5d433d9a 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s5
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = high
+intent_category = visual
material = generic_pla
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg
index 1874a846e4..ad280d6142 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s5
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = normal
+intent_category = visual
material = generic_pla
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg
index 31a8fa8ef7..2c0ca34f03 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s5
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = fast
+intent_category = visual
material = generic_tough_pla
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg
index 99b390a03a..84ab765c21 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s5
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = high
+intent_category = visual
material = generic_tough_pla
variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg
index e5022cfad4..a3740c80c3 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg
@@ -6,8 +6,8 @@ definition = ultimaker_s5
[metadata]
setting_version = 20
type = intent
-intent_category = visual
quality_type = normal
+intent_category = visual
material = generic_tough_pla
variant = AA 0.4
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
index afb105b535..4e2114909a 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
@@ -20,10 +20,10 @@ ooze_shield_angle = 40
raft_airgap = 0.4
retraction_min_travel = 5
skin_overlap = 50
-speed_layer_0 = 10
speed_print = 70
speed_topbottom = =math.ceil(speed_print * 30 / 70)
speed_wall = =math.ceil(speed_print * 30 / 70)
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
+speed_layer_0 = 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
index a269239781..705b63ad02 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg
@@ -11,6 +11,7 @@ weight = 0
material = generic_pc
variant = AA 0.25
is_experimental = True
+
[values]
brim_width = 20
cool_fan_full_at_height = =layer_height_0 + layer_height
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
index d9ee0e629b..376af254f9 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -12,9 +12,10 @@ material = generic_petg
variant = AA 0.25
[values]
-initial_layer_line_width_factor = 100
-material_print_temperature = =default_material_print_temperature - 5
retraction_combing_max_distance = 8
speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8
+initial_layer_line_width_factor = 100
+
+material_print_temperature = =default_material_print_temperature - 5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
index 16c0c0d676..74c7370130 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg
@@ -11,6 +11,7 @@ weight = 0
material = generic_pp
variant = AA 0.25
is_experimental = True
+
[values]
brim_width = 10
cool_fan_speed_max = 100
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg
index a695827302..1ba0ffd3cd 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg
@@ -14,15 +14,16 @@ variant = AA 0.4
[values]
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
material_print_temperature = =default_material_print_temperature + 20
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
prime_tower_enable = False
-raft_airgap = 0.15
skin_overlap = 20
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = 10
speed_print = 60
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 35 / 60)
speed_wall = =math.ceil(speed_print * 45 / 60)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+speed_infill = =math.ceil(speed_print * 50 / 60)
+
+raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg
index 802e5c9d00..33d620ede2 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg
@@ -15,14 +15,17 @@ variant = AA 0.4
cool_min_speed = 7
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
material_print_temperature = =default_material_print_temperature + 15
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
prime_tower_enable = False
-raft_airgap = 0.15
-speed_infill = =math.ceil(speed_print * 45 / 60)
-speed_layer_0 = 10
speed_print = 60
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 40 / 60)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+
+
+speed_infill = =math.ceil(speed_print * 45 / 60)
+
+raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg
index d83461ee9c..5e6ec3e259 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg
@@ -15,13 +15,16 @@ variant = AA 0.4
cool_min_speed = 12
machine_nozzle_cool_down_speed = 0.8
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
prime_tower_enable = False
-raft_airgap = 0.15
-speed_infill = =math.ceil(speed_print * 40 / 50)
-speed_layer_0 = 10
speed_print = 50
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 30 / 50)
+
+
+speed_infill = =math.ceil(speed_print * 40 / 50)
+
+raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg
index bed87d7b95..4141c023aa 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg
@@ -14,13 +14,16 @@ variant = AA 0.4
[values]
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
material_print_temperature = =default_material_print_temperature + 10
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
prime_tower_enable = False
-raft_airgap = 0.15
-speed_infill = =math.ceil(speed_print * 40 / 55)
-speed_layer_0 = 10
speed_print = 55
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_wall = =math.ceil(speed_print * 30 / 55)
+
+
+speed_infill = =math.ceil(speed_print * 40 / 55)
+
+raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg
index 2c4432db17..593781314a 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg
@@ -18,16 +18,17 @@ cool_fan_speed_max = =cool_fan_speed
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_print_temperature = =default_material_print_temperature + 5
+# prime_tower_enable: see CURA-4248
prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
skin_overlap = 20
speed_layer_0 = =math.ceil(speed_print * 20 / 70)
speed_topbottom = =math.ceil(speed_print * 35 / 70)
speed_wall = =math.ceil(speed_print * 50 / 70)
speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
-support_angle = 45
-support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+top_bottom_thickness = 1
support_brim_enable = True
-support_interface_density = =min(extruderValues('material_surface_energy'))
support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-top_bottom_thickness = 1
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_angle = 45
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg
index 7886cc164f..577362391f 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg
@@ -12,22 +12,23 @@ material = generic_bam
variant = AA 0.4
[values]
+support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
+# prime_tower_enable: see CURA-4248
prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
-speed_layer_0 = =math.ceil(speed_print * 20 / 80)
speed_print = 80
+speed_layer_0 = =math.ceil(speed_print * 20 / 80)
speed_topbottom = =math.ceil(speed_print * 30 / 80)
speed_wall = =math.ceil(speed_print * 40 / 80)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-support_angle = 45
-support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+top_bottom_thickness = 1
support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
-support_interface_density = =min(extruderValues('material_surface_energy'))
support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
-top_bottom_thickness = 1
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_angle = 45
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg
index 8731404e73..416a175c81 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg
@@ -12,20 +12,21 @@ material = generic_bam
variant = AA 0.4
[values]
+support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
cool_min_speed = 7
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
+# prime_tower_enable: see CURA-4248
prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
skin_overlap = 10
speed_layer_0 = =math.ceil(speed_print * 20 / 70)
-support_angle = 45
-support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
-support_interface_density = =min(extruderValues('material_surface_energy'))
support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_angle = 45
top_bottom_thickness = 1
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg
index 8de2272716..a8b51892c7 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg
@@ -1,16 +1,17 @@
[general]
version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
definition = ultimaker_s3
[metadata]
setting_version = 20
type = quality
quality_type = verydraft
-weight = -3
+weight = -2
material = generic_bam
variant = AA 0.4
is_experimental = True
+
[values]
brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
@@ -24,10 +25,10 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70)
speed_topbottom = =math.ceil(speed_print * 35 / 70)
speed_wall = =math.ceil(speed_print * 50 / 70)
speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
-support_angle = 45
-support_bottom_distance = 0.3
+top_bottom_thickness = 1
support_brim_enable = True
-support_interface_density = =min(extruderValues('material_surface_energy'))
support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
support_top_distance = 0.3
-top_bottom_thickness = 1
+support_bottom_distance = 0.3
+support_angle = 45
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
index 04df2951fa..5d01e40230 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.4
[values]
cool_fan_speed_max = 80
cool_min_speed = 5
+
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
@@ -33,6 +34,7 @@ skin_overlap = 20
speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 40 / 50)
+
speed_wall = =math.ceil(speed_print * 50 / 50)
speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
support_z_distance = =layer_height
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
index d90b6c0a04..73ea3d5cea 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.4
[values]
cool_fan_speed_max = 80
cool_min_speed = 6
+
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
@@ -33,6 +34,7 @@ skin_overlap = 20
speed_layer_0 = =math.ceil(speed_print * 20 / 45)
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
+
speed_wall = =math.ceil(speed_print * 45 / 45)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
support_z_distance = =layer_height
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
index c043bb9bb7..56ec94d871 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.4
[values]
cool_fan_speed_max = 50
cool_min_speed = 5
+
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
index 3196fc777f..8fda5b84c6 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.4
[values]
cool_fan_speed_max = 50
cool_min_speed = 7
+
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg
index 00dad75b09..2553121d76 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg
@@ -12,16 +12,17 @@ material = generic_cpe
variant = AA 0.4
[values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 10
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
skin_overlap = 20
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 35 / 60)
speed_wall = =math.ceil(speed_print * 45 / 60)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg
index df68316eb1..b8c8538a00 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg
@@ -13,15 +13,16 @@ variant = AA 0.4
[values]
cool_min_speed = 7
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 40 / 60)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg
index 4850bc393c..360984cc12 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg
@@ -13,16 +13,17 @@ variant = AA 0.4
[values]
cool_min_speed = 12
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature - 5
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
-speed_infill = =math.ceil(speed_print * 40 / 50)
-speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_print = 50
+speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 30 / 50)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 40 / 50) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg
index 41594ab90f..8db4957fa9 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg
@@ -12,15 +12,16 @@ material = generic_cpe
variant = AA 0.4
[values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
-speed_infill = =math.ceil(speed_print * 45 / 55)
-speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_print = 55
+speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_wall = =math.ceil(speed_print * 30 / 55)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 45 / 55) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
index 9d4069eead..a0c909af75 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
@@ -14,9 +14,9 @@ variant = AA 0.4
[values]
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 10
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
raft_airgap = 0.4
retraction_prime_speed = =retraction_speed
@@ -24,4 +24,4 @@ skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
+switch_extruder_retraction_speeds = 40 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
index df0aa521c3..58b6f80f5d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
@@ -14,9 +14,9 @@ variant = AA 0.4
[values]
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
raft_airgap = 0.4
retraction_prime_speed = =retraction_speed
@@ -24,4 +24,4 @@ skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
+switch_extruder_retraction_speeds = 40 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
index fcc766e14a..0dd7ec5a0d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
@@ -14,8 +14,8 @@ variant = AA 0.4
[values]
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 15
-material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
raft_airgap = 0.4
retraction_prime_speed = =retraction_speed
@@ -23,4 +23,4 @@ skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
+switch_extruder_retraction_speeds = 40 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
index bd46912a8d..8f17f79616 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
@@ -14,8 +14,8 @@ variant = AA 0.4
[values]
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 12
-material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
raft_airgap = 0.4
retraction_prime_speed = =retraction_speed
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
index 016a66ea60..b3f3aa6cd0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + layer_height
cool_fan_speed_max = 50
cool_min_layer_time_fan_speed_max = 5
cool_min_speed = 8
+
infill_overlap = 0
infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
index 3cb5249538..eaf031fe52 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + layer_height
cool_fan_speed_max = 50
cool_min_layer_time_fan_speed_max = 5
cool_min_speed = 5
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
infill_wipe_dist = 0.1
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg
index f40c3d9968..e77195665a 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg
@@ -12,16 +12,17 @@ material = generic_petg
variant = AA 0.4
[values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
-material_final_print_temperature = =material_print_temperature - 5
-material_initial_print_temperature = =material_print_temperature
material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature - 5
retraction_combing_max_distance = 8
skin_overlap = 20
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 35 / 60)
speed_wall = =math.ceil(speed_print * 45 / 60)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60)
+initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg
index 496e5662ca..8117c60edc 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg
@@ -13,15 +13,16 @@ variant = AA 0.4
[values]
cool_min_speed = 7
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 40 / 60)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60)
+initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg
index f710c0fa58..85a05b576a 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg
@@ -13,16 +13,17 @@ variant = AA 0.4
[values]
cool_min_speed = 12
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 15
-material_initial_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature - 10
+material_initial_print_temperature = =material_print_temperature - 10
+material_final_print_temperature = =material_print_temperature - 15
retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 40 / 50)
-speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_print = 50
+speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 30 / 50)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 40 / 50)
+initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg
index a3ef8347f1..b75ab359b4 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg
@@ -12,16 +12,17 @@ material = generic_petg
variant = AA 0.4
[values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 15
-material_initial_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature - 5
+material_initial_print_temperature = =material_print_temperature - 10
+material_final_print_temperature = =material_print_temperature - 15
retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 45 / 55)
-speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_print = 55
+speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_wall = =math.ceil(speed_print * 30 / 55)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 45 / 55)
+initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg
index 9e4855a3cc..8daad94c4c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg
@@ -12,17 +12,12 @@ material = generic_pla
variant = AA 0.4
[values]
-acceleration_wall = 2000
-acceleration_wall_0 = 2000
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
-infill_sparse_density = 15
-layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_print_temperature = =default_material_print_temperature + 5
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
skin_overlap = 20
speed_layer_0 = 10
@@ -30,3 +25,9 @@ speed_topbottom = =math.ceil(speed_print * 40 / 70)
speed_wall = =math.ceil(speed_print * 55 / 70)
speed_wall_0 = =math.ceil(speed_wall * 45 / 50)
top_bottom_thickness = 0.8
+infill_sparse_density = 15
+layer_height_0 = 0.2
+acceleration_wall = 2000
+acceleration_wall_0 = 2000
+
+raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg
index cd95a1ec89..16b0868446 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg
@@ -14,15 +14,16 @@ variant = AA 0.4
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
-layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
-speed_layer_0 = 10
speed_print = 70
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 35 / 70)
speed_wall = =math.ceil(speed_print * 45 / 70)
speed_wall_0 = =math.ceil(speed_wall * 35 / 70)
top_bottom_thickness = 1
+layer_height_0 = 0.2
+
+raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg
index 789bccd411..6ec0425176 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg
@@ -15,16 +15,17 @@ variant = AA 0.4
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
cool_min_speed = 10
-layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_print_temperature = =default_material_print_temperature - 5
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
skin_overlap = 10
-speed_layer_0 = 10
speed_print = 50
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 35 / 50)
speed_wall = =math.ceil(speed_print * 35 / 50)
top_bottom_thickness = 1
+layer_height_0 = 0.2
+
+raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg
index 9ef1ae8e0a..4928a166b4 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg
@@ -15,12 +15,13 @@ variant = AA 0.4
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
cool_min_speed = 7
-layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
skin_overlap = 10
speed_layer_0 = 10
top_bottom_thickness = 1
+layer_height_0 = 0.2
+
+raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
index d89657527b..d20c1303b8 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
@@ -1,33 +1,38 @@
[general]
version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
definition = ultimaker_s3
[metadata]
setting_version = 20
type = quality
quality_type = verydraft
-weight = -3
+weight = -2
material = generic_pla
variant = AA 0.4
is_experimental = True
+
[values]
+infill_sparse_density = 15
acceleration_print = 2000
-acceleration_topbottom = 1000
acceleration_wall = 1500
acceleration_wall_0 = 1000
+acceleration_topbottom = 1000
+speed_print = 50
+speed_wall = 50
+
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-infill_sparse_density = 15
+
+material_print_temperature = =default_material_print_temperature + 10
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
-material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
skin_overlap = 20
-speed_print = 50
-speed_wall = 50
top_bottom_thickness = 0.9
-wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+
+raft_airgap = 0.25
+wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
index a26e442819..d68e3dd779 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 7
cool_min_speed = 2.5
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
index 06cf202bc6..7eed793e6a 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg
@@ -40,6 +40,7 @@ retraction_min_travel = 0.8
speed_layer_0 = =math.ceil(speed_print * 15 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
+
speed_travel_layer_0 = 50
speed_wall = =math.ceil(speed_print * 25 / 25)
speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
index 61453c278c..97c92f934c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 7
cool_min_speed = 2.5
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
@@ -40,6 +41,7 @@ retraction_min_travel = 0.8
speed_layer_0 = =math.ceil(speed_print * 15 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
+
speed_travel_layer_0 = 50
speed_wall = =math.ceil(speed_print * 25 / 25)
speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg
index 72be73dc22..ae44c3f019 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg
@@ -15,16 +15,17 @@ variant = AA 0.4
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
cool_min_speed = 10
-layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_print_temperature = =default_material_print_temperature - 15
prime_tower_enable = False
retraction_prime_speed = =retraction_speed
skin_overlap = 10
-speed_layer_0 = =math.ceil(speed_print * 20 / 45)
speed_print = 45
+speed_layer_0 = =math.ceil(speed_print * 20 / 45)
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
top_bottom_thickness = 1.2
+layer_height_0 = 0.2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
index 4f594f4dc4..2d05a15f3c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
@@ -1,33 +1,38 @@
[general]
version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
definition = ultimaker_s3
[metadata]
setting_version = 20
type = quality
quality_type = verydraft
-weight = -3
+weight = -2
material = generic_tough_pla
variant = AA 0.4
is_experimental = True
+
[values]
+infill_sparse_density = 15
acceleration_print = 2000
-acceleration_topbottom = 1000
acceleration_wall = 1500
acceleration_wall_0 = 1000
+acceleration_topbottom = 1000
+speed_print = 50
+speed_wall = 50
+
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-infill_sparse_density = 15
+
+material_print_temperature = =default_material_print_temperature - 5
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
-material_print_temperature = =default_material_print_temperature - 5
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
skin_overlap = 20
-speed_print = 50
-speed_wall = 50
top_bottom_thickness = 1.2
-wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+
+raft_airgap = 0.25
+wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
index b461efb73b..24ae39f8b1 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 4
gradual_infill_step_height = =5 * layer_height
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
index 08fcbc3187..468184028c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 4
gradual_infill_step_height = =5 * layer_height
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
index 0be0f52120..333307e533 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 4
gradual_infill_step_height = =5 * layer_height
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg
index 7afbea4788..e314a6080d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg
@@ -12,6 +12,7 @@ material = generic_abs
variant = AA 0.8
[values]
+
material_print_temperature = =default_material_print_temperature + 20
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 30 / 50)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg
index e473cd6f28..c983a4558c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg
@@ -12,9 +12,10 @@ material = generic_abs
variant = AA 0.8
[values]
+
material_print_temperature = =default_material_print_temperature + 25
-speed_infill = =math.ceil(speed_print * 37 / 50)
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 37 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 37 / 50)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg
index 2571776d35..199e80e9ac 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg
@@ -12,6 +12,7 @@ material = generic_abs
variant = AA 0.8
[values]
+
material_print_temperature = =default_material_print_temperature + 22
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 30 / 50)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg
index 4ba71e0357..a694688d41 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg
@@ -1,19 +1,22 @@
[general]
version = 4
-name = Normal - Experimental
+name = Fast - Experimental
definition = ultimaker_s3
[metadata]
setting_version = 20
type = quality
-quality_type = fast
-weight = -1
+quality_type = draft
+weight = -2
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg
index b54dec7fff..38413229e0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg
@@ -11,9 +11,12 @@ weight = -4
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 5
@@ -23,12 +26,12 @@ retraction_combing_max_distance = 50
retraction_hop = 0.1
retraction_hop_enabled = False
skin_overlap = 0
-speed_infill = =math.ceil(speed_print * 40 / 50)
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
speed_slowdown_layers = 8
speed_topbottom = =math.ceil(speed_print * 35 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_infill = =math.ceil(speed_print * 40 / 50)
support_z_distance = =layer_height
top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg
index 47d12c3da7..b238164e4f 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg
@@ -11,9 +11,12 @@ weight = -3
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 9 * layer_height
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 7
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg
index c05205a9f2..6421e5ea77 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg
@@ -13,6 +13,7 @@ variant = AA 0.8
[values]
brim_width = 15
+
material_print_temperature = =default_material_print_temperature + 15
prime_tower_enable = True
retraction_combing_max_distance = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
index 8cd5ba4ac2..93756a3621 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
@@ -13,11 +13,13 @@ variant = AA 0.8
[values]
brim_width = 15
+
material_print_temperature = =default_material_print_temperature + 20
prime_tower_enable = True
retraction_combing_max_distance = 50
-speed_infill = =math.ceil(speed_print * 33 / 45)
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 33 / 45)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+
+speed_infill = =math.ceil(speed_print * 33 / 45) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg
index 1d619bf42c..2afb9dc78a 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg
@@ -13,6 +13,7 @@ variant = AA 0.8
[values]
brim_width = 15
+
material_print_temperature = =default_material_print_temperature + 17
prime_tower_enable = True
retraction_combing_max_distance = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
index c11350773c..09de59ba20 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
@@ -15,6 +15,8 @@ variant = AA 0.8
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
index 4539cab117..d6e11ca953 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
@@ -15,6 +15,8 @@ variant = AA 0.8
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
index 3736e729e9..599789f528 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
@@ -15,6 +15,8 @@ variant = AA 0.8
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg
index a5a7ff0018..61d0cc5109 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg
@@ -1,19 +1,22 @@
[general]
version = 4
-name = Normal - Experimental
+name = Fast - Experimental
definition = ultimaker_s3
[metadata]
setting_version = 20
type = quality
-quality_type = fast
-weight = -1
+quality_type = draft
+weight = -2
material = generic_pc
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
+
+
material_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
index b34df4a1ac..f441c0acac 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
@@ -11,16 +11,19 @@ weight = -4
material = generic_pc
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
+
+
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
skin_overlap = 0
-speed_infill = =math.ceil(speed_print * 37 / 50)
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
speed_slowdown_layers = 8
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 37 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 37 / 50)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg
index 546f3a80ae..a044987670 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg
@@ -11,9 +11,12 @@ weight = -3
material = generic_pc
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 9 * layer_height
+
+
material_print_temperature = =default_material_print_temperature - 2
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg
index 9e900c5658..5b4142f762 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg
@@ -13,11 +13,12 @@ variant = AA 0.8
[values]
brim_width = 7
-cool_fan_speed = 20
-initial_layer_line_width_factor = 100
+
material_print_temperature = =default_material_print_temperature - 5
prime_tower_enable = True
retraction_combing_max_distance = 8
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
+cool_fan_speed = 20
+initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
index 8b9fa7de7f..2aae9c8933 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
@@ -13,13 +13,14 @@ variant = AA 0.8
[values]
brim_width = 7
-cool_fan_speed = 20
-initial_layer_line_width_factor = 100
+
material_print_temperature = =default_material_print_temperature - 5
prime_tower_enable = True
retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 33 / 45)
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 33 / 45)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 33 / 45)
+cool_fan_speed = 20
+initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg
index 4dbd1099f4..85b076551c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg
@@ -13,12 +13,14 @@ variant = AA 0.8
[values]
brim_width = 7
-cool_fan_speed = 20
-initial_layer_line_width_factor = 100
-layer_height_0 = 0.27
+
material_print_temperature = =default_material_print_temperature - 5
prime_tower_enable = True
retraction_combing_max_distance = 8
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
+cool_fan_speed = 20
+layer_height_0 = 0.27
+initial_layer_line_width_factor = 100
+
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg
index 4aad3505c6..60244f52af 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg
@@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
cool_min_speed = 2
gradual_infill_step_height = =3 * layer_height
-layer_height_0 = 0.4
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
-support_angle = 70
-top_bottom_thickness = =layer_height * 4
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
index a5aef78a45..a2e863cb8d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -16,18 +16,18 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
cool_min_speed = 2
gradual_infill_step_height = =3 * layer_height
-layer_height_0 = 0.4
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 15
prime_tower_enable = True
-speed_infill = =math.ceil(speed_print * 35 / 45)
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 35 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
-support_angle = 70
-top_bottom_thickness = =layer_height * 4
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_infill = =math.ceil(speed_print * 35 / 45)
+layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg
index 0e1200ea48..a67dc3be1b 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg
@@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
cool_min_speed = 2
gradual_infill_step_height = =3 * layer_height
-layer_height_0 = 0.4
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
-support_angle = 70
-top_bottom_thickness = =layer_height * 4
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
index 2ed16d2428..e2904aa1e7 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
@@ -15,6 +15,7 @@ variant = AA 0.8
brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
material_bed_temperature_layer_0 = =material_bed_temperature
material_print_temperature = =default_material_print_temperature - 2
@@ -33,5 +34,4 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
-top_skin_expand_distance = =line_width * 2
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
index 932e74a409..d4508c05c0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -15,6 +15,7 @@ variant = AA 0.8
brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
material_bed_temperature_layer_0 = =material_bed_temperature
material_print_temperature = =default_material_print_temperature + 2
@@ -28,11 +29,10 @@ retraction_extra_prime_amount = 0.5
retraction_hop = 0.5
retraction_min_travel = 1.5
retraction_prime_speed = 15
-speed_infill = =math.ceil(speed_wall * 30 / 30)
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+speed_infill = =math.ceil(speed_wall * 30 / 30)
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
-top_skin_expand_distance = =line_width * 2
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
index 19c2b14c99..b68839785f 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -15,6 +15,7 @@ variant = AA 0.8
brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
material_bed_temperature_layer_0 = =material_bed_temperature
material_print_temperature_layer_0 = =default_material_print_temperature + 2
@@ -32,5 +33,4 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
-top_skin_expand_distance = =line_width * 2
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
index a03f52f4c2..f611f7d17e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.8
[values]
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
machine_nozzle_cool_down_speed = 0.5
machine_nozzle_heat_up_speed = 2.5
@@ -40,6 +41,5 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
-top_skin_expand_distance = =line_width * 2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
index b881b5d3a6..e7d370cb8a 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.8
[values]
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 15
machine_nozzle_cool_down_speed = 0.5
@@ -32,16 +33,15 @@ retraction_hop = 1.5
retraction_hop_only_when_collides = False
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
-speed_infill = =speed_print
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)
speed_wall = =speed_print
speed_wall_x = =speed_print
+speed_infill = =speed_print
support_angle = 50
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
-top_skin_expand_distance = =line_width * 2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
index f8d758abb0..f318034971 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.8
[values]
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 15
machine_nozzle_cool_down_speed = 0.5
@@ -40,6 +41,5 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
-top_skin_expand_distance = =line_width * 2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg
index 8e517d0ee5..f9ea2ed4db 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg
@@ -13,12 +13,12 @@ variant = BB 0.4
[values]
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = False
retraction_count_max = 5
skin_overlap = 20
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg
index e4bd6f7f98..9ca8ea51ec 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg
@@ -12,14 +12,14 @@ material = generic_pva
variant = BB 0.4
[values]
+support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
material_print_temperature = =default_material_print_temperature + 5
prime_tower_enable = False
retraction_count_max = 5
skin_overlap = 15
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg
index 3708aaf544..018298d706 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg
@@ -12,12 +12,12 @@ material = generic_pva
variant = BB 0.4
[values]
+support_infill_sparse_thickness = =3*layer_height
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
prime_tower_enable = False
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
-support_infill_sparse_thickness = =3*layer_height
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg
index d9cdfe4f58..48394a8feb 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg
@@ -12,12 +12,12 @@ material = generic_pva
variant = BB 0.4
[values]
+support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
prime_tower_enable = False
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg
index 8a10923b48..85e530fdc1 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg
@@ -1,6 +1,6 @@
[general]
version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
definition = ultimaker_s3
[metadata]
@@ -11,12 +11,13 @@ weight = -3
material = generic_pva
variant = BB 0.4
is_experimental = True
+
[values]
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
support_infill_sparse_thickness = 0.3
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg
index 78d4987cab..ab1a289761 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg
@@ -13,10 +13,10 @@ variant = BB 0.8
[values]
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
material_print_temperature = =default_material_print_temperature + 5
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg
index 97cc65b8ce..0e2f072d03 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg
@@ -13,9 +13,9 @@ variant = BB 0.8
[values]
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg
index 87d10a7987..d5ff375abb 100644
--- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg
@@ -13,10 +13,10 @@ variant = BB 0.8
[values]
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
support_infill_sparse_thickness = 0.3
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg
index e90b9c6d2b..0ad61736ab 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg
@@ -16,7 +16,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
+
initial_layer_line_width_factor = 130.0
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg
index 36a0eb09c8..758a81d3a8 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg
@@ -7,7 +7,7 @@ definition = ultimaker_s3
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_cffcpe
variant = CC 0.4
@@ -16,7 +16,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
+
initial_layer_line_width_factor = 130.0
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg
index 6c380d6295..a0ca08eb8a 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg
@@ -16,7 +16,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
+
initial_layer_line_width_factor = 130.0
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg
index faf738c643..d538f95bea 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg
@@ -7,7 +7,7 @@ definition = ultimaker_s3
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_cffpa
variant = CC 0.4
@@ -16,7 +16,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
+
initial_layer_line_width_factor = 130.0
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg
index 1173c7339c..2caa3776eb 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg
@@ -16,7 +16,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
+
initial_layer_line_width_factor = 130.0
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg
index 6d5ccf3855..f9fffb3171 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg
@@ -7,7 +7,7 @@ definition = ultimaker_s3
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_gffcpe
variant = CC 0.4
@@ -16,7 +16,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
+
initial_layer_line_width_factor = 130.0
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg
index c91e9a0fff..465bff3d8d 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg
@@ -16,7 +16,9 @@ cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
+
initial_layer_line_width_factor = 130.0
+
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
@@ -24,3 +26,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg
index b6d9f5e2a1..40df72973c 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg
@@ -7,7 +7,7 @@ definition = ultimaker_s3
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_gffpa
variant = CC 0.4
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg
index 7e063af586..1a4abc69eb 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg
@@ -1,16 +1,17 @@
[general]
version = 4
-name = Fast - Experimental
+name = Fast
definition = ultimaker_s3
[metadata]
setting_version = 20
type = quality
quality_type = draft
-weight = -2
+weight = -3
material = generic_pla
variant = CC 0.4
is_experimental = True
+
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
top_bottom_thickness = =layer_height * 4
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg
index 6844077345..64640ddc5f 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg
@@ -1,16 +1,17 @@
[general]
version = 4
-name = Normal - Experimental
+name = Normal
definition = ultimaker_s3
[metadata]
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_pla
variant = CC 0.4
is_experimental = True
+
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
top_bottom_thickness = =layer_height * 4
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg
index 1e19814d67..8a617f2d04 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg
index 662f167f69..9c396012bb 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg
index 6975526d71..de38df43ee 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg
index 986dda1437..5b3c0024ab 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg
index 981136de08..b80ecb7ed0 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg
@@ -1,16 +1,17 @@
[general]
version = 4
-name = Fast - Experimental
+name = Fast
definition = ultimaker_s3
[metadata]
setting_version = 20
type = quality
quality_type = draft
-weight = -2
+weight = -3
material = generic_pla
variant = CC 0.6
is_experimental = True
+
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
top_bottom_thickness = =layer_height * 4
diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg
index 7bcd60381e..1644b7d2ff 100644
--- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg
@@ -1,16 +1,17 @@
[general]
version = 4
-name = Normal - Experimental
+name = Normal
definition = ultimaker_s3
[metadata]
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_pla
variant = CC 0.6
is_experimental = True
+
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
top_bottom_thickness = =layer_height * 4
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
index f31ea87a5c..b06a514334 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.25
[values]
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 12
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
@@ -26,3 +27,4 @@ speed_wall = =math.ceil(speed_print * 30 / 70)
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
switch_extruder_retraction_speeds = 40
+
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
index 93f97670ef..abb891489e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg
@@ -11,6 +11,7 @@ weight = 0
material = generic_pc
variant = AA 0.25
is_experimental = True
+
[values]
brim_width = 20
cool_fan_full_at_height = =layer_height_0 + layer_height
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
index 5f7d46dc8b..3df31368bd 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -12,9 +12,9 @@ material = generic_petg
variant = AA 0.25
[values]
-initial_layer_line_width_factor = 100
-material_print_temperature = =default_material_print_temperature - 5
retraction_combing_max_distance = 8
speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8
+initial_layer_line_width_factor = 100
+material_print_temperature = =default_material_print_temperature - 5 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
index 178e738069..e49dce4989 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg
@@ -11,6 +11,7 @@ weight = 0
material = generic_pp
variant = AA 0.25
is_experimental = True
+
[values]
brim_width = 10
cool_fan_speed_max = 100
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg
index 41b2f693fd..4769b27977 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg
@@ -14,15 +14,15 @@ variant = AA 0.4
[values]
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
material_print_temperature = =default_material_print_temperature + 20
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
prime_tower_enable = False
-raft_airgap = 0.15
skin_overlap = 20
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = 10
speed_print = 60
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 35 / 60)
speed_wall = =math.ceil(speed_print * 45 / 60)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+speed_infill = =math.ceil(speed_print * 50 / 60)
+raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg
index a6fc9c5462..7001d74a46 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg
@@ -15,14 +15,14 @@ variant = AA 0.4
cool_min_speed = 7
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
material_print_temperature = =default_material_print_temperature + 15
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
prime_tower_enable = False
-raft_airgap = 0.15
-speed_infill = =math.ceil(speed_print * 45 / 60)
-speed_layer_0 = 10
speed_print = 60
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 40 / 60)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 45 / 60)
+raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg
index 496d17b2e8..0383c18746 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg
@@ -15,13 +15,16 @@ variant = AA 0.4
cool_min_speed = 12
machine_nozzle_cool_down_speed = 0.8
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
prime_tower_enable = False
-raft_airgap = 0.15
-speed_infill = =math.ceil(speed_print * 40 / 50)
-speed_layer_0 = 10
speed_print = 50
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 30 / 50)
+
+
+speed_infill = =math.ceil(speed_print * 40 / 50)
+
+raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg
index d7f7be3a31..004a29cf0a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg
@@ -14,13 +14,15 @@ variant = AA 0.4
[values]
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 20
-material_initial_print_temperature = =material_print_temperature - 15
material_print_temperature = =default_material_print_temperature + 10
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
prime_tower_enable = False
-raft_airgap = 0.15
-speed_infill = =math.ceil(speed_print * 40 / 55)
-speed_layer_0 = 10
speed_print = 55
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_wall = =math.ceil(speed_print * 30 / 55)
+
+
+speed_infill = =math.ceil(speed_print * 40 / 55)
+raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg
index 3271e26dba..28d7691462 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg
@@ -18,16 +18,17 @@ cool_fan_speed_max = =cool_fan_speed
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_print_temperature = =default_material_print_temperature + 5
+# prime_tower_enable: see CURA-4248
prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
skin_overlap = 20
speed_layer_0 = =math.ceil(speed_print * 20 / 70)
speed_topbottom = =math.ceil(speed_print * 35 / 70)
speed_wall = =math.ceil(speed_print * 50 / 70)
speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
-support_angle = 45
-support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+top_bottom_thickness = 1
support_brim_enable = True
-support_interface_density = =min(extruderValues('material_surface_energy'))
support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
-top_bottom_thickness = 1
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_angle = 45
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg
index 2ff072d0e1..e2450cd6b0 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg
@@ -12,22 +12,23 @@ material = generic_bam
variant = AA 0.4
[values]
+support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
+# prime_tower_enable: see CURA-4248
prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
-speed_layer_0 = =math.ceil(speed_print * 20 / 80)
speed_print = 80
+speed_layer_0 = =math.ceil(speed_print * 20 / 80)
speed_topbottom = =math.ceil(speed_print * 30 / 80)
speed_wall = =math.ceil(speed_print * 40 / 80)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-support_angle = 45
-support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+top_bottom_thickness = 1
support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
-support_interface_density = =min(extruderValues('material_surface_energy'))
support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
-top_bottom_thickness = 1
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_angle = 45
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg
index 5e6203dbbf..24f007b99b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg
@@ -12,20 +12,21 @@ material = generic_bam
variant = AA 0.4
[values]
+support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
cool_min_speed = 7
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
+# prime_tower_enable: see CURA-4248
prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
skin_overlap = 10
speed_layer_0 = =math.ceil(speed_print * 20 / 70)
-support_angle = 45
-support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
-support_interface_density = =min(extruderValues('material_surface_energy'))
support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_angle = 45
top_bottom_thickness = 1
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg
index 7417ee6c6f..f6769a439f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg
@@ -1,16 +1,17 @@
[general]
version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
definition = ultimaker_s5
[metadata]
setting_version = 20
type = quality
quality_type = verydraft
-weight = -3
+weight = -2
material = generic_bam
variant = AA 0.4
is_experimental = True
+
[values]
brim_replaces_support = False
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
@@ -24,10 +25,10 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70)
speed_topbottom = =math.ceil(speed_print * 35 / 70)
speed_wall = =math.ceil(speed_print * 50 / 70)
speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
-support_angle = 45
-support_bottom_distance = 0.3
+top_bottom_thickness = 1
support_brim_enable = True
-support_interface_density = =min(extruderValues('material_surface_energy'))
support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
support_top_distance = 0.3
-top_bottom_thickness = 1
+support_bottom_distance = 0.3
+support_angle = 45
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
index c39d1516af..ecc8682f28 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.4
[values]
cool_fan_speed_max = 80
cool_min_speed = 5
+
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
@@ -33,6 +34,7 @@ skin_overlap = 20
speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 40 / 50)
+
speed_wall = =math.ceil(speed_print * 50 / 50)
speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
support_z_distance = =layer_height
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
index 5d74e6164b..fa3b571769 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.4
[values]
cool_fan_speed_max = 80
cool_min_speed = 6
+
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
@@ -33,6 +34,7 @@ skin_overlap = 20
speed_layer_0 = =math.ceil(speed_print * 20 / 45)
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
+
speed_wall = =math.ceil(speed_print * 45 / 45)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
support_z_distance = =layer_height
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
index cef6d64e99..26a8059fed 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.4
[values]
cool_fan_speed_max = 50
cool_min_speed = 5
+
infill_overlap = 0
infill_wipe_dist = 0
machine_min_cool_heat_time_window = 15
@@ -35,6 +36,7 @@ skin_overlap = 20
speed_layer_0 = =math.ceil(speed_print * 20 / 40)
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 30 / 35)
+
speed_wall = =math.ceil(speed_print * 35 / 40)
speed_wall_0 = =math.ceil(speed_wall * 30 / 35)
support_z_distance = =layer_height
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
index 2d33b40631..1795b2086f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg
@@ -35,6 +35,7 @@ skin_overlap = 20
speed_layer_0 = =math.ceil(speed_print * 20 / 40)
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 30 / 35)
+
speed_wall = =math.ceil(speed_print * 35 / 40)
speed_wall_0 = =math.ceil(speed_wall * 30 / 35)
support_z_distance = =layer_height
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
index 6b1f8504d2..bdfd6aadea 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg
@@ -12,16 +12,16 @@ material = generic_cpe
variant = AA 0.4
[values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 10
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
skin_overlap = 20
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 35 / 60)
speed_wall = =math.ceil(speed_print * 45 / 60)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg
index de3910f816..68d2879f47 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg
@@ -13,15 +13,16 @@ variant = AA 0.4
[values]
cool_min_speed = 7
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 40 / 60)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg
index 546af06919..40d950871d 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg
@@ -13,16 +13,17 @@ variant = AA 0.4
[values]
cool_min_speed = 12
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature - 5
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
-speed_infill = =math.ceil(speed_print * 40 / 50)
-speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_print = 50
+speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 30 / 50)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 40 / 50) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg
index 2614b40d60..a5cab8a96c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg
@@ -12,15 +12,16 @@ material = generic_cpe
variant = AA 0.4
[values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 50
retraction_prime_speed = =retraction_speed
-speed_infill = =math.ceil(speed_print * 45 / 55)
-speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_print = 55
+speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_wall = =math.ceil(speed_print * 30 / 55)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 45 / 55) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
index e4d6d270ee..f0ced52d33 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
@@ -14,9 +14,9 @@ variant = AA 0.4
[values]
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 10
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
raft_airgap = 0.4
retraction_prime_speed = =retraction_speed
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
index 8b77d7010f..90fd37a5fb 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
@@ -14,9 +14,9 @@ variant = AA 0.4
[values]
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
raft_airgap = 0.4
retraction_prime_speed = =retraction_speed
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
index 72c3e257d1..c6a9e2b017 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
@@ -14,8 +14,8 @@ variant = AA 0.4
[values]
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 15
-material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
raft_airgap = 0.4
retraction_prime_speed = =retraction_speed
@@ -23,4 +23,4 @@ skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
+switch_extruder_retraction_speeds = 40 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
index e3fbfc5b6e..0b0ea1fb9f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
@@ -14,8 +14,8 @@ variant = AA 0.4
[values]
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 12
-material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
ooze_shield_angle = 40
raft_airgap = 0.4
retraction_prime_speed = =retraction_speed
@@ -23,4 +23,4 @@ skin_overlap = 50
speed_layer_0 = 10
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
+switch_extruder_retraction_speeds = 40 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
index 739e168d62..3fa9480c24 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg
@@ -38,6 +38,7 @@ skin_overlap = 30
speed_layer_0 = =math.ceil(speed_print * 25 / 50)
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 25 / 50)
+
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
support_interface_density = 87.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg
index 62d24807b6..3e0bd8d4b8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg
@@ -12,16 +12,16 @@ material = generic_petg
variant = AA 0.4
[values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
-material_final_print_temperature = =material_print_temperature - 5
-material_initial_print_temperature = =material_print_temperature
material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature - 5
retraction_combing_max_distance = 8
skin_overlap = 20
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 35 / 60)
speed_wall = =math.ceil(speed_print * 45 / 60)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60)
+initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg
index d5a87efce1..f9a8aa8915 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg
@@ -13,15 +13,16 @@ variant = AA 0.4
[values]
cool_min_speed = 7
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
-material_final_print_temperature = =material_print_temperature - 10
-material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 50 / 60)
-speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_print = 60
+speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 40 / 60)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 50 / 60)
+initial_layer_line_width_factor = 100 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg
index 49978a1b46..289521bd01 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg
@@ -13,16 +13,17 @@ variant = AA 0.4
[values]
cool_min_speed = 12
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 15
-material_initial_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature - 10
+material_initial_print_temperature = =material_print_temperature - 10
+material_final_print_temperature = =material_print_temperature - 15
retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 40 / 50)
-speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_print = 50
+speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 30 / 50)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 40 / 50)
+initial_layer_line_width_factor = 100 \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg
index 6e4a6907de..8129f66fc3 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg
@@ -12,16 +12,16 @@ material = generic_petg
variant = AA 0.4
[values]
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-initial_layer_line_width_factor = 100
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
-material_final_print_temperature = =material_print_temperature - 15
-material_initial_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature - 5
+material_initial_print_temperature = =material_print_temperature - 10
+material_final_print_temperature = =material_print_temperature - 15
retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 45 / 55)
-speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_print = 55
+speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_wall = =math.ceil(speed_print * 30 / 55)
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+speed_infill = =math.ceil(speed_print * 45 / 55)
+initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg
index bda40276c4..41944ad06e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg
@@ -12,17 +12,12 @@ material = generic_pla
variant = AA 0.4
[values]
-acceleration_wall = 2000
-acceleration_wall_0 = 2000
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
-infill_sparse_density = 15
-layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_print_temperature = =default_material_print_temperature + 5
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
skin_overlap = 20
speed_layer_0 = 10
@@ -30,3 +25,8 @@ speed_topbottom = =math.ceil(speed_print * 40 / 70)
speed_wall = =math.ceil(speed_print * 55 / 70)
speed_wall_0 = =math.ceil(speed_wall * 45 / 50)
top_bottom_thickness = 0.8
+infill_sparse_density = 15
+layer_height_0 = 0.2
+acceleration_wall = 2000
+acceleration_wall_0 = 2000
+raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg
index b58cabc738..66aa89a6a7 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg
@@ -14,15 +14,15 @@ variant = AA 0.4
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
-layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
-speed_layer_0 = 10
speed_print = 70
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 35 / 70)
speed_wall = =math.ceil(speed_print * 45 / 70)
speed_wall_0 = =math.ceil(speed_wall * 35 / 70)
top_bottom_thickness = 1
+layer_height_0 = 0.2
+raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg
index 5a7f57ac29..1d498d252a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg
@@ -15,16 +15,16 @@ variant = AA 0.4
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
cool_min_speed = 10
-layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_print_temperature = =default_material_print_temperature - 5
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
skin_overlap = 10
-speed_layer_0 = 10
speed_print = 50
+speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 35 / 50)
speed_wall = =math.ceil(speed_print * 35 / 50)
top_bottom_thickness = 1
+layer_height_0 = 0.2
+raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg
index 7d6815f135..1eb4fd8735 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg
@@ -15,12 +15,12 @@ variant = AA 0.4
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
cool_min_speed = 7
-layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
skin_overlap = 10
speed_layer_0 = 10
top_bottom_thickness = 1
+layer_height_0 = 0.2
+raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
index e89b30990c..962f906e74 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
@@ -1,33 +1,39 @@
[general]
version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
definition = ultimaker_s5
[metadata]
setting_version = 20
type = quality
quality_type = verydraft
-weight = -3
+weight = -2
material = generic_pla
variant = AA 0.4
is_experimental = True
+
[values]
+infill_sparse_density = 15
acceleration_print = 2000
-acceleration_topbottom = 1000
acceleration_wall = 1500
acceleration_wall_0 = 1000
+acceleration_topbottom = 1000
+speed_print = 50
+speed_wall = 50
+
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-infill_sparse_density = 15
+
+material_print_temperature = =default_material_print_temperature + 10
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
-material_print_temperature = =default_material_print_temperature + 10
+
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
skin_overlap = 20
-speed_print = 50
-speed_wall = 50
top_bottom_thickness = 0.9
-wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+
+raft_airgap = 0.25
+wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
index ebb514af89..082e20d372 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 7
cool_min_speed = 2.5
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
index 0abc43467b..d98cbc9037 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 7
cool_min_speed = 2.5
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
@@ -40,6 +41,7 @@ retraction_min_travel = 0.8
speed_layer_0 = =math.ceil(speed_print * 15 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
+
speed_travel_layer_0 = 50
speed_wall = =math.ceil(speed_print * 25 / 25)
speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
index bd8ab98e55..ebc2639424 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 7
cool_min_speed = 2.5
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
infill_wipe_dist = 0.1
@@ -40,6 +41,7 @@ retraction_min_travel = 0.8
speed_layer_0 = =math.ceil(speed_print * 15 / 25)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
+
speed_travel_layer_0 = 50
speed_wall = =math.ceil(speed_print * 25 / 25)
speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg
index bf8686d358..3bb7ba5d2f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg
@@ -15,16 +15,16 @@ variant = AA 0.4
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
cool_min_speed = 10
-layer_height_0 = 0.2
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_print_temperature = =default_material_print_temperature - 15
prime_tower_enable = False
retraction_prime_speed = =retraction_speed
skin_overlap = 10
-speed_layer_0 = =math.ceil(speed_print * 20 / 45)
speed_print = 45
+speed_layer_0 = =math.ceil(speed_print * 20 / 45)
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
top_bottom_thickness = 1.2
+layer_height_0 = 0.2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
index 1758a95b61..5150537256 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
@@ -1,33 +1,38 @@
[general]
version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
definition = ultimaker_s5
[metadata]
setting_version = 20
type = quality
quality_type = verydraft
-weight = -3
+weight = -2
material = generic_tough_pla
variant = AA 0.4
is_experimental = True
+
[values]
+infill_sparse_density = 15
acceleration_print = 2000
-acceleration_topbottom = 1000
acceleration_wall = 1500
acceleration_wall_0 = 1000
+acceleration_topbottom = 1000
+speed_print = 50
+speed_wall = 50
+
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =cool_fan_speed
-infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
-infill_sparse_density = 15
+
+material_print_temperature = =default_material_print_temperature - 5
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
-material_print_temperature = =default_material_print_temperature - 5
prime_tower_enable = False
-raft_airgap = 0.25
retraction_prime_speed = =retraction_speed
skin_overlap = 20
-speed_print = 50
-speed_wall = 50
top_bottom_thickness = 1.2
-wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
+
+infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
+
+raft_airgap = 0.25
+wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
index 19324e1777..dc8fb80084 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 4
gradual_infill_step_height = =5 * layer_height
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
index 86c8817c5d..ed9a9e7756 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 4
gradual_infill_step_height = =5 * layer_height
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
index 42ad6c4cd2..61602c2e7b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -17,6 +17,7 @@ cool_fan_speed_max = 100
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 4
gradual_infill_step_height = =5 * layer_height
+
infill_overlap = 0
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 10
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg
index 72f29e606b..ee5dff1264 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg
@@ -12,6 +12,7 @@ material = generic_abs
variant = AA 0.8
[values]
+
material_print_temperature = =default_material_print_temperature + 20
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 30 / 50)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg
index 6b352edb2d..8de9e328d9 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg
@@ -12,9 +12,10 @@ material = generic_abs
variant = AA 0.8
[values]
+
material_print_temperature = =default_material_print_temperature + 25
-speed_infill = =math.ceil(speed_print * 37 / 50)
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_wall = =math.ceil(speed_print * 37 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 37 / 50)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg
index b90f30046d..3255684648 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg
@@ -12,6 +12,7 @@ material = generic_abs
variant = AA 0.8
[values]
+
material_print_temperature = =default_material_print_temperature + 22
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 30 / 50)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg
index b04bc2227f..3c1491befd 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg
@@ -1,19 +1,21 @@
[general]
version = 4
-name = Normal - Experimental
+name = Fast - Experimental
definition = ultimaker_s5
[metadata]
setting_version = 20
type = quality
-quality_type = fast
-weight = -1
+quality_type = draft
+weight = -2
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 10
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg
index d3f95d449f..30b1940b9c 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg
@@ -11,9 +11,12 @@ weight = -4
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 5
@@ -23,12 +26,12 @@ retraction_combing_max_distance = 50
retraction_hop = 0.1
retraction_hop_enabled = False
skin_overlap = 0
-speed_infill = =math.ceil(speed_print * 40 / 50)
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
speed_slowdown_layers = 8
speed_topbottom = =math.ceil(speed_print * 35 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_infill = =math.ceil(speed_print * 40 / 50)
support_z_distance = =layer_height
top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg
index a2c896836f..01cdfb6142 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg
@@ -11,9 +11,12 @@ weight = -3
material = generic_cpe_plus
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 9 * layer_height
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 7
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg
index 19f7e7be37..ed90985548 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg
@@ -13,6 +13,7 @@ variant = AA 0.8
[values]
brim_width = 15
+
material_print_temperature = =default_material_print_temperature + 15
prime_tower_enable = True
retraction_combing_max_distance = 50
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
index d15f1a7c84..87d8bb69e1 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
@@ -13,11 +13,12 @@ variant = AA 0.8
[values]
brim_width = 15
+
material_print_temperature = =default_material_print_temperature + 20
prime_tower_enable = True
retraction_combing_max_distance = 50
-speed_infill = =math.ceil(speed_print * 33 / 45)
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 33 / 45)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 33 / 45)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg
index 721d0a8752..970964203f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg
@@ -13,6 +13,7 @@ variant = AA 0.8
[values]
brim_width = 15
+
material_print_temperature = =default_material_print_temperature + 17
prime_tower_enable = True
retraction_combing_max_distance = 50
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
index 8e73a5a755..fc9d586503 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
@@ -15,6 +15,8 @@ variant = AA 0.8
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
+
+
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
ooze_shield_angle = 40
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg
index 354b187085..30877bf726 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg
@@ -1,19 +1,22 @@
[general]
version = 4
-name = Normal - Experimental
+name = Fast - Experimental
definition = ultimaker_s5
[metadata]
setting_version = 20
type = quality
-quality_type = fast
-weight = -1
+quality_type = draft
+weight = -2
material = generic_pc
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
+
+
material_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
@@ -24,3 +27,4 @@ speed_slowdown_layers = 15
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
index 6cfd2c8d94..fd3ae94a9e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
@@ -11,16 +11,19 @@ weight = -4
material = generic_pc
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 7 * layer_height
+
+
material_print_temperature_layer_0 = =material_print_temperature
raft_airgap = 0.5
skin_overlap = 0
-speed_infill = =math.ceil(speed_print * 37 / 50)
speed_layer_0 = =math.ceil(speed_print * 15 / 50)
speed_print = 50
speed_slowdown_layers = 8
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 37 / 50)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 37 / 50)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg
index 0b9e0f27bf..6fe4bd5999 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg
@@ -11,6 +11,7 @@ weight = -3
material = generic_pc
variant = AA 0.8
is_experimental = True
+
[values]
brim_width = 14
cool_fan_full_at_height = =layer_height_0 + 9 * layer_height
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg
index 47a26097f5..926a1394bd 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg
@@ -13,11 +13,12 @@ variant = AA 0.8
[values]
brim_width = 7
-cool_fan_speed = 20
-initial_layer_line_width_factor = 100
+
material_print_temperature = =default_material_print_temperature - 5
prime_tower_enable = True
retraction_combing_max_distance = 8
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
+cool_fan_speed = 20
+initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg
index f13991359d..1d2b4bf257 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg
@@ -13,13 +13,14 @@ variant = AA 0.8
[values]
brim_width = 7
-cool_fan_speed = 20
-initial_layer_line_width_factor = 100
+
material_print_temperature = =default_material_print_temperature - 5
prime_tower_enable = True
retraction_combing_max_distance = 8
-speed_infill = =math.ceil(speed_print * 33 / 45)
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 33 / 45)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 33 / 45)
+cool_fan_speed = 20
+initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg
index 41e42809cf..d9a6c58217 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg
@@ -13,11 +13,13 @@ variant = AA 0.8
[values]
brim_width = 7
-cool_fan_speed = 20
-initial_layer_line_width_factor = 100
+
material_print_temperature = =default_material_print_temperature - 5
prime_tower_enable = True
retraction_combing_max_distance = 8
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
+cool_fan_speed = 20
+initial_layer_line_width_factor = 100
+
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg
index cac2e008fc..5a75d250ae 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg
@@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
cool_min_speed = 2
gradual_infill_step_height = =3 * layer_height
-layer_height_0 = 0.4
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
-support_angle = 70
-top_bottom_thickness = =layer_height * 4
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
index 1703c141e2..7f1cf80f12 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -16,18 +16,18 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
cool_min_speed = 2
gradual_infill_step_height = =3 * layer_height
-layer_height_0 = 0.4
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 15
prime_tower_enable = True
-speed_infill = =math.ceil(speed_print * 35 / 45)
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 35 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
-support_angle = 70
-top_bottom_thickness = =layer_height * 4
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_infill = =math.ceil(speed_print * 35 / 45)
+layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg
index 07f93e993f..9da869a34e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg
@@ -16,17 +16,17 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
cool_min_speed = 2
gradual_infill_step_height = =3 * layer_height
-layer_height_0 = 0.4
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = True
+support_angle = 70
+top_bottom_thickness = =layer_height * 4
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
-support_angle = 70
-top_bottom_thickness = =layer_height * 4
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
index 4c262310e8..f3deb0b0f9 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
@@ -15,6 +15,7 @@ variant = AA 0.8
brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
material_bed_temperature_layer_0 = =material_bed_temperature
material_print_temperature = =default_material_print_temperature - 2
@@ -33,5 +34,4 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
-top_skin_expand_distance = =line_width * 2
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
index 539e6335c7..859f408ffb 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -15,6 +15,7 @@ variant = AA 0.8
brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
material_bed_temperature_layer_0 = =material_bed_temperature
material_print_temperature = =default_material_print_temperature + 2
@@ -28,11 +29,10 @@ retraction_extra_prime_amount = 0.5
retraction_hop = 0.5
retraction_min_travel = 1.5
retraction_prime_speed = 15
-speed_infill = =math.ceil(speed_wall * 30 / 30)
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+speed_infill = =math.ceil(speed_wall * 30 / 30)
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
-top_skin_expand_distance = =line_width * 2
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
index 9c3cb44e07..85ca930444 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -15,6 +15,7 @@ variant = AA 0.8
brim_width = 25
cool_min_layer_time_fan_speed_max = 6
cool_min_speed = 17
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral'
material_bed_temperature_layer_0 = =material_bed_temperature
material_print_temperature_layer_0 = =default_material_print_temperature + 2
@@ -32,5 +33,4 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
-top_skin_expand_distance = =line_width * 2
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
index 57dc15f243..32351241f7 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.8
[values]
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
machine_nozzle_cool_down_speed = 0.5
machine_nozzle_heat_up_speed = 2.5
@@ -40,6 +41,5 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
-top_skin_expand_distance = =line_width * 2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
index 1d8cf0809c..6e3732f812 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.8
[values]
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 15
machine_nozzle_cool_down_speed = 0.5
@@ -31,16 +32,15 @@ retraction_extra_prime_amount = 0.5
retraction_hop = 1.5
retraction_hop_only_when_collides = False
retraction_min_travel = =line_width * 2
-speed_infill = =speed_print
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)
speed_wall = =speed_print
speed_wall_x = =speed_print
+speed_infill = =speed_print
support_angle = 50
switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
-top_skin_expand_distance = =line_width * 2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
index 95e5da677d..ab43aa6af3 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -14,6 +14,7 @@ variant = AA 0.8
[values]
brim_width = 8.75
cool_min_layer_time_fan_speed_max = 6
+top_skin_expand_distance = =line_width * 2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
infill_sparse_density = 15
machine_nozzle_cool_down_speed = 0.5
@@ -40,6 +41,5 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
-top_skin_expand_distance = =line_width * 2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
index 325692a5b7..05069e722c 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg
@@ -13,12 +13,12 @@ variant = BB 0.4
[values]
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
material_print_temperature = =default_material_print_temperature + 10
prime_tower_enable = False
retraction_count_max = 5
skin_overlap = 20
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
index e445afe911..7539f5fdb1 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg
@@ -12,14 +12,14 @@ material = generic_pva
variant = BB 0.4
[values]
+support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
material_print_temperature = =default_material_print_temperature + 5
prime_tower_enable = False
retraction_count_max = 5
skin_overlap = 15
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
index 4f70be3b8c..c320676f02 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg
@@ -12,12 +12,12 @@ material = generic_pva
variant = BB 0.4
[values]
+support_infill_sparse_thickness = =3*layer_height
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
prime_tower_enable = False
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
-support_infill_sparse_thickness = =3*layer_height
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
index 50ca204965..a068c96756 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg
@@ -12,12 +12,12 @@ material = generic_pva
variant = BB 0.4
[values]
+support_infill_sparse_thickness = =2*layer_height
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
prime_tower_enable = False
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
-support_infill_sparse_thickness = =2*layer_height
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg
index fd239c5343..c8c7971f09 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg
@@ -1,6 +1,6 @@
[general]
version = 4
-name = Extra Fast - Experimental
+name = Extra Fast
definition = ultimaker_s5
[metadata]
@@ -11,13 +11,14 @@ weight = -3
material = generic_pva
variant = BB 0.4
is_experimental = True
+
[values]
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
prime_tower_enable = False
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
support_infill_sparse_thickness = 0.3
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
index 27618f9478..e526fc6426 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg
@@ -13,10 +13,10 @@ variant = BB 0.8
[values]
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
material_print_temperature = =default_material_print_temperature + 5
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
index 45c178e704..ae5b0aacfe 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg
@@ -13,9 +13,9 @@ variant = BB 0.8
[values]
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
index 60a70fcda4..b37122ab7e 100644
--- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg
@@ -13,10 +13,10 @@ variant = BB 0.8
[values]
brim_replaces_support = False
-cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
retraction_count_max = 5
-skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
support_brim_enable = True
support_infill_sparse_thickness = 0.3
support_interface_enable = True
+skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width))
+cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
support_use_towers = True
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg
index c0e20f1584..0e738f1e3d 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg
index 8b3030ce09..e0d01ba82f 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg
@@ -7,7 +7,7 @@ definition = ultimaker_s5
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_cffcpe
variant = CC 0.4
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg
index 0307bbff4a..52d0a07ea5 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg
index ac6883ca44..86dad3779b 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg
@@ -7,7 +7,7 @@ definition = ultimaker_s5
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_cffpa
variant = CC 0.4
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg
index c44b25bd94..da79e206cf 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg
index a79662a65d..644b964c28 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg
@@ -7,7 +7,7 @@ definition = ultimaker_s5
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_gffcpe
variant = CC 0.4
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg
index ee1ac1ef7a..2977a497eb 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg
index c0a4cb9a4a..a339098b6a 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg
@@ -7,7 +7,7 @@ definition = ultimaker_s5
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_gffpa
variant = CC 0.4
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg
index ec88e11d72..16d916f56a 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg
@@ -1,16 +1,17 @@
[general]
version = 4
-name = Fast - Experimental
+name = Fast
definition = ultimaker_s5
[metadata]
setting_version = 20
type = quality
quality_type = draft
-weight = -2
+weight = -3
material = generic_pla
variant = CC 0.4
is_experimental = True
+
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
top_bottom_thickness = =layer_height * 4
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg
index 98da59afd9..80e101c1a6 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg
@@ -1,16 +1,17 @@
[general]
version = 4
-name = Normal - Experimental
+name = Normal
definition = ultimaker_s5
[metadata]
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_pla
variant = CC 0.4
is_experimental = True
+
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
top_bottom_thickness = =layer_height * 4
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg
index 02430694b3..dd2f4231c7 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg
index ab1c73641e..eb2cc63b78 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg
index e4019fea55..e5bc3d2e5b 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg
index 2d45c63fcf..72e1c0f4fe 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg
@@ -24,3 +24,4 @@ skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg
index 0589c86926..af5bb5b9b2 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg
@@ -1,16 +1,17 @@
[general]
version = 4
-name = Fast - Experimental
+name = Fast
definition = ultimaker_s5
[metadata]
setting_version = 20
type = quality
quality_type = draft
-weight = -2
+weight = -3
material = generic_pla
variant = CC 0.6
is_experimental = True
+
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
top_bottom_thickness = =layer_height * 4
diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg
index fff2fdb4d2..e2dbe4a511 100644
--- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg
@@ -1,16 +1,17 @@
[general]
version = 4
-name = Normal - Experimental
+name = Normal
definition = ultimaker_s5
[metadata]
setting_version = 20
type = quality
quality_type = fast
-weight = -1
+weight = -2
material = generic_pla
variant = CC 0.6
is_experimental = True
+
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
@@ -26,7 +27,7 @@ prime_tower_enable = True
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
top_bottom_thickness = =layer_height * 4