Merge branch 'master' of github.com:ultimaker/Cura into transparent_limit_to_extruder

* 'master' of github.com:ultimaker/Cura: (94 commits)
  Re-enable Japanese from language selection menu
  Add Japanese translations for setting descriptions
  Update PVA profiles
  Changed profile names
  Simplified some code
  Changed final spot where we still used findContainer when looking for container with specific type
  Directly use property instead of searching
  Added a type hinting to QualityManager
  JSON description fix: warn users when not to use spiralize (CURA-3636)
  Add setting_version every time we create InstanceContainer
  Increase warning value for gradual infill steps
  Convert all metadata fields to string
  cleanup: prime => prime blob and lil doc (CURA-3634)
  fix: don't make disallowed area if blob is disabled (CURA-3634)
  Be robust against older specification version numbers
  Read setting_version from version attribute on root
  Added bunch of typing to extruder manager
  Fix resolve strategy "new" for user instance container
  Added missing typehinting
  Row element was not used
  ...
This commit is contained in:
Arjen Hiemstra 2017-05-16 10:57:06 +02:00
commit c5c67ee8be
289 changed files with 5298 additions and 786 deletions

View file

@ -7,6 +7,7 @@
"type": "extruder",
"author": "Ultimaker B.V.",
"manufacturer": "Ultimaker",
"setting_version": 1,
"visible": false
},
"settings":

View file

@ -8,6 +8,7 @@
"author": "Ultimaker B.V.",
"category": "Ultimaker",
"manufacturer": "Ultimaker",
"setting_version": 1,
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,
@ -1217,19 +1218,6 @@
"enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
"settable_per_mesh": true
},
"sub_div_rad_mult":
{
"label": "Cubic Subdivision Radius",
"description": "A multiplier on the radius from the center of each cube to check for the boundary of the model, as to decide whether this cube should be subdivided. Larger values lead to more subdivisions, i.e. more small cubes.",
"unit": "%",
"type": "float",
"default_value": 100,
"minimum_value": "0",
"minimum_value_warning": "100",
"maximum_value_warning": "200",
"enabled": "infill_sparse_density > 0 and infill_pattern == 'cubicsubdiv'",
"settable_per_mesh": true
},
"sub_div_rad_add":
{
"label": "Cubic Subdivision Shell",
@ -1335,7 +1323,7 @@
"default_value": 0,
"type": "int",
"minimum_value": "0",
"maximum_value_warning": "4",
"maximum_value_warning": "5",
"maximum_value": "0 if spaghetti_infill_enabled else (999999 if infill_line_distance == 0 else (20 - math.log(infill_line_distance) / math.log(2)))",
"enabled": "infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv' and not spaghetti_infill_enabled",
"settable_per_mesh": true
@ -3636,7 +3624,7 @@
"none": "None"
},
"default_value": "brim",
"resolve": "'raft' if 'raft' in extruderValues('adhesion_type') else ('brim' if 'brim' in extruderValues('adhesion_type') else 'skirt')",
"limit_to_extruder": "adhesion_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": false
},
@ -4583,7 +4571,7 @@
"magic_spiralize":
{
"label": "Spiralize Outer Contour",
"description": "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature used to be called Joris in older versions.",
"description": "Spiralize smooths out the Z move of the outer edge. This will create a steady Z increase over the whole print. This feature turns a solid model into a single walled print with a solid bottom. This feature should only be enabled when each layer only contains a single part.",
"type": "bool",
"default_value": false,
"settable_per_mesh": false,
@ -4595,7 +4583,9 @@
"description": "Smooth the spiralized contours to reduce the visibility of the Z seam (the Z-seam should be barely visible on the print but will still be visible in the layer view). Note that smoothing will tend to blur fine surface details.",
"type": "bool",
"default_value": true,
"enabled": "magic_spiralize"
"enabled": "magic_spiralize",
"settable_per_mesh": false,
"settable_per_extruder": false
}
}
},

View file

@ -11,8 +11,7 @@
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2.png",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2Extendedbackplate.png",
"supported_actions": ["UpgradeFirmware"]
"platform_texture": "Ultimaker2Extendedbackplate.png"
},
"overrides": {

File diff suppressed because it is too large Load diff

View file

@ -56,7 +56,6 @@ UM.Dialog
{
text: catalog.i18nc("@text:window", "You have customized some profile settings.\nWould you like to keep or discard those settings?")
anchors.margins: UM.Theme.getSize("default_margin").width
font: UM.Theme.getFont("default")
wrapMode: Text.WordWrap
}
}

