3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 22:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
33296 commits 305 branches 272 tags 787 MiB
Commit graph

4442 commits

Author SHA1 Message Date
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
Joey de l'Arago
12c53ce4e4 Use resolveOrValue 2023-04-12 16:26:46 +02:00
Joey de l'Arago
a70e212124 Merge branch 'main' into updated_elegoo_definitions 
# Conflicts:
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg
#	resources/quality/elegoo/base/abs040/abs_040024.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg
#	resources/quality/elegoo/base/asa040/asa_040024.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg
#	resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg
#	resources/quality/elegoo/base/petg040/petg_040028.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040012.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040016.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040020.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040024.inst.cfg
#	resources/quality/elegoo/base/pla040/pla_040028.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg
#	resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg
 2023-04-11 19:07:27 +02:00
Ashok Varma
0217a8642d
Lint Fix : removed redundant override 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2023-04-09 12:40:13 -07:00
Ashok-Varma
044651f856 Add SV06 Plus profile based on Sovol profile, Update SV06 profile with updates 2023-04-09 09:44:53 -07:00
William Faircloth
5f5253ea59
feat: use correct name 2023-04-08 15:18:48 -04:00
William Faircloth
2f0ac6b998
feat: add kp3s pro 2023-04-08 15:10:14 -04:00
Jelle Spijker
bba02e5e16
Merge remote-tracking branch 'origin/main' into CURA-10415_main_based_update_tree 2023-04-08 10:23:17 +02:00
Jelle Spijker
59d0fb68ea
Merge remote-tracking branch 'origin/main' into CURA-10415_main_based_update_tree 
# Conflicts:
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po
 2023-04-08 10:20:12 +02:00
Casper Lamboo
2e4d580277
Merge pull request #14272 from sparkym3/Make_Creality_Ender_3_S1_consistent 
Make Creality Ender 3 S1 consistent
 2023-04-07 16:11:49 +02:00
NicolasBOYARD
0386976061 eMotionTech IDEX420 Mirror definition update 
In file definition of Strateo IDEX420 mirror, previously, Start Gcode had in comment "select the duplicate tool".
It is now corrected by "select the mirror tool"
 2023-03-31 10:33:10 +02:00
NicolasBOYARD
f6e6b8c748 eMotionTech - Strateo IDEX420 added to Cura 
Files added to :
- definitions
- extruders
- quality
- variant
setting_version has benn updated to "21"
XML file "product_to_id.json" has been updated because "STRATEO3D" is noww a brand of 2 machines : DUAL600 and IDEX420
IDEX420 is a "IDEX" machine, so we created 3 definition files : 1 main file "strateo3d_IDEX420" and 2 inherited files "strateo3d_IDEX420_duplicate" and "strateo3d_IDEX420_mirror"
materials PA6CF and PA6GF added to both machines in quality folders
 2023-03-30 12:22:50 +02:00
Remco Burema
c3ca642a78
Merge pull request #15057 from Ultimaker/CURA-10317_other_inconsitent_material_profiles_in_internal_builds 
Cura 10317 other inconsistent material profiles in internal builds
 2023-03-29 20:54:21 +02:00
Thomas Rahm
52173cd732 Fixed Typo 2023-03-29 07:14:26 +02:00
Thomas Rahm
536c95555e Suggested profile changes: Ensure minimum support area is 0 for tree support to avoid 'No trees generated' bug report. Removed extra z heightfor Tree support as this should no longer be required with the new implementation 2023-03-29 06:50:30 +02:00
Thomas Rahm
2e2f6f82ea More Tree Support realated changes to fdmprinter.def.json 2023-03-29 06:39:57 +02:00
Remco Burema
5b209161ac Remove wireprinting options. 
Wireprinting wasn't actively maintained, and almost an entire different min-engine. It's also rarely used, and presumed broken. Remove it, so it doesn't have to be maintained or clog up other maintanance and/or refactor tasks.

frontend part of CURA-10394
 2023-03-28 13:50:20 +02:00
Jelle Spijker
230182d85c
Merge remote-tracking branch 'origin/main' into CURA-10317_other_inconsitent_material_profiles_in_internal_builds 2023-03-28 11:27:57 +02:00
Jelle Spijker
30e671a94c
Merge pull request #15066 from Ultimaker/CURA-10032 
Make smart brim settable per extruder
 2023-03-28 09:33:52 +02:00
jellespijker
3d88c3c105 Applied printer-linter format 2023-03-27 08:58:42 +00:00
casperlamboo
06482c1937
Applied printer-linter format 
(cherry picked from commit 5037d2f642)
 2023-03-27 09:21:25 +02:00
c.lamboo
7e8229a976
Fix gcode flavors in profiles 
For some printer definitions the `machine_gcode_flavor` was entered incorrectly (the display name was used rather than the flavor-key). Previously in combo boxes the flavour would default to the first key (which is "marlin"). Due to recent changes we will not default anymore to the first option, but instead show nothing. By changing the flavor to the correct key the flavors will show up correctly again.

CURA-10374

(cherry picked from commit 2181bbceb3)
 2023-03-27 09:21:25 +02:00
casperlamboo
5037d2f642 Applied printer-linter format 2023-03-23 15:23:42 +00:00
c.lamboo
2181bbceb3 Fix gcode flavors in profiles 
For some printer definitions the `machine_gcode_flavor` was entered incorrectly (the display name was used rather than the flavor-key). Previously in combo boxes the flavour would default to the first key (which is "marlin"). Due to recent changes we will not default anymore to the first option, but instead show nothing. By changing the flavor to the correct key the flavors will show up correctly again.

CURA-10374
 2023-03-23 16:22:22 +01:00
Jelle Spijker
f8d3e914bc
Copied relevant settings from xmas branch 
Since the xmas branch was based on 5.2 and that branch
contained some magic to facilitate the S7 release with
a lot of definition/profile changes. It is best to manually
copy the relevant setting.

Contributes to CURA-10415

Contributes to CURA-10415
 2023-03-23 11:55:35 +01:00
c.lamboo
f5b7176da5 Make smart brim settable per extruder 
CURA-10032
 2023-03-22 18:32:09 +01:00
jellespijker
c72e8ece7d Applied printer-linter format 2023-03-22 10:53:34 +00:00
Jelle Spijker
61ff8b42b6
Merge pull request #14624 from highpowerxh/addSM2Dual 
Add Snapmaker 2.0 Dual Extruder Definitions

Contributes to CURA-10441
 2023-03-22 11:52:21 +01:00
Jelle Spijker
dd70e127e9
simplyfied meshes for LNL3D D6 
Contributes to CURA-10440
 2023-03-22 11:44:34 +01:00
jellespijker
ec919bc758 Applied printer-linter format 2023-03-22 10:07:30 +00:00
Jelle Spijker
73f8227d96
Fix meshes for LNL3D printers 
Contributes to CURA-10440
 2023-03-22 11:06:10 +01:00
Jelle Spijker
62bb5e96c3
Merge pull request #14782 from LNL3D/LNL3D-printer-profiles 
Added LNL3D printer profiles
 2023-03-22 11:05:24 +01:00
jellespijker
9ba3062fe2 Applied printer-linter format 2023-03-22 08:45:07 +00:00
Jelle Spijker
779ce6f970
Merge branch 'main' into addSM2Dual 2023-03-22 07:35:15 +01:00
Jelle Spijker
86a167fcd3
Merge branch 'main' into LNL3D-printer-profiles 2023-03-22 07:34:59 +01:00