GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 20:29:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-6635_add_printer_by_manufacturer' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2019-07-03 14:29:26 +02:00
commit d43415191b
12 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/definitions/creality_base.def.json
View File

@ -142,7 +142,7 @@
"metadata": { "metadata": {
"visible": false, "visible": false,
"author": "trouch.com", "author": "trouch.com",
"manufacturer": "CreawsomeMod", "manufacturer": "Creality3D",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"first_start_actions": ["MachineSettingsAction"], "first_start_actions": ["MachineSettingsAction"],

2
resources/definitions/easyarts_ares.def.json
View File

@ -5,7 +5,7 @@
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "nliaudat", "author": "nliaudat",
"manufacturer": "EasyArts (discontinued)", "manufacturer": "EasyArts",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"machine_extruder_trains": "machine_extruder_trains":
{ {

2
resources/definitions/kossel_mini.def.json
View File

@ -5,7 +5,7 @@
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "Claudio Sampaio (Patola)", "author": "Claudio Sampaio (Patola)",
"manufacturer": "Other", "manufacturer": "Johann",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "kossel_platform.stl", "platform": "kossel_platform.stl",
"platform_offset": [0, -0.25, 0], "platform_offset": [0, -0.25, 0],

2
resources/definitions/kossel_pro.def.json
View File

@ -5,7 +5,7 @@
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "Chris Petersen", "author": "Chris Petersen",
"manufacturer": "OpenBeam", "manufacturer": "Johann",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "kossel_pro_build_platform.stl", "platform": "kossel_pro_build_platform.stl",
"platform_offset": [0, -0.25, 0], "platform_offset": [0, -0.25, 0],

2
resources/definitions/prusa_i3.def.json
View File

@ -5,7 +5,7 @@
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "Quillford", "author": "Quillford",
"manufacturer": "Prusajr", "manufacturer": "Prusa3D",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "prusai3_platform.stl", "platform": "prusai3_platform.stl",
"machine_extruder_trains": "machine_extruder_trains":

2
resources/definitions/prusa_i3_mk2.def.json
View File

@ -5,7 +5,7 @@
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "Apsu, Nounours2099", "author": "Apsu, Nounours2099",
"manufacturer": "Prusa Research", "manufacturer": "Prusa3D",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "prusai3_platform.stl", "platform": "prusai3_platform.stl",
"has_materials": true, "has_materials": true,

2
resources/definitions/prusa_i3_xl.def.json
View File

@ -5,7 +5,7 @@
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "guigashm", "author": "guigashm",
"manufacturer": "Prusajr", "manufacturer": "Prusa3D",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "prusai3_xl_platform.stl", "platform": "prusai3_xl_platform.stl",
"machine_extruder_trains": "machine_extruder_trains":

6
resources/definitions/stereotech_start.def.json
View File

@ -5,12 +5,12 @@
"metadata": { "metadata": {
"visible": true, "visible": true,
"author": "Stereotech", "author": "Stereotech",
"manufacturer": "Other", "manufacturer": "Stereotech LLC.",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "stereotech_start.stl", "platform": "stereotech_start.stl",
"icon": "icon_ultimaker2", "icon": "icon_ultimaker2",
"platform_offset": [0, 0, 0], "platform_offset": [0, 0, 0],
"machine_extruder_trains": "machine_extruder_trains":
{ {
"0": "stereotech_start_extruder_0" "0": "stereotech_start_extruder_0"
} }

4
resources/definitions/vertex_delta_k8800.def.json
View File

@ -3,10 +3,10 @@
"version": 2, "version": 2,
"inherits": "fdmprinter", "inherits": "fdmprinter",
"metadata": { "metadata": {
"manufacturer": "Velleman nv", "manufacturer": "Velleman N.V.",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"visible": true, "visible": true,
"author": "Velleman", "author": "Velleman N.V.",
"has_machine_quality": true, "has_machine_quality": true,
"has_materials": true, "has_materials": true,
"machine_extruder_trains": "machine_extruder_trains":

2
resources/definitions/vertex_k8400.def.json
View File

@ -4,7 +4,7 @@
"inherits": "fdmprinter", "inherits": "fdmprinter",
"metadata": { "metadata": {
"visible": true, "visible": true,
"manufacturer": "Velleman", "manufacturer": "Velleman N.V.",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "Vertex_build_panel.stl", "platform": "Vertex_build_panel.stl",
"platform_offset": [0, -3, 0], "platform_offset": [0, -3, 0],

2
resources/definitions/vertex_k8400_dual.def.json
View File

@ -4,7 +4,7 @@
"inherits": "fdmprinter", "inherits": "fdmprinter",
"metadata": { "metadata": {
"visible": true, "visible": true,
"manufacturer": "Velleman", "manufacturer": "Velleman N.V.",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "Vertex_build_panel.stl", "platform": "Vertex_build_panel.stl",
"platform_offset": [0, -3, 0], "platform_offset": [0, -3, 0],

4
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View File

@ -24,7 +24,7 @@ Item
// The currently active (expanded) section/category, where section/category is the grouping of local machine items. // The currently active (expanded) section/category, where section/category is the grouping of local machine items.
property string currentSection: preferredCategory property string currentSection: preferredCategory
// By default (when this list shows up) we always expand the "Ultimaker" section. // By default (when this list shows up) we always expand the "Ultimaker" section.
property string preferredCategory: "Ultimaker" property string preferredCategory: "Ultimaker B.V."
property int maxItemCountAtOnce: 10 // show at max 10 items at once, otherwise you need to scroll. property int maxItemCountAtOnce: 10 // show at max 10 items at once, otherwise you need to scroll.
@ -89,7 +89,7 @@ Item
{ {
id: machineDefinitionsModel id: machineDefinitionsModel
filter: { "visible": true } filter: { "visible": true }
sectionProperty: "category" sectionProperty: "manufacturer"
preferredSectionValue: preferredCategory preferredSectionValue: preferredCategory
} }