3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 22:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' into feature_support_meshes_present

Browse source 
# Conflicts:
#	cura/Scene/CuraSceneController.py
#	cura/Scene/CuraSceneNode.py
This commit is contained in:
fieldOfView 2020-06-04 10:27:11 +02:00
commit c34162a2ba
2961 changed files with 361563 additions and 555322 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -61,7 +61,7 @@ Item
updateMeshTypeCheckedState(type)
}
UM.I18nCatalog { id: catalog; name: "uranium"}
UM.I18nCatalog { id: catalog; name: "cura"}
Column
{