Ghostkeeper c7d7dd11d1 Merge branch 'master' into PyQt6_upgrade ... Conflicts: cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6. plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.		2022-02-21 11:52:28 +01:00
..
bundled_packages	Merge branch 'marketplace_redesign' of github.com:Ultimaker/Cura into CURA-8588_replace_toolbox_with_marketplace	2022-01-03 11:32:06 +01:00
definitions	Merge pull request #11023 from NilsRo/master	2022-02-17 09:48:25 +01:00
extruders	Merge pull request #10978 from dagoma3d/dagoma-pro430	2022-02-09 15:13:55 +01:00
i18n	Update cura.po	2022-02-01 16:29:24 +01:00
images	Add new icon styles	2022-02-09 16:55:28 +01:00
intent	remove duplicate info	2021-12-23 14:58:17 +01:00
meshes	Merge branch 'master' of https://github.com/baldaaaa/Cura	2022-02-09 15:16:15 +01:00
qml	Merge branch 'master' into PyQt6_upgrade	2022-02-21 11:52:28 +01:00
quality	Added Nylon quality presets for the Artillery Printer (#11463)	2022-02-11 14:09:49 +01:00
setting_visibility	Add raft interface/middle layers to expert profile.	2022-02-08 12:01:20 +01:00
shaders	Add missing type to lowestPrintableHeight variable	2021-05-12 13:26:10 +02:00
texts	Update change_log.txt	2022-01-28 11:50:39 +01:00
themes	adjusted colors and size of origin gizmo	2022-02-15 16:45:57 +01:00
variants	Merge branch 'master' of https://github.com/baldaaaa/Cura	2022-02-09 15:16:15 +01:00
public_key.pem	Move the package signature pem file to the Resources folder	2020-03-19 15:14:21 +01:00
README_resources.txt	Fix various typos	2021-09-07 11:33:54 -04:00