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

360 Commits

Author SHA1 Message Date
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
Jelle Spijker
aaa8d0cf03
Merge branch 'main' into CURA-10561-makerbot 
# Conflicts:
#	conanfile.py
 2023-10-28 08:24:27 +02:00
Jelle Spijker
edb38aa5f3
Use internal user cura_private_data 
Easier to filter upon

Contributes to CURA-10561
 2023-10-28 08:13:55 +02:00
Jelle Spijker
cdb581a80b
Use CURA-10561 private data branch 
Contributes to CURA-10561
 2023-10-26 17:31:20 +02:00
Jelle Spijker
494543a7d7
Use CURA-10561 Uranium 
Contributes to CURA-10561
 2023-10-26 16:23:04 +02:00
Jelle Spijker
b2ced7c0ba
Install pyDulcificum 
Contributes to CURA-10561
 2023-10-26 16:09:38 +02:00
Jelle Spijker
69f474a426
Merge branch 'main' into CURA-10561-makerbot 2023-10-26 15:27:25 +02:00
Casper Lamboo
15e7bb1f07
Pin gradual flow 2023-10-26 14:11:44 +02:00
Jelle Spijker
6d0332e895
use the latest 0.1.x stable gradual flow plugin 2023-10-25 22:41:28 +02:00
c.lamboo
e7188c2f9f Find python dependencies directly in python 
CURA-10561
 2023-10-19 21:54:50 +02:00
c.lamboo
6f1adaad43 Make Conan/Python installs available for whole project and not just the AboutDialog 
Generation of dependency list now happens in
Also cleaned up the AboutDialog.qml

CURA-10561
 2023-10-19 18:39:08 +02:00
Jaime van Kessel
9f1be535eb
Merge branch '5.5' of github.com:Ultimaker/Cura 2023-10-11 15:36:16 +02:00
Casper Lamboo
b81e1b8741
Merge pull request #16829 from Ultimaker/CURA-10994_translations_v5p5 
[CURA-10994] Translations for 5.5.x
 2023-10-11 10:33:50 +02:00
Jelle Spijker
73900d33a2
Merge branch '5.5' 
# Conflicts:
#	conanfile.py
 2023-10-10 12:24:18 +02:00
Jelle Spijker
57b581d19b
Revert "Revert "loosen versions to latest stable"" 
This reverts commit e2578554e6fb6f4f8d02f6396f003e93d6993cfb.
 2023-10-10 12:23:18 +02:00
Jelle Spijker
e2578554e6
Revert "loosen versions to latest stable" 
This reverts commit 8d34bcdeb55df5098dbc58913de235b372b64c90.
 2023-10-10 11:18:40 +02:00
Jelle Spijker
8d34bcdeb5
loosen versions to latest stable 2023-10-10 11:03:02 +02:00
Jelle Spijker
0f770aca15
set version to 5.6.0-alpha 2023-10-10 11:00:49 +02:00
Jelle Spijker
72bba90e73
Pin versions 2023-10-10 10:53:38 +02:00
c.lamboo
fe3024c273 Disable re-generation of pot files 
CURA-10994
 2023-10-02 10:31:53 +02:00
jellespijker
24e1cfa2b7 Use testing for dependencies on main 
Otherwise, we will use the same dependencies for 5.5.0-beta. Such as CuraEngine and fdm_materials etc.
 2023-09-29 15:25:48 +02:00
Casper Lamboo
18be6e3c0b
Update conanfile.py 2023-09-20 18:38:58 +02:00
Jelle Spijker
5a89a436d6
install bundled gradual plugin next to curaengine exec 
Contributes CURA-11038
 2023-09-20 17:00:19 +02:00
j.spijker@ultimaker.com
58fabecaa8 Pin the specific stable versions 2023-09-20 14:59:04 +02:00
Remco Burema
7633ebf704 Start 5.5.x release branch. 2023-09-20 14:01:36 +02:00
j.spijker@ultimaker.com
8c2f2209dd Install full plugin for development 2023-09-20 12:48:57 +02:00
Jelle Spijker
8126b9a6f6
Use testing package from Uranium and CuraEngine 
Contributes to CURA-10475 and CURA-10591
 2023-09-11 12:24:37 +02:00
Jelle Spijker
038a8358b1
Pin pyArcus, pySavitar and pynestd2d to released 5.3.0 
Contributes CURA-10951 and CURA-10475
 2023-09-11 08:23:43 +02:00