View file

@ -1,66 +0,0 @@
// Copyright (c) 2015 Ultimaker B.V.
// Cura is released under the terms of the AGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Window 2.1
import UM 1.1 as UM
UM.Dialog
{
id: base
//: Dialog title
title: catalog.i18nc("@title:window", "Multiply Model")
minimumWidth: 400 * Screen.devicePixelRatio
minimumHeight: 80 * Screen.devicePixelRatio
width: minimumWidth
height: minimumHeight
property var objectId: 0;
onAccepted: CuraApplication.multiplyObject(base.objectId, parseInt(copiesField.text))
property variant catalog: UM.I18nCatalog { name: "cura" }
signal reset()
onReset: {
copiesField.text = "1";
copiesField.selectAll();
copiesField.focus = true;
}
Row
{
spacing: UM.Theme.getSize("default_margin").width
Label {
text: "Number of copies:"
anchors.verticalCenter: copiesField.verticalCenter
}
TextField {
id: copiesField
validator: RegExpValidator { regExp: /^\d{0,2}/ }
maximumLength: 2
}
}
rightButtons:
[
Button
{
text: catalog.i18nc("@action:button","OK")
onClicked: base.accept()
enabled: base.objectId != 0 && parseInt(copiesField.text) > 0
},
Button
{
text: catalog.i18nc("@action:button","Cancel")
onClicked: base.reject()
}
]
}

View file

@ -152,6 +152,7 @@ UM.PreferencesPage
append({ text: "Suomi", code: "fi" })
append({ text: "Français", code: "fr" })
append({ text: "Italiano", code: "it" })
append({ text: "日本語", code: "jp" })
append({ text: "Nederlands", code: "nl" })
append({ text: "Português do Brasil", code: "ptbr" })
append({ text: "Русский", code: "ru" })

View file

