GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 03:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,347 Commits 290 Branches 260 Tags
Commit Graph

356 Commits

Author SHA1 Message Date
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
jspijker
207d111915 No fuzzy matching again 
Contribute to CURA-10208
 2023-03-06 10:08:45 +01:00
jspijker
9162ea745f No wrap and sort by file 
Contributes to CURA-10208
 2023-03-03 13:16:42 +01:00
jspijker
5f6a3a44ff Revert "Use cura_10317 channel" 
This reverts commit 004213723eb8f1f4cafe8de00fdc3d163458741e.
 2023-02-27 16:33:11 +01:00
jspijker
8d20626fd4 Merge branch 'main' into CURA-10317_other_inconsitent_material_profiles_in_internal_builds 2023-02-27 16:32:38 +01:00
jspijker
004213723e Use cura_10317 channel 
Revert after merge to main

Contribute to CURA-10317
 2023-02-27 15:21:10 +01:00
jspijker
93564ac008 deploy cura resources 
Contributes to CURA-10317 Inconsitent material profiles in internal builds
 2023-02-24 14:42:00 +01:00
jspijker
a7a26c5670 Clear the info as you would clear a header only lib 
Contributes to CURA-10317 Inconsitent material profiles in internal builds
 2023-02-24 11:38:53 +01:00
jspijker
a6ede540e8 Move staging urls out-of conanfile 
Contributes to CURA-10317 Inconsitent material profiles in internal builds
 2023-02-24 11:35:46 +01:00
Jelle Spijker
b896a7231e Merge branch '5.3' 
# Conflicts:
#	conanfile.py
 2023-02-23 17:12:21 +01:00
Jelle Spijker
de51e02fe6 Revert "Revert "Use latest stable packages"" 
This reverts commit 9140553e70249b30dcccf9b31b3d6c17d22d43c2.
 2023-02-23 17:10:09 +01:00
Jelle Spijker
9140553e70 Revert "Use latest stable packages" 
This reverts commit 6c7223f92b13bf54e3a5a7f72dae37313503abe8.
 2023-02-23 16:41:24 +01:00
Jelle Spijker
b0cc2f2822 clear the info 2023-02-23 16:41:01 +01:00
jspijker
16a3c3715e Don't build with conan higher then 1.56 2023-02-23 15:39:17 +01:00
jspijker
6c7223f92b Use latest stable packages 
- uranium
- curaengine
- fdm_materials
 2023-02-23 15:38:28 +01:00
jspijker
2853d71af8 Pin conan version to 1.56.0 or lower 2023-02-23 15:31:33 +01:00
jspijker
28ab2a98c6 Merge branch '5.3' 2023-02-23 15:26:19 +01:00
Remco Burema
5970524b3a Merge branch '5.3' 2023-02-23 13:41:00 +01:00
Jelle Spijker
096bdc43e5 Fixed typo 2023-02-23 13:24:30 +01:00
jspijker
04f5aa04b8 Only update po on Windows 2023-02-23 10:57:20 +01:00
jspijker
422fd1a00b Add po files 2023-02-23 02:07:36 +01:00
jspijker
e3a347f47c build mo to LC_MESSAGES 2023-02-23 01:41:46 +01:00
jspijker
eec81bf027 using package folder during deploy 2023-02-23 00:57:44 +01:00
jspijker
e03888fd47 don't copy the cura_app during deplo 2023-02-23 00:38:42 +01:00
jspijker
b93c2ce56f copy cura_appy.py during generation to Script/bin 2023-02-22 23:56:27 +01:00
jspijker
818a00d4b4 copy cura_appy.py during generation to Script/bin 2023-02-22 23:33:09 +01:00
jspijker
adac0c52a2 copy cura_appy.py during generation to bin 2023-02-22 23:20:49 +01:00
jspijker
f2649bc7ce fix install path 2023-02-22 23:06:47 +01:00
jspijker
4a3c3df892 Fixed mo generating location 2023-02-22 22:14:03 +01:00
jspijker
88da5300ef Fixed paths 2023-02-22 21:52:25 +01:00
jspijker
065e785e90 Fixing Paths 
To custom for it
 2023-02-22 21:43:28 +01:00
jelle Spijker
132fbe0e17 Fix building translations 2023-02-22 21:05:05 +01:00