Skip to content

Commit

Permalink
Merge branch 'main' into CURA-12236_expose-preferred-travel-area-in-c…
Browse files Browse the repository at this point in the history
…ombing
  • Loading branch information
HellAholic authored Jan 13, 2025
2 parents 5f81ba3 + 382b98e commit 1a2de1b
Show file tree
Hide file tree
Showing 123 changed files with 137 additions and 139 deletions.
1 change: 0 additions & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ jobs:
f.write(release_notes.render(
timestamp=str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")),
caller_workflow=caller_workflow,
branch="" if is_main else short_version,
branch_specific="" if is_main else f"?branch={short_version}",
))
Expand Down
29 changes: 14 additions & 15 deletions .github/workflows/nightly_release_notes.md.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,32 @@

| | |
|--------------:|--------------------------------------------------------------------------------------------|
| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}
?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) |
| **Nightlies** | [![nightly](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) |

# Unit Test results

| | |
|-------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **Cura {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml) |
| **CuraEngine {{ branch }}** | [![unit-test](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml) |
| **Uranium {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml) |
| **CuraEngine GradualFlow 0.1** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) |
| **synsepalum-dulcificum 0.1** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml) |
| **Cura** | [![unit-test](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml) |
| **CuraEngine** | [![unit-test](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml) |
| **Uranium** | [![unit-test](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml) |
| **CuraEngine GradualFlow** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) |
| **synsepalum-dulcificum** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml) |
| **libSavitar** | [![unit-test](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml) |
| **libnest2d** | [![unit-test](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml) |

# Conan packages

| | |
|------------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **Cura {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml) |
| **CuraEngine {{ branch }}** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml) |
| **Uranium {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml) |
| **fdm_materials {{ branch }}** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml) |
| **cura-binary-data {{ branch }}** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml) |
| **CuraEngine GradualFlow 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) |
| **synsepalum-dulcificum 0.1** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml) |
| **CuraEngine gRPC definitions 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml) |
| **Cura** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml) |
| **CuraEngine** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml) |
| **Uranium** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml) |
| **fdm_materials** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml) |
| **cura-binary-data** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml) |
| **CuraEngine GradualFlow** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) |
| **synsepalum-dulcificum** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml) |
| **CuraEngine gRPC definitions** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml) |
| **libArcus** | [![conan-package](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml) |
| **pyArcus** | [![conan-package](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml) |
| **libSavitar** | [![conan-package](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml) |
Expand Down
6 changes: 3 additions & 3 deletions resources/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ def package(self):

def package_info(self):
self.cpp_info.includedirs = []
self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res"))
self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions"))
self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders"))
self.runenv_info.define("CURA_RESOURCES", os.path.join(self.package_folder, "res"))
self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions"))
self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders"))

def package_id(self):
self.info.clear()
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.25_ASA_fast.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.25_ASA_fine.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.25_PVA_fast.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.25_PVA_fine.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.25_TPU_fast.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.25_TPU_fine.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.25mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.30_ASA_fast.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.30_ASA_fine.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.30_PVA_fast.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.30_PVA_fine.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = extrafine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.30_TPU_fast.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.30_TPU_fine.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.30mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.35_ASA_fast.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.35_ASA_fine.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.35_PVA_fast.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.35_PVA_fine.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_pva
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.35_TPU_fast.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.35_TPU_fine.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_tpu
quality_type = normal
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.35mm

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = extrafast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.40_ASA_fast.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fast
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

Expand Down
2 changes: 1 addition & 1 deletion resources/quality/voron2/voron2_v6_0.40_ASA_fine.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version = 4
[metadata]
material = generic_asa
quality_type = fine
setting_version = 23
setting_version = 24
type = quality
variant = V6 0.40mm

Expand Down
Loading

0 comments on commit 1a2de1b

Please sign in to comment.