@ -24,66 +24,89 @@ TabView
property double spoolLength: calculateSpoolLength()
property real costPerMeter: calculateCostPerMeter()
property bool reevaluateLinkedMaterials: false
property string linkedMaterialNames:
{
if (reevaluateLinkedMaterials)
{
reevaluateLinkedMaterials = false;
}
if(!base.containerId || !base.editingEnabled)
{
return ""
}
var linkedMaterials = Cura.ContainerManager.getLinkedMaterials(base.containerId);
return linkedMaterials.join(", ");
}
Tab
{
title: catalog.i18nc("@title","Information")
anchors
{
leftMargin: UM.Theme.getSize("default_margin").width
topMargin: UM.Theme.getSize("default_margin").height
bottomMargin: UM.Theme.getSize("default_margin").height
rightMargin: 0
}
anchors.margins: UM.Theme.getSize("default_margin").width
ScrollView
{
id: scrollView
anchors.fill: parent
horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
flickableItem.flickableDirection: Flickable.VerticalFlick
frameVisible: true
property real columnWidth: Math.floor(viewport.width * 0.5) - UM.Theme.getSize("default_margin").width
Flow
{
id: containerGrid
width: base.width;
x: UM.Theme.getSize("default_margin").width
y: UM.Theme.getSize("default_lining").height
property real rowHeight: textField.height;
width: base.width
property real rowHeight: textField.height + UM.Theme.getSize("default_lining").height
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Display Name") }
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Display Name") }
ReadOnlyTextField
{
id: displayNameTextField;
width: base.secondColumnWidth;
width: scrollView.columnWidth;
text: properties.name;
readOnly: !base.editingEnabled;
onEditingFinished: base.setName(properties.name, text)
}
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Brand") }
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Brand") }
ReadOnlyTextField
{
id: textField;
width: base.secondColumnWidth;
width: scrollView.columnWidth;
text: properties.supplier;
readOnly: !base.editingEnabled;
onEditingFinished: base.setMetaDataEntry("brand", properties.supplier, text)
onEditingFinished:
{
base.setMetaDataEntry("brand", properties.supplier, text);
pane.objectList.currentIndex = pane.getIndexById(base.containerId);
}
}
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Material Type") }
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Material Type") }
ReadOnlyTextField
{
width: base.secondColumnWidth;
width: scrollView.columnWidth;
text: properties.material_type;
readOnly: !base.editingEnabled;
onEditingFinished: base.setMetaDataEntry("material", properties.material_type, text)
onEditingFinished:
{
base.setMetaDataEntry("material", properties.material_type, text);
pane.objectList.currentIndex = pane.getIndexById(base.containerId)
}
}
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Color") }
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Color") }
Row
{
width: base.secondColumnWidth;
width: scrollView.columnWidth;
height: parent.rowHeight;
spacing: UM.Theme.getSize("default_margin").width/2
@ -115,11 +138,11 @@ TabView
Label { width: parent.width; height: parent.rowHeight; font.bold: true; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Properties") }
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Density") }
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Density") }
ReadOnlySpinBox
{
id: densitySpinBox
width: base.secondColumnWidth
width: scrollView.columnWidth
value: properties.density
decimals: 2
suffix: " g/cm³"
@ -130,11 +153,11 @@ TabView
onValueChanged: updateCostPerMeter()
}
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Diameter") }
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Diameter") }
ReadOnlySpinBox
{
id: diameterSpinBox
width: base.secondColumnWidth
width: scrollView.columnWidth
value: properties.diameter
decimals: 2
suffix: " mm"
@ -145,11 +168,11 @@ TabView
onValueChanged: updateCostPerMeter()
}
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament Cost") }
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament Cost") }
SpinBox
{
id: spoolCostSpinBox
width: base.secondColumnWidth
width: scrollView.columnWidth
value: base.getMaterialPreferenceValue(properties.guid, "spool_cost")
prefix: base.currency + " "
decimals: 2
@ -161,11 +184,11 @@ TabView
}
}
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament weight") }
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament weight") }
SpinBox
{
id: spoolWeightSpinBox
width: base.secondColumnWidth
width: scrollView.columnWidth
value: base.getMaterialPreferenceValue(properties.guid, "spool_weight")
suffix: " g"
stepSize: 100
@ -178,24 +201,45 @@ TabView
}
}
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament length") }
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Filament length") }
Label
{
width: base.secondColumnWidth
width: scrollView.columnWidth
text: "~ %1 m".arg(Math.round(base.spoolLength))
verticalAlignment: Qt.AlignVCenter
height: parent.rowHeight
}
Label { width: base.firstColumnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Cost per Meter") }
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Cost per Meter") }
Label
{
width: base.secondColumnWidth
width: scrollView.columnWidth
text: "~ %1 %2/m".arg(base.costPerMeter.toFixed(2)).arg(base.currency)
verticalAlignment: Qt.AlignVCenter
height: parent.rowHeight
}
Item { width: parent.width; height: UM.Theme.getSize("default_margin").height; visible: unlinkMaterialButton.visible }
Label
{
width: 2 * scrollView.columnWidth
verticalAlignment: Qt.AlignVCenter
text: catalog.i18nc("@label", "This material is linked to %1 and shares some of its properties.").arg(base.linkedMaterialNames)
wrapMode: Text.WordWrap
visible: unlinkMaterialButton.visible
}
Button
{
id: unlinkMaterialButton
text: catalog.i18nc("@label", "Unlink Material")
visible: base.linkedMaterialNames != ""
onClicked:
{
Cura.ContainerManager.unlinkMaterial(base.containerId)
base.reevaluateLinkedMaterials = true
}
}
Item { width: parent.width; height: UM.Theme.getSize("default_margin").height }
Label { width: parent.width; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Description") }
@ -203,7 +247,7 @@ TabView
ReadOnlyTextArea
{
text: properties.description;
width: base.firstColumnWidth + base.secondColumnWidth
width: 2 * scrollView.columnWidth
wrapMode: Text.WordWrap
readOnly: !base.editingEnabled;
@ -216,13 +260,15 @@ TabView
ReadOnlyTextArea
{
text: properties.adhesion_info;
width: base.firstColumnWidth + base.secondColumnWidth
width: 2 * scrollView.columnWidth
wrapMode: Text.WordWrap
readOnly: !base.editingEnabled;
onEditingFinished: base.setMetaDataEntry("adhesion_info", properties.adhesion_info, text)
}
Item { width: parent.width; height: UM.Theme.getSize("default_margin").height }
}
function updateCostPerMeter()
@ -266,8 +312,10 @@ TabView
{
id: label
width: base.firstColumnWidth;
height: spinBox.height
height: spinBox.height + UM.Theme.getSize("default_lining").height
text: model.label
elide: Text.ElideRight
verticalAlignment: Qt.AlignVCenter
}
ReadOnlySpinBox
{
@ -380,6 +428,7 @@ TabView
Cura.ContainerManager.setContainerName(base.containerId, new_value);
// update material name label. not so pretty, but it works
materialProperties.name = new_value;
pane.objectList.currentIndex = pane.getIndexById(base.containerId)
}
}
}

View file

@ -14,6 +14,12 @@ UM.ManagementPage
title: catalog.i18nc("@title:tab", "Materials");
Component.onCompleted:
{
// Workaround to make sure all of the items are visible
objectList.positionViewAtBeginning();
}
model: UM.InstanceContainersModel
{
filter:
@ -81,6 +87,7 @@ UM.ManagementPage
anchors.fill: parent;
onClicked:
{
forceActiveFocus();
if(!parent.ListView.isCurrentItem)
{
parent.ListView.view.currentIndex = index;
@ -91,9 +98,11 @@ UM.ManagementPage
}
activeId: Cura.MachineManager.activeMaterialId
activeIndex: {
activeIndex: getIndexById(activeId)
function getIndexById(material_id)
{
for(var i = 0; i < model.rowCount(); i++) {
if (model.getItem(i).id == Cura.MachineManager.activeMaterialId) {
if (model.getItem(i).id == material_id) {
return i;
}
}
@ -135,6 +144,24 @@ UM.ManagementPage
}
},
Button
{
text: catalog.i18nc("@action:button", "Create")
iconName: "list-add"
onClicked:
{
var material_id = Cura.ContainerManager.createMaterial()
if(material_id == "")
{
return
}
if(Cura.MachineManager.hasMaterials)
{
Cura.MachineManager.setActiveMaterial(material_id)
}
base.objectList.currentIndex = base.getIndexById(material_id);
}
},
Button
{
text: catalog.i18nc("@action:button", "Duplicate");
iconName: "list-add";
@ -152,6 +179,7 @@ UM.ManagementPage
{
Cura.MachineManager.setActiveMaterial(material_id)
}
base.objectList.currentIndex = base.getIndexById(material_id);
}
},
Button
@ -206,6 +234,8 @@ UM.ManagementPage
properties: materialProperties
containerId: base.currentItem != null ? base.currentItem.id : ""
property alias pane: base
}
QtObject
@ -251,6 +281,10 @@ UM.ManagementPage
{
Cura.ContainerManager.removeContainer(containers[i])
}
if(base.objectList.currentIndex > 0)
{
base.objectList.currentIndex--;
}
currentItem = base.model.getItem(base.objectList.currentIndex) // Refresh the current item.
}
}

View file

@ -45,17 +45,4 @@ Item
}
}
}
Label
{
visible: base.readOnly
text: textArea.text
anchors.fill: parent
anchors.margins: textArea.__style ? textArea.__style.textMargin : 4
color: palette.buttonText
}
SystemPalette { id: palette }
}

