Commit graph

12 commits

Author SHA1 Message Date
Ghostkeeper
9140b71b19
Merge branch 'libArachne_rebased'
Conflicts:
	plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
	resources/definitions -> Bunch of conflicts with profile updates.
	resources/quality -> Bunch of conflicts with profile updates.
	resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
2021-12-14 11:48:58 +01:00
Remco Burema
8c8ec5391f
Revert settings-version to the one for Arachne-builds. 2021-10-20 11:01:13 +02:00
Remco Burema
2fc20fd04a
Prep for merge with main branch. Setting-version 18 to 19. 2021-10-19 18:32:51 +02:00
THeijmans
a698409a25 Set line widths equal to nozzle diameter
and remove line width lines from profiles (PP-13)
2021-09-16 10:27:44 +02:00
Konstantinos Karmas
3e143a012a Change the setting version to 19
Since the setting version 18 is used in the arachne beta build, we decided to make the the setting version to 19 in the normal releases, so that we make sure that projects made in arachne beta won't use any version upgrade scripts if a user attempts to open them in 4.12.

CURA-8510
2021-09-15 16:25:04 +02:00
Ghostkeeper
453b666b1d
Increment setting_version to 18
We now have version 18, where Flsun Super Racer has customised profiles.
Nothing changes in the built-in profiles. It only needs a change in the machine instances.

Contributes to issue CURA-8510.
2021-09-14 16:32:43 +02:00
Ghostkeeper
88954922d4
Merge branch 'master' into libArachne_rebased
Conflicts:
	resources/texts/change_log.txt -> Adding 4.10 release notes in between 4.9 and Arachne.
2021-06-30 16:46:19 +02:00
StijnArntz
e25ca09bec PETG_updates_410
Changed max combing distance for UMS3, UMS5, UM2C and UM3 to reduce stringing. Fixed distance of 8 mm.
2021-06-25 13:31:18 +02:00
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
StijnArntz
3e1cc89145 Changed version 16 to 17
Changed version number 16 to 17
2021-05-31 09:54:03 +02:00
StijnArntz
e68beabcbe Extra line at end of file
Added extra line at end of file
2021-05-31 09:34:47 +02:00
StijnArntz
605e1d1b2f PETG for UM3
Removed Generic and UM PETG from exclude material list.
Add quality files for PETG on UM3.
2021-05-31 09:20:00 +02:00