GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 05:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,696 Commits 287 Branches 260 Tags
Commit Graph

360 Commits

Author SHA1 Message Date
Remco Burema
2de0a9711a Require packages from main branches instead of from CURA-10915. 2023-09-08 22:52:41 +02:00
Jelle Spijker
f1df7f67d5
deploy packaging scripts 
Contributes CURA-10951
 2023-09-05 05:20:34 +02:00
Jelle Spijker
7fbd716bb4
Bundling the Gradualflow plugin 
This commit simplifies the deploy method in conanfile.py by reducing the number of lines of code and refactor the
handling of the Gradualflow plugin in the deploy method. In conandata.yml, the paths for the Gradualflow plugin
resources have been adjusted for correct deployment. This update aims to fix the pyinstaller deployment failures
associated with the Gradualflow plugin. It resolves the CURA-10951 tracking issue.

Contributes CURA-10951
 2023-09-05 05:11:51 +02:00
jellespijker
5cf2ecc666 Only use shared grpc defs on Linux 
Contributes to CURA-10951
 2023-08-31 08:40:11 +02:00
jellespijker
f958d69f1c Override zlib version to 1.2.13 
fixes incompatible mismatch in versions between pyarcus and protobuf

Contributes to CURA-10951
 2023-08-31 06:17:15 +02:00
jellespijker
f2948338ae Use shared curaengine_grpc_definitions 
Although not a direct dependency of Cura, still need to define it here,
such that we can set it as shared for all dependencies.
Needed to overcome the issues with glibc and static compiling of the
gradual flow plugin on ubuntu 20.04 with gcc-13

Contributes to CURA-10951
 2023-08-31 06:01:16 +02:00
Jelle Spijker
3305044b74 Merge branch 'CURA-10475_engineplugin' into CURA-10951_gh_build_curapackage 2023-08-31 05:57:22 +02:00
jellespijker
fc1135d919 Use CURA-10475 engine conan package 
Contributes to CURA-10951
 2023-08-31 05:56:46 +02:00
Jelle Spijker
2d389a6819 Windows packaging 
Contributes to CURA-10951
 2023-08-30 16:51:56 +02:00
Jelle Spijker
c62e392c81 use Windows slashes on Windows 
Contributes to CURA-10951
 2023-08-30 13:09:22 +02:00
Jelle Spijker
c30c403a65 Don't exclude 
Contributes to CURA-10951
 2023-08-30 13:04:01 +02:00
Jelle Spijker
4517364eb3 Copy the bundled external package info 
Contributes to CURA-10951
 2023-08-30 11:31:14 +02:00
jellespijker
0210b06fbb Pyinstaller package directories from the instal directory 
Contributes to CURA-10951
 2023-08-30 10:51:53 +02:00
jellespijker
eeb3050e08 Change the order of plugin deploy 
Contributes to CURA-10951
 2023-08-30 10:44:28 +02:00
Jelle Spijker
ae2e1ec314 Merge branch 'main' into CURA-10475_engineplugin 
# Conflicts:
#	.github/workflows/requirements-conan-package.txt
#	conanfile.py
 2023-08-29 17:44:50 +02:00
Jelle Spijker
d3809f8bd7 Still a header only 
Contributes to CURA-10951
 2023-08-29 16:18:47 +02:00
Jelle Spijker
87b6ad63a7 Merge remote-tracking branch 'origin/main' into CURA-10951_gh_build_curapackage 
# Conflicts:
#	conanfile.py
 2023-08-29 16:13:39 +02:00
saumya.jain
d80e349f0b source_folder as root for materials 
conan build fix
 2023-08-29 15:27:47 +02:00
Jelle Spijker
2f2b88fd24 Use the source_folder as a rootfor materials 
Contributes to CURA-10951
 2023-08-29 15:25:32 +02:00
saumya.jain
0397095789 pyarcus pynest2d and pysavitar version changed 
conan build fix
 2023-08-29 15:18:59 +02:00
Jelle Spijker
89fe3d2777 Don't use the import method 
This will be deprecated, since we are also using self.dependencies we
should do this in the generate.

Contributes to CURA-10951
 2023-08-29 13:07:23 +02:00
Jelle Spijker
df9e4564d2 Merge branch 'CURA-10446_modify_gcode_path' into CURA-10951_gh_build_curapackage 
# Conflicts:
#	.github/workflows/requirements-conan-package.txt
#	conanfile.py
 2023-08-29 10:17:41 +02:00
