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

29731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jaime van Kessel
6a36840793 Use optional assert message instead of print 2022-07-08 10:24:23 +02:00
Jaime van Kessel
1f1ee7ff60 Fix buildvolume tests 2022-07-08 10:19:09 +02:00
Jaime van Kessel
e73a18afc1 Fix elegoo definitions 2022-07-08 10:11:04 +02:00
Jaime van Kessel
0c37fe333a Fix position of extruder elegoo 2022-07-08 10:08:48 +02:00
Jaime van Kessel
117e9976eb Fix Convex hull decorator tests 2022-07-08 10:02:52 +02:00
Jaime van Kessel
c75268dd07 Change default_value to value for elegoo_neptune for infill_pattern 2022-07-08 10:00:15 +02:00
Jaime van Kessel
4656ba0917 Remove deleted setting from profiles 2022-07-08 09:59:31 +02:00
Jaime van Kessel
ce136fafc1 Bump version number of jgaurora profile 2022-07-08 09:56:58 +02:00
Jaime van Kessel
afed96187c Change default_value to value 2022-07-08 09:55:11 +02:00
Jaime van Kessel
9c0671f2a7 Remove unnedeeded default_value overide 2022-07-08 09:53:05 +02:00
j.spijker@ultimaker.com
1066e6a99f Add libEGL to system deps for Linux 
Contributes to CURA-9365
 2022-07-08 09:33:17 +02:00
j.spijker@ultimaker.com
8500e34f25 Use the app_root to obtain the resources 
Contributes to CURA-9365
 2022-07-08 09:26:27 +02:00
Miroslav Sustek
0167e4b94b Czech translations for v5.1 2022-07-07 21:14:13 +02:00