3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'main' into CURA-10317_other_inconsitent_material_profiles_in_internal_builds

Browse source
This commit is contained in:
jspijker 2023-02-27 16:32:38 +01:00
commit 8d20626fd4
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
conanfile.py
View file

@ -278,11 +278,11 @@ class CuraConan(ConanFile):
self.requires("pysavitar/5.2.2")
self.requires("pynest2d/5.2.2")
self.requires("uranium/(latest)@ultimaker/testing")
self.requires("fdm_materials/(latest)@{}/testing".format("internal" if self.options.internal else "ultimaker"))
self.requires("fdm_materials/(latest)@{}/cura_10317".format("internal" if self.options.internal else "ultimaker"))
self.requires("cura_binary_data/(latest)@ultimaker/testing")
self.requires("cpython/3.10.4")
if self.options.internal:
self.requires("cura_private_data/(latest)@ultimaker/testing")
self.requires("cura_private_data/(latest)@ultimaker/cura_10317")
def build_requirements(self):
if self.options.devtools: