Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building_cura_main

This commit is contained in:
Jelle Spijker 2022-06-21 07:52:58 +02:00
commit cd12d24584
306 changed files with 24 additions and 375 deletions

View file

@ -34,61 +34,6 @@ class MaterialManagementModel(QObject):
def __init__(self, parent: Optional[QObject] = None) -> None:
super().__init__(parent = parent)
self._material_sync = CloudMaterialSync(parent=self)
self._checkIfNewMaterialsWereInstalled()
def _checkIfNewMaterialsWereInstalled(self) -> None:
"""
Checks whether new material packages were installed in the latest startup. If there were, then it shows
a message prompting the user to sync the materials with their printers.
"""
application = cura.CuraApplication.CuraApplication.getInstance()
for package_id, package_data in application.getPackageManager().getPackagesInstalledOnStartup().items():
if package_data["package_info"]["package_type"] == "material":
# At least one new material was installed
self._showSyncNewMaterialsMessage()
break
def _showSyncNewMaterialsMessage(self) -> None:
sync_materials_message = Message(
text = catalog.i18nc("@action:button",
"Please sync the material profiles with your printers before starting to print."),
title = catalog.i18nc("@action:button", "New materials installed"),
message_type = Message.MessageType.WARNING,
lifetime = 0
)
sync_materials_message.addAction(
"sync",
name = catalog.i18nc("@action:button", "Sync materials"),
icon = "",
description = "Sync your newly installed materials with your printers.",
button_align = Message.ActionButtonAlignment.ALIGN_RIGHT
)
sync_materials_message.addAction(
"learn_more",
name = catalog.i18nc("@action:button", "Learn more"),
icon = "",
description = "Learn more about syncing your newly installed materials with your printers.",
button_align = Message.ActionButtonAlignment.ALIGN_LEFT,
button_style = Message.ActionButtonStyle.LINK
)
sync_materials_message.actionTriggered.connect(self._onSyncMaterialsMessageActionTriggered)
# Show the message only if there are printers that support material export
container_registry = cura.CuraApplication.CuraApplication.getInstance().getContainerRegistry()
global_stacks = container_registry.findContainerStacks(type = "machine")
if any([stack.supportsMaterialExport for stack in global_stacks]):
sync_materials_message.show()
def _onSyncMaterialsMessageActionTriggered(self, sync_message: Message, sync_message_action: str):
if sync_message_action == "sync":
QDesktopServices.openUrl(QUrl("https://example.com/openSyncAllWindow"))
# self.openSyncAllWindow()
sync_message.hide()
elif sync_message_action == "learn_more":
QDesktopServices.openUrl(QUrl("https://support.ultimaker.com/hc/en-us/articles/360013137919?utm_source=cura&utm_medium=software&utm_campaign=sync-material-printer-message"))
@pyqtSlot("QVariant", result = bool)
def canMaterialBeRemoved(self, material_node: "MaterialNode") -> bool:

View file

