3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-01 06:41:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2.1'

Browse source 
Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
This commit is contained in:
Ghostkeeper 2016-04-04 18:49:09 +02:00
commit 0684cee681
86 changed files with 2336 additions and 3490 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/ChangeLogPlugin/ChangeLog.qml
View file

@ -12,8 +12,8 @@ UM.Dialog
{
id: base
minimumWidth: 400
minimumHeight: 300;
title: "Changelog"
minimumHeight: 300
title: catalog.i18nc("@label", "Changelog")
ScrollView
{
@ -28,8 +28,13 @@ UM.Dialog
}
Button
{
UM.I18nCatalog
{
id: catalog
name: "cura"
}
anchors.bottom:parent.bottom
text: "close"
text: catalog.i18nc("@action:button", "Close")
onClicked: base.hide()
anchors.horizontalCenter: parent.horizontalCenter
}

2
plugins/ChangeLogPlugin/__init__.py
View file

@ -12,7 +12,7 @@ def getMetaData():
"name": catalog.i18nc("@label", "Changelog"),
"author": "Ultimaker",
"version": "1.0",
"description": catalog.i18nc("@info:whatsthis", "Shows changes since latest checked version"),
"description": catalog.i18nc("@info:whatsthis", "Shows changes since latest checked version."),
"api": 2
}
}