View file

@ -53,7 +53,8 @@ Item
id: infillCellRight
height: childrenRect.height;
width: base.width * .55
width: base.width * .5
spacing: UM.Theme.getSize("default_margin").width
anchors.left: infillCellLeft.right
@ -124,7 +125,7 @@ Item
{
id: infillIcon
anchors.fill: parent;
anchors.margins: UM.Theme.getSize("infill_button_margin").width
anchors.margins: 2
sourceSize.width: width
sourceSize.height: width
@ -184,47 +185,47 @@ Item
Component.onCompleted:
{
infillModel.append({
name: catalog.i18nc("@label", "Empty"),
name: catalog.i18nc("@label", "0%"),
percentage: 0,
steps: 0,
percentageMin: -1,
percentageMax: 0,
stepsMin: -1,
stepsMax: 0,
text: catalog.i18nc("@label", "Empty infill will leave your model hollow with low strength"),
text: catalog.i18nc("@label", "Empty infill will leave your model hollow with low strength."),
icon: "hollow"
})
infillModel.append({
name: catalog.i18nc("@label", "Light"),
name: catalog.i18nc("@label", "20%"),
percentage: 20,
steps: 0,
percentageMin: 0,
percentageMax: 30,
stepsMin: -1,
stepsMax: 0,
text: catalog.i18nc("@label", "Light (20%) infill will give your model an average strength"),
text: catalog.i18nc("@label", "Light (20%) infill will give your model an average strength."),
icon: "sparse"
})
infillModel.append({
name: catalog.i18nc("@label", "Dense"),
name: catalog.i18nc("@label", "50%"),
percentage: 50,
steps: 0,
percentageMin: 30,
percentageMax: 70,
stepsMin: -1,
stepsMax: 0,
text: catalog.i18nc("@label", "Dense (50%) infill will give your model an above average strength"),
text: catalog.i18nc("@label", "Dense (50%) infill will give your model an above average strength."),
icon: "dense"
})
infillModel.append({
name: catalog.i18nc("@label", "Solid"),
name: catalog.i18nc("@label", "100%"),
percentage: 100,
steps: 0,
percentageMin: 70,
percentageMax: 9999999999,
stepsMin: -1,
stepsMax: 0,
text: catalog.i18nc("@label", "Solid (100%) infill will make your model completely solid"),
text: catalog.i18nc("@label", "Solid (100%) infill will make your model completely solid."),
icon: "solid"
})
infillModel.append({
@ -236,7 +237,7 @@ Item
stepsMin: 0,
stepsMax: 9999999999,
infill_layer_height: 1.5,
text: catalog.i18nc("@label", "This will gradually increase the amount of infill towards the top"),
text: catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top."),
icon: "gradual"
})
}

View file

@ -13,13 +13,10 @@ UM.Dialog
{
title: catalog.i18nc("@title:window", "Save Project")
width: 550 * Screen.devicePixelRatio
minimumWidth: 550 * Screen.devicePixelRatio
width: 500
height: 400
height: 350 * Screen.devicePixelRatio
minimumHeight: 350 * Screen.devicePixelRatio
property int spacerHeight: 10 * Screen.devicePixelRatio
property int spacerHeight: 10
property bool dontShowAgain: true
@ -42,7 +39,6 @@ UM.Dialog
Item
{
anchors.fill: parent
anchors.margins: 20 * Screen.devicePixelRatio
UM.SettingDefinitionsModel
{
@ -232,42 +228,43 @@ UM.Dialog
height: spacerHeight
width: height
}
CheckBox
{
id: dontShowAgainCheckbox
text: catalog.i18nc("@action:label", "Don't show project summary on save again")
checked: dontShowAgain
}
}
CheckBox
{
id: dontShowAgainCheckbox
anchors.bottom: parent.bottom
anchors.left: parent.left
text: catalog.i18nc("@action:label", "Don't show project summary on save again")
checked: dontShowAgain
}
Button
{
id: cancel_button
anchors.bottom: parent.bottom
anchors.right: ok_button.left
anchors.rightMargin: 2
text: catalog.i18nc("@action:button","Cancel");
enabled: true
onClicked: close()
}
Button
{
id: ok_button
anchors.bottom: parent.bottom
anchors.right: parent.right
text: catalog.i18nc("@action:button","Save");
enabled: true
onClicked: {
close()
yes()
}
anchors.bottomMargin: - 0.5 * height
anchors.bottom: parent.bottom
anchors.right: parent.right
}
Button
{
id: cancel_button
text: catalog.i18nc("@action:button","Cancel");
enabled: true
onClicked: close()
anchors.bottom: parent.bottom
anchors.right: ok_button.left
anchors.bottomMargin: - 0.5 * height
anchors.rightMargin:2
}
}
}

