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

..

bundled_packages

Update SDK version to 8.1.0

2022-07-01 09:04:49 +02:00

definitions

Merge branch 'main' into CURA-9365

2022-07-08 12:37:32 +02:00

extruders

Fix elegoo definitions

2022-07-08 10:11:04 +02:00

i18n

Correct Dutch translations of Marketplace

2022-06-22 17:00:22 +02:00

images

removed wrong enterprise image

2022-03-25 10:44:50 +01:00

intent

Further cleanup of the jerk settings. UM2 based machine have no jerk settings, removed them. Set first layer jerk equal to print jerk and removed all jerk settings (except for jerk_print) in the quality and variant files.

2022-06-02 11:33:22 +02:00

meshes

Merge pull request #11255 from Toylerrr/master

2022-05-06 18:49:30 +02:00

qml

Merge branch 'main' into CURA-9365

2022-07-08 12:37:32 +02:00

quality

Remove deleted setting from profiles

2022-07-08 09:59:31 +02:00

setting_visibility

The horizontal expansion can be used to create a more robust support structure when needed. Therefore also expose this setting in the Basic settings view.

2022-06-10 10:29:14 +02:00

shaders

…

texts

Update change log for 5.1 beta

2022-07-01 11:40:07 +02:00

themes

Suggested changes

2022-06-15 17:40:07 +02:00

variants

increase retract distance of PVA to default

2022-06-29 14:42:05 +02:00

public_key.pem

…

README_resources.txt

…