NicolasBOYARD
21d9cb294a
Merge branch 'main' of https://github.com/eMotion-Tech/Cura
2023-04-20 14:31:14 +02:00
NicolasBOYARD
06121ef394
update bad version
...
version 17 and version 21
2023-04-20 14:31:08 +02:00
eMotion-Tech
1ba1caeea3
Merge branch 'Ultimaker:main' into main
2023-04-20 14:22:00 +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
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
c.lamboo
860aa7ad9d
Pin dependency versions
...
CURA-10520
2023-04-18 16:03:27 +02:00
c.lamboo
82b0889199
Update changelog
...
CURA-10520
2023-04-18 14:58:13 +02:00
eMotion-Tech
35fcaa8eda
Merge branch 'main' into main
2023-04-18 10:54:58 +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
d7d32b07ae
Bump-up settings version to 22
...
for longer cube 2
2023-04-17 14:06:52 +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
Jelle Spijker
47a248e825
Bump-up settings version to 22
...
for Creality ender 3 S1 pro
2023-04-08 10:42:48 +02:00
Jelle Spijker
0ad2687bdb
Run conan profile detection after switching compiler
...
Should fix failing UT
2023-04-08 10:25:51 +02:00
Jelle Spijker
82ad1cbff3
Update unit-test.yml
2023-04-08 09:39:20 +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
c.lamboo
cf7bc063f1
Fix: Make "add printer" sections individually collapsable
...
One variable was incorrectly named
CURA-10484
2023-04-06 21:52:50 +02:00
c.lamboo
20b171dbeb
Make "add printer" sections individually collapsable
...
CURA-10484
2023-04-06 21:46:51 +02:00
jellespijker
66d43d52aa
update translations
2023-04-06 15:56:17 +00:00
Jelle Spijker
06e140a0fa
Merge branch '5.3'
...
# Conflicts:
# resources/i18n/es_ES/fdmprinter.def.json.po
# resources/i18n/fr_FR/fdmprinter.def.json.po
# resources/i18n/ja_JP/cura.po
# resources/i18n/ja_JP/fdmprinter.def.json.po
# resources/i18n/ko_KR/cura.po
# resources/i18n/nl_NL/cura.po
# resources/i18n/nl_NL/fdmprinter.def.json.po
# resources/i18n/ru_RU/fdmprinter.def.json.po
2023-04-06 17:52:54 +02:00
Jelle Spijker
061a09f8b8
Merge branch 'CURA-10376_fix_TM' into 5.3
2023-04-06 14:35:57 +02:00
Jelle Spijker
43f6d89c1c
Merge Smartling translations
...
Contribute to CURA-10376
2023-04-06 14:24:34 +02:00
Jelle Spijker
01d22d1ad4
Also check on Uranium.pot
...
Contribute to CURA-10376
2023-04-05 12:35:23 +02:00
Jelle Spijker
1763b9bf9d
filter on relevant cura files
...
Contribute to CURA-10376
2023-04-04 15:47:56 +02:00
c.lamboo
af4efad1cf
Don't capitalize "UltiMaker" for brand names
...
CURA-10376
2023-04-03 21:46:51 +02:00
c.lamboo
ef09fe640b
Fix removing tu elements
...
CURA-10376
2023-04-03 21:46:24 +02:00
Jelle Spijker
19b3c93a0c
Hand-over
...
Contribute to CURA-10376
2023-04-03 13:51:03 +02:00
Jelle Spijker
0feda7fe08
Sanitize the fuzzy key string before match
...
Contribute to CURA-10376
2023-04-03 13:29:05 +02:00