View file

@ -1,7 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = abax_pri3
[metadata]
@ -9,6 +8,7 @@ type = quality
material = generic_pla
weight = 0
quality_type = normal
setting_version = 1
[values]
layer_height = 0.2

View file

@ -1,7 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = abax_pri3
[metadata]
@ -9,6 +8,7 @@ type = quality
material = generic_pla
weight = 1
quality_type = high
setting_version = 1
[values]
layer_height = 0.1

View file

@ -1,7 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = abax_pri3
[metadata]
@ -9,6 +8,7 @@ type = quality
material = generic_pla
weight = 0
quality_type = normal
setting_version = 1
[values]
layer_height = 0.2

View file

@ -1,7 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = abax_pri5
[metadata]
@ -9,6 +8,7 @@ type = quality
material = generic_pla
weight = 0
quality_type = normal
setting_version = 1
[values]
layer_height = 0.2

View file

@ -1,7 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = abax_pri5
[metadata]
@ -9,6 +8,7 @@ type = quality
material = generic_pla
weight = 1
quality_type = high
setting_version = 1
[values]
layer_height = 0.1

View file

@ -1,7 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = abax_pri5
[metadata]
@ -9,6 +8,7 @@ type = quality
material = generic_pla
weight = 0
quality_type = normal
setting_version = 1
[values]
layer_height = 0.2

