3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 15:07:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
Cura/plugins/Toolbox/resources
History
Ghostkeeper 266e08fdff
Merge branch 'master' into ui_rework_4_0 
Conflicts:
	plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky.
	resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.
2018-11-13 16:23:36 +01:00
..
images CURA-5536 Add the icon indicating when a plugin is already installed. 2018-07-13 13:20:32 +02:00
qml Merge branch 'master' into ui_rework_4_0 2018-11-13 16:23:36 +01:00