3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
30349 commits 306 branches 270 tags 786 MiB
Commit graph

30349 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Joey de l'Arago
f80e0425a7
Merge pull request #12708 from Ultimaker/CURA-9365 
Introduce Conan, JFrog and GitHub Actions to build and manage Cura (and her dependencies
 2022-07-13 14:05:33 +02:00
Joey de l'Arago
c66ea0a5a5
Merge branch 'main' into CURA-9365 2022-07-13 14:05:08 +02:00
Casper Lamboo
91a830ab06
Fix version number matching 2022-07-13 11:35:07 +02:00
Casper Lamboo
596bfe8a37
Fix version number matching 2022-07-13 11:28:09 +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
Jelle Spijker
56659ce8f8
Update .gitignore 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-07-12 14:09:55 +02:00
Jelle Spijker
550d4b8256
Update .github/workflows/unit-test.yml 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-07-12 14:06:59 +02:00
Jelle Spijker
4fdd78eff2
Update .github/workflows/unit-test.yml 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-07-12 14:06:42 +02:00
Jelle Spijker
7aebfac30b
Update .github/workflows/unit-test.yml 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-07-12 14:06:10 +02:00
Jelle Spijker
69913053ec
Update .github/workflows/conan-package.yml 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-07-12 13:57:11 +02:00
Casper Lamboo
bedcb8b2ab
Delete fix_app_qt_folder_names_for_codesign.py 2022-07-12 13:42:21 +02:00
Jaime van Kessel
c3b5653d5e
Merge pull request #12748 from lacgondi/main 
Fix minor spelling mistakes in README.md
 2022-07-12 12:58:35 +02:00
László Gondi
72a29a99a3 Fix minor spelling in README.md 
Changed "out" to "our" in the Configuring Cura and Translating Cura sections.
 2022-07-12 12:24:22 +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
80c3a1d735 remove single quotes 
Contributes to CURA-9365
 2022-07-12 11:49:06 +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
b56b65ab3d use the job outputs 
Contributes to CURA-9365
 2022-07-12 11:45:20 +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
j.spijker@ultimaker.com
6c4e85b85c Get correct issue number from PR 
Contributes to CURA-9365
 2022-07-12 11:32:04 +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
15c67719ed 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:22 +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
52636dc81d fix typo 
Contributes to CURA-9365
 2022-07-12 11:10:55 +02:00
j.spijker@ultimaker.com
90336ce08e Use the latest prerelease but count from the latest stable 
Contributes to CURA-9365
 2022-07-12 11:08:45 +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
0a000a756e Use the input for the project name 
Contributes to CURA-9365
 2022-07-12 11:03:52 +02:00
j.spijker@ultimaker.com
a1c39c7537 Count from the latest stable release 
Contributes to CURA-9365
 2022-07-12 11:02:48 +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
4fd744cc95 use the first index 
Contributes to CURA-9365
 2022-07-12 10:58:07 +02:00
j.spijker@ultimaker.com
43d9174d95 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:47 +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
Jaime van Kessel
6536b37525 Set background color for machine actions 
Otherwise the background is always white, which makes it unusuable for darktheme

CURA-9465
 2022-07-11 16:19:26 +02:00
Jaime van Kessel
461165ea39 Set the correct color for inactive text 
It used to be all back, which is just unreadable...

CURA-9465
 2022-07-11 16:16:08 +02:00
Jaime van Kessel
656a3dc707 Remove stray print 2022-07-11 16:02:17 +02:00
j.spijker@ultimaker.com
913d9b8ed7 Add serial to the hidden imports 
Should fix USB printing not working
 2022-07-11 15:41:15 +02:00
j.spijker@ultimaker.com
479679b018 Also add libegl-dev to Linux system req 
Contributes to CURA-9205
 2022-07-11 12:04:15 +02:00
j.spijker@ultimaker.com
4c6ad9f4d6 Specify Ubuntu 22.04 explicitly 
The latest points to 22.04, which is the latest stable GH runner

Contributes to CURA-9205
 2022-07-11 11:11:17 +02:00
j.spijker@ultimaker.com
5e40f2eaec Build an AppImage with the latest Ubuntu 
Instead of trying to support multiple libstdc++ or ship or own (bad pratcice in general)
an easy solution could be to provide two different AppImage's, were one is build on the
latest Ubuntu runner.

This should fix #11856 for the 5.1.0 release, but I don't consider this a permanent and/or
sustainable solution. We should still create a ticket on the backlog to solves this issue
in a more generic way and future-proof way.

Contributes to CURA-9205
 2022-07-11 10:09:18 +02:00
c.lamboo
19d62da737 Possible fix for Cura crashing on Zorin OS 16 
Appearently the `QT_STYLE_OVERRIDE` variable is set for some users, crashing Cura. Unset variable `QT_STYLE_OVERRIDE` as a precaution

https://github.com/Ultimaker/Cura/issues/12343
 2022-07-11 00:05:15 +02:00
j.spijker@ultimaker.com
613d397c2e Don't run with the conan config for powershell 
Contributes to CURA-9365
 2022-07-08 18:57:46 +02:00