Jelle Spijker 7632f66d23 Merge branch 'master' into libArachne_rebased ... # Conflicts: # resources/texts/change_log.txt		2021-04-24 14:12:33 +02:00
..
bundled_packages	Initial commit for the DL	2021-04-20 11:30:49 +02:00
definitions	Merge branch 'master' into libArachne_rebased	2021-04-24 14:12:33 +02:00
extruders	Squashed commit of the following:	2021-04-15 14:26:31 +02:00
i18n	Added Traditional Chinese	2021-04-16 20:24:28 +02:00
images	Merge branch 'master' into libArachne_rebased	2021-04-24 14:12:33 +02:00
intent	Revert "Bump setting_version to 17" for instances	2021-04-02 10:43:24 +02:00
meshes	Squashed commit of the following:	2021-04-15 14:26:31 +02:00
qml	Merge pull request #9590 from Ultimaker/4.9_smartling_translations	2021-04-19 13:36:27 +02:00
quality	Merge branch 'master' into libArachne_rebased	2021-04-16 18:17:04 +02:00
setting_visibility	Merge branch 'master' into libArachne_rebased	2021-04-08 13:49:52 +02:00
shaders	Actually show 'on buildplate' color when z=0.	2021-01-22 18:47:45 +01:00
texts	Merge branch 'master' into libArachne_rebased	2021-04-24 14:12:33 +02:00
themes	Remove now unused image of printers	2021-04-01 19:36:00 +02:00
variants	Merge branch 'master' into libArachne_rebased	2021-04-16 18:17:04 +02:00
public_key.pem	Move the package signature pem file to the Resources folder	2020-03-19 15:14:21 +01:00