@ -1,4 +1,4 @@
# Copyright (c) 2021 Ultimaker B.V.
# Copyright (c) 2022 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from PyQt6.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QUrl
@ -18,6 +18,7 @@ if TYPE_CHECKING:
from UM.Signal import Signal
catalog = i18nCatalog("cura")
class CloudMaterialSync(QObject):
"""
Handles the synchronisation of material profiles with cloud accounts.
@ -44,7 +45,6 @@ class CloudMaterialSync(QObject):
break
def openSyncAllWindow(self):
self.reset()
if self.sync_all_dialog is None:

View file

@ -1253,12 +1253,12 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
@staticmethod
def _parse_packages_metadata(archive: zipfile.ZipFile) -> List[Dict[str, str]]:
try:
package_metadata = json.loads(archive.open("Metadata/packages.json").read().decode("utf-8"))
package_metadata = json.loads(archive.open("Cura/packages.json").read().decode("utf-8"))
return package_metadata["packages"]
except KeyError:
Logger.warning("No package metadata was found in .3mf file.")
except Exception:
Logger.error("Failed to load packes metadata from .3mf file")
Logger.error("Failed to load packages metadata from .3mf file.")
return []

View file

@ -41,7 +41,7 @@ catalog = i18nCatalog("cura")
THUMBNAIL_PATH = "Metadata/thumbnail.png"
MODEL_PATH = "3D/3dmodel.model"
PACKAGE_METADATA_PATH = "Metadata/packages.json"
PACKAGE_METADATA_PATH = "Cura/packages.json"
class ThreeMFWriter(MeshWriter):
def __init__(self):

View file

@ -31,7 +31,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Height (mm)")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
MouseArea {
id: peak_height_label
@ -64,7 +64,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Base (mm)")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
MouseArea
{
@ -98,7 +98,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Width (mm)")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
MouseArea {
id: width_label
@ -132,7 +132,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Depth (mm)")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
MouseArea {
id: depth_label
@ -166,7 +166,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: ""
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
MouseArea {
id: lighter_is_higher_label
@ -203,7 +203,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Color Model")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
MouseArea {
id: color_model_label
@ -240,7 +240,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "1mm Transmittance (%)")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
MouseArea {
id: transmittance_label
@ -272,7 +272,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
text: catalog.i18nc("@action:label", "Smoothing")
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
MouseArea
{

View file

@ -47,7 +47,7 @@ Item
Column
{
Layout.fillWidth: true
Layout.alignment: Qt.AlignmentFlag.AlignTop
Layout.alignment: Qt.AlignTop
spacing: base.columnSpacing
@ -176,7 +176,7 @@ Item
Column
{
Layout.fillWidth: true
Layout.alignment: Qt.AlignmentFlag.AlignTop
Layout.alignment: Qt.AlignTop
spacing: base.columnSpacing

View file

@ -48,7 +48,7 @@ UM.Dialog
font: UM.Theme.getFont("large")
anchors.verticalCenter: icon.verticalCenter
height: UM.Theme.getSize("marketplace_large_icon").height
verticalAlignment: Qt.AlignmentFlag.AlignVCenter
verticalAlignment: Qt.AlignVCenter
}
}

View file

@ -19,7 +19,7 @@ Item
property bool showInstallButton: false
property bool showUpdateButton: false
property string missingPackageReadMoreUrl: "https://ultimaker.atlassian.net/wiki/spaces/SD/pages/1231916580/Campaign+links+from+Cura+to+the+Ultimaker+domain"
property string missingPackageReadMoreUrl: "https://support.ultimaker.com/hc/en-us/articles/360011968360-Using-the-Ultimaker-Marketplace?utm_source=cura&utm_medium=software&utm_campaign=load-file-material-missing"
width: parent.width

View file

@ -31,7 +31,7 @@ Item
Cura.SecondaryButton
{
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
Layout.preferredHeight: UM.Theme.getSize("action_button").height
Layout.preferredWidth: height
@ -47,7 +47,7 @@ Item
UM.Label
{
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
Layout.fillWidth: true
text: detailPage.title

View file

@ -87,7 +87,6 @@
"wall_0_wipe_dist": { "value": 0.2 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": true },
"retraction_speed": {
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",

View file

@ -192,7 +192,6 @@
"wall_0_wipe_dist": { "value": 0.0 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"retraction_speed": {
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",

View file

@ -97,7 +97,6 @@
"wall_0_wipe_dist": { "value": 0.0 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"retraction_speed": {
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",

View file

@ -27,7 +27,6 @@
"infill_overlap": { "value": 15.0 },
"skin_overlap": { "value": 20.0 },
"fill_outline_gaps": { "value": true },
"filter_out_tiny_gaps": { "value": true },
"roofing_layer_count": { "value": 2 },
"xy_offset_layer_0": { "value": -0.1 },
"speed_print": { "value": 50 },

View file

@ -196,7 +196,6 @@
"wall_0_wipe_dist": { "value": 0.0 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"retraction_speed": {
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",

View file

@ -175,7 +175,6 @@
"wall_0_wipe_dist": { "value": 0.0 },
"top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3 if layer_height > 0.15 else 0.8" },
"optimize_wall_printing_order": { "value": true },
"filter_out_tiny_gaps": { "value": false },
"fill_outline_gaps": { "value": false },
"z_seam_type": { "value": "'sharpest_corner'" },
"z_seam_corner": { "value": "'z_seam_corner_weighted'" },

View file

@ -97,7 +97,6 @@
"wall_0_wipe_dist": { "value": 0.0 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"retraction_speed": {
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",

View file

@ -91,7 +91,6 @@
"wall_0_inset": {"value": "0" },
"inset_direction": {"value": "'outside_in'" },
"alternate_extra_perimeter": {"value": false },
"filter_out_tiny_gaps": {"value": true },
"fill_outline_gaps": {"value": true },
"z_seam_type": {"value": "'shortest'"},
"z_seam_x": {"value": "300"},

View file

@ -207,7 +207,6 @@
"wall_0_wipe_dist": { "value": 0.0 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"retraction_speed": {
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",

View file

@ -113,7 +113,6 @@
"minimum_interface_area": { "value": 10 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"adhesion_type": { "value": "'skirt'" },
"brim_replaces_support": { "value": false },

View file

@ -130,7 +130,6 @@
"minimum_interface_area": { "value": 10 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"adhesion_type": { "value": "'skirt'" },
"brim_replaces_support": { "value": false },

View file

@ -131,7 +131,6 @@
"minimum_interface_area": { "value": 10 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"adhesion_type": { "value": "'skirt'" },
"brim_replaces_support": { "value": false },

View file

@ -97,7 +97,6 @@
"wall_0_wipe_dist": { "value": 0.0 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"retraction_amount": { "default_value": 5 },
"retraction_speed": {

View file

@ -51,7 +51,6 @@
"optimize_wall_printing_order": {"value": false },
"inset_direction": {"value": "'inside_out'" },
"alternate_extra_perimeter": {"value": false },
"filter_out_tiny_gaps": {"value": true },
"fill_outline_gaps": {"value": true },
"xy_offset": {"value": 0},
"skin_no_small_gaps_heuristic": {"value": true },

View file

@ -194,7 +194,6 @@
"wall_0_wipe_dist": { "value": 0.0 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"retraction_speed": {
"maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",

View file

@ -150,9 +150,6 @@
"fill_outline_gaps": {
"default_value": false
},
"filter_out_tiny_gaps": {
"default_value": false
},
"retraction_hop": {
"default_value": 0.2
},

View file

@ -84,7 +84,6 @@
"wall_0_wipe_dist": { "value": 0.0 },
"fill_outline_gaps": { "value": true },
"filter_out_tiny_gaps": { "value": true },
"retraction_speed": {
"maximum_value_warning": "machine_max_feedrate_e",
@ -99,8 +98,7 @@
"maximum_value_warning": "machine_max_feedrate_e",
"maximum_value": 200
},
"retraction_hop_enabled": { "value": "True" },
"retraction_hop": { "value": 0.2 },
"retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
"retraction_combing_max_distance": { "value": 30 },

View file

@ -64,7 +64,6 @@
"wall_0_wipe_dist": { "value": 0.0 },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"retraction_hop_enabled": { "value": "False" },
"retraction_hop": { "value": 0.2 },

View file

@ -211,7 +211,6 @@
"cool_fan_speed_max": { "value": "100" },
"cool_min_speed": { "value": "7" },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"infill_line_width": { "value": "round(line_width * 0.42 / 0.35, 2)" },
"infill_overlap": { "value": 30.0 },
"infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },

View file

@ -402,7 +402,7 @@ Window
UM.Label
{
Layout.fillWidth: true
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
text: catalog.i18nc("@text Asking the user whether printers are missing in a list.", "Printers missing?")
+ "\n"
+ catalog.i18nc("@text", "Make sure all your printers are turned ON and connected to Digital Factory.")
@ -413,7 +413,7 @@ Window
Cura.SecondaryButton
{
id: refreshListButton
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.alignment: Qt.AlignVCenter
text: catalog.i18nc("@button", "Refresh List")
iconSource: UM.Theme.getIcon("ArrowDoubleCircleRight")
onClicked: Cura.API.account.sync(true)

View file

@ -65,7 +65,7 @@ Item
Rectangle
{
Layout.alignment: Qt.AlignmentFlag.AlignHCenter
Layout.alignment: Qt.AlignHCenter
color: UM.Theme.getColor("viewport_overlay")
width: whatsNewViewport.width
height: whatsNewViewport.height

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.3
layer_height_0 = 0.3
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.1
layer_height_0 = 0.1
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.2
layer_height_0 = 0.2
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

View file

@ -27,7 +27,6 @@ jerk_print = 8
jerk_travel = 10
layer_height = 0.3
layer_height_0 = 0.3
material_diameter = 1.75
retract_at_layer_change = False
retraction_amount = 6
retraction_hop = 0.075

View file

@ -27,7 +27,6 @@ jerk_print = 8
jerk_travel = 10
layer_height = 0.1
layer_height_0 = 0.1
material_diameter = 1.75
retract_at_layer_change = False
retraction_amount = 6
retraction_hop = 0.075

View file

@ -27,7 +27,6 @@ jerk_print = 8
jerk_travel = 10
layer_height = 0.2
layer_height_0 = 0.2
material_diameter = 1.75
retract_at_layer_change = False
retraction_amount = 6
retraction_hop = 0.075

View file

@ -18,7 +18,6 @@ cool_fan_speed_0 = 0
layer_height = 0.10
layer_height_0 = 0.20
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 210
material_print_temperature_layer_0 = 210
speed_infill = =speed_print

View file

@ -18,7 +18,6 @@ cool_fan_speed_0 = 0
layer_height = 0.2
layer_height_0 = 0.3
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 210
material_print_temperature_layer_0 = 210
speed_infill = =speed_print

View file

@ -18,7 +18,6 @@ cool_fan_speed_0 = 0
layer_height = 0.30
layer_height_0 = 0.40
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 210
material_print_temperature_layer_0 = 210
speed_infill = =speed_print

View file

@ -18,7 +18,6 @@ cool_fan_speed_0 = 0
layer_height = 0.4
layer_height_0 = 0.4
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 210
material_print_temperature_layer_0 = 210
speed_infill = =speed_print

View file

@ -18,7 +18,6 @@ cool_fan_speed_0 = 0
layer_height = 0.08
layer_height_0 = 0.12
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
speed_infill = =speed_print

View file

@ -18,7 +18,6 @@ cool_fan_speed_0 = 0
layer_height = 0.12
layer_height_0 = 0.16
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
speed_infill = =speed_print

View file

@ -19,7 +19,6 @@ cool_fan_speed_0 = 0
layer_height = 0.16
layer_height_0 = 0.2
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
speed_infill = =speed_print

View file

@ -18,7 +18,6 @@ cool_fan_speed_0 = 0
layer_height = 0.2
layer_height_0 = 0.28
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
speed_infill = =speed_print

View file

@ -18,7 +18,6 @@ cool_fan_speed_0 = 0
layer_height = 0.28
layer_height_0 = 0.32
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
speed_infill = =speed_print

View file

@ -18,7 +18,6 @@ cool_fan_speed_0 = 0
layer_height = 0.32
layer_height_0 = 0.32
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
speed_infill = =speed_print

View file

@ -18,7 +18,6 @@ cool_fan_speed_0 = 0
layer_height = 0.4
layer_height_0 = 0.4
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 205
material_print_temperature_layer_0 = 0
speed_infill = =speed_print

View file

@ -18,7 +18,6 @@ cool_fan_speed_0 = 0
layer_height = 0.48
layer_height_0 = 0.48
material_bed_temperature = 40
material_diameter = 1.75
material_print_temperature = 205
material_print_temperature_layer_0 = 0
speed_infill = =speed_print

View file

@ -30,7 +30,6 @@ retraction_combing = off
retraction_amount = 0.75
retraction_speed = 70
material_flow = 98
material_diameter = 1.75
support_use_towers = False
support_z_distance = 0.2

View file

@ -30,7 +30,6 @@ retraction_combing = off
retraction_amount = 0.75
retraction_speed = 70
material_flow = 98
material_diameter = 1.75
support_use_towers = False
support_z_distance = 0.2

View file

@ -30,7 +30,6 @@ retraction_combing = off
retraction_amount = 0.75
retraction_speed = 70
material_flow = 98
material_diameter = 1.75
support_use_towers = False
support_z_distance = 0.2

View file

@ -29,7 +29,6 @@ retraction_combing = off
retraction_amount = 0.75
retraction_speed = 70
material_flow = 98
material_diameter = 1.75
support_use_towers = False
support_z_distance = 0.2

View file

@ -30,7 +30,6 @@ retraction_combing = off
retraction_amount = 0.75
retraction_speed = 70
material_flow = 98
material_diameter = 1.75
support_use_towers = False
support_z_distance = 0.2

View file

@ -30,7 +30,6 @@ retraction_combing = off
retraction_amount = 0.75
retraction_speed = 70
material_flow = 98
material_diameter = 1.75
support_use_towers = False
support_z_distance = 0.2

View file

@ -30,7 +30,6 @@ retraction_combing = off
retraction_amount = 0.75
retraction_speed = 70
material_flow = 98
material_diameter = 1.75
support_use_towers = False
support_z_distance = 0.2

View file

@ -29,7 +29,6 @@ retraction_combing = off
retraction_amount = 0.75
retraction_speed = 70
material_flow = 98
material_diameter = 1.75
support_use_towers = False
support_z_distance = 0.2

View file

@ -11,7 +11,6 @@ weight = 3
material = generic_pla
[values]
material_diameter = 1.75
speed_print = 40
speed_topbottom = 30
speed_wall_0 = 35

View file

@ -11,7 +11,6 @@ weight = 2
material = generic_pla
[values]
material_diameter = 1.75
speed_print = 40
speed_topbottom = 30
speed_wall_0 = 35

View file

@ -11,7 +11,6 @@ weight = 3
material = generic_abs
[values]
material_diameter = 1.75
speed_print = 40
speed_topbottom = 30
speed_wall_0 = 35

View file

@ -11,7 +11,6 @@ weight = 3
material = generic_pla
[values]
material_diameter = 1.75
speed_print = 40
speed_topbottom = 30
speed_wall_0 = 35

View file

@ -24,7 +24,6 @@ speed_travel = 120
material_print_temperature = 246
material_bed_temperature = 85
material_diameter = 1.75
retraction_speed = 50
retraction_amount = 1.5

View file

@ -24,7 +24,6 @@ speed_travel = 120
material_print_temperature = 246
material_bed_temperature = 85
material_diameter = 1.75
retraction_speed = 50
retraction_amount = 1.5

View file

@ -24,7 +24,6 @@ speed_travel = 120
material_print_temperature = 246
material_bed_temperature = 85
material_diameter = 1.75
retraction_speed = 50
retraction_amount = 1.5

View file

@ -24,7 +24,6 @@ speed_travel = 120
material_print_temperature = 246
material_bed_temperature = 85
material_diameter = 1.75
retraction_speed = 50
retraction_amount = 1.5

View file

@ -24,7 +24,6 @@ speed_travel = 120
material_print_temperature = 246
material_bed_temperature = 85
material_diameter = 1.75
retraction_speed = 50
retraction_amount = 1.5

View file

@ -18,7 +18,6 @@ speed_print = 60
material_print_temperature = 214
material_bed_temperature = 60
material_diameter = 1.75
retraction_speed = 40
retraction_amount = 2.15

View file

@ -18,7 +18,6 @@ speed_print = 30
material_print_temperature = 214
material_bed_temperature = 60
material_diameter = 1.75
retraction_speed = 40
retraction_amount = 2.15

View file

@ -18,7 +18,6 @@ speed_print = 40
material_print_temperature = 214
material_bed_temperature = 60
material_diameter = 1.75
retraction_speed = 40
retraction_amount = 2.15

View file

@ -18,7 +18,6 @@ speed_print = 60
material_print_temperature = 214
material_bed_temperature = 60
material_diameter = 1.75
retraction_speed = 40
retraction_amount = 2.15

View file

@ -18,7 +18,6 @@ speed_print = 50
material_print_temperature = 214
material_bed_temperature = 60
material_diameter = 1.75
retraction_speed = 40
retraction_amount = 2.15

View file

@ -17,7 +17,6 @@ adhesion_type = raft
speed_print = 60
material_print_temperature = 214
material_diameter = 1.75
retraction_speed = 40
retraction_amount = 2.15

View file

@ -23,7 +23,6 @@ speed_topbottom = =math.ceil(speed_print * 20 / 40)
speed_travel = 120
material_print_temperature = 214
material_diameter = 1.75
retraction_speed = 40
retraction_amount = 2.15

View file

@ -23,7 +23,6 @@ speed_topbottom = =math.ceil(speed_print * 30 / 50)
speed_travel = 120
material_print_temperature = 214
material_diameter = 1.75
retraction_speed = 40
retraction_amount = 2.15

View file

@ -17,7 +17,6 @@ adhesion_type = raft
speed_print = 60
material_print_temperature = 214
material_diameter = 1.75
retraction_speed = 40
retraction_amount = 2.15

View file

@ -23,7 +23,6 @@ speed_topbottom = =math.ceil(speed_print * 20 / 60)
speed_travel = 120
material_print_temperature = 214
material_diameter = 1.75
retraction_speed = 40
retraction_amount = 2.15

View file

@ -46,7 +46,6 @@ gradual_infill_steps = 0
infill_before_walls = False
infill_support_enabled = False
max_skin_angle_for_expansion = 90
material_diameter = 1.75
default_material_print_temperature = 220
material_print_temperature = 220
material_print_temperature_layer_0 = 220

View file

@ -45,7 +45,6 @@ gradual_infill_steps = 0
infill_before_walls = False
infill_support_enabled = False
max_skin_angle_for_expansion = 90
material_diameter = 1.75
default_material_print_temperature = 220
material_print_temperature = 220
material_print_temperature_layer_0 = 220

View file

@ -45,7 +45,6 @@ gradual_infill_steps = 0
infill_before_walls = False
infill_support_enabled = False
max_skin_angle_for_expansion = 90
material_diameter = 1.75
default_material_print_temperature = 220
material_print_temperature = 220
material_print_temperature_layer_0 = 220

View file

@ -47,7 +47,6 @@ gradual_infill_steps = 0
infill_before_walls = False
infill_support_enabled = False
max_skin_angle_for_expansion = 90
material_diameter = 1.75
default_material_print_temperature = 220
material_print_temperature = 220
material_print_temperature_layer_0 = 220

View file

@ -44,7 +44,6 @@ gradual_infill_steps = 0
infill_before_walls = False
infill_support_enabled = False
max_skin_angle_for_expansion = 90
material_diameter = 1.75
default_material_print_temperature = 220
material_print_temperature = 220
material_print_temperature_layer_0 = 220

View file

@ -47,7 +47,6 @@ gradual_infill_steps = 0
infill_before_walls = False
infill_support_enabled = False
max_skin_angle_for_expansion = 90
material_diameter = 1.75
default_material_print_temperature = 220
material_print_temperature = 220
material_print_temperature_layer_0 = 220

View file

@ -46,7 +46,6 @@ gradual_infill_steps = 0
infill_before_walls = False
infill_support_enabled = False
max_skin_angle_for_expansion = 90
material_diameter = 1.75
default_material_print_temperature = 220
material_print_temperature = 220
material_print_temperature_layer_0 = 220

View file

@ -45,7 +45,6 @@ gradual_infill_steps = 0
infill_before_walls = False
infill_support_enabled = False
max_skin_angle_for_expansion = 90
material_diameter = 1.75
default_material_print_temperature = 220
material_print_temperature = 220
material_print_temperature_layer_0 = 220

View file

@ -45,7 +45,6 @@ gradual_infill_steps = 0
infill_before_walls = False
infill_support_enabled = False
max_skin_angle_for_expansion = 90
material_diameter = 1.75
default_material_print_temperature = 220
material_print_temperature = 220
material_print_temperature_layer_0 = 220

View file

@ -45,7 +45,6 @@ gradual_infill_steps = 0
infill_before_walls = False
infill_support_enabled = False
max_skin_angle_for_expansion = 90
material_diameter = 1.75
default_material_print_temperature = 220
material_print_temperature = 220
material_print_temperature_layer_0 = 220

View file

@ -14,7 +14,6 @@ global_quality = True
brim_width = 4.0
infill_pattern = zigzag
layer_height = 0.3
material_diameter = 1.75
speed_infill = =speed_print
speed_print = 50
speed_support = 30

View file

@ -14,7 +14,6 @@ global_quality = True
brim_width = 4.0
infill_pattern = zigzag
layer_height = 0.1
material_diameter = 1.75
speed_infill = =speed_print
speed_print = 50
speed_support = 30

View file

@ -14,7 +14,6 @@ global_quality = True
brim_width = 4.0
infill_pattern = zigzag
layer_height = 0.2
material_diameter = 1.75
speed_infill = =math.ceil(speed_print * 60 / 50)
speed_print = 50
speed_support = 30

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.3
layer_height_0 = 0.3
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.1
layer_height_0 = 0.1
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.2
layer_height_0 = 0.2
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.3
layer_height_0 = 0.3
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.1
layer_height_0 = 0.1
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.2
layer_height_0 = 0.2
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.3
layer_height_0 = 0.3
material_bed_temperature = 60
material_diameter = 1.75
retract_at_layer_change = False
retraction_amount = 6
retraction_hop = 0.075

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.1
layer_height_0 = 0.1
material_bed_temperature = 60
material_diameter = 1.75
retract_at_layer_change = False
retraction_amount = 6
retraction_hop = 0.075

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.2
layer_height_0 = 0.2
material_bed_temperature = 60
material_diameter = 1.75
retract_at_layer_change = False
retraction_amount = 6
retraction_hop = 0.075

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.3
layer_height_0 = 0.3
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.1
layer_height_0 = 0.1
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

View file

@ -29,7 +29,6 @@ jerk_travel = 10
layer_height = 0.2
layer_height_0 = 0.2
material_bed_temperature = 60
material_diameter = 1.75
material_print_temperature = 200
material_print_temperature_layer_0 = 0
retract_at_layer_change = False

Some files were not shown because too many files have changed in this diff Show more