3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '5.5'

Browse source 
# Conflicts:
#	conanfile.py
This commit is contained in:
Jelle Spijker 2023-10-10 12:24:18 +02:00
commit 73900d33a2
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
7 changed files with 150 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conanfile.py
View file

@ -305,7 +305,7 @@ class CuraConan(ConanFile):
def requirements(self):
self.requires("boost/1.82.0")
self.requires("curaengine_grpc_definitions/latest@ultimaker/testing")
self.requires("curaengine_grpc_definitions/(latest)@ultimaker/testing")
self.requires("zlib/1.2.13")
self.requires("pyarcus/5.3.0")
self.requires("curaengine/(latest)@ultimaker/testing")