3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 12:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
33010 commits 306 branches 270 tags 779 MiB
Commit graph

33010 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
j.spijker@ultimaker.com
db67c1f66a Don't run with the conan config for powershell 
Contributes to CURA-9365
 2022-07-08 18:56:50 +02:00
j.spijker@ultimaker.com
c4d78529e0 Use conan-recipe-version from CURA-9365 
Contributes to CURA-9365
 2022-07-08 18:39:07 +02:00
j.spijker@ultimaker.com
b482b4d60c sync requirements with Uranium 
Contributes to CURA-9365
 2022-07-08 17:11:25 +02:00
j.spijker@ultimaker.com
e82cc1c9a5 Add 5.1.0-alpha 
Same config as beta

Once merged to main we should bump up the Version in GitVersion
And set this to use the correct requirements

Contributes to CURA-9365
 2022-07-08 17:00:47 +02:00
j.spijker@ultimaker.com
7e35a0eddb Remove buildmeta when PR 
Contributes to CURA-9365
 2022-07-08 16:51:12 +02:00
j.spijker@ultimaker.com
85d3bb1a3a Add pull_request against main branches 
FIXME:
A PR against a release branch will now get the alpha requirements out
of the conandata.yml

Contributes to CURA-9365
 2022-07-08 16:45:52 +02:00
j.spijker@ultimaker.com
ce686202a1 specify output name 
Contributes to CURA-9365
 2022-07-08 16:19:14 +02:00
j.spijker@ultimaker.com
4d501e8b7a Don't use _ for pr 
Contributes to CURA-9365
 2022-07-08 16:15:58 +02:00
j.spijker@ultimaker.com
0a1452dccb Simplified set-output for channel 
Contributes to CURA-9365
 2022-07-08 16:11:47 +02:00
j.spijker@ultimaker.com
1d3693cb1b Prepend pr_ for pull_request 
Contributes to CURA-9365
 2022-07-08 16:01:21 +02:00
Remco Burema
562184166e Make it possible for another user to uninstall. 
Users other than the original installer, can't easily uninstall, even if they have the rights. This should be possible. Users without the rights can still try to start the program, but would then need permission and get kicked out. 'HKCU' is a shorthand referring _only_ to the current user. 'HKCR' is a shorthand that refers _both_ to the current user _and_ the local machine. Most (except one) of the registry keys in the old setup (with CPack) where 'installed' to the latter, only one, which doesn't even seem to exist anymore in the new setup, refrered to the former. In short: This commit should restore the ability to uninstall Cura from any sufficiently elevated account to do such action, as was done by the 'old' buildsystem.

should fix Ultimaker/Cura#12582
 2022-07-08 15:59:04 +02:00
j.spijker@ultimaker.com
5f12f1f43b Fix brackets 
Contributes to CURA-9365
 2022-07-08 15:56:36 +02:00
j.spijker@ultimaker.com
23234ea15f Fix for short branch names 
Contributes to CURA-9365
 2022-07-08 15:48:34 +02:00
j.spijker@ultimaker.com
6e46d357e5 Added missing closing braces 
Contributes to CURA-9365
 2022-07-08 15:42:29 +02:00
j.spijker@ultimaker.com
eb943f7f72 Added missing quote character 
Contributes to CURA-9365
 2022-07-08 15:41:22 +02:00
j.spijker@ultimaker.com
349eac5ca5 Use conan-recipe-version from CURA-9365 branch 
Contributes to CURA-9365
 2022-07-08 15:39:43 +02:00
j.spijker@ultimaker.com
f9b7d74050 Use full pr number 
Contributes to CURA-9365
 2022-07-08 15:37:18 +02:00
j.spijker@ultimaker.com
0d04f3e517 Remove pull request alias 
Contributes to CURA-9365
 2022-07-08 15:34:25 +02:00
j.spijker@ultimaker.com
70c4125742 sanitize versioning naming of pr events 
Contributes to CURA-9365
 2022-07-08 15:26:56 +02:00
j.spijker@ultimaker.com
cda4cdf66c Make release branch detection generic 
Contributes to CURA-9365
 2022-07-08 15:15:26 +02:00
jspijker
f9d4628b95 Merge branch 'main' into CURA-9365 
# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/cura-installer.yml
#	.github/workflows/requirements-conan-package.txt
#	resources/definitions/Mark2_for_Ultimaker2.def.json
#	resources/definitions/elegoo_neptune_2.def.json
#	resources/definitions/elegoo_neptune_2D.def.json
 2022-07-08 12:37:32 +02:00
j.spijker@ultimaker.com
8750c218db Added missing indirect pip requirements 
Contributes to CURA-9365
 2022-07-08 12:17:50 +02:00
j.spijker@ultimaker.com
8b5ed4b26b Downgrade urllib3 to 1.25.9 
to fix dependency conflict

Contributes to CURA-9365
 2022-07-08 12:07:04 +02:00
j.spijker@ultimaker.com
9b8f4b5ec9 Add twisted to requirements 
Contributes to CURA-9365
 2022-07-08 12:05:07 +02:00
j.spijker@ultimaker.com
ed02364809 Add requests to requirements 
Fixes #12696

Contributes to CURA-9365
 2022-07-08 12:05:07 +02:00
j.spijker@ultimaker.com
3cb58c6554 Updated conandata to run from main 
Note: This will work correctly when all the requirements
are also merged

Contributes to CURA-9365
 2022-07-08 12:05:07 +02:00