Commit graph

29572 commits

Author SHA1 Message Date
j.spijker@ultimaker.com
cd303b4e6f Make sure all dynamic libs are copied to the dist
Solve it dynamically in the Ultimaker-Cura.spec,
Such that we can copy files manually (OpenSSL shared)
to the bin/Script folder after the cura install step.

Contributes to CURA-9342
2022-07-18 11:34:21 +02:00
j.spijker@ultimaker.com
798facd63b Add pkg-config to Linux system reqs
Is needed to build CPython and it wasn't installed

Contributes to CURA-9342
2022-07-18 10:01:24 +02:00
Jelle Spijker
5dbef74e22 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-15 15:46:10 +02:00
j.spijker@ultimaker.com
0793572dc3 Limit the number of commits to checkout to 3000
Should speed up this workflow

Seems like a reasonable number (for Cura) at the
time of writing that would include up until 4.13.1

Contributes to CURA-9459
2022-07-15 13:52:21 +02:00
j.spijker@ultimaker.com
c01410146d Checkout the repo, needed by setup python
Contributes to CURA-9459
2022-07-15 13:44:12 +02:00
j.spijker@ultimaker.com
b2531c851f Run unit tests as a composite action
To avoid conflicts between the Cura Python modules and the
EnricoMi/publish-unit-test-result-action

Contributes to CURA-9459
2022-07-15 13:39:36 +02:00
c.lamboo
0c322a67c6 Merge remote-tracking branch 'origin/5.1' into 5.1 2022-07-15 11:42:46 +02:00
c.lamboo
2318b0dd5e Remove line break in translation string
CURA-9420
2022-07-15 11:42:27 +02:00
Ghostkeeper
ed60657b1d
Fix whitespace around slash
This was inconsistent with other uses in Chinese and just in and of itself.

Contributes to issue CURA-9420.
2022-07-15 11:40:38 +02:00
c.lamboo
e1b640528d Update translation strings
CURA-9420
2022-07-15 11:20:21 +02:00
Casper Lamboo
a8a8b6751a
Merge pull request #12700 from sustmi/czech-translations-v5.1
Czech translations for v5.1
2022-07-15 10:43:42 +02:00
Ghostkeeper
f210e98fb7
Merge branch '5.1' of github.com:Ultimaker/Cura into 5.1 2022-07-15 10:36:07 +02:00
Ghostkeeper
dcd792c34c
Fix capital letter of Parser
It's in a column of descriptions where each description starts with a capital letter. However in this case the translator couldn't have known that it needs to start with a capital letter since JSON is allcaps anyway.

Contributes to issue CURA-9420.
2022-07-15 10:35:19 +02:00
Ghostkeeper
fb081aa30d
Merge branch '5.1' of https://github.com/Patola/Cura into Patola-5.1 2022-07-15 10:29:53 +02:00
j.spijker@ultimaker.com
73e7ba4046 Remove 5.1.0-beta from workflow
Contributes to CURA-9365
2022-07-15 10:13:51 +02:00
Joey de l'Arago
d39b6d15cd
Merge pull request #12764 from Ultimaker/CURA-9428
Fix rendering issues when moving dialogs between screen with different scale settings
2022-07-15 10:13:28 +02:00
j.spijker@ultimaker.com
a0d775b90e Update workflows
Contributes to CURA-9365
2022-07-15 10:03:37 +02:00
j.spijker@ultimaker.com
dbc62492e7 Use latest for beta
Contributes to CURA-9365
2022-07-15 08:00:19 +02:00
j.spijker@ultimaker.com
3edd748c50 Use reqs for 5.1.0-beta
Contributes to CURA-9365

(cherry picked from commit 12eb5f15d1)
2022-07-15 07:59:19 +02:00
c.lamboo
35fce917c6 Use UM.Window in the material sync dialog and the preference pages
CURA-9428
2022-07-15 07:25:54 +02:00
j.spijker@ultimaker.com
8f1ad7e6b4
Use umbase 0.1.4
Contributes to CURA-9365
2022-07-14 18:21:55 +02:00
j.spijker@ultimaker.com
3ea7dd8565
Use umbase 0.1.4
Contributes to CURA-9365
2022-07-14 18:21:23 +02:00
Jelle Spijker
4093e1e808
Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-14 17:39:28 +02:00
j.spijker@ultimaker.com
e0c7259149
Notify on success
Contributes to CURA-9365
2022-07-14 16:28:08 +02:00
j.spijker@ultimaker.com
77979c384d
Lowercase username
Contributes to CURA-9365

