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
0bbe2fed13
Remove 5.1.0-beta from workflow
...
Contributes to CURA-9365
2022-07-15 10:05:16 +02:00
Jelle Spijker
3def77416d
Merge branch '5.1'
2022-07-15 10:04:26 +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
17748d0a9a
print boolean to lower case
...
Contributes to CURA-9365
2022-07-15 09:07:37 +02:00
j.spijker@ultimaker.com
a75596f97c
bool is_release_branch added
...
Contributes to CURA-9365
2022-07-15 08:58:09 +02:00
j.spijker@ultimaker.com
2b808daa4e
Add major_minor output for easier release branch detection
...
Contributes to CURA-9365
2022-07-15 08:34:30 +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
j.spijker@ultimaker.com
310fb48f87
Add specific branch req
...
Contributes to CURA-9365
2022-07-15 07:58:48 +02:00
j.spijker@ultimaker.com
b9b13b0d69
Use reqs for 5.1.0-beta
...
Contributes to CURA-9365
(cherry picked from commit 12eb5f15d1
2022-07-15 07:57:07 +02:00
Jelle Spijker
363f65211e
Merge branch '5.1' into CURA-9459_standard_default_install_path
2022-07-15 07:56:26 +02:00
j.spijker@ultimaker.com
12eb5f15d1
Use reqs for 5.1.0-beta
...
Contributes to CURA-9365
2022-07-15 07:55:05 +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
6645d6fe94
Use umbase 0.1.4
...
Contributes to CURA-9365
2022-07-14 18:22:47 +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
Jelle Spijker
1a0ecfd850
Merge branch '5.1'
...
# Conflicts:
# .github/workflows/conan-package.yml
# .github/workflows/cura-installer.yml
2022-07-14 16:30:52 +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
f5a559179b
Lowercase username
...
Contributes to CURA-9365
2022-07-14 14:55:54 +02:00
j.spijker@ultimaker.com
409c079d8f
Simplified nsis script
...
Contributes to CURA-9365
2022-07-14 14:47:58 +02:00
j.spijker@ultimaker.com
b0f9c6bb28
Use the full app name
...
I believe this should ensure that specific
folders and location will then have a unique
path for this app in the registry, which
should make the install path version specific
Contributes to CURA-9365
2022-07-14 12:47:39 +02:00
j.spijker@ultimaker.com
95a8de45ee
Use testing channel as a default
...
Contributes to CURA-9365
2022-07-14 10:40:23 +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
bc54bbe28e
Shorten description
...
Contributes to CURA-9365
2022-07-14 09:27:00 +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
j.spijker@ultimaker.com
0d4a879632
Add option for additional conan install args
...
Contributes to CURA-9365
2022-07-14 09:24:32 +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
94bedf2a1c
Use ref_name when a tag is pushed
...
Contributes to CURA-9365
2022-07-14 09:19:39 +02:00
j.spijker@ultimaker.com
b3cc3818b5
various fixes to workflow
...
Contributes to CURA-9365
2022-07-14 09:18:37 +02:00
j.spijker@ultimaker.com
62ea4f3a48
Updated branches in workflows
...
Contributes to CURA-9365
2022-07-14 09:12:51 +02:00
Casper Lamboo
13167bf30b
Remove gitpython from conan requirements
2022-07-14 08:53:40 +02:00
Jelle Spijker
7dc378fb4c
remove reference to curaengine
...
copy-paste left over
2022-07-13 19:31:01 +02:00
Jelle Spijker
0adfe59b93
Make sure gitpython is installed
2022-07-13 19:00:07 +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
c.lamboo
d18bbfbfc7
Revert "Attempt to fix tests"
...
This reverts commit ba5f4fa290
2022-07-13 15:41:13 +02:00
c.lamboo
ba5f4fa290
Attempt to fix tests
...
Remove `gitpython` from requirements-conan-package.txt and install it manually instead
2022-07-13 15:38:58 +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
