Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Blocks machines to ultimaker cura #11620

Merged
merged 44 commits into from
Jan 10, 2023
+3,117 −0
Merged

Add Blocks machines to ultimaker cura #11620

Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
58505d9
add definition files Blocks
jgrilo-blocks Mar 7, 2022
6a8e695
add extruder files
jgrilo-blocks Mar 7, 2022
15ab283
Add mesh files
jgrilo-blocks Mar 7, 2022
8caacfa
add quality setting files
jgrilo-blocks Mar 7, 2022
17d93d0
add variants files
jgrilo-blocks Mar 7, 2022
6d7617b
add variants files
jgrilo-blocks Mar 23, 2022
1371bf1
Revert "add variants files "
jgrilo-blocks Mar 23, 2022
7428b13
Add variants files
jgrilo-blocks Mar 23, 2022
e49a574
Add quality files
jgrilo-blocks Mar 23, 2022
15c7a98
Edited definitions files
jgrilo-blocks Mar 23, 2022
228da72
R21 definition file fixed
jgrilo-blocks Apr 1, 2022
a70c773
Definition Blocks Files
braga-dev Oct 14, 2022
1f12e42
Update Blocks Extruder Files
braga-dev Oct 14, 2022
247d05e
Update Meshes Blocks Printers
braga-dev Oct 14, 2022
b39a00b
Update Blocks Global Files
braga-dev Oct 14, 2022
7610d92
Update Global Files
braga-dev Oct 14, 2022
27b9c1e
Update Standard Files
braga-dev Oct 14, 2022
01fb120
Update Blocks Variants
braga-dev Oct 14, 2022
5a05f8e
Update resources/definitions/blocks_pros30.def.json
braga-dev Oct 14, 2022
1c2dcd8
Merge branch 'Ultimaker:main' into master
braga-dev Dec 16, 2022
1dabc6b
Update resources/definitions/blocks_base.def.json
braga-dev Dec 16, 2022
b6104c1
Update resources/definitions/blocks_base.def.json
braga-dev Dec 16, 2022
0e0fab3
Update resources/definitions/blocks_base.def.json
braga-dev Dec 16, 2022
35ecb7c
Update resources/definitions/blocks_base.def.json
braga-dev Dec 16, 2022
9b3bd34
Update resources/definitions/blocks_base.def.json
braga-dev Dec 16, 2022
12285e9
Update resources/definitions/blocks_base.def.json
braga-dev Dec 16, 2022
bb4b0c4
Update resources/definitions/blocks_base.def.json
braga-dev Dec 16, 2022
dc21a69
Update resources/definitions/blocks_base.def.json
braga-dev Dec 16, 2022
3b49f5a
Applied printer-linter format
braga-dev Dec 16, 2022
31b3e8d
Apply suggestions from code review
braga-dev Dec 16, 2022
69ae67c
Applied printer-linter format
braga-dev Dec 16, 2022
6376783
Merge branch 'Ultimaker:main' into master
braga-dev Dec 16, 2022
8334745
Apply suggestions from code review
braga-dev Dec 30, 2022
a8ef4e2
Applied printer-linter format
braga-dev Dec 30, 2022
e8a5751
Merge branch 'main' into blockstech
jellespijker Dec 30, 2022
85201e7
Merge branch 'main' into blockstech
jellespijker Dec 30, 2022
ee58dce
Moved block variants to their own specific folder
jellespijker Dec 30, 2022
5f5e758
Applied printer-linter formatting
jellespijker Dec 30, 2022
1b59141
Removed old 4.x settings
jellespijker Dec 30, 2022
c2e5246
Use the correct stl file
jellespijker Dec 30, 2022
db8aa5b
Fixed wrong extruder number mismatch
jellespijker Dec 30, 2022
52aed18
Merge pull request #1 from Ultimaker/blockstech
braga-dev Jan 6, 2023
2c4b4eb
Delete blocks_oneauto_extruder_0.def.json
braga-dev Jan 6, 2023
63a1994
Merge branch 'Ultimaker:main' into master
braga-dev Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update Blocks Global Files
@braga-dev
braga-dev authored Oct 14, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit b39a00b4402ea75ade666b25cf6c57fc43f72bb0
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.20_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Draft Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = low 0.2
weight = -5
@@ -13,5 +13,4 @@ variant = 0.2mm Nozzle

[values]
layer_height = 0.15
layer_height_0 = 0.15

layer_height_0 = 0.15
6 changes: 2 additions & 4 deletions resources/quality/blocks/Nozzle/blocks_global_0.20_standard.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Standard Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = normal 0.2
weight = -3
@@ -13,6 +13,4 @@ variant = 0.2mm Nozzle

[values]
layer_height = 0.1
layer_height_0 = 0.15
material_diameter = 1.75

layer_height_0 = 0.15
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.30_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Draft Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = draft
weight = -5
@@ -13,5 +13,4 @@ variant = 0.3mm Nozzle

[values]
layer_height = 0.2
layer_height_0 = 0.2

layer_height_0 = 0.2
6 changes: 2 additions & 4 deletions resources/quality/blocks/Nozzle/blocks_global_0.30_standard.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Standard Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = normal 0.3
weight = -3
@@ -13,6 +13,4 @@ variant = 0.3mm Nozzle

[values]
layer_height = 0.16
layer_height_0 = 0.16
material_diameter = 1.75