View file

@ -1,7 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = abax_titan
[metadata]
@ -9,6 +8,7 @@ type = quality
material = generic_pla
weight = 0
quality_type = normal
setting_version = 1
[values]
layer_height = 0.2

View file

@ -1,13 +1,13 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = abax_titan
[metadata]
type = quality
material = generic_pla
weight = 1
quality_type = high
setting_version = 1
[values]
layer_height = 0.1

View file

@ -1,7 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = abax_titan
[metadata]
@ -9,6 +8,7 @@ type = quality
material = generic_pla
weight = 0
quality_type = normal
setting_version = 1
[values]
layer_height = 0.2

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_abs_175_cartesio_0.25_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_abs_175_cartesio_0.25_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_abs_175_cartesio_0.4_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_abs_175_cartesio_0.4_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -8,6 +8,7 @@ type = quality
quality_type = coarse
material = generic_abs_175_cartesio_0.8_mm
weight = 3
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -8,6 +8,7 @@ type = quality
quality_type = extra coarse
material = generic_abs_175_cartesio_0.8_mm
weight = 4
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_abs_175_cartesio_0.8_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_abs_175_cartesio_0.8_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = dsm_arnitel2045_175_cartesio_0.4_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = dsm_arnitel2045_175_cartesio_0.4_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -8,6 +8,7 @@ type = quality
quality_type = coarse
global_quality = True
weight = 0
setting_version = 1
[values]
layer_height = 0.4

View file

@ -8,6 +8,7 @@ type = quality
quality_type = extra coarse
global_quality = True
weight = 0
setting_version = 1
[values]
layer_height = 0.6

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
global_quality = True
weight = 0
setting_version = 1
[values]
layer_height = 0.1

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
global_quality = True
weight = 0
setting_version = 1
[values]
layer_height = 0.2

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_hips_175_cartesio_0.25_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_hips_175_cartesio_0.25_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_hips_175_cartesio_0.4_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_hips_175_cartesio_0.4_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -8,6 +8,7 @@ type = quality
quality_type = coarse
material = generic_hips_175_cartesio_0.8_mm
weight = 3
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -8,6 +8,7 @@ type = quality
quality_type = extra coarse
material = generic_hips_175_cartesio_0.8_mm
weight = 4
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_hips_175_cartesio_0.8_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_hips_175_cartesio_0.8_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_nylon_175_cartesio_0.25_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_nylon_175_cartesio_0.25_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_nylon_175_cartesio_0.4_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_nylon_175_cartesio_0.4_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -8,6 +8,7 @@ type = quality
quality_type = coarse
material = generic_nylon_175_cartesio_0.8_mm
weight = 3
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -8,6 +8,7 @@ type = quality
quality_type = extra coarse
material = generic_nylon_175_cartesio_0.8_mm
weight = 4
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_nylon_175_cartesio_0.8_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_nylon_175_cartesio_0.8_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_pc_175_cartesio_0.25_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_pc_175_cartesio_0.25_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_pc_175_cartesio_0.4_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_pc_175_cartesio_0.4_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -8,6 +8,7 @@ type = quality
quality_type = coarse
material = generic_pc_175_cartesio_0.8_mm
weight = 3
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -8,6 +8,7 @@ type = quality
quality_type = extra coarse
material = generic_pc_175_cartesio_0.8_mm
weight = 4
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_pc_175_cartesio_0.8_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_pc_175_cartesio_0.8_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_petg_175_cartesio_0.25_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_petg_175_cartesio_0.25_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_petg_175_cartesio_0.4_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_petg_175_cartesio_0.4_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -8,6 +8,7 @@ type = quality
quality_type = coarse
material = generic_petg_175_cartesio_0.8_mm
weight = 3
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -8,6 +8,7 @@ type = quality
quality_type = extra coarse
material = generic_petg_175_cartesio_0.8_mm
weight = 4
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_petg_175_cartesio_0.8_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_petg_175_cartesio_0.8_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_pla_175_cartesio_0.25_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_pla_175_cartesio_0.25_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_pla_175_cartesio_0.4_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_pla_175_cartesio_0.4_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -8,6 +8,7 @@ type = quality
quality_type = coarse
material = generic_pla_175_cartesio_0.8_mm
weight = 3
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -8,6 +8,7 @@ type = quality
quality_type = extra coarse
material = generic_pla_175_cartesio_0.8_mm
weight = 4
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_pla_175_cartesio_0.8_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_pla_175_cartesio_0.8_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_pva_175_cartesio_0.25_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_pva_175_cartesio_0.25_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.3

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_pva_175_cartesio_0.4_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_pva_175_cartesio_0.4_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.5

