Commit graph

33589 commits

Author SHA1 Message Date
Casper Lamboo
31073b93d8
Merge branch 'main' into CURA-11288 2023-12-07 10:31:23 +01:00
c.lamboo
84d56367f4 Also listen to the "/" appended string for url schemes
Windows adds a slash for some reason

CURA-11288
2023-12-06 13:33:57 +01:00
Casper Lamboo
c4a88a33a7
Merge pull request #17527 from Ultimaker/CURA-11279_fix_arrange_grid
[CURA-11279] Fix arrange in grid
2023-12-06 12:18:32 +01:00
Casper Lamboo
6ebbf67c36
Merge branch 'main' into CURA-11279_fix_arrange_grid 2023-12-06 12:18:22 +01:00
c.lamboo
237d1a899b Revert "Use absolute transformation to set location for arrange"
This reverts commit 920809f064.
2023-12-06 12:10:34 +01:00
c.lamboo
920809f064 Use absolute transformation to set location for arrange
Using relative positioning proved to create issues; when spamming of arrange instructions it was possible to end up in the following time line
1: arrange action a is started
2: arrange action b is started
3: arrange action a finished computation, and applies transformations on the models
4: arrange action b finishes computation and applies relative transformations on top of the previous transformations

By using absolute positioning this issue is resolved

CURA-11279
2023-12-06 11:40:34 +01:00
c.lamboo
0353037b31 Use getWorldPosition for TranslateOperation
CURA-11279
2023-12-06 11:36:54 +01:00
c.lamboo
568fc4ca76 Revert "Fix opening files on windows"
This reverts commit d6a73a5976.
2023-12-06 08:49:37 +01:00
c.lamboo
d6a73a5976 Fix opening files on windows
`_open_url_queue` is expecting a list of strings, not a `QUrl` instance

CURA-11288
2023-12-06 07:57:45 +01:00
c.lamboo
153e2e7bd0 Fix warning/Boyscouting
CURA-11288
2023-12-06 07:14:36 +01:00
c.lamboo
c4939701e1 Re-enable genrate cura version
CURA-11288
2023-12-06 06:37:36 +01:00
c.lamboo
351183f407 Temporarily pin spdlog
CURA-11288
2023-12-06 06:13:39 +01:00
c.lamboo
a7a4e4bd29 Revert "Update nsi installer"
This reverts commit 4b4b8b3514.
2023-12-06 06:06:08 +01:00
c.lamboo
b46f6e8e09 Add support for CLI file opening with 'cura' and 'slicer' schemes
CURA-11288
2023-12-05 18:24:44 +01:00
Erwan MATHIEU
9a108dc720
Set explicit parameter name
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2023-12-05 14:41:15 +01:00
Erwan MATHIEU
68818a525d Use absolute transform coordinates instead of relative
CURA-11279
2023-12-05 13:53:30 +01:00
Jelle Spijker
ee1f1a1a82
Merge remote-tracking branch 'origin/CURA-11364_add_sentry_engine'
# Conflicts:
#	conanfile.py
2023-12-05 10:22:46 +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
c.lamboo
ba9e122f6a unpin dulcificum 2023-12-04 11:45:12 +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
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
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
c.lamboo
cf6874c984 Use the HttpRequestManager to avoid blocking the main thread
CURA-11289
2023-12-01 10:53:30 +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
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
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
319d478a9a
Merge pull request #17422 from Ultimaker/remove-luts
Clean up bot LUT
2023-11-29 15:09:09 +01:00