3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
26181 commits 306 branches 272 tags 787 MiB
Commit graph

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
tomasbaldi
9052e2dae3
adding profiles for Trimaker printers (#8537) 
* adding profiles for Trimaker printers

* adding profiles for Trimaker printers v2

* Update resources/extruders/trimaker_nebula_extruder.def.json

Co-authored-by: Jaime van Kessel <nallath@gmail.com>

* Update resources/extruders/trimaker_cosmosII_extruder.def.json

Co-authored-by: Jaime van Kessel <nallath@gmail.com>

* Delete trimaker_cosmosII_platform.STL

* correction extension of trimaker_cosmosII_platform.stl and modification in trimaker_cosmosII.def.json and trimaker_nebula.def.json

* Update trimaker_nebula_platform.stl

* move the STL up

* Update resources/definitions/trimaker_nebula.def.json

"grid" -> "'grid'"

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

* Update resources/definitions/trimaker_cosmosII.def.json

"grid" -> "'grid'"

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

* 220x220x260 -> 230x230x260 (nebula)

* change the name of the qualities directory

* translate quality names from spanish to english

* change nebula platform_offset

* change nebula platform_offset 2

Co-authored-by: Jaime van Kessel <nallath@gmail.com>
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-02-09 15:28:04 +01:00