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/setting_visibility
History
Ghostkeeper c781391b9b
Merge branch 'master' into libArachne_rebased 
To my surprise, it seems fdmprinter has merged perfectly. Nice.

Conflicts:
	resources/setting_visibility/advanced.cfg -> Settings moved to a different category while we added new settings in the same place.
2021-02-10 11:55:37 +01:00
..
advanced.cfg Move top/bottom settings to separate category 2021-02-05 14:59:38 +01:00
basic.cfg Move top/bottom settings to separate category 2021-02-05 14:59:38 +01:00
expert.cfg Merge branch 'master' into libArachne_rebased 2021-02-10 11:55:37 +01:00