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 '5.6'

Browse source 
# Conflicts:
#	conanfile.py
This commit is contained in:
Jelle Spijker 2023-10-31 19:56:39 +01:00
commit 02326cf892
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
49 changed files with 72443 additions and 68890 deletions
Download patch file Download diff file Expand all files Collapse all files

8
conanfile.py
View file

@ -297,7 +297,7 @@ class CuraConan(ConanFile):
def requirements(self):
self.requires("boost/1.82.0")
self.requires("fmt/9.0.0")
self.requires("curaengine_grpc_definitions/(latest)@ultimaker/testing")
self.requires("curaengine_grpc_definitions/0.1.0")
self.requires("zlib/1.2.13")
self.requires("pyarcus/5.3.0")
self.requires("dulcificum/(latest)@ultimaker/stable")
@ -305,14 +305,14 @@ class CuraConan(ConanFile):
self.requires("pysavitar/5.3.0")
self.requires("pynest2d/5.3.0")
self.requires("curaengine_plugin_gradual_flow/0.1.0")
self.requires("uranium/(latest)@ultimaker/testing")
self.requires("cura_binary_data/(latest)@ultimaker/testing")
self.requires("uranium/(latest)@ultimaker/stable")
self.requires("cura_binary_data/(latest)@ultimaker/stable")
self.requires("cpython/3.10.4")
if self.options.internal:
self.requires("cura_private_data/(latest)@internal/testing")
self.requires("fdm_materials/(latest)@internal/testing")
else:
self.requires("fdm_materials/(latest)@ultimaker/testing")
self.requires("fdm_materials/(latest)@ultimaker/stable")
def build_requirements(self):
if self.options.get_safe("enable_i18n", False):