Commit graph

31424 commits

Author SHA1 Message Date
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
Jordan
c43ae2e355
Add naxe machines, quality and materials 2022-07-07 16:54:56 +02:00
Rijk van Manen
55375a22d4 increase printing temperature BAM 0.1 layerheight
reduced printing temperature for BAM 0.1mm layer height profile causes extrusion issues. No drawback for increasing to the default printing temperature are found. PP-190
2022-07-07 15:35:54 +02:00
Jaime van Kessel
d1cd4eec76
Merge pull request #12683 from Ultimaker/PP-190_increase-printing-temperature-BAM
PP-190_increase-printing-temperature-BAM
2022-07-07 15:35:32 +02:00
Jaime van Kessel
93bcd544ac
Merge pull request #12695 from Ultimaker/fix_crash_project_deleted_user
Fix crash if a Digital Library project is made by deleted user
2022-07-07 15:23:29 +02:00
joeydelarago
5d5c83ec11
Add missing background color to WorkspaceSummaryDialog.qml
CURA-9402
2022-07-07 15:06:53 +02:00
Ghostkeeper
15c1b96d7b
Fix crash if a Digital Library project is made by deleted user
If the user that created a project has been deleted, the response from the API doesn't include a username. This crashes Cura because it had no default for the username.
The organization_shared field was also optional.

Done as a small fry to fix a bug found by a colleague.
2022-07-07 15:04:15 +02:00
j.spijker@ultimaker.com
4d98ba3540 Fixed missing qoutes
Contributes to CURA-9365
2022-07-07 07:07:32 +02:00
j.spijker@ultimaker.com
5191d4f9da Add missing comma
Contributes to CURA-9365
2022-07-07 06:13:15 +02:00
j.spijker@ultimaker.com
c100f68f58 Add missing info.plist
2ce60de673/packaging/Info.plist.in (L5)

Contributes to CURA-9365
2022-07-07 05:58:58 +02:00
j.spijker@ultimaker.com
b84ee29627 ducktype the PyInstaller BUNDLE
Should be an acceptable workaround for pyinstaller/pyinstaller#6612

The `assemble` method is probably to0 specific to contribute with
a PR against PyInstaller.

Contributes to CURA-9365
2022-07-07 05:38:08 +02:00
Rijk van Manen
d301e9a807 increase printing temperature BAM 0.1 layerheight
reduced printing temperature for BAM 0.1mm layer height profile causes extrusion issues. No drawback for increasing to the default printing temperature are found. PP-190
2022-07-06 17:08:54 +02:00
j.spijker@ultimaker.com
48539bb7f8
Only convert path to string
Contributes to CURA-9365
2022-07-06 14:28:43 +02:00
j.spijker@ultimaker.com
c9587c3d21
convert to posixpath string
Contributes to CURA-9365
2022-07-06 14:17:53 +02:00