3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into ui_rework_4_0

Browse source 
Conflicts:
	plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky.
	resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.
This commit is contained in:
Ghostkeeper 2018-11-13 16:23:36 +01:00
commit 266e08fdff
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
30 changed files with 273 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

106
resources/bundled_packages/cura.json
View file

@ -9,7 +9,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -26,7 +26,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -43,7 +43,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -60,7 +60,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -77,7 +77,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -94,7 +94,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -111,7 +111,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -128,7 +128,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -145,7 +145,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -162,7 +162,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -179,7 +179,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -213,7 +213,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -230,7 +230,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -247,7 +247,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -281,7 +281,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -298,7 +298,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -315,7 +315,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -332,7 +332,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -349,7 +349,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -366,7 +366,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -383,7 +383,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -400,7 +400,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -417,7 +417,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -434,7 +434,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -451,7 +451,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -468,7 +468,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -485,7 +485,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -502,7 +502,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -519,7 +519,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -536,7 +536,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -553,7 +553,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -570,7 +570,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -587,7 +587,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -604,7 +604,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -621,7 +621,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -638,7 +638,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -655,7 +655,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -672,7 +672,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -689,7 +689,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -723,7 +723,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -740,7 +740,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "plugins@ultimaker.com",
"website": "https://ultimaker.com"
@ -1301,7 +1301,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/abs",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
@ -1320,7 +1320,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/breakaway",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
@ -1339,7 +1339,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/abs",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
@ -1358,7 +1358,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/cpe",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
@ -1377,7 +1377,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/abs",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
@ -1396,7 +1396,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/pc",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
@ -1415,7 +1415,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/abs",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
@ -1434,7 +1434,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/pp",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
@ -1453,7 +1453,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/abs",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
@ -1472,7 +1472,7 @@
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/tpu-95a",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",
@ -1487,11 +1487,11 @@
"package_type": "material",
"display_name": "Ultimaker Tough PLA",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"package_version": "1.0.2",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/tough-pla",
"author": {
"author_id": "Ultimaker",
"author_id": "UltimakerPackages",
"display_name": "Ultimaker B.V.",
"email": "materials@ultimaker.com",
"website": "https://ultimaker.com",

2
resources/qml/Preferences/GeneralPage.qml
View file

@ -171,7 +171,7 @@ UM.PreferencesPage
append({ text: "日本語", code: "ja_JP" })
append({ text: "한국어", code: "ko_KR" })
append({ text: "Nederlands", code: "nl_NL" })
append({ text: "Polski", code: "pl_PL" })
//Polish is disabled for being incomplete: append({ text: "Polski", code: "pl_PL" })
append({ text: "Português do Brasil", code: "pt_BR" })
append({ text: "Português", code: "pt_PT" })
append({ text: "Русский", code: "ru_RU" })

2
resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = fast
weight = -1
material = fabtotum_abs
material = generic_abs
[values]
adhesion_type = raft

2
resources/quality/fabtotum/fabtotum_abs_high.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = high
weight = 1
material = fabtotum_abs
material = generic_abs
[values]
adhesion_type = raft

2
resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = normal
weight = 0
material = fabtotum_abs
material = generic_abs
[values]
adhesion_type = raft

2
resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = fast
weight = -1
material = fabtotum_nylon
material = generic_nylon
[values]
adhesion_type = raft

2
resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = high
weight = 1
material = fabtotum_nylon
material = generic_nylon
[values]
adhesion_type = raft

2
resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = normal
weight = 0
material = fabtotum_nylon
material = generic_nylon
[values]
adhesion_type = raft

2
resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = fast
weight = -1
material = fabtotum_pla
material = generic_pla
[values]
adhesion_type = skirt

2
resources/quality/fabtotum/fabtotum_pla_high.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = high
weight = 1
material = fabtotum_pla
material = generic_pla
[values]
adhesion_type = skirt

2
resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = normal
weight = 0
material = fabtotum_pla
material = generic_pla
[values]
adhesion_type = skirt

2
resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg
View file

@ -6,7 +6,7 @@ name = Fast Quality
[metadata]
type = quality
setting_version = 5
material = fabtotum_tpu
material = generic_tpu
quality_type = fast
weight = -1

2
resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg
View file

@ -6,7 +6,7 @@ name = High Quality
[metadata]
type = quality
setting_version = 5
material = fabtotum_tpu
material = generic_tpu
quality_type = high
weight = 1

2
resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg
View file

@ -6,7 +6,7 @@ name = Normal Quality
[metadata]
type = quality
setting_version = 5
material = fabtotum_TPU
material = generic_tpu
quality_type = normal
weight = 0

2
resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = fast
weight = 1
material = zyyx_pro_flex
material = generic_tpu
[values]
layer_height = 0.3

2
resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = fine
weight = 3
material = zyyx_pro_flex
material = generic_tpu
[values]
layer_height = 0.12

2
resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = normal
weight = 2
material = zyyx_pro_flex
material = generic_tpu
[values]
layer_height = 0.2

2
resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = fast
weight = 1
material = zyyx_pro_pla
material = generic_pla
[values]
layer_height = 0.3

2
resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = fine
weight = 3
material = zyyx_pro_pla
material = generic_pla
[values]
layer_height = 0.1

2
resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg
View file

@ -8,7 +8,7 @@ setting_version = 5
type = quality
quality_type = normal
weight = 2
material = zyyx_pro_pla
material = generic_pla
[values]
layer_height = 0.2