Jelle Spijker
8a4dd000f1 Use pysavitar from CURA-10951 
Contributes to CURA-10951 and CURA-10446
 2023-08-29 09:26:08 +02:00
Jelle Spijker
ea43f61ae4 Use pynest from CURA-10951 
Contributes to CURA-10951 and CURA-10446
 2023-08-29 09:03:39 +02:00
Jelle Spijker
2f166a545c Use pyarcus from CURA-10951 
Contributes to CURA-10951 and CURA-10446
 2023-08-29 08:25:35 +02:00
Jelle Spijker
7cb2e96b63 Use pyarcus 10951 
Contributes to CURA-10951 and CURA-10446
 2023-08-29 08:24:01 +02:00
Jelle Spijker
d7a218b302
Bundle the gradualflow plugin 
Contributes CURA-10466
 2023-08-28 15:36:46 +02:00
Jelle Spijker
247025ffc4
Use curaengine from cura_10446 
Contributes CURA-10466
 2023-08-28 13:49:40 +02:00
c.lamboo
0667230055 Merge branch 'main' into CURA-10475_engineplugin 2023-08-11 10:20:11 +02:00
saumya.jain
f2a1830ad9 testing for build 
CURA-10770
 2023-08-08 15:05:53 +02:00
saumya.jain
64a77440da from deploy field. 
CURA-10770
 2023-08-08 13:42:31 +02:00
Jelle Spijker
0fc507e556
Merge branch 'main' into CURA-10475_engineplugin 2023-08-07 16:01:21 +02:00
Casper Lamboo
84bcdc3bf4
Merge pull request #16331 from Ultimaker/CURA-10770_Developer_about_dialog 
Fixed for all the used python packages in venv
 2023-08-07 14:28:15 +02:00
Jelle Spijker
c6fb3fe59c
Merge branch 'main' into CURA-10475_engineplugin 2023-08-07 09:05:15 +02:00
Jelle Spijker
ce82033f6a
exclude the correct conan versions 2023-08-07 08:21:03 +02:00
saumya.jain
a6780b5417 Review comments fixed 
CURA-10770
 2023-08-02 10:45:02 +02:00
saumya.jain
1442031e28 Review comments fixed 
CURA-10770
 2023-08-02 09:24:42 +02:00
Jelle Spijker
730dec8d86
Merge branch 'main' into CURA-10475_engineplugin 2023-08-01 15:58:02 +02:00
Jelle Spijker
0f7b092507
Allow for using Conan 1.60 
Contributes CURA-10475
 2023-08-01 07:47:51 +02:00
saumya.jain
e686baaf92 Fixed for all the used python packages in venv 
CURA-10770
 2023-07-31 11:47:15 +02:00
Jaime van Kessel
d08e2bc018
Increased max conan version to 1.60.0 
For some magical reason, i got issues with 1.56.0. It used to work
but when I needed to do a conan install, it suddenly failed to install
any python packages, claiming I didn't have openssl.
 2023-07-28 11:16:51 +02:00
Casper Lamboo
e5f5011f82
Attempt to fix build 2023-07-26 11:00:40 +02:00
saumya.jain
0c7d0540b9 Cura about dialog when shaked gives extra info 
CURA-10770
 2023-07-25 11:20:58 +02:00
Jelle Spijker
fad3d09b95
specify boost version in root package 
Solve version conflict with libnest2d
 2023-07-18 12:41:34 +02:00
Jelle Spijker
cd08e6e3bf
Use pyarcus from branch CURA-10475 2023-07-18 12:31:02 +02:00
Jelle Spijker
8c5278ab1d
Use the branch dependencies 
Contributes to CURA-10717 and CURA-10475
 2023-07-12 18:39:32 +02:00
Jelle Spijker
974ea889ca
Update version for main 2023-06-06 15:41:56 +02:00
Jelle Spijker
7f6bb7aa42
use curaengine latest 2023-04-27 14:18:38 +02:00
Jelle Spijker
59d0fb68ea
Merge remote-tracking branch 'origin/main' into CURA-10415_main_based_update_tree 
# Conflicts:
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po
 2023-04-08 10:20:12 +02:00
Remco Burema
c3ca642a78
Merge pull request #15057 from Ultimaker/CURA-10317_other_inconsitent_material_profiles_in_internal_builds 
Cura 10317 other inconsistent material profiles in internal builds
 2023-03-29 20:54:21 +02:00