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
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
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
j.spijker@ultimaker.com
1c77eb07a4 Use VirtualPythonEnv 
Contributes to CURA-9365
 2022-07-07 20:08:30 +02:00
j.spijker@ultimaker.com
82904ccd3f Fix version if version is None 
Contributes to CURA-9365
 2022-07-07 20:04:38 +02:00
jspijker
593ba0ec36 Revert "Also create package when unit-test workflow is changed" 
This reverts commit ab4c62e46f.
 2022-07-07 19:52:00 +02:00
j.spijker@ultimaker.com
cbe8a90b35 Use local folder 
Contributes to CURA-9365
 2022-07-07 19:51:38 +02:00
j.spijker@ultimaker.com
c22999c314 handle local packages correctly 
Contributes to CURA-9365
 2022-07-07 19:49:04 +02:00
j.spijker@ultimaker.com
ab4c62e46f Also create package when unit-test workflow is changed 
needed due to the install without a dot

Contributes to CURA-9365
 2022-07-07 17:20:48 +02:00
j.spijker@ultimaker.com
dea224718b Use the exported package 
Since the VirtualPythonEnv seems to be broken

Contributes to CURA-9365
 2022-07-07 17:19:38 +02:00
Jelle Spijker
c16e1fcf60
Use venv folder 2022-07-07 17:08:21 +02:00
j.spijker@ultimaker.com
d84133c484 Remove redundant options for conan install 
Contributes to CURA-9365
 2022-07-07 17:00:36 +02:00
j.spijker@ultimaker.com
7ed81f0110 Also test when unit-test workflow changes 
Contributes to CURA-9365
 2022-07-07 16:57:08 +02:00
j.spijker@ultimaker.com
df5446b4c6 Add unit-tests 
Contributes to CURA-9365
 2022-07-07 16:55:41 +02:00