GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 08:05:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,612 Commits 295 Branches 268 Tags
Commit Graph

29612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 12eb5f15d16ebc908938644d221a2cae5d3c39a2)
 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 12eb5f15d16ebc908938644d221a2cae5d3c39a2)
 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
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 f5a559179bac2e638e62c6a41adf22dcb3ec3bdf)
 2022-07-14 15:47:24 +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
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 0d4a8796328769a57746248cc8449eb56882d4c6)
 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
j.spijker@ultimaker.com
fcc1a38e3f Use the latest prerelease but count from the latest stable 
Contributes to CURA-9365
 2022-07-12 11:08:22 +02:00
j.spijker@ultimaker.com
5dd1798979 Use the input for the project name 
Contributes to CURA-9365
 2022-07-12 11:04:11 +02:00
j.spijker@ultimaker.com
fbf49221b5 Count from the latest stable release 
Contributes to CURA-9365
 2022-07-12 11:04:11 +02:00
j.spijker@ultimaker.com
ba1e4eb39f use the first index 
Contributes to CURA-9365
 2022-07-12 10:58:25 +02:00
j.spijker@ultimaker.com
36c4c56abb Use custom versioning system 
We already had to customize to much, it isn't worth
the effort to continue with GitVersion

The script still has some issues when a tag is pushed

Contributes to CURA-9365
 2022-07-12 10:55:05 +02:00
Jaime van Kessel
0fac778601
Fix postprocessing settings being too dark 
In dark theme you couldn't really read them.

CURA-9465
 2022-07-12 10:06:39 +02:00
Ghostkeeper
00cfa5dc4c
Remove fill colours from some icons 
The icons cannot be recoloured if they already have a colour.

Contributes to issue CURA-9465.
 2022-07-11 17:32:14 +02:00
Ghostkeeper
fdd96b30a7
Fix dark theme primary colour 
The dark theme was overriding the primary colour with the wrong Ultimaker Blue colour. There is a newer blue, and it was applied as 'accent_1'. The dark theme had its own version of that one too. But the old Primary colour was still the wrong one.

Contributes to issue CURA-9465.
 2022-07-11 17:18:01 +02:00
Jaime van Kessel
796f80c9b9 Remove fill from settings icon 
Otherwise we can't use it in UM.ColorImage

CURA-9465
 2022-07-11 16:38:37 +02:00
Jaime van Kessel
32121c7adc Add background color for rename dialogs 
CURA-9465
 2022-07-11 16:21:10 +02:00