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
8aa6d2c5b6
Update conan_data with actual version 
Contributes to CURA-10831
 2023-12-05 07:44:04 +01:00
Jelle Spijker
b678951759
Applied work-around for GH true/false instead of True/False 
Contributes to CURA-10831
 2023-12-04 18:15:50 +01:00
c.lamboo
58c174ff68 pin dulcificum to 0.1.0-beta.2 2023-12-04 13:49:02 +01:00
c.lamboo
89be765841 Revert "unpin dulcificum" 
This reverts commit ba9e122f6add419824e6fc03d55df40766d4e71d.
 2023-12-04 13:48:05 +01:00
c.lamboo
ba9e122f6a unpin dulcificum 2023-12-04 11:45:12 +01:00
Jelle Spijker
a0f161cd18
Merge branch 'main' into CURA-10831 
# Conflicts:
#	conanfile.py
 2023-12-04 11:05:10 +01:00
Erwan MATHIEU
7d04a988b1
Merge branch 'main' into CURA-11080_use_openssl_3 2023-12-04 10:09:56 +01:00
jellespijker
bffbded591 Override spdlog version 2023-12-01 17:42:27 +01:00
jellespijker
806eba0c6b Merge remote-tracking branch 'origin/CURA-11080_use_openssl_3' into CURA-10831 
# Conflicts:
#	conanfile.py
 2023-12-01 11:27:05 +01:00
Jelle Spijker
10b69e801e
Openssl shared on Linux static for the rest 
Contribute to CURA-11080
 2023-12-01 07:51:31 +01:00
c.lamboo
d93d66dd8a Use sentry cura engine version 
CURA-11364
 2023-11-30 13:45:21 +01:00
c.lamboo
1e190ebcb9 Format file 
CURA-1364
 2023-11-30 13:16:25 +01:00
Jelle Spijker
ef5bc6d3d5 Use custom CPython 3.10.4 and OpenSSL 3.2.0 
Due to changes made to the recipes up stream,
and some tweaks to our own cpython recipe.

We can now build cpython with the newest OpenSSL version

Contribute to CURA-11080
 2023-11-30 12:57:14 +01:00
Casper Lamboo
1dc350012d
Merge branch 'main' into CURA-11364_add_sentry_engine 2023-11-30 09:29:47 +01:00
Jelle Spijker
ac55306d0b
Use Dulcificum 0.1.0-beta.1 2023-11-29 18:44:11 +01:00
Jelle Spijker
37a4c5d19a
Merge branch 'main' into CURA-10831 
# Conflicts:
#	.github/workflows/conan-package-create.yml
#	.github/workflows/conan-package.yml
 2023-11-29 15:18:39 +01:00
Jelle Spijker
50fe469122
Use CCI gettext 
Contributes to CURA-10831
 2023-11-28 17:30:15 +01:00
Jaime van Kessel
344d648445
Merge branch '5.6' of github.com:Ultimaker/Cura 2023-11-27 12:40:56 +01:00
Jelle Spijker
1f6edc42c9
Merge branch 'main' into CURA-10831 
# Conflicts:
#	conanfile.py
 2023-11-27 08:03:07 +01:00
Jelle Spijker
3811e37c73
Use updated translation tools 
These also take bundled plugin settings into account

Contribute to CURA-11300
 2023-11-24 12:59:46 +01:00
c.lamboo
4ce092837e Merge branch '5.6' 
# Conflicts:
#	conanfile.py
 2023-11-24 10:24:52 +01:00
Jelle Spijker
b7c1022ed1
Use conf to get Cura version 2023-11-24 10:20:46 +01:00
Jelle Spijker
1d8918f30d
Use conf to get i18n options 
This will give us more finegrained control
if we want the pot files extracted
or build the mo files

Contributes to CURA-11300
 2023-11-24 10:18:23 +01:00
Jelle Spijker
f22d82c1e0
Use CURA-11634 for CuraEngine 
Contributes to CURA-11364
 2023-11-21 13:27:26 +01:00
Jelle Spijker
3bd2ea4296
Pin dulcificum version 
Contributes to CURA-11364
 2023-11-21 13:22:18 +01:00
Jelle Spijker
3052c6be3b
Enable Sentry for the engine if the conan con sentry_url is set 
If you want to test this locally do a conan install with:

```
-c user.curaengine:sentry_url=<sentry_url>
```

The URL is stored in the CuraEngine repository variables

