Jelle Spijker efafe1503d

Merge branch '5.6' ...

# Conflicts:
#	conanfile.py
#	resources/definitions/ultimaker_methodx.def.json
#	resources/definitions/ultimaker_methodxl.def.json

2023-11-15 13:53:39 +01:00

..

bundled_packages

Upgrade SDK version

2023-11-14 17:36:24 +01:00

definitions

Merge branch '5.6'

2023-11-15 13:53:39 +01:00

extruders

Applied printer-linter format

2023-10-31 16:11:56 +00:00

i18n

Update po and pot files

2023-10-31 19:31:14 +01:00

images

Add Method X and Method XL meshes

2023-10-31 18:51:33 +01:00

intent

Merge branch '5.6'

2023-11-15 13:53:39 +01:00

meshes

Add Method X and Method XL meshes

2023-10-31 18:51:33 +01:00

qml

Fix nozzle selection checkmark

2023-11-10 15:21:18 +01:00

quality

Merge branch '5.6'

2023-11-15 13:53:39 +01:00

setting_visibility

Add prime_tower_raft_base_line_spacing to setting visibility

2023-10-30 11:17:32 +01:00

shaders

…

texts

Tiny improvement to 5.6 changelog text.

2023-11-15 10:43:20 +01:00

themes

icon removed added in depricated icon

2023-09-13 10:14:55 +02:00

variants

Merge branch '5.6'

2023-11-15 13:53:39 +01:00

public_key.pem

…

README_resources.txt

…