3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
34789 commits 304 branches 270 tags 779 MiB
Commit graph

34789 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jelle Spijker
20ab319ec0
Use default values from cura-workflows 
Contributes to CURA-10831
 2023-12-04 16:31:50 +01:00
Jelle Spijker
e904123b80
Use Uranium CURA-11137 
Contribute to CURA-11137
 2023-12-04 14:41:46 +01:00
Jelle Spijker
832b3ea7e5
Merge branch 'CURA-10831' into CURA-11137_update_pyqt6 
# Conflicts:
#	conanfile.py
 2023-12-04 14:38:04 +01:00
Jelle Spijker
7a4d26452a
Fix testing against literal instead of value 
Contribute to CURA-10831
 2023-12-04 14:00:42 +01:00
Jelle Spijker
2d3ef87a47
Use the latest stable dulcificum build 
Contribute to CURA-10831
 2023-12-04 13:54:08 +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 ba9e122f6a.
 2023-12-04 13:48:05 +01:00
Jelle Spijker
7f1158c364
Use cura-workflow OS installers 
Contribute to CURA-10831
 2023-12-04 13:43:30 +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
Saumya Jain
28f55e05fa
Merge branch 'main' into CURA-7647-play-simulation-time-dependent 2023-12-04 10:52:42 +01:00
Erwan MATHIEU
421f3ee5b5
Merge pull request #17488 from Ultimaker/CURA-11080_use_openssl_3 
Cura 11080 use openssl 3
 2023-12-04 10:45:41 +01:00
Jelle Spijker
b19d5d47d3
Use dulcificum 0.1.1-beta.0 
Contributes to CURA-10831
 2023-12-04 10:22:44 +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
4d97e779ed Use process-pull-request workflow 
Contribute to CURA-10831
 2023-12-01 16:18:44 +01:00
c.lamboo
19b75b96fb unpin dulcificum 
CURA-11288
 2023-12-01 16:13:19 +01:00
c.lamboo
34aecf20fe pin uranium 
CURA-11288
 2023-12-01 13:04:49 +01:00
c.lamboo
4b4b8b3514 Update nsi installer 
CURA-11288
 2023-12-01 13:03:40 +01:00
jellespijker
b847cf626b Use working CURA-10831 packages 
Contribute to CURA-10831
 2023-12-01 11:29:02 +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
c.lamboo
cf6874c984 Use the HttpRequestManager to avoid blocking the main thread 
CURA-11289
 2023-12-01 10:53:30 +01:00
Jelle Spijker
31d48aabe7
Use Qt6.6 and PyQt6.6 
Contributes to CURA-11137
 2023-12-01 09:15:21 +01:00
Jelle Spijker
79c7db3e6f
Use Uranium workign branch CURA-11137 
Contributes to CURA-10831 and CURA-11137
 2023-12-01 08:13:30 +01:00
Jelle Spijker
afc8c04935
Merge branch 'CURA-11080_use_openssl_3' into CURA-11137_update_pyqt6 2023-12-01 08:08:21 +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
Jelle Spijker
b629669f77
Use sip<=6.7.12 
6.8.0 seams to have bug which is botching up building pyArcus

Contribute to CURA-11080
 2023-12-01 07:51:31 +01:00
c.lamboo
a442228f38 Open file on url scheme 
CURA-11289
 2023-11-30 22:45:18 +01:00
Paul Kuiper
66ad006bc5 Reduced line width of the middle raft layer from 1.2 to 0.4 
Increase speed from 27.5mm/s to 90mm/s.
 2023-11-30 14:15:00 +01:00
c.lamboo
d93d66dd8a Use sentry cura engine version 
CURA-11364
 2023-11-30 13:45:21 +01:00
c.lamboo
ad871c627e Don't open file on open file event 
CURA-11288
 2023-11-30 13:42:48 +01:00
c.lamboo
87caa0307a Display message on open file event 
CURA-11288
 2023-11-30 13:28:33 +01:00
c.lamboo
2b5f8b3a7c Remove deprecated createAndRemoveOnUninstall action from wix installer 
CURA-11288
 2023-11-30 13:23:37 +01:00
c.lamboo
1e190ebcb9 Format file 
CURA-1364
 2023-11-30 13:16:25 +01:00
Paul Kuiper
d1f4aa6cd3 PP-397 Adjust z shrinkage factor for the PET-CF annealing intent from 2.0 to 0.9% 2023-11-30 13:03:22 +01:00
Jelle Spijker
7573c3e994 Build OpenSSL 3 shared 
No longer a need to deploy a shared dep
independently.

Contribute to CURA-11080
 2023-11-30 12:58:47 +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
c.lamboo
d53b2d94ab Add directory for wix components 
CURA-11288
 2023-11-30 11:51:35 +01:00
c.lamboo
ed378f61ed Merge branch 'main' into CURA-11288 2023-11-30 11:15:00 +01:00
c.lamboo
b9f8ef9bc2 Merge branch 'main' into CURA-11364_add_sentry_engine 2023-11-30 11:02:46 +01:00
c.lamboo
29193d833c Revert "enable_sentry in install commands" 
This reverts commit 2f452c6581.
 2023-11-30 11:01:51 +01:00
c.lamboo
d00c3fea78 Merge branch 'main' into CURA-11364_add_sentry_engine 2023-11-30 10:25:32 +01:00
c.lamboo
a87ad75edc Merge remote-tracking branch 'origin/main' 2023-11-30 10:02:01 +01:00
c.lamboo
2f452c6581 enable_sentry in install commands 2023-11-30 10:01:20 +01:00
Casper Lamboo
1dc350012d
Merge branch 'main' into CURA-11364_add_sentry_engine 2023-11-30 09:29:47 +01:00
Jelle Spijker
ff19142fdf
Don't try to copy non existing openssl 
Contributes to CURA-10831
 2023-11-30 07:16:15 +01:00
Jelle Spijker
b65cd0181f Disable shared openssl for Windows 
Temp fix

Contributes to CURA-10561
 2023-11-29 22:14:18 +01:00
Jelle Spijker
ac55306d0b
Use Dulcificum 0.1.0-beta.1 2023-11-29 18:44:11 +01:00
Jelle Spijker
1a945fe066
Update linux.yml 2023-11-29 17:04:58 +01:00
Jelle Spijker
0d3a926259
Update linux.yml 2023-11-29 16:22:03 +01:00