Commit graph

6 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
Lukkoz
d955262d08 profiles version fixed 2021-02-22 15:52:09 +01:00
Lukkoz
c99ce562ad typo fixed 2021-02-22 15:47:26 +01:00
Lukkoz
eb3d2cf0f9 def.json update 2021-02-22 15:35:16 +01:00
Lukkoz
13c542e675 skriware 2 print settings update
profiles for skriware 2 added,
def.json updated, some resolve problems fixed.
2021-02-22 14:52:14 +01:00