layer_height_0 = 0.16
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.30_ultra.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Ultra Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = ultra
weight = 0
@@ -13,5 +13,4 @@ variant = 0.3mm Nozzle

[values]
layer_height = 0.10
layer_height_0 = 0.16

layer_height_0 = 0.16
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.40_adaptive.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Dynamic Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = adaptive
weight = -2
@@ -14,5 +14,4 @@ variant = 0.4mm Nozzle
[values]
adaptive_layer_height_enabled = true
layer_height = 0.16
layer_height_0 = 0.2

layer_height_0 = 0.2
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.40_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Draft Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = draft
weight = -5
@@ -13,5 +13,4 @@ variant = 0.4mm Nozzle

[values]
layer_height = 0.30
layer_height_0 = 0.20

layer_height_0 = 0.20
6 changes: 2 additions & 4 deletions resources/quality/blocks/Nozzle/blocks_global_0.40_standard.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Standard Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = normal
weight = -3
@@ -13,6 +13,4 @@ variant = 0.4mm Nozzle

[values]
layer_height = 0.2
layer_height_0 = 0.2
material_diameter = 1.75

layer_height_0 = 0.2
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.40_ultra.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Ultra Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = ultra
weight = 0
@@ -13,5 +13,4 @@ variant = 0.4mm Nozzle

[values]
layer_height = 0.10
layer_height_0 = 0.16

layer_height_0 = 0.16
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.50_adaptive.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Dynamic Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = adaptive
weight = -2
@@ -14,5 +14,4 @@ variant = 0.5mm Nozzle
[values]
adaptive_layer_height_enabled = true
layer_height = 0.16
layer_height_0 = 0.2

layer_height_0 = 0.2
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.50_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Draft Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = draft
weight = -5
@@ -13,5 +13,4 @@ variant = 0.5mm Nozzle

[values]
layer_height = 0.30
layer_height_0 = 0.20

layer_height_0 = 0.20
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.50_standard.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Standard Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = normal
weight = -3
@@ -13,5 +13,4 @@ variant = 0.5mm Nozzle

[values]
layer_height = 0.2
layer_height_0 = 0.2
material_diameter = 1.75
layer_height_0 = 0.2
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.50_ultra.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Ultra Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = ultra
weight = 0
@@ -13,5 +13,4 @@ variant = 0.5mm Nozzle

[values]
layer_height = 0.10
layer_height_0 = 0.16

layer_height_0 = 0.16
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.60_adaptive.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Dynamic Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = adaptive
weight = -2
@@ -14,5 +14,4 @@ variant = 0.6mm Nozzle
[values]
adaptive_layer_height_enabled = true
layer_height = 0.16
layer_height_0 = 0.2

layer_height_0 = 0.2
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.60_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Draft Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = draft
weight = -5
@@ -13,5 +13,4 @@ variant = 0.6mm Nozzle

[values]
layer_height = 0.30
layer_height_0 = 0.20

layer_height_0 = 0.20
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.60_low.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Low Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = low
weight = -5
@@ -13,5 +13,4 @@ variant = 0.6mm Nozzle

[values]
layer_height = 0.40
layer_height_0 = 0.20

layer_height_0 = 0.20
6 changes: 2 additions & 4 deletions resources/quality/blocks/Nozzle/blocks_global_0.60_standard.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Standard Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = normal
weight = -3
@@ -13,6 +13,4 @@ variant = 0.6mm Nozzle

[values]
layer_height = 0.2
layer_height_0 = 0.2
material_diameter = 1.75

layer_height_0 = 0.2
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.60_ultra.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Ultra Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = ultra
weight = 0
@@ -13,5 +13,4 @@ variant = 0.6mm Nozzle

[values]
layer_height = 0.10
layer_height_0 = 0.16

layer_height_0 = 0.16
4 changes: 2 additions & 2 deletions resources/quality/blocks/Nozzle/blocks_global_0.80_adaptive.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Dynamic Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = adaptive
weight = -2
@@ -14,4 +14,4 @@ variant = 0.8mm Nozzle
[values]
adaptive_layer_height_enabled = true
layer_height = 0.16
layer_height_0 = 0.2
layer_height_0 = 0.2
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.80_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Draft Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = draft
weight = -5
@@ -13,5 +13,4 @@ variant = 0.8mm Nozzle

[values]
layer_height = 0.30
layer_height_0 = 0.20

layer_height_0 = 0.20
4 changes: 2 additions & 2 deletions resources/quality/blocks/Nozzle/blocks_global_0.80_low.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Super low Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = low
weight = -5
@@ -13,4 +13,4 @@ variant = 0.8mm Nozzle

[values]
layer_height = 0.50
layer_height_0 = 0.20
layer_height_0 = 0.20
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.80_standard.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Standard Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = normal
weight = -3
@@ -13,5 +13,4 @@ variant = 0.8mm Nozzle

[values]
layer_height = 0.2
layer_height_0 = 0.2

layer_height_0 = 0.2
5 changes: 2 additions & 3 deletions resources/quality/blocks/Nozzle/blocks_global_0.80_superlow.inst.cfg
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ name = Super low Quality
definition = blocks_base

[metadata]
setting_version = 19
setting_version = 20
type = quality
quality_type = superlow
weight = -5
@@ -13,5 +13,4 @@ variant = 0.8mm Nozzle

[values]
layer_height = 0.50
layer_height_0 = 0.20

layer_height_0 = 0.20
Loading