Merge branch 'main' into CURA-11622_conan_v2

Ultimaker · Sep 18, 2024 · 06aaec3 · 06aaec3
2 parents 4d44cc6 + 9d697d6
commit 06aaec3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -5,6 +5,7 @@ on:
     paths:
       - '**/*.proto'
       - 'conanfile.py'
+      - 'conandata.yml'
       - 'CMakelists.txt'
       - '.github/workflows/conan-package.yml'
       - '.github/workflows/requirements*.txt'

diff --git a/conandata.yml b/conandata.yml
@@ -1 +1 @@
-version: 0.2.0-alpha.0
+version: 0.2.1
diff --git a/cura/plugins/v0/gcodepath.proto b/cura/plugins/v0/gcodepath.proto
@@ -40,4 +40,6 @@ message GCodePath {
   int64 layer_thickness = 19;
   double flow_ratio = 20;
   bool is_bridge_path = 21;
+  int64 z_offset = 22;
+  bool retract_for_nozzle_switch = 23;
 }
diff --git a/include/folder.placeholder b/include/folder.placeholder
@@ -0,0 +1 @@
+NOTE: Dependant packages expect an 'include' folder, but git doesn't include empty folders.