Ghostkeeper 0993e486f1 Fix JSON syntax error ... JSON doesn't support the extra comma at the end there. It's marked as a syntax error. Contributes to issue CURA-9226.		2022-04-29 10:01:23 +02:00
..
bundled_packages	Upgrade SDK version to 8.0.0 for Cura 5.0	2022-04-20 10:57:38 +02:00
definitions	Fix JSON syntax error	2022-04-29 10:01:23 +02: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	removed wrong enterprise image	2022-03-25 10:44:50 +01:00
intent	Increment setting_version to 20	2022-03-29 15:03:48 +02:00
meshes	Merge branch 'master' of https://github.com/baldaaaa/Cura	2022-02-09 15:16:15 +01:00
qml	Merge branch '5.0' of github.com:Ultimaker/Cura	2022-04-28 13:26:56 +02:00
quality	Merge branch 'master' into PP-54_decrease-resolution	2022-04-07 11:14:30 +02:00
setting_visibility	Merge branch 'master' into PP-129_increase-filter-distance	2022-04-07 13:54:27 +02:00
shaders	Add missing type to lowestPrintableHeight variable	2021-05-12 13:26:10 +02:00
texts	Update change_log.txt	2022-04-21 13:18:32 +02:00
themes	Masking is not avaliable after the QT6 upgrade, this does a kind of primitive masking by placing a rectangle with a circular hole in it over the image.	2022-04-11 14:10:27 +02:00
variants	Increment setting_version to 20	2022-03-29 15:03:48 +02: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