Merge remote-tracking branch 'origin/5.7' into 5.7

This commit is contained in:
c.lamboo 2024-03-15 14:35:00 +01:00
commit c4336e8e8b
7261 changed files with 7291 additions and 7263 deletions

View file

@ -14,7 +14,7 @@ DEFAULT_CURA_LATEST_URL = "https://software.ultimaker.com/latest.json"
# Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for
# example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the
# CuraVersion.py.in template.
CuraSDKVersion = "8.6.0"
CuraSDKVersion = "8.7.0"
try:
from cura.CuraVersion import CuraLatestURL

View file

@ -138,7 +138,7 @@ class CuraApplication(QtApplication):
# SettingVersion represents the set of settings available in the machine/extruder definitions.
# You need to make sure that this version number needs to be increased if there is any non-backwards-compatible
# changes of the settings.
SettingVersion = 22
SettingVersion = 23
Created = False

View file

@ -35,6 +35,19 @@ UM.Dialog
anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.leftMargin: UM.Theme.getSize("default_margin").height
}
Cura.TertiaryButton
{
id: learnMoreButton
visible: manager.isUcp
anchors.right: parent.right
anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.rightMargin: UM.Theme.getSize("default_margin").height
text: catalog.i18nc("@button", "Learn more")
iconSource: UM.Theme.getIcon("LinkExternal")
isIconOnRightSide: true
onClicked: Qt.openUrlExternally("https://support.ultimaker.com/s/article/000002979")
}
}
Rectangle

View file

