Ghostkeeper b8ccb32836 Merge branch 'master' into libArachne_rebased ... Conflicts: resources/definitions/ultimaker2.def.json -> Additions in Arachne around a place where we fixed an enum setting. resources/definitions/ultimaker3.def.json resources/definitions/ultimaker_s3.def.json resources/definitions/ultimaker_s5.def.json		2021-11-12 15:08:29 +01:00
..
whats_new	Updated whats new pages	2021-11-09 10:18:00 +01:00
change_log.txt	Merge branch 'master' into libArachne_rebased	2021-11-12 15:08:29 +01:00