3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-30 14:21:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2.3' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2016-10-26 13:13:27 +02:00
commit a581942869
14 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Settings/MachineManager.py
View file

@ -769,6 +769,8 @@ class MachineManager(QObject):
result = [] result = []
empty_quality_changes = self._empty_quality_changes_container empty_quality_changes = self._empty_quality_changes_container
global_container_stack = self._global_container_stack global_container_stack = self._global_container_stack
if not global_container_stack:
return []
global_machine_definition = quality_manager.getParentMachineDefinition(global_container_stack.getBottom()) global_machine_definition = quality_manager.getParentMachineDefinition(global_container_stack.getBottom())
extruder_stacks = ExtruderManager.getInstance().getActiveExtruderStacks() extruder_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()

4
resources/i18n/de/cura.po
View file

@ -1836,8 +1836,8 @@ msgstr "Empfohlen"
#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383 #: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383
msgctxt "@title:tab" msgctxt "@title:tab"
msgid "Advanced" msgid "Custom"
msgstr "Erweitert" msgstr "Benutzerdefiniert"
#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18
#: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18

4
resources/i18n/en/cura.po
View file

@ -1916,8 +1916,8 @@ msgstr "Recommended"
#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383 #: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383
msgctxt "@title:tab" msgctxt "@title:tab"
msgid "Advanced" msgid "Custom"
msgstr "Advanced" msgstr "Custom"
#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18
#: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18

4
resources/i18n/es/cura.po
View file

@ -1836,8 +1836,8 @@ msgstr "Recomendado"
#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383 #: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383
msgctxt "@title:tab" msgctxt "@title:tab"
msgid "Advanced" msgid "Custom"
msgstr "Avanzado" msgstr "Personalizado"
#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18
#: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18

4
resources/i18n/fi/cura.po
View file

@ -1836,8 +1836,8 @@ msgstr "Suositeltu"
#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383 #: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383
msgctxt "@title:tab" msgctxt "@title:tab"
msgid "Advanced" msgid "Custom"
msgstr "Laajennettu" msgstr "Mukautettu"
#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18
#: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18

4
resources/i18n/fr/cura.po
View file

@ -1836,8 +1836,8 @@ msgstr "Recommandé"
#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383 #: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383
msgctxt "@title:tab" msgctxt "@title:tab"
msgid "Advanced" msgid "Custom"
msgstr "Avancée" msgstr "Personnalisé"
#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18
#: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18

4
resources/i18n/it/cura.po
View file

@ -1836,8 +1836,8 @@ msgstr "Consigliata"
#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383 #: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383
msgctxt "@title:tab" msgctxt "@title:tab"
msgid "Advanced" msgid "Custom"
msgstr "Avanzata" msgstr "Personalizzata"
#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18
#: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18

4
resources/i18n/nl/cura.po
View file

@ -1836,8 +1836,8 @@ msgstr "Aanbevolen"
#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383 #: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383
msgctxt "@title:tab" msgctxt "@title:tab"
msgid "Advanced" msgid "Custom"
msgstr "Geavanceerd" msgstr "Aangepaste"
#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18
#: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18

4
resources/i18n/tr/cura.po
View file

@ -1836,8 +1836,8 @@ msgstr "Önerilen Ayarlar"
#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383 #: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383
msgctxt "@title:tab" msgctxt "@title:tab"
msgid "Advanced" msgid "Custom"
msgstr "Gelişmiş" msgstr "Özel"
#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18
#: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18 #: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18

2
resources/qml/Sidebar.qml
View file

@ -380,7 +380,7 @@ Rectangle
Component.onCompleted: Component.onCompleted:
{ {
modesListModel.append({ text: catalog.i18nc("@title:tab", "Recommended"), item: sidebarSimple }) modesListModel.append({ text: catalog.i18nc("@title:tab", "Recommended"), item: sidebarSimple })
modesListModel.append({ text: catalog.i18nc("@title:tab", "Advanced"), item: sidebarAdvanced }) modesListModel.append({ text: catalog.i18nc("@title:tab", "Custom"), item: sidebarAdvanced })
sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "immediate": true }); sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "immediate": true });
} }

1
resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
View file

@ -14,7 +14,6 @@ adhesion_type = raft
cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10 cool_min_speed = 10
infill_line_width = =round(line_width * 0.5 / 0.4, 2) infill_line_width = =round(line_width * 0.5 / 0.4, 2)
infill_overlap_mm = 0.05
line_width = =machine_nozzle_size line_width = =machine_nozzle_size
material_print_temperature = 255 material_print_temperature = 255
material_standby_temperature = 100 material_standby_temperature = 100

1
resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
View file

@ -14,7 +14,6 @@ adhesion_type = raft
cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10 cool_min_speed = 10
infill_line_width = =round(line_width * 0.5 / 0.4, 2) infill_line_width = =round(line_width * 0.5 / 0.4, 2)
infill_overlap_mm = 0.05
line_width = =machine_nozzle_size line_width = =machine_nozzle_size
material_print_temperature = 250 material_print_temperature = 250
material_standby_temperature = 100 material_standby_temperature = 100

1
resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
View file

@ -14,7 +14,6 @@ adhesion_type = raft
cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 15 cool_min_speed = 15
infill_line_width = =round(line_width * 0.5 / 0.4, 2) infill_line_width = =round(line_width * 0.5 / 0.4, 2)
infill_overlap_mm = 0.05
line_width = =machine_nozzle_size line_width = =machine_nozzle_size
material_standby_temperature = 100 material_standby_temperature = 100
ooze_shield_angle = 40 ooze_shield_angle = 40

1
resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
View file

@ -14,7 +14,6 @@ adhesion_type = raft
cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 12 cool_min_speed = 12
infill_line_width = =round(line_width * 0.5 / 0.4, 2) infill_line_width = =round(line_width * 0.5 / 0.4, 2)
infill_overlap_mm = 0.05
line_width = =machine_nozzle_size line_width = =machine_nozzle_size
material_standby_temperature = 100 material_standby_temperature = 100
ooze_shield_angle = 40 ooze_shield_angle = 40