Conflicts:
plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
Conflicts:
resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
Given that:
* stair stepping is intended to be used to reduce the adhesion between support and the model, where the support rests on the model, and to reduce scarring, and
* PVA doesn't suffer from scarring or adhesion issues due to its water-solubility, and
* our current stair stepping algorithm has some bugs, causing support to disappear sometimes
we've decided to set stair stepping to 0 for all PVA profiles for UM3, UMS5 and UMS3.
Contributes to issue CURA-7311.
This is necessary because our ContainerTree class can only create one tree per definition. This tree is not created separately for every added printer and as such the tree can't be different for every added printer.
However the Ultimaker 2 Olsson block upgrade allows selecting extra variants for the UM2. This changes the available variants in the container tree, so this would be impossible.
By making it a separate definition, it now gets a separate tree. However this does mean that we need to do a version upgrade for this as well.
Contributes to issue CURA-6775.