View file

@ -8,6 +8,7 @@ type = quality
quality_type = coarse
material = generic_pva_175_cartesio_0.8_mm
weight = 3
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -8,6 +8,7 @@ type = quality
quality_type = extra coarse
material = generic_pva_175_cartesio_0.8_mm
weight = 4
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
material = generic_pva_175_cartesio_0.8_mm
weight = 1
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = Normal Quality
name = Fine
definition = cartesio
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = normal
material = generic_pva_175_cartesio_0.8_mm
weight = 2
setting_version = 1
[values]
infill_line_width = 0.9

View file

@ -8,6 +8,7 @@ type = quality
quality_type = coarse
global_quality = True
weight = -3
setting_version = 1
[values]
layer_height = 0.4

View file

@ -9,6 +9,7 @@ type = quality
quality_type = draft
global_quality = True
weight = -2
setting_version = 1
[values]
layer_height = 0.2

View file

@ -8,6 +8,7 @@ type = quality
quality_type = Extra coarse
global_quality = True
weight = -4
setting_version = 1
[values]
layer_height = 0.6

View file

@ -1,6 +1,6 @@
[general]
version = 2
name = High Quality
name = Extra Fine
definition = fdmprinter
[metadata]
@ -8,6 +8,7 @@ type = quality
quality_type = high
global_quality = True
weight = 1
setting_version = 1
[values]
layer_height = 0.06

View file

@ -8,6 +8,7 @@ type = quality
material = generic_petg_imade3d_jellybox_0.4_mm
weight = -1
quality_type = fast
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
material = generic_petg_imade3d_jellybox_0.4_mm_2-fans
weight = -1
quality_type = fast
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
material = generic_petg_imade3d_jellybox_0.4_mm
weight = 0
quality_type = normal
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
material = generic_petg_imade3d_jellybox_0.4_mm_2-fans
weight = 0
quality_type = normal
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
material = generic_pla_imade3d_jellybox_0.4_mm
weight = -1
quality_type = fast
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
material = generic_pla_imade3d_jellybox_0.4_mm_2-fans
weight = -1
quality_type = fast
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
material = generic_pla_imade3d_jellybox_0.4_mm
weight = 1
quality_type = high
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
material = generic_pla_imade3d_jellybox_0.4_mm_2-fans
weight = 1
quality_type = high
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
material = generic_pla_imade3d_jellybox_0.4_mm
weight = 0
quality_type = normal
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
material = generic_pla_imade3d_jellybox_0.4_mm_2-fans
weight = 0
quality_type = normal
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
material = generic_pla_imade3d_jellybox_0.4_mm
weight = 2
quality_type = ultrahigh
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
material = generic_pla_imade3d_jellybox_0.4_mm_2-fans
weight = 2
quality_type = ultrahigh
setting_version = 1
[values]
adhesion_type = skirt

View file

@ -8,6 +8,7 @@ type = quality
quality_type = low
global_quality = True
weight = -1
setting_version = 1
[values]
infill_sparse_density = 10

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