Jelle Spijker efafe1503d
Merge branch '5.6'
# Conflicts:
#	conanfile.py
#	resources/definitions/ultimaker_methodx.def.json
#	resources/definitions/ultimaker_methodxl.def.json
2023-11-15 13:53:39 +01:00
..
2017-09-28 13:00:43 +02:00
2020-05-28 17:13:44 +02:00
2023-02-28 10:35:02 +01:00