(cherry picked from commit f5a559179b)
2022-07-14 15:47:24 +02:00
j.spijker@ultimaker.com
7068c87130
Add copied openssl 1.1.1l binaries to pyinstall binaries
Contributes to CURA-9342
2022-07-14 10:38:59 +02:00
Evangelos Trantos
96c4e15c03
Merge pull request #12746 from Ultimaker/CURA-9465_dark_theme_issues
Fix multiple dark theme issues
2022-07-14 09:34:58 +02:00
j.spijker@ultimaker.com
57a0c214d1
Add option for additional conan install args
Contributes to CURA-9365
2022-07-14 09:25:24 +02:00
j.spijker@ultimaker.com
7f1e17b820
Add option for additional conan install args
Contributes to CURA-9365

(cherry picked from commit 0d4a879632)
2022-07-14 09:25:05 +02:00
Jelle Spijker
9cb8e4d742
Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-14 09:20:42 +02:00
j.spijker@ultimaker.com
b3cc3818b5
various fixes to workflow
Contributes to CURA-9365
2022-07-14 09:18:37 +02:00
Jelle Spijker
7dc378fb4c
remove reference to curaengine
copy-paste left over
2022-07-13 19:31:01 +02:00
Jelle Spijker
8492b2f11f
Use workflow from main 2022-07-13 18:57:46 +02:00
Jelle Spijker
771856fd60
Use workflow from main 2022-07-13 18:56:24 +02:00
Jelle Spijker
0140c2a601
allow copy to fail 2022-07-13 18:53:06 +02:00
Ghostkeeper
107d12856d
Remove fill colours from this icon
Otherwise the theme won't have any effect on it since 5.0.

Done as a 5 minute fix.
2022-07-13 17:35:19 +02:00
Jaime van Kessel
9363ab6960
Merge branch '5.1' of github.com:Ultimaker/Cura into 5.1 2022-07-13 16:37:37 +02:00
Jaime van Kessel
66e10a3c7c
Merge pull request #12753 from Ultimaker/PP-193_support_infill_sparse_thickness_only_for_PVA_and_BAM
Removed the 'support_infill_sparse_thickness' setting from the global…
2022-07-13 16:36:58 +02:00
j.spijker@ultimaker.com
6b31e6a776 Split up OpenSSL install and copy
Contributes to CURA-9365
2022-07-13 16:32:18 +02:00
p.kuiper
32eefbb404 Removed the 'support_infill_sparse_thickness' setting from the global quality files and only added them to the PVA and BAM quality files.
This prevents infill layer skipping during self support.

Relates to PP-193
2022-07-13 16:29:18 +02:00
j.spijker@ultimaker.com
81aa56c259 Explicitly build and copy OpenSSL shared OS specific
Contributes to CURA-9365
2022-07-13 15:27:57 +02:00
j.spijker@ultimaker.com
ce018da48f Explicitly build and copy OpenSSL shared
This is a workaround to ensure that we use and pack a shared library for OpenSSL 1.1.1l.
We currently compile OpenSSL statically for CPython, but our Python Dependenies (such as
PyQt6) require a shared library. Because Conan won't allow for building the same library
with two different options (easily) we need to install it explicitly and do a manual copy
to the VirtualEnv, such that Pyinstaller can find it.

Contributes to CURA-9365
2022-07-13 15:01:26 +02:00
c.lamboo
2a2945bcfe Attempt to fix tests
Remove `gitpython` from requirements-conan-package.txt and install it manually instead
2022-07-13 09:25:16 +02:00
Remco Burema
b268657fbd Enable Alternate Wall Dirs for end-users too.
It's a little bit unclear, but the initial reason we set this to false was because we wanted to make sure most of the 'metal print' releated features dropped in 5.1, not 5.0?

still CURA-8097 .. sort of
2022-07-12 12:18:38 +02:00
j.spijker@ultimaker.com
51da6ca87b remove single quotes
Contributes to CURA-9365
2022-07-12 11:49:39 +02:00
j.spijker@ultimaker.com
8ae326d7a5 use the job outputs
Contributes to CURA-9365
2022-07-12 11:45:55 +02:00
j.spijker@ultimaker.com
b3c60eb34b Get correct issue number from PR
Contributes to CURA-9365
2022-07-12 11:35:08 +02:00
Jaime van Kessel
ecee9181b9
Merge pull request #12736 from Ultimaker/CURA-9205_appimage_not_launching_on_ubuntu_2204
Cura 9205 appimage not launching on ubuntu 2204
2022-07-12 11:19:45 +02:00
j.spijker@ultimaker.com
2263407856 Count from latest tag
This can result in a strange versioning compared
to the previous 5.1.0 beta,

but it will only be cosmetic

Contributes to CURA-9365
2022-07-12 11:16:06 +02:00
j.spijker@ultimaker.com
cf9482218f fix typo
Contributes to CURA-9365
2022-07-12 11:11:26 +02:00