Commit graph

4329 commits

Author SHA1 Message Date
Jelle Spijker
ba5cd429c0
Merge pull request #15632 from Ultimaker/PP-81_Easy_to_tear_of_brim
PP-81 easy to tear of brim
2023-06-05 10:56:39 +02:00
Jelle Spijker
b07e21cb1a
Merge remote-tracking branch 'origin/main' into PP-321_Cleanup_skin_overlap_settings
# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_TW/cura.po
2023-06-05 10:18:03 +02:00
Jelle Spijker
e3cbc37740
fixed mapping of support extruder nr
Contributes to PP-285 and CURA-10643
2023-06-05 09:16:56 +02:00
Jelle Spijker
20c2b2b4cd
Revert mapping value
Currently fails, will fix this after the weekend

Contributes to PP-285 and CURA-10643
2023-06-02 17:35:08 +02:00
Paul Kuiper
34b57fb203 Added material_is_support_material setting and added a resolve function to select the correct support_extruder.
Relates to: PP-285
2023-05-30 17:27:25 +02:00
Frederic98
afc36fbfd9 Applied printer-linter format 2023-05-30 15:24:43 +00:00
Frederic Meeuwissen
eb2aa80ffa PP-81: Set brim_gap to horizontal expansion + 50um 2023-05-30 17:22:33 +02:00
Paul Kuiper
ed4ad6b8ef Cleanup skin overlap. Set to 20% by default for S line machines.
Relates to: PP-321
2023-05-15 11:56:07 +02:00
Paul Kuiper
ffbc7bb310 Cleanup of infill overlap setting. Make it 10% for S line machines and keep it 0% for the other machines. Removed all overwrites from the quality profiles.
Relates to: PP-336
2023-05-15 11:21:14 +02:00
pkuiper-ultimaker
d11b3c011d Applied printer-linter format 2023-05-15 08:16:35 +00:00
Paul Kuiper
a199afa501 Increased brim distance to -initial_layer_horizontal_expansion + 0.05 to create an easier to tear of brim.
Relates to: PP-81
2023-05-15 10:15:16 +02:00
pkuiper-ultimaker
2a03d03c23 Applied printer-linter format 2023-05-15 06:42:28 +00:00
Paul Kuiper
4af771dab2 Increased brim distance to -initial_layer_horizontal_expansion + 0.05 to create an easier to tear of brim.
Relates to: PP-81
2023-05-15 08:41:20 +02:00
goofoo
1a7ce4d344 Merge branch 'main' of https://github.com/goofoo3d/Cura into main 2023-05-08 14:11:19 +08:00
goofoo
04da0c9f7e add Renkforce Pro 10+ 2023-05-08 14:10:11 +08:00
Remco Burema
0bc3556c97 Don't set the Max Branch Angle beyond nominal values by default.
Otherwise, for example, a support angle of 90 can cause this setting to block slicing, since it will be beyond its maximum value.

