3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
Cura/resources/quality/cartesio
History
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
..
abs Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
arnitel Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
hips Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
nylon Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
pc Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
petg Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
pla Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
pva Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
cartesio_global_Coarse_Quality.inst.cfg Revert settings-version to the one for Arachne-builds. 2021-10-20 11:01:13 +02:00
cartesio_global_Extra_Coarse_Quality.inst.cfg Revert settings-version to the one for Arachne-builds. 2021-10-20 11:01:13 +02:00
cartesio_global_High_Quality.inst.cfg Revert settings-version to the one for Arachne-builds. 2021-10-20 11:01:13 +02:00
cartesio_global_Normal_Quality.inst.cfg Revert settings-version to the one for Arachne-builds. 2021-10-20 11:01:13 +02:00