casper 411252bcef Merge branch 'master' into CURA-8081_shrinkage_plate_duplicate ... # Conflicts: # resources/definitions/fdmprinter.def.json		2021-12-16 23:14:20 +01:00
..
advanced.cfg	Merge branch 'master' into libArachne_rebased	2021-08-12 18:50:29 +02:00
basic.cfg	Add current version to setting_visibility	2021-04-01 16:17:01 +02:00
expert.cfg	Merge branch 'master' into CURA-8081_shrinkage_plate_duplicate	2021-12-16 23:14:20 +01:00