Ghostkeeper c781391b9b Merge branch 'master' into libArachne_rebased ... To my surprise, it seems fdmprinter has merged perfectly. Nice. Conflicts: resources/setting_visibility/advanced.cfg -> Settings moved to a different category while we added new settings in the same place.		2021-02-10 11:55:37 +01:00
..
bundled_packages	Update the material packages versions	2020-10-26 14:11:18 +01:00
definitions	Merge branch 'master' into libArachne_rebased	2021-02-10 11:55:37 +01:00
extruders	adding profiles for Trimaker printers (#8537)	2021-02-09 15:28:04 +01:00
i18n	Add missing brackets	2020-11-09 14:32:18 +01:00
images	Possible alternate non-numbered versions.	2020-12-20 21:55:13 +01:00
intent	... also of course delete them from definitions.	2020-12-09 21:20:08 +01:00
meshes	adding profiles for Trimaker printers (#8537)	2021-02-09 15:28:04 +01:00
qml	Fix typo in variable name	2021-02-09 14:24:09 +01:00
quality	Merge branch 'master' into libArachne_rebased	2021-02-10 11:55:37 +01:00
setting_visibility	Merge branch 'master' into libArachne_rebased	2021-02-10 11:55:37 +01:00
shaders	Don't show overhang on first layer or below buildplate.	2020-09-01 14:40:43 +02:00
texts	Changelog: Forgot to add 'Maximum Extrusion Area Deviation'.	2020-12-24 09:39:13 +01:00
themes	Move top/bottom settings to separate category	2021-02-05 14:59:38 +01:00
variants	Updated settings_version to 18	2021-02-05 10:16:22 +01:00
public_key.pem	Move the package signature pem file to the Resources folder	2020-03-19 15:14:21 +01:00