diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt index 26d167db2b..48121932b8 100644 --- a/.github/workflows/requirements-conan-package.txt +++ b/.github/workflows/requirements-conan-package.txt @@ -1,2 +1,2 @@ conan==1.56.0 -sip +sip==6.7.1 diff --git a/conanfile.py b/conanfile.py index bcb276832b..7725ade370 100644 --- a/conanfile.py +++ b/conanfile.py @@ -302,10 +302,10 @@ class CuraConan(ConanFile): def requirements(self): self.requires("boost/1.81.0") - self.requires("pyarcus/(latest)@ultimaker/cura_10475") - self.requires("curaengine/(latest)@ultimaker/cura_10475") - self.requires("pysavitar/5.2.2") - self.requires("pynest2d/5.2.2") + self.requires("pyarcus/(latest)@ultimaker/cura_10951") + self.requires("curaengine/(latest)@ultimaker/cura_10446") + self.requires("pysavitar/(latest)@ultimaker/cura_10951") + self.requires("pynest2d/(latest)@ultimaker/cura_10951") self.requires("uranium/(latest)@ultimaker/cura_10475") self.requires("cura_binary_data/(latest)@ultimaker/testing") self.requires("cpython/3.10.4") diff --git a/plugins/CuraEngineBackend/Cura.proto b/plugins/CuraEngineBackend/Cura.proto index f60a7f96d8..54c322fa0a 100644 --- a/plugins/CuraEngineBackend/Cura.proto +++ b/plugins/CuraEngineBackend/Cura.proto @@ -13,6 +13,7 @@ enum SlotID { SIMPLIFY_MODIFY = 100; POSTPROCESS_MODIFY = 101; INFILL_MODIFY = 102; + GCODE_PATHS_MODIFY = 103; INFILL_GENERATE = 200; }