@ -36,13 +36,23 @@ UM.Dialog
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.rightMargin: anchors.leftMargin
UM.Label
RowLayout
{
id: titleLabel
text: catalog.i18nc("@action:title Don't translate 'Universal Cura Project'", "Summary - Universal Cura Project")
font: UM.Theme.getFont("large")
UM.Label
{
id: titleLabel
text: catalog.i18nc("@action:title Don't translate 'Universal Cura Project'", "Summary - Universal Cura Project")
font: UM.Theme.getFont("large")
}
Cura.TertiaryButton
{
id: learnMoreButton
text: catalog.i18nc("@button", "Learn more")
iconSource: UM.Theme.getIcon("LinkExternal")
isIconOnRightSide: true
onClicked: Qt.openUrlExternally("https://support.ultimaker.com/s/article/000002979")
}
}
UM.Label
{
id: descriptionLabel

View file

@ -68,6 +68,11 @@ class VersionUpgrade56to57(VersionUpgrade):
if removed in parser["values"]:
del parser["values"][removed]
if "brim_outside_only" in parser["values"]:
parser["values"]["brim_location"] = "outside" if parser["values"][
"brim_outside_only"] == "True" else "everywhere"
del parser["values"]["brim_outside_only"]
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_abs
quality_type = D010
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_abs
quality_type = D015
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_abs
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_abs
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_abs
quality_type = D030
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_abs
quality_type = D010
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_abs
quality_type = D015
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_abs
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_abs
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_abs
quality_type = D030
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_petg
quality_type = D010
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_petg
quality_type = D015
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_petg
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_petg
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_petg
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_petg
quality_type = D030
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_petg
quality_type = D010
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_petg
quality_type = D015
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_petg
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_petg
quality_type = D015
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_petg
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_petg
quality_type = D030
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pla
quality_type = D010
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pla
quality_type = D015
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pla
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_pla
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_pla
quality_type = D030
setting_version = 22
setting_version = 23
type = intent
variant = DBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pla
quality_type = D010
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pla
quality_type = D015
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pla
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_pla
quality_type = D020
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_pla
quality_type = D030
setting_version = 22
setting_version = 23
type = intent
variant = FBE 0.40mm

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_pla
quality_type = Elegoo_layer_005
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pla
quality_type = Elegoo_layer_015
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_pla
quality_type = Elegoo_layer_015
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pla
quality_type = Elegoo_layer_010
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_pla
quality_type = Elegoo_layer_010
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_pla
quality_type = Elegoo_layer_020
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -8,7 +8,7 @@ intent_category = quick
is_experimental = True
material = generic_pla
quality_type = Elegoo_layer_030
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_pla
quality_type = Elegoo_layer_005
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -8,7 +8,7 @@ intent_category = engineering
is_experimental = True
material = generic_pla
quality_type = Elegoo_layer_015
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_pla
quality_type = Elegoo_layer_015
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -8,7 +8,7 @@ intent_category = engineering
is_experimental = True
material = generic_pla
quality_type = Elegoo_layer_010
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_pla
quality_type = Elegoo_layer_010
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -8,7 +8,7 @@ intent_category = engineering
is_experimental = True
material = generic_pla
quality_type = Elegoo_layer_020
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -8,7 +8,7 @@ intent_category = quick
is_experimental = True
material = generic_pla
quality_type = Elegoo_layer_020
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -8,7 +8,7 @@ intent_category = quick
is_experimental = True
material = generic_pla
quality_type = Elegoo_layer_030
setting_version = 22
setting_version = 23
type = intent
variant = 0.40mm_Elegoo_Nozzle

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_abs
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_abs
quality_type = fast
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_abs
quality_type = fast
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_abs
quality_type = high
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_abs
quality_type = normal
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_abs
quality_type = normal
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_cpe
quality_type = fast
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_cpe
quality_type = normal
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_nylon
quality_type = fast
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_nylon
quality_type = normal
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pc
quality_type = fast
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pc
quality_type = normal
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_petg
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_petg
quality_type = fast
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_petg
quality_type = fast
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_petg
quality_type = high
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_petg
quality_type = normal
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_petg
quality_type = normal
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = quick
material = generic_pla
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pla
quality_type = fast
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_pla
quality_type = fast
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_pla
quality_type = high
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_pla
quality_type = normal
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_pla
quality_type = normal
setting_version = 22
setting_version = 23
type = intent
variant = VO 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = solid
material = ultimaker_abscf_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1C

View file

@ -7,7 +7,7 @@ version = 4
intent_category = solid
material = ultimaker_absr_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1C

View file

@ -8,7 +8,7 @@ intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1C

View file

@ -8,7 +8,7 @@ intent_category = solid
is_experimental = True
material = ultimaker_nylon12-cf_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1C

View file

@ -7,7 +7,7 @@ version = 4
intent_category = solid
material = ultimaker_absr_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1XA

View file

@ -8,7 +8,7 @@ intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1XA

View file

@ -7,7 +7,7 @@ version = 4
intent_category = solid
material = ultimaker_abscf_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = LABS

View file

@ -7,7 +7,7 @@ version = 4
intent_category = solid
material = ultimaker_absr_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = LABS

View file

@ -8,7 +8,7 @@ intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = LABS

View file

@ -8,7 +8,7 @@ intent_category = solid
is_experimental = True
material = ultimaker_nylon12-cf_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = LABS

View file

@ -7,7 +7,7 @@ version = 4
intent_category = solid
material = ultimaker_abscf_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1C

View file

@ -7,7 +7,7 @@ version = 4
intent_category = solid
material = ultimaker_absr_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1C

View file

@ -8,7 +8,7 @@ intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1C

View file

@ -8,7 +8,7 @@ intent_category = solid
is_experimental = True
material = ultimaker_nylon12-cf_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1C

View file

@ -7,7 +7,7 @@ version = 4
intent_category = solid
material = ultimaker_absr_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1XA

View file

@ -8,7 +8,7 @@ intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = 1XA

View file

@ -7,7 +7,7 @@ version = 4
intent_category = solid
material = ultimaker_abscf_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = LABS

View file

@ -7,7 +7,7 @@ version = 4
intent_category = solid
material = ultimaker_absr_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = LABS

View file

@ -8,7 +8,7 @@ intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = LABS

View file

@ -8,7 +8,7 @@ intent_category = solid
is_experimental = True
material = ultimaker_nylon12-cf_175
quality_type = draft
setting_version = 22
setting_version = 23
type = intent
variant = LABS

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_abs
quality_type = high
setting_version = 22
setting_version = 23
type = intent
variant = AA 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_abs
quality_type = fast
setting_version = 22
setting_version = 23
type = intent
variant = AA 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = visual
material = generic_abs
quality_type = fast
setting_version = 22
setting_version = 23
type = intent
variant = AA 0.4

View file

@ -7,7 +7,7 @@ version = 4
intent_category = engineering
material = generic_abs
quality_type = normal
setting_version = 22
setting_version = 23
type = intent
variant = AA 0.4

Some files were not shown because too many files have changed in this diff Show more