GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-12 21:28:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,404 Commits 290 Branches 260 Tags
Commit Graph

32404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remco Burema
68087b1551 Resolve failed printer definition linting. 
CURA-10332 | PP-249
 2023-04-20 23:11:42 +02:00
c.lamboo
ba16f7917b Merge branch '5.3' 2023-04-20 12:36:58 +02:00
c.lamboo
ac2adfd6ba Add proper credentials in changelog 2023-04-20 12:32:32 +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
c.lamboo
ac43ddd91e Update changelog 
CURA-10520
5.3.1 		2023-04-19 10:05:43 +02:00
Casper Lamboo
d0841a7d5a
Merge pull request #15287 from Ultimaker/fix_cool_max_speed 
Despite the name, 'Max' Fan Speed should be able to go below min

CURA-10533
 2023-04-19 10:00:24 +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
54167566d7
Merge pull request #15074 from ThomasRahm/suggested_ui_changes 
Suggested UI changes
 2023-04-18 16:12:47 +02:00
Remco Burema
f22c5b884a
Merge branch 'CURA-10415_main_based_update_tree' into suggested_ui_changes 2023-04-18 16:10:14 +02:00
c.lamboo
860aa7ad9d Pin dependency versions 
CURA-10520
 2023-04-18 16:03:27 +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
c.lamboo
82b0889199 Update changelog 
CURA-10520
 2023-04-18 14:58:13 +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
jellespijker
f0d6354444 update translations 2023-04-18 08:41:24 +00: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 21de7a366735a282fb459dfff4b517a0a6df84e7.
 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
Casper Lamboo
07fc38448b
Merge pull request #15022 from fieldOfView/fix_postprocessing_script_folders 
Stop postprocessing plugin creating unnecessary script folders
 2023-04-17 18:02:09 +02:00
Aldo Hoeben
7ddd1037a6
Merge branch 'main' into fix_postprocessing_script_folders 2023-04-17 16:39:30 +02:00
Jelle Spijker
4f24eb5b15
Merge pull request #15238 from Ultimaker/CURA-10371_translations_for_5_3_1 
CURA-10371 Update translations
 2023-04-17 14:36:32 +02:00
Jelle Spijker
3f276f08b6
Removed wrongly translated strings 
The %1 location marker wasn't translated by Smartling.

Contributes to CURA-10371
 2023-04-17 14:15:21 +02:00
Jelle Spijker
26999d5782
Merge branch '5.3' into CURA-10371_translations_for_5_3_1 2023-04-17 14:11:34 +02:00
Jelle Spijker
a07b0bc183
Merge branch 'main' into CURA-10415_main_based_update_tree 2023-04-17 14:08:43 +02:00
Jelle Spijker
d7d32b07ae
Bump-up settings version to 22 
for longer cube 2
 2023-04-17 14:06:52 +02:00
Jelle Spijker
49da87b97d
Merge branch 'main' into CURA-10415_main_based_update_tree 2023-04-17 13:51:29 +02:00
Jaime van Kessel
55f88547d7
Merge branch '5.3' of github.com:Ultimaker/Cura 2023-04-17 12:49:09 +02:00
Jaime van Kessel
b5b6f8197b
Fix the writeStarted emit 
When printing via abstract printer, this signal was not correctly emitted
causing the postprocessing script to fail

CURA-10524
 2023-04-17 12:47:54 +02:00
fieldOfView
378e5fedea Merge branch 'main' into fix_postprocessing_script_folders 2023-04-15 17:47:36 +02:00
Aldo Hoeben
1924d8c1b0 Continue if there is no scripts folder inside a resource folder 
Co-authored-by: Casper Lamboo <casperlamboo@gmail.com>
 2023-04-15 17:44:09 +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
Casper Lamboo
1b15eb4a4c
Capitalize UltiMaker 
CURA-10371
 2023-04-14 15:38:02 +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
c.lamboo
f337788ba2 Update translations 
CURA-10371
 2023-04-14 13:09:43 +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
Paul Kuiper
3b716d08b2 Removed the reduced print speed for the bottom interface layers of the BB cores (effectively for PVA). 
Relates to PP-328
 2023-04-14 09:52:43 +02:00
Joey de l'Arago
12c53ce4e4 Use resolveOrValue 2023-04-12 16:26:46 +02:00
Joey de l'Arago
83117e5985 bump versions 2023-04-12 16:00:24 +02:00
Joey de l'Arago
ed1b844b41 Remove random string and format 2023-04-12 15:43:03 +02:00
Joey de l'Arago
ee0b14fcac Update update script. Deleted qualities will now be replaced with new ones. 2023-04-12 15:40:13 +02:00
Joey de l'Arago
04adf487f3 Merge remote-tracking branch 'origin/updated_elegoo_definitions' into updated_elegoo_definitions 2023-04-12 10:19:03 +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