NicolasBOYARD
dbd79d0639
Merge branch 'main' of https://github.com/eMotion-Tech/Cura
2023-05-05 11:43:19 +02:00
NicolasBOYARD
539794b43f
eMotionTech override removed
2023-05-05 11:43:14 +02:00
eMotion-Tech
73a49154cc
Merge branch 'Ultimaker:main' into main
2023-05-04 14:16:21 +02:00
NicolasBOYARD
2ab02f6743
Merge branch 'main' of https://github.com/eMotion-Tech/Cura
2023-05-04 12:13:13 +02: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
NicolasBOYARD
68250ece64
eMotionTech
...
Remove T{initial_extruder_nr} from DUAL600 and IDEX420 start gcode (it was mandatory in Cura 4.xx but created a minor bug in Cura 5.xx)
2023-04-27 09:08:56 +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
eMotion-Tech
1343fbadad
Merge branch 'Ultimaker:main' into main
2023-04-21 15:28:01 +02: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
NicolasBOYARD
c0acb33d8d
eMotionTech Fix "limit_support_retractions"
...
line with "limit_support_retractions" removed from file strateo3d_IDEX420.def.json
2023-04-20 15:00:21 +02:00
eMotion-Tech
1ba1caeea3
Merge branch 'Ultimaker:main' into main
2023-04-20 14:22:00 +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
eMotion-Tech
35fcaa8eda
Merge branch 'main' into main
2023-04-18 10:54:58 +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
Jelle Spijker
49da87b97d
Merge branch 'main' into CURA-10415_main_based_update_tree
2023-04-17 13:51:29 +02:00
casperlamboo
024876b314
Applied printer-linter format
2023-04-14 15:23:38 +00:00
Casper Lamboo
1a45962b04
Merge pull request #14479 from BradleyFord/main
...
Addition of Longer3D LK4 X
2023-04-14 17:22:29 +02:00
Bryan Foley
bed7f22a1b
SEM-166 UMs7 firmware location updated
...
With this commit we use the dedicated update url for the UMs7 firmware
location instead of the UMs5 location
2023-04-14 13:32:10 +02:00
bryanfoley
e606dae5c5
Applied printer-linter format
2023-04-14 09:33:54 +00:00
Bryan Foley
807f407d9f
SEM-166 Add extra BOM numbers to UMs3, UMs5 and UMs7
2023-04-14 11:31:57 +02:00