CURA-10553
2023-05-03 13:09:10 +02:00
jellespijker
a2f85fde03 Applied printer-linter format 2023-04-28 14:47:18 +00:00
Jelle Spijker
dec1aa6c8a
Merge branch 'main' into main 2023-04-28 13:45:30 +02:00
Jelle Spijker
c3c08535b4
Cura 10437 sovol sv04 (#15376)
Add Sovol SV04 


* Add files via upload

Add SV04 definition file

* Applied printer-linter format

* Add files via upload

Add SV04 extruder file

* Applied printer-linter format

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Applied printer-linter format

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Dual_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Dual_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Dual_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Dual_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Dual_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Dual_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Dual_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Dual_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Dual_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Applied printer-linter format

* Update resources/definitions/SV04_Single_Mode_2.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/definitions/SV04_Copy_Mode.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Delete SV04_Copy_Mode.def.json

* Delete SV04_Dual_Mode.def.json

* Delete SV04_Mirror_Mode.def.json

* Delete SV04_Single_Mode_1.def.json

* Delete SV04_Single_Mode_2.def.json

* Delete SV04_extruder_0.def.json

* Delete SV04_extruder_1.def.json

* Delete SV04_extruder_left.def.json

* Delete SV04_extruder_right.def.json

* Add files via upload

* Add files via upload

* Update resources/definitions/Sovol3D_SV04_base.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update resources/extruders/SV04_extruder_left.def.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update Sovol3D_SV04_base.def.json

* Update SV04_extruder_left.def.json

* Applied printer-linter format

* Update SV04_extruder_right.def.json

* Applied printer-linter format

* Update SV04_extruder_0.def.json

* Update SV04_extruder_1.def.json

* Applied printer-linter format

* Delete Sovol3D_SV04_base.def.json

* Update SV04_Copy_Mode.def.json

* Update SV04_Dual_Mode.def.json

* Update SV04_Mirror_Mode.def.json

* Update SV04_Single_Mode_1.def.json

* Update SV04_Single_Mode_2.def.json

* Update SV04_extruder_left.def.json

* Applied printer-linter format

* Bring SV04 printer/extruder def in-line with sovol_base

Contributes to CURA-10437

* Applied printer-linter format

---------

Co-authored-by: Joyce-lujunxu <1130956035@qq.com>
Co-authored-by: Joyce-lujunxu <Joyce-lujunxu@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: jellespijker <jellespijker@users.noreply.github.com>
2023-04-28 13:23:11 +02:00
Jelle Spijker
07b8fcd4b7
Merge remote-tracking branch 'origin/main' into CURA-10065_tree_support_no_gradual
# Conflicts:
#	plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py
2023-04-28 12:23:33 +02:00
Jelle Spijker
64767aa2ce
Removed Tree Support from labels
Shorten the label because it is already clear
2023-04-28 11:59:40 +02:00
Jelle Spijker
ff7d75374a
Fixed upgrade settings
There were some redundant tree settings:

- support_tree_branch_distance
- support_tree_collision_resolution
2023-04-28 11:44:22 +02:00
jellespijker
b67d29e3fa Applied printer-linter format 2023-04-28 09:08:03 +00:00
Jelle Spijker
77b38bb45d
Merge branch 'main' into updated_elegoo_definitions 2023-04-28 10:32:15 +02:00
Remco Burema
376688bbb9 Fix unit test: Reference in profile to removed setting. 2023-04-26 09:13:16 +02:00
Remco Burema
d84960c7b7 Gradual infill with Tree Support 2.0 caused floating parts.
Should not be on when doing tree support anyway, so change configs to reflect that.

CURA-10065
2023-04-25 17:51:40 +02:00
c.lamboo
697f51db23 Merge branch 'CURA-10415_main_based_update_tree' 2023-04-25 10:13:49 +02:00
casperlamboo
6ce83b3b4f Applied printer-linter format 2023-04-24 12:20:59 +00:00
Casper Lamboo
38bca1e628
Merge pull request #15184 from willuhmjs/main
Add Kingroon KP3S Pro Printer

CURA-10541
2023-04-24 14:19:41 +02:00
c.lamboo
b033ada606 Merge branch 'main' into CURA-10415_main_based_update_tree 2023-04-24 11:01:04 +02:00
Ashok Varma
1afccc6a3e
Merge branch 'main' into main 2023-04-21 14:55:37 -07:00
Remco Burema
6a704f4802 Fix printer definition linter problem (default brim width). 2023-04-21 00:15:20 +02:00
Remco Burema
0f117cf8f0
Merge pull request #14590 from Ultimaker/PP-324_Limit_bed_temperature_to_120C
Consistent max. and warning for the build plate temperature
2023-04-20 23:46:12 +02:00
rburema
29380a5ed7 Applied printer-linter format 2023-04-20 21:33:03 +00:00
Remco Burema
b6926b9a24
Merge branch 'main' into PP-249_53_enable-support-brim 2023-04-20 23:31:37 +02:00
Remco Burema
68087b1551 Resolve failed printer definition linting.
CURA-10332 | PP-249
2023-04-20 23:11:42 +02:00
Remco Burema
9a0697905e Merge branch '5.3' 2023-04-20 12:03:35 +02:00
nallath
d2f0ee4192 Applied printer-linter format 2023-04-19 10:43:59 +00:00
syntax1269
fa5166d42a
Adding two printers Tina2 and Tina2S (#15095)
CURA-10534
2023-04-19 12:42:45 +02:00
Remco Burema
d561ba5def Despite the name, 'Maximum' Fan Speed should be able to go below minimum.
This is because the maximum fan speed is really just the fan speed for layers at or below a certain layer time threshold. Interpolation-logic in the backend (engine) still holds up, even if the values are 'switched' in the sense that the supposed 'max' is lower than the 'min'.

Change was needed since some UM materials had a Maximum Fan Speed set to 15, even though the normal speed and the Minimum Fan Speed are set to 50 in the machine. Despite the confusing naming, from context this seems intentional.

Will fix #15233
2023-04-18 20:53:20 +02:00
rburema
7272bedfec Applied printer-linter format 2023-04-18 14:18:21 +00:00
Remco Burema
f22c5b884a
Merge branch 'CURA-10415_main_based_update_tree' into suggested_ui_changes 2023-04-18 16:10:14 +02:00
Remco Burema
121acbbe15
Apply printer-linter suggestions.
Remove the causes of all redundancy warnings.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-04-18 15:58:04 +02:00
Remco Burema
0c0304667e Align main-based tree-2.0 branch with changes from 'xmas-alpha'.
This is the last change that was missing, originally part of a way larger commit, which is why it wasn't reaplied.

the original commit was part of CURA-9879, this 'manual cherry-pick' was done because there was one branch for CURA-10415 that was based on the 'xmas build' we shated with the public. However, in order to get that out in time, we made some temporary changes, that apparently should not be merged to main. Another branch was made for CURA-10415 that's based on main, but it appeared that this particular change was still missing.
2023-04-18 14:57:30 +02:00
Casper Lamboo
b6c35e7b19 Use proper setting variable name
CURA-10472
2023-04-18 14:41:43 +02:00
Jelle Spijker
5002d3695c
Merge branch 'main' into CURA-10415_main_based_update_tree 2023-04-18 10:36:56 +02:00
Remco Burema
cf6cbafb25
Fit 'Tree Support Rest Preference' description to behaviour.
CURA-10463
2023-04-18 10:36:12 +02:00
Jelle Spijker
6a040819c9
Merge pull request #15237 from Ultimaker/SEM-166_add_new_s_line_bom_numbers
SEM-166 Add extra BOM numbers to UMs3, UMs5 and UMs7
2023-04-18 10:32:22 +02:00
Bryan Foley
3b538d975c Revert "SEM-166 Apply suggestions from code review"
This reverts commit 21de7a3667.
2023-04-18 10:12:23 +02:00
Bryan Foley
21de7a3667
SEM-166 Apply suggestions from code review
Co-authored-by: Jelle Spijker <jelle.spijker@ultimaker.com>
2023-04-18 10:06:46 +02:00