mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
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. |
||
|---|---|---|
| .. | ||
| bundled_packages | ||
| definitions | ||
| extruders | ||
| i18n | ||
| images | ||
| intent | ||
| meshes | ||
| qml | ||
| quality | ||
| setting_visibility | ||
| shaders | ||
| texts | ||
| themes | ||
| variants | ||
| public_key.pem | ||