Contributes to CURA-11364
 2023-11-21 13:21:25 +01:00
Casper Lamboo
9144c1d178
Merge pull request #17264 from Ultimaker/CURA-11300_translations_v5p6 
[CURA-11300] Officially supported languages' translations for v5.6.x
 2023-11-17 10:33:10 +01:00
Jelle Spijker
78cafeca4b
Only check internal requirements when building internal 
Contributes to CURA-10831
 2023-11-16 13:30:26 +01:00
c.lamboo
1950cc65aa Pin dulcificum at beta.1 release 2023-11-16 11:13:14 +01:00
Remco Burema
278206d456 Merge remote-tracking branch 'origin/5.6' into CURA-11300_translations_v5p6 2023-11-15 14:40:32 +01:00
Jelle Spijker
a7d4ba0528
use testing for fdm_material and curaengine 
Contributes to CURA-11269
 2023-11-15 13:54:40 +01:00
Jelle Spijker
4656873e9d
Set working versions to 5.6.0-beta.2 
Contributes to CURA-11269
 2023-11-15 13:46:04 +01:00
Jelle Spijker
b66b032e45
Revert "Pin release versions to 5.6.0-beta.1" 
This reverts commit 2ec70cb6b7837d30560bcb74e2942bbb9ed0c5f1.
 2023-11-15 13:45:25 +01:00
Jelle Spijker
2ec70cb6b7
Pin release versions to 5.6.0-beta.1 
Contributes to CURA-11269
 2023-11-15 11:11:56 +01:00
Jelle Spijker
39e505371e
fix option naming 
should be `enable_i18n`

Contributes to CURA-10831
 2023-11-12 11:08:09 +01:00
Jelle Spijker
1216674728
Modernize conanfile.py 
This commit updates the Uranium dependency in the Conan file and introduces an internationalization (i18n) option.
It refactor the devtool checks to check for the "enable_i18n" option instead.
Lastly, cleanups and adjustments are done in preparation for enabling i18n in the build process.

Contributes to CURA-10831
 2023-11-12 11:00:21 +01:00
Jelle Spijker
1fb1fe9faa
don't set release from conandata.yml 
Contributes to CURA-10831
 2023-11-11 11:59:56 +01:00
Jelle Spijker
2dfe6d7e5d
Set requirements and version with conandata 
This will allow workflow automations to easily create release branches and set the versions

Contributes to CURA-10831
 2023-11-11 08:54:23 +01:00
c.lamboo
ff81fb6ca0 force commit 2023-11-10 15:35:54 +01:00
Remco Burema
b8deb31eb9 Merge branch '5.6' 2023-11-07 15:17:32 +01:00
c.lamboo
51ab740905 Simplify conan install 
CURA-11263
 2023-11-03 14:53:33 +01:00
c.lamboo
293f2ebda9 Revert "Find python dependencies directly in python" 
This reverts commit e7188c2f9f92b6c9a695d850a987aab0bed5de08.
 2023-11-02 16:52:34 +01:00
Jelle Spijker
02326cf892
Merge branch '5.6' 
# Conflicts:
#	conanfile.py
 2023-10-31 19:56:39 +01:00
Jelle Spijker
3e50cee8ec
Bump to 5.7.0-alpha 2023-10-31 19:37:19 +01:00
Jelle Spijker
1e7d332843
Pin versions or point to Stable branches for Cura 5.6 2023-10-31 19:03:50 +01:00
c.lamboo
6a5e01a5fa Uncouple dependencies 
CURA-10561
 2023-10-31 17:33:02 +01:00
Jelle Spijker
16249e490e Allow sideloading of resources via env 
`CURA_DATA_ROOT` and `URANIUM_DATA_ROOT`
This allows the conanfile.py to point to `venv/share/cura`

This functionality is disabled in sys.frozen

Contributes to CURA-10561
 2023-10-29 14:25:06 +01:00
Jelle Spijker
94eb9e1a21 Build dulcificum static on Windows 
Contributes to CURA-10561
 2023-10-29 11:52:27 +01:00
Jelle Spijker
872ce27d8a Give translations their own option 
Only available on bash/zsh environments

Contributes to CURA-10561 - CURA-11117
 2023-10-29 11:51:56 +01:00
Jelle Spijker
64f5f54919
Fix missing pyinstaller spec generation 
Contributes to CURA-10561
 2023-10-28 12:59:18 +02:00