Commit graph

14497 commits

Author SHA1 Message Date
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
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
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 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
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
d7d32b07ae
Bump-up settings version to 22
for longer cube 2
2023-04-17 14:06:52 +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
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
43f6d89c1c
Merge Smartling translations
Contribute to CURA-10376
2023-04-06 14:24:34 +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
Jelle Spijker
28d6e993df
Bump up setting version to 22 2023-03-31 07:24:43 +02:00
Jelle Spijker
980de97162 Set FileMode ExistingFile in the open file dialog 2023-03-30 15:05:25 +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
rburema
4091800340 update translations 2023-03-28 11:58:00 +00: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
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