GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-19 20:29:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
36,308 Commits 287 Branches 260 Tags
Commit Graph

437 Commits

Author SHA1 Message Date
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
Jelle Spijker
b7498e81a9
set version to 5.4.0-alpha when None 2023-03-29 08:00:50 +02:00
Jelle Spijker
734d72dcc8
Modernize copy during deploy 
Contributes to CURA-10317
 2023-03-28 10:51:48 +02:00
Jelle Spijker
2d5be9a88a
copy cura from the package folder 
Contributes to CURA-10317
 2023-03-27 13:44:26 +02:00
Jelle Spijker
d9bc5e0ad6
Fix missing jinja templates 
Contributes to CURA-10317
 2023-03-27 13:15:21 +02:00
Jelle Spijker
51b81a9fd8
don't use format 
The install command at the private repo, can't
seem to override it from the commandline then

Contributes to CURA-10317
 2023-03-27 12:37:40 +02:00
Jelle Spijker
d2644df7b6
Make it work with the export_sources method 
Contributes to CURA-10317
 2023-03-27 11:54:10 +02:00
Jelle Spijker
1f4956de1b
Make it work with the export_sources method 
Contributes to CURA-10317
 2023-03-27 11:46:39 +02:00
Jelle Spijker
c2721abf87
use copy_deps for copying curaengine 
conf doesn't work as expected in Conan<2.0

Contributes to CURA-10317
 2023-03-27 11:24:24 +02:00
Jelle Spijker
b88576bd25
Merge branch 'main' into CURA-10317_other_inconsitent_material_profiles_in_internal_builds 2023-03-27 10:56:13 +02:00
Jelle Spijker
b0f20b8b91
Use the curaengine from the CURA-10415 branch 
Contributes to CURA-10415
 2023-03-23 12:09:57 +01:00
Jelle Spijker
7a15e5098f
Merge branch '5.3' 2023-03-08 13:25:22 +01:00
Jelle Spijker
684da999f6
re-added the bindirs 
For some reason the paths aren't found by the py_requires

Contributes to CURA-10376
 2023-03-08 13:24:23 +01:00
Jelle Spijker
769ff3c736
Merge branch '5.3' 2023-03-08 11:28:58 +01:00
Jelle Spijker
b4632f67a2
run gettext with force_host_context 
Contributes to CURA-10376
 2023-03-08 11:05:04 +01:00
Jelle Spijker
d56edc2d16
Unpinned dependencies for the 5.3.1 development 2023-03-08 09:11:19 +01:00
Jelle Spijker
7fc7b238cd
Merge branch '5.3' 2023-03-08 09:09:02 +01:00
Jelle Spijker
5845059612
Use the latest gettext conan recipe 
Slightly modified to be compatible with our conan version

Contributes to CURA-10376
 2023-03-08 08:58:07 +01:00
Jelle Spijker
0f19f00805
Set version for development 2023-03-08 08:12:29 +01:00
jspijker
8a73fa8935 Pin 5.3.0 dependencies 2023-03-07 11:55:04 +01:00
jspijker
4bc11c5138 Merge remote-tracking branch 'origin/5.3' 
# Conflicts:
#	conanfile.py
 2023-03-06 23:13:21 +01:00
jspijker
3e8cc7b78f Use translationextractor 2.0.0 
Contribute to CURA-10208
 2023-03-06 21:43:26 +01:00
jspijker
877ced17cc Fixes for translations 
We don't have a conan_data.yml anymore

Contribute to CURA-10208
 2023-03-06 20:10:25 +01:00
jspijker
f2dd3154e4 Use translationextractor 1.1.0 
Contribute to CURA-10208
 2023-03-06 16:55:29 +01:00