3 Commits

Author SHA1 Message Date
Ghostkeeper
611208368c
Merge branch 'master' into libArachne_rebased
Conflicts:
	cura/CuraApplication.py: Setting version
	fdmprinter and fdmextruder: Setting version
	intents, qualities and variants: Setting version
	Changelog: 4.9.1 was added, should be below Arachne changes
2021-06-16 18:04:54 +02:00
Kostas Karmas
2645dc880e Update setting version to 17 for 4.10
CURA-8212
2021-05-10 17:39:33 +02:00
KeltE
cbafac6133
Cura Definition for Flasforge DreamerNX (#9303)
* Add files via upload

* Update resources/definitions/flashforge_base.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/flashforge_base.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/flashforge_dreamer_nx.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Update resources/definitions/flashforge_dreamer_nx.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>

* Rename ff_dreamernx_extruder_0.def.json to flashforge_dreamernx_extruder_0.def.json

* Update flashforge_dreamer_nx.def.json

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2021-03-08 16:51:45 +01:00