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:
authorcasper <c.lamboo@ultimaker.com>2022-03-21 15:39:16 +0300
committercasper <c.lamboo@ultimaker.com>2022-03-21 15:39:16 +0300
commitbfa8118c9f60e569d0a0ea76cb0be8e08ce1856c (patch)
treeb50ab0189cd8df77f3d1c0e33be095744e51ce45
parent10339555f4a817f918606fc350032d940d2cace5 (diff)
parente715017545c7e90826d92566139f2144464eef69 (diff)
Merge branch 'master' into CURA-8979_Materials_Preference_Page
# Conflicts: # resources/qml/ColorDialog.qml # resources/qml/Preferences/ProfilesPage.qml
-rwxr-xr-xcura/CuraApplication.py7
-rw-r--r--plugins/PostProcessingPlugin/scripts/ChangeAtZ.py2
-rw-r--r--resources/definitions/fdmprinter.def.json111
-rw-r--r--resources/definitions/snapmaker2.def.json2
-rw-r--r--resources/definitions/ultimaker.def.json6
-rw-r--r--resources/definitions/ultimaker3.def.json1
-rw-r--r--resources/definitions/ultimaker_s3.def.json1
-rw-r--r--resources/definitions/ultimaker_s5.def.json1
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg69
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg69
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg69
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg69
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg69
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg69
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg69
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg69
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg69
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg69
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg71
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg71
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg71
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg71
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg71
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg71
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg71
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg71
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg71
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg71
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg1
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg3
-rw-r--r--resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg3
-rw-r--r--resources/qml/ColorDialog.qml7
-rw-r--r--resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml4
-rw-r--r--resources/qml/Preferences/GeneralPage.qml22
-rw-r--r--resources/qml/Settings/SettingView.qml35
-rw-r--r--resources/qml/SpinBox.qml12
-rw-r--r--resources/quality/fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg1
-rw-r--r--resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg1
-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.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg1
-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.25_TPLA_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg1
-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_CPE_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg2
-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_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg1
-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.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg1
-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.25_TPLA_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg1
-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_CPE_Draft_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg1
-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_PC_High_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg2
-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_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg2
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg3
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg1
-rw-r--r--resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg1
-rw-r--r--resources/themes/cura-light/theme.json3
-rw-r--r--resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg1
-rw-r--r--resources/variants/ultimaker2_extended_plus_0.25.inst.cfg1
-rw-r--r--resources/variants/ultimaker2_olsson_0.25.inst.cfg1
-rw-r--r--resources/variants/ultimaker2_plus_0.25.inst.cfg1
-rw-r--r--resources/variants/ultimaker2_plus_connect_0.25.inst.cfg1
-rw-r--r--resources/variants/ultimaker3_aa0.25.inst.cfg2
-rw-r--r--resources/variants/ultimaker3_aa0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker3_aa04.inst.cfg1
-rw-r--r--resources/variants/ultimaker3_bb0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker3_extended_aa0.25.inst.cfg2
-rw-r--r--resources/variants/ultimaker3_extended_aa0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker3_extended_aa04.inst.cfg1
-rw-r--r--resources/variants/ultimaker3_extended_bb0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s3_aa0.25.inst.cfg2
-rw-r--r--resources/variants/ultimaker_s3_aa0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s3_aa04.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s3_bb0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s3_cc04.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s3_cc06.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s5_aa0.25.inst.cfg2
-rw-r--r--resources/variants/ultimaker_s5_aa0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s5_aa04.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s5_bb0.8.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s5_cc04.inst.cfg1
-rw-r--r--resources/variants/ultimaker_s5_cc06.inst.cfg1
355 files changed, 875 insertions, 1175 deletions
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 7645e88b7e..4285f9ac1d 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -43,7 +43,7 @@ from UM.Scene.Selection import Selection
from UM.Scene.ToolHandle import ToolHandle
from UM.Settings.ContainerRegistry import ContainerRegistry
from UM.Settings.InstanceContainer import InstanceContainer
-from UM.Settings.SettingDefinition import SettingDefinition, DefinitionPropertyType
+from UM.Settings.SettingDefinition import SettingDefinition, DefinitionPropertyType, toIntConversion
from UM.Settings.SettingFunction import SettingFunction
from UM.Settings.Validator import Validator
from UM.View.SelectionPass import SelectionPass # For typing.
@@ -382,11 +382,12 @@ class CuraApplication(QtApplication):
SettingDefinition.addSupportedProperty("resolve", DefinitionPropertyType.Function, default=None,
depends_on="value")
- SettingDefinition.addSettingType("extruder", None, str, Validator)
- SettingDefinition.addSettingType("optional_extruder", None, str, None)
+ SettingDefinition.addSettingType("extruder", None, toIntConversion, Validator)
+ SettingDefinition.addSettingType("optional_extruder", None, toIntConversion, None)
SettingDefinition.addSettingType("[int]", None, str, None)
+
def _initializeSettingFunctions(self):
"""Adds custom property types, settings types, and extra operators (functions).
diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py
index 72b26b13f6..91b36389f3 100644
--- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py
+++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py
@@ -298,7 +298,7 @@ class ChangeAtZ(Script):
},
"caz_change_retract": {
"label": "Change Retraction",
- "description": "Indicates you would like to modify retraction properties.",
+ "description": "Indicates you would like to modify retraction properties. Does not work when using relative extrusion.",
"type": "bool",
"default_value": false
},
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index b1cbb07904..287eeaedda 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1092,38 +1092,6 @@
"default_value": "inward_distributed",
"limit_to_extruder": "wall_0_extruder_nr"
},
- "wall_transition_threshold": {
- "label": "Middle Line Threshold",
- "description": "The smallest line width, as a factor of the normal line width, below which it will choose to use fewer, but wider lines to fill the available space the wall needs to occupy. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.",
- "type": "float",
- "unit": "%",
- "default_value": 90,
- "minimum_value": "1",
- "maximum_value": "99",
- "children":
- {
- "wall_split_middle_threshold": {
- "label": "Split Middle Line Threshold",
- "description": "The smallest line width, as a factor of the normal line width, above which the middle line (if there is one) will be split into two. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.",
- "type": "float",
- "unit": "%",
- "default_value": 90,
- "value": "wall_transition_threshold",
- "minimum_value": "1",
- "maximum_value": "99"
- },
- "wall_add_middle_threshold": {
- "label": "Add Middle Line Threshold",
- "description": "The smallest line width, as a factor of the normal line width, above which a middle line (if there wasn't one already) will be added. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.",
- "type": "float",
- "unit": "%",
- "default_value": 80,
- "value": "wall_transition_threshold * 8 / 9",
- "minimum_value": "1",
- "maximum_value": "99"
- }
- }
- },
"wall_transition_length":
{
"label": "Wall Transition Length",
@@ -1236,6 +1204,74 @@
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
+ "min_wall_line_width":
+ {
+ "label": "Minimum Wall Line Width",
+ "description": "For thin structures around once or twice the nozzle size, the line widths need to be altered to adhere to the thickness of the model. This setting controls the minimum line width allowed for the walls. The minimum line widths inherently also determine the maximum line widths, since we transition from N to N+1 walls at some geometry thickness where the N walls are wide and the N+1 walls are narrow. The widest possible wall line is twice the Minimum Wall Line Width.",
+ "unit": "mm",
+ "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)",
+ "maximum_value_warning": "min(wall_line_width_0, wall_line_width_x)",
+ "minimum_value_warning_old": "(0.1 + 0.4 * machine_nozzle_size) if inset_direction == \"outside_in\" else 0.1 * machine_nozzle_size",
+ "maximum_value_warning_old": "2 * machine_nozzle_size",
+ "default_value": 0.3,
+ "value": "machine_nozzle_size * .75",
+ "type": "float",
+ "settable_per_mesh": true,
+ "children":
+ {
+ "min_even_wall_line_width":
+ {
+ "label": "Minimum Even Wall Line Width",
+ "description": "The minimum line width for normal polygonal walls. This setting determines at which model thickness we switch from printing a single thin wall line, to printing two wall lines. A higher Minimum Even Wall Line Width leads to a higher maximum odd wall line width. The maximum even wall line width is calculated as Outer Wall Line Width + 0.5 * Minimum Odd Wall Line Width.",
+ "unit": "mm",
+ "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)",
+ "maximum_value_warning": "min(wall_line_width_0, wall_line_width_x)",
+ "default_value": 0.3,
+ "value": "min_wall_line_width",
+ "type": "float",
+ "settable_per_mesh": true,
+ "children":
+ {
+ "wall_split_middle_threshold": {
+ "label": "Split Middle Line Threshold",
+ "description": "The smallest line width, as a factor of the normal line width, above which the middle line (if there is one) will be split into two. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.",
+ "type": "float",
+ "unit": "%",
+ "default_value": 50,
+ "value": "max(1, min(99, 100 * (2 * min_even_wall_line_width - wall_line_width_0) / wall_line_width_0))",
+ "value_explicit": "100 * (2 * min_even_wall_line_width - wall_line_width_0) / (wall_line_width_0 + wall_line_width_x - wall_line_width_0)",
+ "minimum_value": "1",
+ "maximum_value": "99"
+ }
+ }
+ },
+ "min_odd_wall_line_width":
+ {
+ "label": "Minimum Odd Wall Line Width",
+ "description": "The minimum line width for middle line gap filler polyline walls. This setting determines at which model thickness we switch from printing two wall lines, to printing two outer walls and a single central wall in the middle. A higher Minimum Odd Wall Line Width leads to a higher maximum even wall line width. The maximum odd wall line width is calculated as 2 * Minimum Even Wall Line Width,",
+ "unit": "mm",
+ "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)",
+ "maximum_value_warning": "min(wall_line_width_0, wall_line_width_x)",
+ "default_value": 0.3,
+ "value": "min_wall_line_width",
+ "type": "float",
+ "settable_per_mesh": true,
+ "children":
+ {
+ "wall_add_middle_threshold": {
+ "label": "Add Middle Line Threshold",
+ "description": "The smallest line width, as a factor of the normal line width, above which a middle line (if there wasn't one already) will be added. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.",
+ "type": "float",
+ "unit": "%",
+ "default_value": 75,
+ "value": "max(1, min(99, 100 * min_odd_wall_line_width / wall_line_width_x))",
+ "minimum_value": "1",
+ "maximum_value": "99"
+ }
+ }
+ }
+ }
+ },
"fill_outline_gaps": {
"label": "Print Thin Walls",
"description": "Print pieces of the model which are horizontally thinner than the nozzle size.",
@@ -1260,10 +1296,10 @@
},
"min_bead_width":
{
- "label": "Minimum Wall Line Width",
+ "label": "Minimum Thin Wall Line Width",
"description": "Width of the wall that will replace thin features (according to the Minimum Feature Size) of the model. If the Minimum Wall Line Width is thinner than the thickness of the feature, the wall will become as thick as the feature itself.",
"unit": "mm",
- "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200",
+ "value": "machine_nozzle_size * .75",
"default_value": 0.2,
"minimum_value": "0.001",
"minimum_value_warning": "min_feature_size",
@@ -4366,6 +4402,7 @@
"default_value": "0",
"value": "support_extruder_nr",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1",
+ "resolve": "max(extruderValues('support_interface_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false,
"children":
@@ -4378,6 +4415,7 @@
"default_value": "0",
"value": "support_interface_extruder_nr",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1",
+ "resolve": "max(extruderValues('support_roof_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false
},
@@ -4389,6 +4427,7 @@
"default_value": "0",
"value": "support_interface_extruder_nr",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1",
+ "resolve": "max(extruderValues('support_bottom_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false
}
@@ -5421,6 +5460,7 @@
"default_value": "0",
"value": "int(defaultExtruderPosition())",
"enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') != 'none' or resolveOrValue('prime_tower_brim_enable'))",
+ "resolve": "max(extruderValues('adhesion_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false,
"children":
@@ -5444,6 +5484,7 @@
"default_value": "0",
"value": "adhesion_extruder_nr",
"enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
+ "resolve": "max(extruderValues('raft_base_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false
},
@@ -5455,6 +5496,7 @@
"default_value": "0",
"value": "adhesion_extruder_nr",
"enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
+ "resolve": "max(extruderValues('raft_interface_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false
},
@@ -5466,6 +5508,7 @@
"default_value": "0",
"value": "adhesion_extruder_nr",
"enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
+ "resolve": "max(extruderValues('raft_surface_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false
}
diff --git a/resources/definitions/snapmaker2.def.json b/resources/definitions/snapmaker2.def.json
index 2c749d2b1b..9a26ea21a7 100644
--- a/resources/definitions/snapmaker2.def.json
+++ b/resources/definitions/snapmaker2.def.json
@@ -29,7 +29,7 @@
"default_value": "M104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ;Set Bed Temperature\nG28 ;home\nG90 ;absolute positioning\nG1 X-10 Y-10 F3000 ;Move to corner \nG1 Z0 F1800 ;Go to zero offset\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nG92 E0 ;Zero set extruder position\nG1 E20 F200 ;Feed filament to clear nozzle\nG92 E0 ;Zero set extruder position"
},
"machine_end_gcode": {
- "default_value": "M104 S0 ;Extruder heater off\nM140 S0 ;Heated bed heater off\nG90 ;absolute positioning\nG92 E0 ;Retract the filament\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z{machine_width} E-1 F3000 ;move Z up a bit and retract filament even more\nG1 X0 F3000 ;move X to min endstops, so the head is out of the way\nG1 Y{machine_depth} F3000 ;so the head is out of the way and Plate is moved forward"
+ "default_value": "M104 S0 ;Extruder heater off\nM140 S0 ;Heated bed heater off\nG90 ;absolute positioning\nG92 E0 ;Retract the filament\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z{machine_height} E-1 F3000 ;move Z up a bit and retract filament even more\nG1 X0 F3000 ;move X to min endstops, so the head is out of the way\nG1 Y{machine_depth} F3000 ;so the head is out of the way and Plate is moved forward"
},
"machine_nozzle_size": {
"default_value": 0.4
diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index e8eae781d1..d062a043f3 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -47,6 +47,9 @@
"line_width": {
"value": "machine_nozzle_size"
},
+ "wall_thickness": {
+ "value": "wall_line_width_0 + wall_line_width_x"
+ },
"infill_before_walls": {
"value": "False"
},
@@ -67,6 +70,9 @@
},
"bottom_layers": {
"value": "math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))"
+ },
+ "xy_offset": {
+ "value": "-layer_height * 0.2"
}
}
}
diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index 197bfa4513..48bb7b4362 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -166,7 +166,6 @@
"top_bottom_thickness": { "value": "1" },
"travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
"wall_0_inset": { "value": "0" },
- "wall_thickness": { "value": "1" },
"zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }
}
}
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 034a2d78d4..83feb98eb2 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -159,7 +159,6 @@
"travel_avoid_supports": { "value": "True" },
"travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
"wall_0_inset": { "value": "0" },
- "wall_thickness": { "value": "1" },
"meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
"meshfix_maximum_deviation": { "value": "layer_height / 4" },
"initial_layer_line_width_factor": { "value": "120" },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 36aa311c23..c4afee4e3a 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -161,7 +161,6 @@
"travel_avoid_supports": { "value": "True" },
"travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
"wall_0_inset": { "value": "0" },
- "wall_thickness": { "value": "1" },
"meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
"meshfix_maximum_deviation": { "value": "layer_height / 4" },
"optimize_wall_printing_order": { "value": "True" },
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
index 5028a193e1..3973958201 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
@@ -18,8 +18,7 @@ speed_wall = =speed_print
speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
speed_layer_0 = 20
-top_bottom_thickness = =wall_thickness
-wall_thickness = =line_width * 2
+top_bottom_thickness = 0.8
infill_sparse_density = 15
jerk_print = 30
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
index 39d3455341..ce071c0e9f 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
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 03b3974996..4769a7b237 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
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 7d2fe3435c..349754543a 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
index 0d2b0df40b..962c23ba33 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
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 12c05d6a9a..56add13d10 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
index 36bd136f11..78221f4c28 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_cpe_plus
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_cpe_plus
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
index 92b83b0daa..ae44cf40a5 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_cpe_plus
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_cpe_plus
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
index 0dd1d9e6cb..19dbd9c52e 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_cpe
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_cpe
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
index adf9744b20..545c776b08 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_cpe
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_cpe
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
index 3b56baa68b..053b3b710a 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_nylon
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_nylon
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
index 8a453f1423..3807904e2e 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_nylon
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_nylon
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
index be3b0e768f..563753fdf3 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_pc
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_pc
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
index 2088491e1e..702b9b5eec 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_pc
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_pc
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
index 9396ad1ab1..313a77d86f 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_petg
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_petg
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
index a8f85b6da3..7dde3d14c2 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
@@ -1,35 +1,34 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_petg
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s3
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_petg
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg
index 5d869888c5..fc15076461 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg
@@ -18,8 +18,7 @@ speed_wall = =speed_print
speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
speed_layer_0 = 20
-top_bottom_thickness = =wall_thickness
-wall_thickness = =line_width * 2
+top_bottom_thickness = 0.8
infill_sparse_density = 15
jerk_print = 30
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
index 406b45f226..9cdee1381f 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
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 7b455965b6..22b9c8c868 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
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 20eef0666e..0d2a6e78dc 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
index 3edfa90da5..358d5c517c 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
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 7826c9b0b2..7abc1e166d 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
index fdaf5f32ed..5150a762e3 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
@@ -35,5 +35,4 @@ speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
speed_layer_0 = 20
-wall_thickness = =line_width * 2
-top_bottom_thickness = =wall_thickness \ No newline at end of file
+top_bottom_thickness = 0.8 \ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
index 3dbb03b38c..c09de5cc0a 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
@@ -18,8 +18,7 @@ speed_wall = =speed_print
speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
speed_layer_0 = 20
-top_bottom_thickness = =wall_thickness
-wall_thickness = =line_width * 2
+top_bottom_thickness = 0.8
infill_sparse_density = 15
jerk_print = 30
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
index 513e8b63d9..b27355a79e 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
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 c80e665041..b8a8b26c25 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
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 5a0fdccf3c..c3fa9d03a7 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
index 3d80753d3f..ffbd5785a0 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
@@ -31,4 +31,3 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
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 610fa16fcc..df474457eb 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg
index 4ca187133e..865115e1da 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg
@@ -35,5 +35,4 @@ speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
speed_layer_0 = 20
-wall_thickness = =line_width * 2
-top_bottom_thickness = =wall_thickness \ No newline at end of file
+top_bottom_thickness = 0.8 \ No newline at end of file
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
index 374cb1bca4..a6d14f8548 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
@@ -18,8 +18,7 @@ speed_wall = =speed_print
speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
speed_layer_0 = 20
-top_bottom_thickness = =wall_thickness
-wall_thickness = =line_width * 2
+top_bottom_thickness = 0.8
infill_sparse_density = 15
jerk_print = 30
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
index ab2e9bc6f6..39153f554f 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
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 45cba2271e..9df2b7d624 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
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 3658a72539..c49a030379 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
index a58642f073..8c6510d7d6 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
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 9633a2d6e8..68f5c8e67c 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
index 916b80c811..7d2f5ee686 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_cpe_plus
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_cpe_plus
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
index a3d99c2ed0..141284e636 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_cpe_plus
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_cpe_plus
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
index d9929fc35c..fceeafdeb7 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_cpe
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_cpe
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
index 45df698f7e..d98a914046 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_cpe
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_cpe
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
index fcd58dd33e..479af8f737 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_nylon
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_nylon
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
index cadc30da58..96231ce051 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_nylon
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_nylon
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
index d23ff28b91..ab630874d5 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_pc
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_pc
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
index 950f420016..e6644926dd 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_pc
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_pc
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
index fba5e369ee..b659129a76 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = fast
-material = generic_petg
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = fast
+material = generic_petg
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
index 29d052675d..8022784344 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
@@ -1,36 +1,35 @@
-[general]
-version = 4
-name = Accurate
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 19
-type = intent
-intent_category = engineering
-quality_type = normal
-material = generic_petg
-variant = AA 0.4
-
-[values]
-
-jerk_print = 30
-jerk_infill = =jerk_print
-jerk_topbottom = =jerk_print
-jerk_wall = =jerk_print
-jerk_wall_0 = =jerk_wall
-jerk_wall_x = =jerk_wall
-jerk_layer_0 = 5
-
-speed_print = 30
-speed_infill = =speed_print
-speed_layer_0 = 20
-speed_topbottom = =speed_print
-speed_wall = =speed_print
-speed_wall_0 = =speed_wall
-speed_wall_x = =speed_wall
-top_bottom_thickness = =wall_thickness
-
-wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
-xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
+[general]
+version = 4
+name = Accurate
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 19
+type = intent
+intent_category = engineering
+quality_type = normal
+material = generic_petg
+variant = AA 0.4
+
+[values]
+
+jerk_print = 30
+jerk_infill = =jerk_print
+jerk_topbottom = =jerk_print
+jerk_wall = =jerk_print
+jerk_wall_0 = =jerk_wall
+jerk_wall_x = =jerk_wall
+jerk_layer_0 = 5
+
+speed_print = 30
+speed_infill = =speed_print
+speed_layer_0 = 20
+speed_topbottom = =speed_print
+speed_wall = =speed_print
+speed_wall_0 = =speed_wall
+speed_wall_x = =speed_wall
+top_bottom_thickness = =wall_thickness
+
+wall_thickness = =line_width * 3
+xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
+
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
index 25dcb1a793..c26054525f 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
@@ -18,8 +18,7 @@ speed_wall = =speed_print
speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
speed_layer_0 = 20
-top_bottom_thickness = =wall_thickness
-wall_thickness = =line_width * 2
+top_bottom_thickness = 0.8
infill_sparse_density = 15
jerk_print = 30
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
index cc76a5706a..030a3699f1 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
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 ff6adc5257..650f61bc63 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
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 09c67fb20e..c817103b3c 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
index 28353777bf..7737eff565 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
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 8934e3fd80..3b355b7da9 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
index a3f5b02ec2..a7b56a55ae 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg
@@ -35,5 +35,4 @@ speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
speed_layer_0 = 20
-wall_thickness = =line_width * 2
-top_bottom_thickness = =wall_thickness \ No newline at end of file
+top_bottom_thickness = 0.8 \ No newline at end of file
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
index a811b9d673..13c8672be2 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
@@ -18,8 +18,7 @@ speed_wall = =speed_print
speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
speed_layer_0 = 20
-top_bottom_thickness = =wall_thickness
-wall_thickness = =line_width * 2
+top_bottom_thickness = 0.8
infill_sparse_density = 15
jerk_print = 30
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
index 5db4117aa1..dbdbc9b1c7 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
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 39292b0306..2c21b84c70 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
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 53eb8d16fd..4efb4834fb 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
index 22485e8777..287917f2b5 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
@@ -31,5 +31,4 @@ speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
wall_thickness = =line_width * 3
-xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
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 155f6177cc..a964da4111 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
@@ -13,5 +13,4 @@ variant = AA 0.4
[values]
speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
+top_bottom_thickness = 1.05
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg
index 5d22b722af..dec43bd73e 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg
@@ -35,5 +35,4 @@ speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
speed_layer_0 = 20
-wall_thickness = =line_width * 2
-top_bottom_thickness = =wall_thickness \ No newline at end of file
+top_bottom_thickness = 0.8 \ No newline at end of file
diff --git a/resources/qml/ColorDialog.qml b/resources/qml/ColorDialog.qml
index be587a4f25..6877ef34b6 100644
--- a/resources/qml/ColorDialog.qml
+++ b/resources/qml/ColorDialog.qml
@@ -21,6 +21,13 @@ UM.Dialog
property alias swatchGridColumns: colorSwatchGrid.columns
+ // In this case we would like to let the content of the dialog determine the size of the dialog
+ // however with the current implementation of the dialog this is not possible, so instead we calculate
+ // the size of the dialog ourselves.
+ // Ugly workaround for windows having overlapping elements due to incorrect dialog width
+ minimumWidth: content.width + (Qt.platform.os == "windows" ? 4 * margin : 2 * margin)
+ minimumHeight: content.height + buttonRow.height + (Qt.platform.os == "windows" ? 5 * margin : 3 * margin)
+
property alias color: colorInput.text
property var swatchColors: [
"#2161AF", "#57AFB2", "#F7B32D", "#E33D4A", "#C088AD",
diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
index 0e2985ae32..bcace5a8b1 100644
--- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
+++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
@@ -93,8 +93,8 @@ UM.Dialog
leftButtons: [
Cura.ComboBox
{
- implicitHeight: UM.Theme.getSize("combobox_wide").height
- implicitWidth: UM.Theme.getSize("combobox_wide").width
+ implicitHeight: UM.Theme.getSize("combobox").height
+ implicitWidth: UM.Theme.getSize("combobox").width
id: discardOrKeepProfileChangesDropDownButton
textRole: "text"
diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index 9bb99f23cf..b8f2e1b50d 100644
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -148,6 +148,14 @@ UM.PreferencesPage
bottom: parent.bottom
right: parent.right
}
+
+ onPositionChanged: {
+ // This removes focus from items when scrolling.
+ // This fixes comboboxes staying open and scrolling container
+ if (!activeFocus) {
+ forceActiveFocus();
+ }
+ }
}
Column
@@ -215,7 +223,7 @@ UM.PreferencesPage
textRole: "text"
model: languageList
- implicitWidth: UM.Theme.getSize("combobox_wide").width
+ implicitWidth: UM.Theme.getSize("combobox").width
implicitHeight: currencyField.height
function setCurrentIndex() {
@@ -255,7 +263,7 @@ UM.PreferencesPage
id: currencyField
selectByMouse: true
text: UM.Preferences.getValue("cura/currency")
- implicitWidth: UM.Theme.getSize("combobox_wide").width
+ implicitWidth: UM.Theme.getSize("combobox").width
onTextChanged: UM.Preferences.setValue("cura/currency", text)
}
@@ -284,7 +292,7 @@ UM.PreferencesPage
model: themeList
textRole: "text"
- implicitWidth: UM.Theme.getSize("combobox_wide").width
+ implicitWidth: UM.Theme.getSize("combobox").width
implicitHeight: currencyField.height
currentIndex:
@@ -554,8 +562,8 @@ UM.PreferencesPage
model: comboBoxList
textRole: "text"
- width: UM.Theme.getSize("combobox_wide").width
- height: UM.Theme.getSize("combobox_wide").height
+ width: UM.Theme.getSize("combobox").width
+ height: UM.Theme.getSize("combobox").height
currentIndex:
{
@@ -711,8 +719,8 @@ UM.PreferencesPage
Cura.ComboBox
{
id: choiceOnOpenProjectDropDownButton
- width: UM.Theme.getSize("combobox_wide").width
- height: UM.Theme.getSize("combobox_wide").height
+ width: UM.Theme.getSize("combobox").width
+ height: UM.Theme.getSize("combobox").height
model: ListModel
{
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index ecafd25913..40e9e19b01 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -25,7 +25,6 @@ Item
top: parent.top
left: parent.left
right: settingVisibilityMenu.left
- rightMargin: UM.Theme.getSize("default_margin").width
}
height: UM.Theme.getSize("print_setup_big_item").height
@@ -131,8 +130,6 @@ Item
SettingVisibilityPresetsMenu
{
id: settingVisibilityPresetsMenu
- x: settingVisibilityMenu.x
- y: settingVisibilityMenu.y
onCollapseAllCategories:
{
settingsSearchTimer.stop()
@@ -142,32 +139,32 @@ Item
}
}
- UM.SimpleButton
+ UM.BurgerButton
{
id: settingVisibilityMenu
anchors
{
- top: filterContainer.top
- bottom: filterContainer.bottom
+ verticalCenter: filterContainer.verticalCenter
right: parent.right
- rightMargin: UM.Theme.getSize("wide_margin").width
}
- width: UM.Theme.getSize("medium_button_icon").width
- height: UM.Theme.getSize("medium_button_icon").height
- iconSource: UM.Theme.getIcon("Hamburger")
- hoverColor: UM.Theme.getColor("small_button_text_hover")
- color: UM.Theme.getColor("small_button_text")
onClicked:
{
settingVisibilityPresetsMenu.popup(
- settingVisibilityMenu,
+ popupContainer,
-settingVisibilityPresetsMenu.width + UM.Theme.getSize("default_margin").width,
settingVisibilityMenu.height
)
}
}
+ Item
+ {
+ // Work around to prevent the buttom from being rescaled if a popup is attached
+ id: popupContainer
+ anchors.bottom: settingVisibilityMenu.bottom
+ anchors.right: settingVisibilityMenu.right
+ }
// Mouse area that gathers the scroll events to not propagate it to the main view.
MouseArea
@@ -191,7 +188,17 @@ Item
}
clip: true
cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item.
- ScrollBar.vertical: UM.ScrollBar { id: scrollBar }
+ ScrollBar.vertical: UM.ScrollBar
+ {
+ id: scrollBar
+ onPositionChanged: {
+ // This removes focus from items when scrolling.
+ // This fixes comboboxes staying open and scrolling container
+ if (!activeFocus) {
+ forceActiveFocus();
+ }
+ }
+ }
model: UM.SettingDefinitionsModel
{
diff --git a/resources/qml/SpinBox.qml b/resources/qml/SpinBox.qml
index 3c5a4d95e2..5f809a434a 100644
--- a/resources/qml/SpinBox.qml
+++ b/resources/qml/SpinBox.qml
@@ -72,6 +72,18 @@ Item
base.value = value * base.stepSize;
}
+ // This forces TextField to commit typed values before incrementing with buttons.
+ // This fixes the typed value not being incremented when the textField has active focus.
+ up.onPressedChanged:
+ {
+ base.forceActiveFocus()
+ }
+
+ down.onPressedChanged:
+ {
+ base.forceActiveFocus()
+ }
+
background: Item {}
contentItem: Cura.TextField
diff --git a/resources/quality/fast.inst.cfg b/resources/quality/fast.inst.cfg
index 47e064cc6b..743ec93081 100644
--- a/resources/quality/fast.inst.cfg
+++ b/resources/quality/fast.inst.cfg
@@ -17,5 +17,4 @@ cool_min_layer_time = 3
speed_wall_0 = =math.ceil(speed_print * 40 / 60)
speed_wall_x = =math.ceil(speed_print * 80 / 60)
speed_infill = =math.ceil(speed_print * 100 / 60)
-wall_thickness = 1
speed_topbottom = =math.ceil(speed_print * 30 / 60)
diff --git a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
index 15483409a7..1c0629f317 100644
--- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
@@ -18,4 +18,3 @@ infill_sparse_density = 22
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
top_bottom_thickness = 0.72
-wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
index 63563ac9ef..d25348a524 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
@@ -21,4 +21,3 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_travel = 150
speed_wall = =math.ceil(speed_print * 50 / 60)
top_bottom_thickness = 0.75
-wall_thickness = 0.7
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
index b13c39c673..ccdbfcf67c 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
@@ -19,4 +19,3 @@ speed_layer_0 = =round(speed_print * 30 / 50)
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 20 / 50)
top_bottom_thickness = 0.72
-wall_thickness = 1.05
diff --git a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
index 2bbb4952bf..4f8ed51f0a 100644
--- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
@@ -19,4 +19,3 @@ speed_layer_0 = =round(speed_print * 30 / 50)
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 20 / 50)
top_bottom_thickness = 0.8
-wall_thickness = 1.05
diff --git a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
index 9bb3b38200..60b3e54ef5 100644
--- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
@@ -21,4 +21,3 @@ speed_topbottom = =math.ceil(speed_print * 20 / 55)
speed_wall = =math.ceil(speed_print * 40 / 55)
speed_wall_0 = =math.ceil(speed_print * 25 / 55)
top_bottom_thickness = 1.2
-wall_thickness = 1.59
diff --git a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
index 0deab058ad..ac9a38f61a 100644
--- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
@@ -19,4 +19,3 @@ speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
speed_wall_0 = =math.ceil(speed_print * 25 / 40)
top_bottom_thickness = 1.2
-wall_thickness = 2.1
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
index ae0b9cefa8..dc365cd367 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
@@ -20,4 +20,3 @@ infill_sparse_density = 22
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
top_bottom_thickness = 0.72
-wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
index 68aff39936..1e3072b513 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
@@ -23,7 +23,6 @@ speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_travel = 150
speed_wall = =math.ceil(speed_print * 40 / 55)
top_bottom_thickness = 0.75
-wall_thickness = 0.7
speed_wall_0 = =math.ceil(speed_print * 40 / 55)
speed_wall_x = =math.ceil(speed_print * 80 / 55)
speed_infill = =math.ceil(speed_print * 100 / 55)
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
index a1f9dce7f0..878993fd03 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
@@ -21,6 +21,5 @@ speed_layer_0 = =round(speed_print * 30 / 45)
speed_print = 45
speed_wall = =math.ceil(speed_print * 30 / 45)
top_bottom_thickness = 0.72
-wall_thickness = 1.05
speed_topbottom = =math.ceil(speed_print * 15 / 45)
speed_infill = =math.ceil(speed_print * 45 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
index a667f45e44..bb4cf23979 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
@@ -21,4 +21,3 @@ speed_layer_0 = =round(speed_print * 30 / 45)
speed_print = 45
speed_wall = =math.ceil(speed_print * 30 / 45)
top_bottom_thickness = 0.8
-wall_thickness = 1.05
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
index a73c13ecec..e5e903544a 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
@@ -21,4 +21,3 @@ speed_infill = =math.ceil(speed_print * 55 / 40)
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
top_bottom_thickness = 1.2
-wall_thickness = 1.59
diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
index 85d8436603..de37f1e8bf 100644
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
@@ -20,4 +20,3 @@ infill_sparse_density = 20
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
top_bottom_thickness = 1.2
-wall_thickness = 2.1
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
index 56727fc86f..0e7e14d661 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
@@ -20,4 +20,3 @@ infill_sparse_density = 22
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
top_bottom_thickness = 0.72
-wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
index 7293177170..ac7ac2d3f7 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
@@ -22,7 +22,6 @@ speed_print = 45
speed_travel = 150
speed_wall = =math.ceil(speed_print * 40 / 45)
top_bottom_thickness = 0.75
-wall_thickness = 0.7
speed_wall_0 = =math.ceil(speed_print * 30 / 45)
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall_x = =math.ceil(speed_print * 40 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
index ca3224ace7..5e20f288fe 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
@@ -21,6 +21,5 @@ speed_layer_0 = =round(speed_print * 30 / 45)
speed_print = 45
speed_wall = =math.ceil(speed_print * 30 / 45)
top_bottom_thickness = 0.72
-wall_thickness = 1.05
speed_topbottom = =math.ceil(speed_print * 15 / 45)
speed_infill = =math.ceil(speed_print * 45 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
index 2be7544374..0356681013 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
@@ -21,4 +21,3 @@ speed_layer_0 = =round(speed_print * 30 / 45)
speed_print = 45
speed_wall = =math.ceil(speed_print * 30 / 45)
top_bottom_thickness = 0.8
-wall_thickness = 1.05
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
index 997f1fbab1..ec96dca598 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
@@ -20,4 +20,3 @@ infill_sparse_density = 20
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
top_bottom_thickness = 1.2
-wall_thickness = 1.59
diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
index 8935e57bd1..008e9acdbb 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
@@ -20,4 +20,3 @@ infill_sparse_density = 20
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
top_bottom_thickness = 1.2
-wall_thickness = 2.1
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
index c4d4798cef..b2114f254b 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
@@ -38,4 +38,3 @@ support_infill_rate = =20 if support_enable and support_structure == 'normal' el
support_pattern = lines
support_z_distance = 0.26
top_bottom_thickness = 1.5
-wall_thickness = 1.14
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
index e0fa416aaf..08d8680014 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
@@ -38,4 +38,3 @@ support_infill_rate = =20 if support_enable and support_structure == 'normal' el
support_pattern = lines
support_z_distance = 0.26
top_bottom_thickness = 1.5
-wall_thickness = 1.14
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
index 29bcd5e3b9..da52322af5 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
@@ -43,4 +43,3 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = 0.22
top_bottom_thickness = 0.75
-wall_thickness = 1.14
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
index 1b1102ae41..940468c2c9 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
@@ -43,4 +43,3 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = 0.22
top_bottom_thickness = 0.75
-wall_thickness = 1.14
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
index 65c7e56fee..15f1447a29 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
@@ -38,4 +38,3 @@ support_infill_rate = =20 if support_enable and support_structure == 'normal' el
support_pattern = lines
support_z_distance = 0.26
top_bottom_thickness = 1.2
-wall_thickness = 2.1
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
index c99e991aef..be2e57c767 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
@@ -38,4 +38,3 @@ support_infill_rate = =20 if support_enable and support_structure == 'normal' el
support_pattern = lines
support_z_distance = 0.26
top_bottom_thickness = 1.2
-wall_thickness = 2.1
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
index e3104ecb40..df742c79c8 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
@@ -40,5 +40,4 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1
speed_infill = =math.ceil(speed_print * 40 / 40)
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
index 1953c20a11..7a1fc9963f 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
@@ -40,4 +40,3 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
index 4680476de8..0c3056f47f 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
@@ -39,7 +39,6 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = =layer_height * 2
top_bottom_thickness = 0.75
-wall_thickness = 1.06
speed_wall_0 = =math.ceil(speed_print * 30 / 45)
speed_wall_x = =math.ceil(speed_print * 40 / 45)
speed_infill = =math.ceil(speed_print * 45 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
index 2f0a543ec5..b28481a6aa 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
@@ -38,4 +38,3 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = =layer_height * 2
top_bottom_thickness = 0.75
-wall_thickness = 1.06
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
index 1442289d90..d31d84a314 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
@@ -44,5 +44,4 @@ support_top_distance = 0.55
support_xy_distance = 0.7
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1.2
speed_infill = =math.ceil(speed_print * 55 / 55)
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
index 13066f1685..6048b82677 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
@@ -42,4 +42,3 @@ support_pattern = lines
support_xy_distance = 0.7
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
index 9288409611..7ca19f5a2c 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
@@ -43,4 +43,3 @@ support_top_distance = 0.5
support_xy_distance = 0.75
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 2.4
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
index f2caa2441b..f014f71ef2 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
@@ -43,4 +43,3 @@ support_top_distance = 0.5
support_xy_distance = 0.75
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 2.4
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
index 77120dec46..e40e91b7a5 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
@@ -34,6 +34,5 @@ support_enable = True
support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
support_pattern = lines
support_z_distance = 0.19
-wall_thickness = 0.88
speed_topbottom = =math.ceil(speed_print * 15 / 30)
speed_infill = =math.ceil(speed_print * 80 / 30)
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
index fce0028973..9f55d229e8 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
@@ -34,4 +34,3 @@ support_enable = True
support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
support_pattern = lines
support_z_distance = 0.19
-wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
index 11b213b799..b0e78c2057 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
@@ -35,6 +35,5 @@ support_enable = True
support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
support_pattern = lines
support_z_distance = 0.19
-wall_thickness = 1.2
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_infill = =math.ceil(speed_print * 45 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
index db8e5058f6..999509b82d 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
@@ -35,4 +35,3 @@ support_enable = True
support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
support_pattern = lines
support_z_distance = 0.19
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
index 28c8ee4ead..b417c4c1df 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
@@ -41,5 +41,4 @@ support_line_distance = 3.5333
support_pattern = lines
support_z_distance = 0.21
top_bottom_thickness = 0.75
-wall_thickness = 1.06
speed_infill = =math.ceil(speed_print * 45 / 45)
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
index 36059ce309..b94f0349f7 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
@@ -41,4 +41,3 @@ support_line_distance = 3.5333
support_pattern = lines
support_z_distance = 0.21
top_bottom_thickness = 0.75
-wall_thickness = 1.06
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
index dd0a425aec..70510c98d2 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
@@ -35,4 +35,3 @@ support_infill_rate = =20 if support_enable and support_structure == 'normal' el
support_pattern = lines
support_z_distance = 0.26
top_bottom_thickness = 2.0
-wall_thickness = 2.1
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
index 3116e3d2fc..cd6b811561 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
@@ -35,4 +35,3 @@ support_infill_rate = =20 if support_enable and support_structure == 'normal' el
support_pattern = lines
support_z_distance = 0.26
top_bottom_thickness = 1.2
-wall_thickness = 2.1
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
index 10f6d07dba..beb0969fd8 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
@@ -64,6 +64,5 @@ support_xy_distance_overhang = =wall_line_width_0
support_z_distance = =layer_height * 2
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 0.76
speed_wall_x = =math.ceil(speed_print * 25 / 25)
speed_infill = =math.ceil(speed_print * 25 / 25)
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
index ca4f9ec1d9..f5b3d298fa 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
@@ -64,4 +64,3 @@ support_xy_distance_overhang = =wall_line_width_0
support_z_distance = =layer_height * 2
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 0.76
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
index c77c6fcb95..390dbf440d 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
@@ -64,4 +64,3 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.1
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 1.14
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
index 58b93a9af1..ab81d3bfe1 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
@@ -64,6 +64,5 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.1
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 1.14
speed_wall_x = =math.ceil(speed_print * 25 / 25)
speed_infill = =math.ceil(speed_print * 25 / 25)
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
index b066ba3929..4bec3c7f24 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
@@ -64,4 +64,3 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.5
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 1.52
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
index a89ac4f68b..fd4813a356 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
@@ -64,4 +64,3 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.5
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 1.52
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
index 5303e5f526..47749c135c 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
@@ -39,5 +39,4 @@ support_infill_rate = =25 if support_enable and support_structure == 'normal' el
support_xy_distance = 0.6
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 0.88
speed_infill = =math.ceil(speed_print * 40 / 40)
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
index b4945a27cd..26299276bb 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
@@ -37,4 +37,3 @@ support_infill_rate = =25 if support_enable and support_structure == 'normal' el
support_xy_distance = 0.65
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1.05
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
index 739f949dfc..a56d5aa535 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
@@ -40,5 +40,4 @@ support_infill_rate = =25 if support_enable and support_structure == 'normal' el
support_xy_distance = 0.7
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1.14
speed_infill = =math.ceil(speed_print * 45 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg
index 956d708e69..49dac6e9c8 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg
@@ -20,4 +20,3 @@ infill_sparse_density = 20
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
top_bottom_thickness = 0.72
-wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg
index 61ede571db..46476599f6 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg
@@ -18,7 +18,6 @@ cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 10
infill_sparse_density = 20
top_bottom_thickness = 0.75
-wall_thickness = 0.7
speed_print = 55
speed_travel = 150
speed_layer_0 = =round(speed_print * 30 / 55)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg
index ab44842212..649b50dc9c 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg
@@ -18,7 +18,6 @@ cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 10
infill_sparse_density = 20
top_bottom_thickness = 0.72
-wall_thickness = 1.05
speed_print = 45
speed_layer_0 = =round(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 30 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg
index 63f92a2770..9fd7dd9cf6 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg
@@ -18,7 +18,6 @@ cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 10
infill_sparse_density = 20
top_bottom_thickness = 0.8
-wall_thickness = 1.05
speed_print = 45
speed_layer_0 = =round(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 30 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg
index b7d9d9d437..b8b8ec5352 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg
@@ -21,4 +21,3 @@ speed_infill = =math.ceil(speed_print * 55 / 40)
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
top_bottom_thickness = 1.2
-wall_thickness = 1.59
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg
index 36e2b2180b..dde8e3bbb1 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg
@@ -20,4 +20,3 @@ infill_sparse_density = 20
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
top_bottom_thickness = 1.2
-wall_thickness = 2.1
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg
index f3d9bb79d9..6031209ccc 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg
@@ -20,5 +20,4 @@ infill_sparse_density = 20
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
top_bottom_thickness = 0.72
-wall_thickness = 0.88
retraction_combing_max_distance = 50 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg
index 0ab179959f..4c08270f6d 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg
@@ -24,7 +24,6 @@ speed_print = 45
speed_travel = 150
speed_wall = =math.ceil(speed_print * 40 / 45)
top_bottom_thickness = 0.75
-wall_thickness = 0.7
speed_wall_0 = =math.ceil(speed_print * 30 / 45)
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall_x = =math.ceil(speed_print * 40 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg
index dc4b06940c..ea6993c7f9 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg
@@ -23,6 +23,5 @@ speed_layer_0 = =round(speed_print * 30 / 45)
speed_print = 45
speed_wall = =math.ceil(speed_print * 30 / 45)
top_bottom_thickness = 0.72
-wall_thickness = 1.05
speed_topbottom = =math.ceil(speed_print * 15 / 45)
speed_infill = =math.ceil(speed_print * 45 / 45) \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg
index 2ea0c4a828..bbfbd452d3 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg
@@ -23,4 +23,3 @@ speed_layer_0 = =round(speed_print * 30 / 45)
speed_print = 45
speed_wall = =math.ceil(speed_print * 30 / 45)
top_bottom_thickness = 0.8
-wall_thickness = 1.05 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg
index 60642a3c69..f6984cbd4f 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg
@@ -22,4 +22,3 @@ retraction_prime_speed = =retraction_speed
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
top_bottom_thickness = 1.2
-wall_thickness = 1.59
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg
index 23e8d25778..e2f2f1b5f4 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg
@@ -20,5 +20,4 @@ infill_sparse_density = 20
speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
top_bottom_thickness = 1.2
-wall_thickness = 2.1
retraction_combing_max_distance = 50 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg
index fdaecf1142..9df0561ba1 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg
@@ -39,4 +39,3 @@ support_infill_rate = =0 if support_enable and support_structure == 'tree' else
support_pattern = lines
support_z_distance = 0.26
top_bottom_thickness = 1.5
-wall_thickness = 1.14 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg
index b9845f7002..83ac3b0500 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg
@@ -39,4 +39,3 @@ support_infill_rate = =0 if support_enable and support_structure == 'tree' else
support_pattern = lines
support_z_distance = 0.26
top_bottom_thickness = 1.5
-wall_thickness = 1.14 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg
index 965182eb4d..51038587a3 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg
@@ -43,4 +43,3 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = 0.22
top_bottom_thickness = 0.75
-wall_thickness = 1.14 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg
index 817635d4fd..51584f5f9b 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg
@@ -43,4 +43,3 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = 0.22
top_bottom_thickness = 0.75
-wall_thickness = 1.14 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg
index 8f3db13ad6..db1798319b 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg
@@ -37,5 +37,4 @@ support_infill_rate = =0 if support_enable and support_structure == 'tree' else
support_pattern = lines
support_z_distance = 0.26
top_bottom_thickness = 1.2
-wall_thickness = 2.1
retraction_combing_max_distance = 50 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg
index c7e44efbbf..738287ba02 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg
@@ -37,5 +37,4 @@ support_infill_rate = =0 if support_enable and support_structure == 'tree' else
support_pattern = lines
support_z_distance = 0.26
top_bottom_thickness = 1.2
-wall_thickness = 2.1
retraction_combing_max_distance = 50
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg
index 79a6223869..0f0663b905 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg
@@ -39,5 +39,4 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1
speed_infill = =math.ceil(speed_print * 40 / 40)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg
index b65b044aea..06c242e813 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg
@@ -39,4 +39,3 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg
index 2358657ab3..ad247a4b3a 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg
@@ -39,7 +39,6 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = =layer_height * 2
top_bottom_thickness = 0.75
-wall_thickness = 1.06
speed_wall_0 = =math.ceil(speed_print * 30 / 45)
speed_wall_x = =math.ceil(speed_print * 40 / 45)
speed_infill = =math.ceil(speed_print * 45 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg
index 5a9283faff..19daf28829 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg
@@ -38,4 +38,3 @@ support_pattern = lines
support_xy_distance = 0.6
support_z_distance = =layer_height * 2
top_bottom_thickness = 0.75
-wall_thickness = 1.06
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg
index 18fe82d680..f79e3d7e47 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg
@@ -44,5 +44,4 @@ support_top_distance = 0.55
support_xy_distance = 0.7
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1.2
speed_infill = =math.ceil(speed_print * 55 / 55)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg
index 8685edd405..d872acfcf0 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg
@@ -42,4 +42,3 @@ support_pattern = lines
support_xy_distance = 0.7
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg
index 02b1e8ae1f..a9580b1655 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg
@@ -42,4 +42,3 @@ support_top_distance = 0.5
support_xy_distance = 0.75
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 2.4
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg
index e9363c7f73..f089dbf76b 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg
@@ -42,4 +42,3 @@ support_top_distance = 0.5
support_xy_distance = 0.75
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 2.4
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg
index e45b40cada..c939fef2f3 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg
@@ -33,5 +33,4 @@ support_enable = True
support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
support_pattern = lines
support_z_distance = 0.19
-wall_thickness = 0.88
speed_topbottom = =math.ceil(speed_print * 15 / 30) \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg
index 4a193f9fe5..93a7a18764 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg
@@ -33,4 +33,3 @@ support_enable = True
support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
support_pattern = lines
support_z_distance = 0.19
-wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg
index 41184ed396..f113656a4e 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg
@@ -34,6 +34,5 @@ support_enable = True
support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
support_pattern = lines
support_z_distance = 0.19
-wall_thickness = 1.2
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_infill = =math.ceil(speed_print * 45 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg
index a90ac4a92d..3f4651f529 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg
@@ -34,4 +34,3 @@ support_enable = True
support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20
support_pattern = lines
support_z_distance = 0.19
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg
index cece9e3581..3f8c33b01c 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg
@@ -40,5 +40,4 @@ support_line_distance = 3.5333
support_pattern = lines
support_z_distance = 0.21
top_bottom_thickness = 0.75
-wall_thickness = 1.06
speed_infill = =math.ceil(speed_print * 45 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg
index 8607215af8..055285ac60 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg
@@ -40,4 +40,3 @@ support_line_distance = 3.5333
support_pattern = lines
support_z_distance = 0.21
top_bottom_thickness = 0.75
-wall_thickness = 1.06
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg
index 645897c076..25d9cf6700 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg
@@ -34,4 +34,3 @@ support_infill_rate = =0 if support_structure == 'tree' else 20
support_pattern = lines
support_z_distance = 0.26
top_bottom_thickness = 1.2
-wall_thickness = 2.1
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg
index 274e88148a..ea386d606c 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg
@@ -20,5 +20,4 @@ infill_sparse_density = 20
speed_layer_0 = 30
speed_print = 30
top_bottom_thickness = 0.72
-wall_thickness = 0.88
retraction_combing_max_distance = 8 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg
index b3603991b1..47b9eae5e8 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg
@@ -22,7 +22,6 @@ speed_print = 45
speed_travel = 150
speed_wall = =math.ceil(speed_print * 40 / 45)
top_bottom_thickness = 0.75
-wall_thickness = 0.7
speed_wall_0 = =math.ceil(speed_print * 30 / 45)
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall_x = =math.ceil(speed_print * 40 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg
index 08d60d6018..9bee196642 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg
@@ -22,7 +22,6 @@ speed_print = 45
speed_travel = 150
speed_wall = =math.ceil(speed_print * 40 / 45)
top_bottom_thickness = 0.75
-wall_thickness = 0.7
speed_wall_0 = =math.ceil(speed_print * 30 / 45)
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall_x = =math.ceil(speed_print * 40 / 45)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg
index c86e206475..7e99b790ed 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg
@@ -21,5 +21,4 @@ speed_layer_0 = 30
speed_print = 45
speed_wall = =math.ceil(speed_print * 30 / 45)
top_bottom_thickness = 0.8
-wall_thickness = 1.05
retraction_combing_max_distance = 8 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg
index 43cf222a39..3f72860e7f 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg
@@ -20,5 +20,4 @@ infill_sparse_density = 20
speed_layer_0 = 30
speed_print = 40
top_bottom_thickness = 1.2
-wall_thickness = 1.59
retraction_combing_max_distance = 8 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg
index de2df7dee3..6c337bf1d5 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg
@@ -20,5 +20,4 @@ infill_sparse_density = 20
speed_layer_0 = 30
speed_print = 40
top_bottom_thickness = 1.2
-wall_thickness = 2.1
retraction_combing_max_distance = 8 \ No newline at end of file
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg
index 84442b895a..f561853992 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg
@@ -18,4 +18,3 @@ infill_sparse_density = 20
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
top_bottom_thickness = 0.72
-wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg
index 94562f422d..927fff72d8 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg
@@ -22,4 +22,3 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_travel = 150
speed_wall = =math.ceil(speed_print * 50 / 60)
top_bottom_thickness = 0.75
-wall_thickness = 0.7
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg
index 43a5cb6596..76d264ac80 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg
@@ -22,4 +22,3 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_travel = 150
speed_wall = =math.ceil(speed_print * 50 / 60)
top_bottom_thickness = 0.75
-wall_thickness = 0.7
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg
index c7c7753cf2..3af455dca4 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg
@@ -20,4 +20,3 @@ speed_layer_0 = =round(speed_print * 30 / 50)
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 20 / 50)
top_bottom_thickness = 0.72
-wall_thickness = 1.05
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg
index 2b3c24a912..e6c6d71737 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg
@@ -20,4 +20,3 @@ speed_layer_0 = =round(speed_print * 30 / 50)
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 20 / 50)
top_bottom_thickness = 0.8
-wall_thickness = 1.05
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg
index 8f3079c4f4..b4719e69db 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg
@@ -22,4 +22,3 @@ speed_topbottom = =math.ceil(speed_print * 20 / 55)
speed_wall = =math.ceil(speed_print * 40 / 55)
speed_wall_0 = =math.ceil(speed_print * 25 / 55)
top_bottom_thickness = 1.2
-wall_thickness = 1.59
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg
index f7798a0293..e4f31c9fe1 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg
@@ -19,4 +19,3 @@ speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
speed_wall_0 = =math.ceil(speed_print * 25 / 40)
top_bottom_thickness = 1.2
-wall_thickness = 2.1
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
index a7dad05ae9..9f7058912a 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg
@@ -63,6 +63,5 @@ support_xy_distance_overhang = =wall_line_width_0
support_z_distance = =layer_height * 2
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 0.76
speed_wall_x = =math.ceil(speed_print * 25 / 25)
speed_infill = =math.ceil(speed_print * 25 / 25)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
index 6f9612ff9a..961124229a 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg
@@ -63,4 +63,3 @@ support_xy_distance_overhang = =wall_line_width_0
support_z_distance = =layer_height * 2
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 0.76
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
index 7c94a57190..db506827db 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg
@@ -63,4 +63,3 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.1
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 1.14
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
index 6e2a8960bd..eca5bdfd15 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg
@@ -63,6 +63,5 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.1
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 1.14
speed_wall_x = =math.ceil(speed_print * 25 / 25)
speed_infill = =math.ceil(speed_print * 25 / 25)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg
index b13fcb5572..0209e93e41 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg
@@ -64,4 +64,3 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.5
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 1.52
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg
index 935c0bb603..7873dc5cac 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg
@@ -64,4 +64,3 @@ support_z_distance = =layer_height * 2
top_bottom_thickness = 1.5
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = 1.52
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg
index b3308686de..44f944a3d4 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg
@@ -18,4 +18,3 @@ infill_sparse_density = 20
speed_layer_0 = =round(speed_print * 30 / 30)
speed_print = 30
top_bottom_thickness = 0.72
-wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg
index 4161bd3781..8090d369fc 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg
@@ -22,4 +22,3 @@ speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_travel = 150
speed_wall = =math.ceil(speed_print * 40 / 50)
top_bottom_thickness = 0.75
-wall_thickness = 1.05
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg
index b26340fdb2..dbec326472 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg
@@ -22,4 +22,3 @@ speed_topbottom = =math.ceil(speed_print * 30 / 40)
speed_travel = 150
speed_wall = =math.ceil(speed_print * 30 / 40)
top_bottom_thickness = 0.75
-wall_thickness = 1.05
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg
index a4ee94c36c..cff856f97d 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg
@@ -21,4 +21,3 @@ speed_print = 40
speed_topbottom = =math.ceil(speed_print * 20 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
top_bottom_thickness = 0.8
-wall_thickness = 1.05
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg
index 173b551e8b..0ade828d53 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg
@@ -22,4 +22,3 @@ speed_topbottom = =math.ceil(speed_print * 20 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_print * 30 / 50)
top_bottom_thickness = 1.2
-wall_thickness = 1.59
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg
index 8a5d70f1f7..f53fe84bb0 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg
@@ -19,4 +19,3 @@ speed_layer_0 = =round(speed_print * 30 / 40)
speed_print = 40
speed_wall_0 = =math.ceil(speed_print * 25 / 40)
top_bottom_thickness = 1.2
-wall_thickness = 2.1
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
index 35654230e4..9a3f92105a 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg
@@ -39,5 +39,4 @@ support_infill_rate = =0 if support_enable and support_structure == 'tree' else
support_xy_distance = 0.6
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 0.88
speed_infill = =math.ceil(speed_print * 40 / 40)
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
index 35a2fd03db..93b84c7168 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg
@@ -37,4 +37,3 @@ support_infill_rate = =0 if support_enable and support_structure == 'tree' else
support_xy_distance = 0.65
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1.05
diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
index f7fbb956b7..6637e06deb 100644
--- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg
@@ -40,5 +40,4 @@ support_infill_rate = =0 if support_structure == 'tree' else 25
support_xy_distance = 0.7
support_z_distance = =layer_height * 2
top_bottom_thickness = 1.2
-wall_thickness = 1.14
speed_infill = =math.ceil(speed_print * 45 / 45)
diff --git a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg
index bba792d870..82eef143ca 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg
@@ -17,4 +17,3 @@ infill_overlap = =0 if infill_sparse_density > 80 else 15
material_final_print_temperature = =material_print_temperature - 5
retraction_prime_speed = 25
speed_topbottom = =math.ceil(speed_print * 30 / 55)
-wall_thickness = 0.92
diff --git a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
index df61c040ae..559c3fdbb8 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -16,4 +16,3 @@ retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8
-wall_thickness = 0.92
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
index 1eaab8a586..21e09ea09b 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg
@@ -49,4 +49,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
index c09c172357..87af117ef0 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
@@ -16,7 +16,6 @@ retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8
-wall_thickness = 0.92
material_print_temperature = =default_material_print_temperature - 5
retraction_combing_max_distance = 8
retraction_combing = all
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg
index 1287a5b43b..82ddc1ae95 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg
@@ -33,4 +33,3 @@ top_bottom_thickness = 0.72
travel_avoid_distance = 0.4
wall_0_inset = 0.015
wall_0_wipe_dist = 0.25
-wall_thickness = 0.7
diff --git a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg
index fe621363d4..50e988afa2 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg
@@ -51,4 +51,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg
index 0da1ac1283..2ec6072c70 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg
@@ -32,4 +32,3 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
top_bottom_thickness = 0.72
wall_0_inset = 0.015
wall_0_wipe_dist = 0.25
-wall_thickness = 0.7
diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg
index 4a0278c7c2..7094d0635e 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg
@@ -24,4 +24,3 @@ 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)
-wall_thickness = 1
diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg
index b302bbee32..f6a00a7527 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg
@@ -26,7 +26,6 @@ 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)
top_bottom_thickness = 1
-wall_thickness = 1
support_brim_enable = True
support_interface_enable = True
support_interface_density = =min(extruderValues('material_surface_energy'))
diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg
index e74bf83698..e2b621c8d4 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg
@@ -25,7 +25,6 @@ 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)
top_bottom_thickness = 1
-wall_thickness = 1
support_brim_enable = True
support_interface_enable = True
support_interface_density = =min(extruderValues('material_surface_energy'))
diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg
index da5b43de8a..e837c5cd9c 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg
@@ -34,4 +34,3 @@ support_offset = 2
support_pattern = triangles
support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
top_bottom_thickness = 1
-wall_thickness = 1
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
index 6175c54619..737d4683a5 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
@@ -43,4 +43,3 @@ speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
support_bottom_distance = =support_z_distance
support_z_distance = =layer_height
wall_0_inset = 0
-wall_thickness = 1
diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
index 413b3da609..1379433040 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
@@ -22,4 +22,3 @@ 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)
-wall_thickness = 1
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
index c2129652ee..0eb741335b 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg
@@ -59,4 +59,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
index 1b3fc14f06..1cf03d3cc7 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg
@@ -57,4 +57,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
index c704d6ca5d..8b167fe35d 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg
@@ -59,4 +59,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
index 2964528789..cb176dbb96 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg
@@ -56,4 +56,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg
index 5ef579300e..971cb3cc1d 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg
@@ -22,6 +22,5 @@ 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)
-wall_thickness = 1
retraction_combing_max_distance = 8
retraction_combing = all
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg
index 818e01f742..436bcc487e 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg
@@ -25,4 +25,3 @@ 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 = 1
-wall_thickness = 1
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg
index 22a6b35322..7122388645 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg
@@ -24,4 +24,3 @@ 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)
top_bottom_thickness = 1
-wall_thickness = 1
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg
index bfc4c38c8c..d51d53a932 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg
@@ -26,4 +26,3 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 30 / 60)
top_bottom_thickness = 1
-wall_thickness = 1
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg
index c47f454305..e8c38d5114 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg
@@ -22,4 +22,3 @@ prime_tower_enable = False
skin_overlap = 10
speed_layer_0 = =math.ceil(speed_print * 20 / 70)
top_bottom_thickness = 1
-wall_thickness = 1
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
index 3d74fc55b3..532a8453cd 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg
@@ -57,4 +57,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
index 70935140fb..6f6819e513 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg
@@ -57,4 +57,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1.1
wall_0_inset = 0
-wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
index 8c84e4787c..65f9bfa7de 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg
@@ -56,4 +56,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1
wall_0_inset = 0
-wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
index b3b71ee573..024e1469ba 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -31,4 +31,3 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 36 / 50)
speed_wall_0 = =math.ceil(speed_print * 26 / 50)
top_bottom_thickness = 1.2
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg
index 71f674616f..e45cfb4b06 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg
@@ -26,5 +26,3 @@ 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
-wall_thickness = 1.23
-
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg
index 42de88a562..b41f591f2e 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg
@@ -28,5 +28,3 @@ 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
-wall_thickness = 1.23
-
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
index 370f636bc4..c72deb5540 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
@@ -58,4 +58,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-wall_thickness = 0.76
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
index d7992a20b9..f44c8e7955 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -59,4 +59,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-wall_thickness = 0.76
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
index 59f0cae71d..d2c6c02bce 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -56,4 +56,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-wall_thickness = 0.76
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
index added0b5ad..312157bdea 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg
@@ -34,4 +34,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
index 0c55551453..708ddd4ff5 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -36,4 +36,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
index 00bdc6c219..3705cc94ad 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg
@@ -35,4 +35,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
index 16093951d2..23baa1d8af 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
@@ -40,4 +40,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.6
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
index 9a2b73fa91..8981a40303 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -40,4 +40,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.6
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
index d08659c036..272485845b 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -40,4 +40,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.6
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg
index 1f86a66c38..eb59d69f6c 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg
@@ -29,4 +29,3 @@ speed_print = 45
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 6
-wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg
index 1c144290b4..b8eaa7d061 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg
@@ -34,4 +34,3 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x \ No newline at end of file
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg
index 31f23166f0..595ab7098b 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg
@@ -35,5 +35,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
-
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
index f0bc86da9f..969441316a 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -50,4 +50,3 @@ switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.3
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
index 73ae3a5564..063485cb2d 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -51,4 +51,3 @@ switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.3
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
index af1cbe6051..11015d0af0 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -50,4 +50,3 @@ switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.3
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg
index f3cc0937a0..777dc63222 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg
@@ -16,4 +16,3 @@ cool_fan_speed = 40
infill_overlap = =0 if infill_sparse_density > 80 else 15
material_final_print_temperature = =material_print_temperature - 5
speed_topbottom = =math.ceil(speed_print * 30 / 55)
-wall_thickness = 0.92
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg
index fc2ae7e17f..1d62998c14 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -17,4 +17,3 @@ retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8
-wall_thickness = 0.92 \ No newline at end of file
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 59423682f1..e39774bf16 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
@@ -47,4 +47,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_thickness = 1.2
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 34fa0d7c84..f65f3b2043 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
@@ -17,7 +17,6 @@ retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8
-wall_thickness = 0.92
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_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg
index 5f51f32b6a..74350d9509 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg
@@ -33,4 +33,3 @@ top_bottom_thickness = 0.72
travel_avoid_distance = 0.4
wall_0_inset = 0.015
wall_0_wipe_dist = 0.25
-wall_thickness = 0.7
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 2f6c5f2888..7b335ddd02 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
@@ -50,4 +50,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg
index 447d0412aa..faf54f8f77 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg
@@ -32,5 +32,3 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
top_bottom_thickness = 0.72
wall_0_inset = 0.015
wall_0_wipe_dist = 0.25
-wall_thickness = 0.7
-
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 9644732c0c..69ee9155fc 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
@@ -24,9 +24,6 @@ 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)
-wall_thickness = 1
-
-
speed_infill = =math.ceil(speed_print * 50 / 60)
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 4d33d3f8e2..79d9d27df7 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
@@ -26,7 +26,6 @@ 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)
top_bottom_thickness = 1
-wall_thickness = 1
support_brim_enable = True
support_interface_enable = True
support_interface_density = =min(extruderValues('material_surface_energy'))
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 a803e13f20..d9153d20b1 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
@@ -25,7 +25,6 @@ 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)
top_bottom_thickness = 1
-wall_thickness = 1
support_brim_enable = True
support_interface_enable = True
support_interface_density = =min(extruderValues('material_surface_energy'))
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 b3ef4abe94..2d7f889236 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
@@ -35,4 +35,3 @@ support_offset = 2
support_pattern = triangles
support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
top_bottom_thickness = 1
-wall_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 757743c70b..c732cb2deb 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
@@ -26,7 +26,6 @@ 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)
top_bottom_thickness = 1
-wall_thickness = 1
support_brim_enable = True
support_interface_enable = True
support_interface_density = =min(extruderValues('material_surface_energy'))
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 1aad4c498f..78e6cee580 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
@@ -43,5 +43,3 @@ speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
support_bottom_distance = =support_z_distance
support_z_distance = =layer_height
wall_0_inset = 0
-wall_thickness = 1
-
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 7c42d02ada..8b4cdca8f1 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
@@ -23,8 +23,6 @@ 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)
-wall_thickness = 1
-
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_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
index f4bb4ba024..71ae63c975 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg
@@ -56,5 +56,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
index ece85f2168..37a0599ee7 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg
@@ -55,5 +55,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-
-wall_thickness = 1.2
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 0caf9b1cd6..363a8ab0b7 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
@@ -57,5 +57,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-
-wall_thickness = 1.2
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 751942b0f9..81b352fe8c 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
@@ -55,5 +55,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-
-wall_thickness = 1.2
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 bff77a1390..0fd77e24b3 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
@@ -22,8 +22,6 @@ 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)
-wall_thickness = 1
-
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_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg
index d5a5be70f8..a4b3fb3380 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
@@ -26,8 +26,6 @@ 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
-wall_thickness = 0.8
-
jerk_travel = 50
infill_sparse_density = 15
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 d274eaffd3..2f89be38f9 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
@@ -25,8 +25,6 @@ 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
-wall_thickness = 1
-
jerk_travel = 50
layer_height_0 = 0.2
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 2f54d272fe..d80d8427c9 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
@@ -27,8 +27,6 @@ speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 35 / 50)
speed_wall = =math.ceil(speed_print * 35 / 50)
top_bottom_thickness = 1
-wall_thickness = 1
-
jerk_travel = 50
layer_height_0 = 0.2
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 2c23a4ae71..20025a8c0b 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
@@ -23,8 +23,6 @@ retraction_prime_speed = =retraction_speed
skin_overlap = 10
speed_layer_0 = 10
top_bottom_thickness = 1
-wall_thickness = 1
-
jerk_travel = 50
layer_height_0 = 0.2
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 362d9ef5b9..fd5e5a7217 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
@@ -37,8 +37,6 @@ prime_tower_enable = False
retraction_prime_speed = =retraction_speed
skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0
skin_overlap = 20
-
-wall_thickness = =line_width * 3
top_bottom_thickness = 0.9
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
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 b59e2537e3..66aed15373 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
@@ -53,5 +53,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-
-wall_thickness = =line_width * 3
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 3b3ff5b463..a600281dc4 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
@@ -54,5 +54,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1.1
wall_0_inset = 0
-
-wall_thickness = =line_width * 3
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 2530ca9490..37a9293976 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
@@ -56,5 +56,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1
wall_0_inset = 0
-
-wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
index a3d1d1f255..d212ce86e6 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -32,5 +32,3 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 36 / 50)
speed_wall_0 = =math.ceil(speed_print * 26 / 50)
top_bottom_thickness = 1.2
-
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg
index cb2d019fdc..9cf21612a2 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg
@@ -27,5 +27,3 @@ 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
-
-wall_thickness = 1.23
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 32ae7fbd53..14dcd79a29 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
@@ -28,7 +28,5 @@ 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
-wall_thickness = 1.23
-
layer_height_0 = 0.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg
index a81a3b9f08..126cf13670 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg
@@ -29,5 +29,3 @@ 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
-wall_thickness = 1.23
-
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 bda8ad2775..7a67e10783 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
@@ -37,8 +37,6 @@ prime_tower_enable = False
retraction_prime_speed = =retraction_speed
skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0
skin_overlap = 20
-
-wall_thickness = =line_width * 3
top_bottom_thickness = 1.2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
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 8b0b8abf0c..b20cc2eaef 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
@@ -55,5 +55,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-
-wall_thickness = 0.76
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 0f4a416273..849763dd0d 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
@@ -55,6 +55,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-
-wall_thickness = 0.76
-
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 2b0b1c1720..5b2d81f30e 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
@@ -54,6 +54,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-
-wall_thickness = 0.76
-
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 279e4f4beb..ab1d37a0ed 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
@@ -25,7 +25,6 @@ prime_tower_enable = True
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
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 9c6ec154fe..01bec374a6 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
@@ -26,7 +26,6 @@ raft_margin = 10
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
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 6ef378376d..86734f57a5 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
@@ -25,7 +25,6 @@ prime_tower_enable = True
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
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 0350a1836f..4ae29a2e78 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
@@ -39,4 +39,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.6
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 cfe751f38b..690ae20b68 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
@@ -39,4 +39,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.6
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 58a7cea554..ed4ca081cb 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
@@ -38,4 +38,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.6
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg
index 91e9ac5632..d8f7e4e236 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg
@@ -32,4 +32,3 @@ speed_wall_0 = =round(speed_print * 35 / 45)
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 6
-wall_thickness = =wall_line_width_0 + wall_line_width_x \ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg
index db12dff2f0..f9a23df7dc 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg
@@ -34,4 +34,3 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg
index a97439f98c..31d43d6d1a 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg
@@ -35,4 +35,3 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 35)
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
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 47cb0623eb..bc3464b305 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
@@ -47,5 +47,4 @@ switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.3
jerk_travel = 50
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 1155e46024..bbbc40dd0d 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
@@ -48,5 +48,4 @@ switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.3
jerk_travel = 50
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 ab5562474d..1eb27c3e9a 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
@@ -47,5 +47,4 @@ switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.3
jerk_travel = 50
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 c354eea9e3..6ce68aea6b 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
@@ -35,4 +35,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
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 a0778a7f88..a6cc519d08 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
@@ -35,4 +35,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
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 c78b060dee..7c660d8d67 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
@@ -35,4 +35,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
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 031db016b6..7cb6a071fb 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
@@ -35,4 +35,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg
index c1d936a7a7..681eae2250 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg
@@ -16,4 +16,3 @@ cool_fan_speed = 40
infill_overlap = =0 if infill_sparse_density > 80 else 15
material_final_print_temperature = =material_print_temperature - 5
speed_topbottom = =math.ceil(speed_print * 30 / 55)
-wall_thickness = 0.92
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
index 761a361df3..ec7975921a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg
@@ -17,4 +17,3 @@ retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8
-wall_thickness = 0.92 \ No newline at end of file
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 2b6121e9ee..2e238eba22 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
@@ -47,4 +47,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_thickness = 1.2
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 d81ae5f88e..be138a72e1 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
@@ -17,7 +17,6 @@ retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8
-wall_thickness = 0.92
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_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg
index 621d837b92..d47272bbf6 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg
@@ -33,4 +33,3 @@ top_bottom_thickness = 0.72
travel_avoid_distance = 0.4
wall_0_inset = 0.015
wall_0_wipe_dist = 0.25
-wall_thickness = 0.7
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 9870b07ab4..afd70b7318 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
@@ -50,4 +50,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1
travel_avoid_distance = 3
wall_0_inset = 0
-wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg
index e4aa517abb..4be629314e 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg
@@ -32,5 +32,3 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
top_bottom_thickness = 0.72
wall_0_inset = 0.015
wall_0_wipe_dist = 0.25
-wall_thickness = 0.7
-
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 d6ef41abe1..c6d0ff9985 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
@@ -24,6 +24,5 @@ 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)
-wall_thickness = 1
speed_infill = =math.ceil(speed_print * 50 / 60)
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 04353d64f9..893c500797 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
@@ -26,7 +26,6 @@ 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)
top_bottom_thickness = 1
-wall_thickness = 1
support_brim_enable = True
support_interface_enable = True
support_interface_density = =min(extruderValues('material_surface_energy'))
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 c1bb6be22f..df7189fbb8 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
@@ -25,7 +25,6 @@ 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)
top_bottom_thickness = 1
-wall_thickness = 1
support_brim_enable = True
support_interface_enable = True
support_interface_density = =min(extruderValues('material_surface_energy'))
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 3e70bcacaf..f350d12cae 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
@@ -35,4 +35,3 @@ support_offset = 2
support_pattern = triangles
support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
top_bottom_thickness = 1
-wall_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 f4528b7fb8..936d157139 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
@@ -26,7 +26,6 @@ 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)
top_bottom_thickness = 1
-wall_thickness = 1
support_brim_enable = True
support_interface_enable = True
support_interface_density = =min(extruderValues('material_surface_energy'))
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 26dc7ea9c3..8ddf41fbea 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
@@ -43,5 +43,3 @@ speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
support_bottom_distance = =support_z_distance
support_z_distance = =layer_height
wall_0_inset = 0
-wall_thickness = 1
-
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 3f3ce3ce79..56924e319a 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
@@ -25,8 +25,5 @@ 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)
top_thickness = =0.8 if infill_sparse_density < 30 and skin_edge_support_thickness == 0.8 else top_bottom_thickness
-wall_thickness = 1
-
-
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_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
index 601d1164fd..f90cab6aee 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg
@@ -55,4 +55,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_thickness = 1.2
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 cad4e25f95..3222a33386 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
@@ -55,4 +55,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
index 6cc4d15e73..027b93ca14 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg
@@ -57,5 +57,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
index 093a04b8a2..9b98b10d72 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg
@@ -55,5 +55,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-
-wall_thickness = 1.2
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 2d39086d6f..344ad9108c 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
@@ -24,8 +24,6 @@ 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)
top_thickness = =0.8 if infill_sparse_density < 30 and skin_edge_support_thickness == 0.8 else top_bottom_thickness
-wall_thickness = 1
-
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_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg
index f339aa3988..d057a8a057 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
@@ -27,8 +27,6 @@ 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
-wall_thickness = 0.8
-
jerk_travel = 50
infill_sparse_density = 15
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 206442121b..1ed844b4fc 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
@@ -25,8 +25,6 @@ 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
-wall_thickness = 1
-
jerk_travel = 50
layer_height_0 = 0.2
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 3f29983cfd..2e69215798 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
@@ -27,8 +27,6 @@ speed_layer_0 = 10
speed_topbottom = =math.ceil(speed_print * 35 / 50)
speed_wall = =math.ceil(speed_print * 35 / 50)
top_bottom_thickness = 1
-wall_thickness = 1
-
jerk_travel = 50
layer_height_0 = 0.2
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 227730f359..8939294b54 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
@@ -23,8 +23,6 @@ retraction_prime_speed = =retraction_speed
skin_overlap = 10
speed_layer_0 = 10
top_bottom_thickness = 1
-wall_thickness = 1
-
jerk_travel = 50
layer_height_0 = 0.2
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 141c4604b0..efccc3a347 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
@@ -37,8 +37,6 @@ prime_tower_enable = False
retraction_prime_speed = =retraction_speed
skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0
skin_overlap = 20
-
-wall_thickness = =line_width * 3
top_bottom_thickness = 0.9
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
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 8c8091cb1e..7312f07e1a 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
@@ -54,5 +54,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
wall_0_inset = 0
-
-wall_thickness = =line_width * 3
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 047ee82739..c9229621dc 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
@@ -56,5 +56,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1.1
wall_0_inset = 0
-
-wall_thickness = =line_width * 3
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 c91c73983e..46a74cb3a9 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
@@ -56,5 +56,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 35
top_bottom_thickness = 1
wall_0_inset = 0
-
-wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
index d65f61cf74..06a79da7bb 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -32,5 +32,3 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 36 / 50)
speed_wall_0 = =math.ceil(speed_print * 26 / 50)
top_bottom_thickness = 1.2
-
-wall_thickness = 1.2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg
index bea0ca9228..5dda143bb2 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg
@@ -27,5 +27,3 @@ 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
-
-wall_thickness = 1.23
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 190f2f8e06..cdb80b7ed7 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
@@ -28,5 +28,4 @@ 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
-wall_thickness = 1.23
layer_height_0 = 0.2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg
index 190f3422b0..c98bc73da9 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg
@@ -29,5 +29,3 @@ 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
-wall_thickness = 1.23
-
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 9e614cdd28..54eb99d099 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
@@ -37,8 +37,6 @@ prime_tower_enable = False
retraction_prime_speed = =retraction_speed
skin_edge_support_thickness = =0.9 if infill_sparse_density < 30 else 0
skin_overlap = 20
-
-wall_thickness = =line_width * 3
top_bottom_thickness = 1.2
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
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 a867e168b1..790551aab4 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
@@ -55,5 +55,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-
-wall_thickness = 0.76
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 f4ef171a69..6b01e411e5 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
@@ -55,6 +55,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-
-wall_thickness = 0.76
-
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 ce9b26051e..20ce8fd979 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
@@ -54,6 +54,3 @@ switch_extruder_retraction_speeds = 35
top_bottom_thickness = 0.7
travel_avoid_distance = 1.5
wall_0_inset = 0
-
-wall_thickness = 0.76
-
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 495f18dc4a..70cf3bd857 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
@@ -25,7 +25,6 @@ prime_tower_enable = True
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
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 814c7a2b5e..1e2ae90927 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
@@ -26,7 +26,6 @@ raft_margin = 10
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
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 bf341d3bf0..0833197f9c 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
@@ -25,7 +25,6 @@ prime_tower_enable = True
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
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 2042e29518..074e24b223 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
@@ -39,4 +39,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.6
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 f0b09c333d..067033d1c3 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
@@ -39,4 +39,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.6
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 9cb6b43d70..26c2b53052 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
@@ -38,4 +38,3 @@ switch_extruder_retraction_amount = 20
switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.6
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.6
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg
index 6f02b91def..852b4ad45a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg
@@ -32,4 +32,3 @@ speed_wall_0 = =round(speed_print * 35 / 45)
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 6
-wall_thickness = =wall_line_width_0 + wall_line_width_x \ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg
index 818e9130e5..5028f98e7b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg
@@ -34,4 +34,3 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg
index b5d32d020c..4c4164feab 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg
@@ -35,4 +35,3 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 35)
support_angle = 70
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
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 d89919328e..12b4734b7f 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
@@ -47,5 +47,4 @@ switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.3
jerk_travel = 50
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 99511e1ab6..bb6520947b 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
@@ -47,5 +47,4 @@ switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.3
jerk_travel = 50
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 19842185fe..847552d471 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
@@ -47,5 +47,4 @@ switch_extruder_retraction_speeds = 45
top_bottom_thickness = 1.2
travel_avoid_distance = 1.5
wall_0_wipe_dist = =line_width * 2
-wall_thickness = 1.3
jerk_travel = 50
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 a9cef5ca36..198c8df013 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
@@ -35,4 +35,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
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 e8a37bb6fc..717b14a722 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
@@ -35,4 +35,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
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 9052dfee7d..3785791ec2 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
@@ -35,4 +35,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
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 fd41d88a76..e1b22ab0f7 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
@@ -35,4 +35,3 @@ support_angle = 70
support_pattern = ='triangles'
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
-wall_thickness = =wall_line_width_0 + wall_line_width_x
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index fce18d88bc..94372d415e 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -587,7 +587,8 @@
"checkbox_radius": [0.25, 0.25],
"spinbox": [6.0, 3.0],
- "combobox_wide": [14, 2],
+ "combobox": [14, 2],
+ "combobox_wide": [22, 2],
"tooltip": [20.0, 10.0],
"tooltip_margins": [1.0, 1.0],
diff --git a/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg
index ffbd25a630..c8fe08a93b 100644
--- a/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg
+++ b/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg
@@ -11,3 +11,4 @@ hardware_type = nozzle
[values]
machine_nozzle_size = 0.25
machine_nozzle_tip_outer_diameter = 0.8
+wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 \ No newline at end of file
diff --git a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg
index c934ca03c4..6a9bdfe81e 100644
--- a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg
+++ b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg
@@ -16,3 +16,4 @@ coasting_min_volume = 0.17
speed_wall = =round(speed_print / 1.2, 1)
speed_wall_0 = =1 if speed_wall < 5 else (speed_wall - 5)
speed_topbottom = =round(speed_print / 1.5, 1)
+wall_thickness = =wall_line_width_0 + wall_line_width_x * 2
diff --git a/resources/variants/ultimaker2_olsson_0.25.inst.cfg b/resources/variants/ultimaker2_olsson_0.25.inst.cfg
index 2419f4c56e..07a9a9649e 100644
--- a/resources/variants/ultimaker2_olsson_0.25.inst.cfg
+++ b/resources/variants/ultimaker2_olsson_0.25.inst.cfg
@@ -12,3 +12,4 @@ hardware_type = nozzle
machine_nozzle_size = 0.25
machine_nozzle_tip_outer_diameter = 0.8
raft_airgap = 0.25
+wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 \ No newline at end of file
diff --git a/resources/variants/ultimaker2_plus_0.25.inst.cfg b/resources/variants/ultimaker2_plus_0.25.inst.cfg
index f48df57e8a..f4685c659a 100644
--- a/resources/variants/ultimaker2_plus_0.25.inst.cfg
+++ b/resources/variants/ultimaker2_plus_0.25.inst.cfg
@@ -17,3 +17,4 @@ raft_airgap = 0.25
speed_topbottom = =round(speed_print / 1.5, 1)
speed_wall = =round(speed_print / 1.2, 1)
speed_wall_0 = =1 if speed_wall < 5 else (speed_wall - 5)
+wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 \ No newline at end of file
diff --git a/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg b/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg
index 36d98a5d8f..63182db79a 100644
--- a/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg
+++ b/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg
@@ -18,3 +18,4 @@ retraction_prime_speed = =retraction_speed
speed_topbottom = =round(speed_print / 1.5, 1)
speed_wall = =round(speed_print / 1.2, 1)
speed_wall_0 = =1 if speed_wall < 5 else (speed_wall - 5)
+wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 \ No newline at end of file
diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg
index e510bac6a8..55083c0f14 100644
--- a/resources/variants/ultimaker3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.25.inst.cfg
@@ -44,5 +44,5 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = 1.2
-wall_thickness = 1.3
+wall_thickness = =wall_line_width_0 + wall_line_width_x * 2
xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index abe079eeb5..1f75b862d0 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -53,4 +53,3 @@ switch_extruder_prime_speed = 20
switch_extruder_retraction_amount = 16.5
top_bottom_thickness = 1.4
wall_0_inset = 0
-wall_thickness = 2
diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg
index 8362a52fb5..7c24475a38 100644
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@@ -39,5 +39,4 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = 1.2
-wall_thickness = 1.3
xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index af5daf9f11..43cd08faeb 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -84,4 +84,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 12
top_bottom_thickness = 1
wall_0_inset = 0
-wall_thickness = 1
diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
index c26249a17b..602158b29b 100644
--- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
@@ -44,5 +44,5 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = 1.2
-wall_thickness = 1.3
+wall_thickness = =wall_line_width_0 + wall_line_width_x * 2
xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file
diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
index 0f603036b8..bf8d74c344 100644
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@@ -53,4 +53,3 @@ switch_extruder_prime_speed = 20
switch_extruder_retraction_amount = 16.5
top_bottom_thickness = 1.4
wall_0_inset = 0
-wall_thickness = 2
diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg
index 2a523703b6..e875fd4263 100644
--- a/resources/variants/ultimaker3_extended_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg
@@ -39,5 +39,4 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = 1.2
-wall_thickness = 1.3
xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index b73d5c2bc7..9dbd34093d 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -84,4 +84,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 12
top_bottom_thickness = 1
wall_0_inset = 0
-wall_thickness = 1
diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
index 9b0714b7bb..ebcd507377 100644
--- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
@@ -44,4 +44,4 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = 1.2
-wall_thickness = 1.3
+wall_thickness = =wall_line_width_0 + wall_line_width_x * 2
diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
index 3bc112c7fa..8284a48ce3 100644
--- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
@@ -54,4 +54,3 @@ switch_extruder_prime_speed = 20
switch_extruder_retraction_amount = 16.5
top_bottom_thickness = 1.4
wall_0_inset = 0
-wall_thickness = 2
diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg
index 9e56a0e75e..5cbc772525 100644
--- a/resources/variants/ultimaker_s3_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa04.inst.cfg
@@ -38,4 +38,3 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = 1.2
-wall_thickness = 1.3
diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
index 5f6373338b..72d4cb3a9c 100644
--- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@@ -82,4 +82,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 12
top_bottom_thickness = 1
wall_0_inset = 0
-wall_thickness = 1
diff --git a/resources/variants/ultimaker_s3_cc04.inst.cfg b/resources/variants/ultimaker_s3_cc04.inst.cfg
index 3f61f5d326..7cd5454fbf 100644
--- a/resources/variants/ultimaker_s3_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc04.inst.cfg
@@ -43,4 +43,3 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = =layer_height * 6
-wall_thickness = =line_width * 3
diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg
index 9a216b8506..a01a58fef8 100644
--- a/resources/variants/ultimaker_s3_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc06.inst.cfg
@@ -43,4 +43,3 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = =layer_height * 6
-wall_thickness = =line_width * 3
diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
index 91f05ac857..23fd6a0b71 100644
--- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
@@ -44,5 +44,5 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = 1.2
-wall_thickness = 1.3
+wall_thickness = =wall_line_width_0 + wall_line_width_x * 2
xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
index 75581681f9..2ec650e81d 100644
--- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
@@ -54,4 +54,3 @@ switch_extruder_prime_speed = 20
switch_extruder_retraction_amount = 16.5
top_bottom_thickness = 1.4
wall_0_inset = 0
-wall_thickness = 2
diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg
index 923d8cadec..e5507ba661 100644
--- a/resources/variants/ultimaker_s5_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa04.inst.cfg
@@ -38,4 +38,3 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = 1.2
-wall_thickness = 1.3
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index 4c43f2da26..ae2b8020a4 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -82,4 +82,3 @@ switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 12
top_bottom_thickness = 1
wall_0_inset = 0
-wall_thickness = 1
diff --git a/resources/variants/ultimaker_s5_cc04.inst.cfg b/resources/variants/ultimaker_s5_cc04.inst.cfg
index 6934706bcd..b745ab8a6c 100644
--- a/resources/variants/ultimaker_s5_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc04.inst.cfg
@@ -43,4 +43,3 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = =layer_height * 6
-wall_thickness = =line_width * 3
diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg
index 98821ca002..0a87570372 100644
--- a/resources/variants/ultimaker_s5_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc06.inst.cfg
@@ -43,4 +43,3 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = =layer_height * 6
-wall_thickness = =line_width * 3