3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-25 11:51:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge branch 'main' into CURA-10406_fix_project_loading

Browse source 
# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_TW/cura.po
This commit is contained in:
c.lamboo 2023-03-17 17:34:13 +01:00
commit 86d95f8375
44 changed files with 672 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
View file

@ -303,18 +303,17 @@ Item
Component.onCompleted:
{
update()
updateModel();
}
function update()
function updateModel()
{
clear()
for (var i = 1; i <= Cura.MachineManager.activeMachine.maxExtruderCount; i++)
{
clear();
for (var i = 1; i <= Cura.MachineManager.activeMachine.maxExtruderCount; i ++) {
// Use String as value. JavaScript only has Number. PropertyProvider.setPropertyValue()
// takes a QVariant as value, and Number gets translated into a float. This will cause problem
// for integer settings such as "Number of Extruders".
append({ text: String(i), value: String(i) })
append({ text: String(i), value: String(i) });
}
}
}
@ -322,7 +321,9 @@ Item
Connections
{
target: Cura.MachineManager
function onGlobalContainerChanged() { extruderCountModel.update() }
function onGlobalContainerChanged() {
extruderCountModel.updateModel();
}
}
}

2
plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
View file

@ -46,7 +46,7 @@ class PauseAtHeight(Script):
"pause_layer":
{
"label": "Pause Layer",
"description": "Enter the Number of the LAST layer you want to finish prior to the pause (from the Cura preview).",
"description": "Enter the Number of the LAST layer you want to finish prior to the pause. Note that 0 is the first layer printed.",
"type": "int",
"value": "math.floor((pause_height - 0.27) / 0.1) + 1",
"minimum_value": "0",