Commit graph

15419 commits

Author SHA1 Message Date
Remco Burema
68231c957d Add settings-function to get an extruder based on a property.
We wanted to select an extruder based on wether or not it has support-material, so that the user doesn't have to think about selecting a support extruder any more and in most cases, can't forget anymore either. The formula present in fdmprinter to do that was not only an unreadable nightmare, but also very slow. We decided to pull most of that functionality into the settings-function machinery instead (but just a bit more generic so other properties can be selected, not just 'material_is_support_material').

done as part of finishing off CURA-10643
2023-06-13 15:59:24 +02:00
c.lamboo
eca903430e Fix setting text fields overlapping in per-object-settings
CURA-10669
2023-06-13 15:24:59 +02:00
Jaime van Kessel
cd3e45c7c4
Merge branch '5.4' of github.com:Ultimaker/Cura 2023-06-12 15:34:54 +02:00
Jaime van Kessel
1c0be9c5ed
Also prevent warning spam if icon isn't set 2023-06-12 15:33:08 +02:00
Jaime van Kessel
7103b9b333
Prevent qml warning spam if custom_icon isn't set 2023-06-12 14:48:31 +02:00
Jaime van Kessel
a2d9f53854
Merge branch '5.4' of github.com:Ultimaker/Cura 2023-06-12 14:45:23 +02:00
c.lamboo
9c90bcc06e Fix setting text fields overlapping in per-object-settings
CURA-10669
2023-06-12 14:29:30 +02:00
c.lamboo
f18e470260 Fix setting text fields overlapping in per-object-settings
CURA-10669
2023-06-12 11:15:45 +02:00
MariMakes
20e40bcd8e Updated Changelog for Cura 5.4
Updated Changelog for Cura 5.4
2023-06-09 18:22:34 +02:00
Jelle Spijker
58b33ae5b1
Fixes acc enable for ankermake m5
Fixes CURA-10098
2023-06-09 11:07:48 +02:00
casperlamboo
f9460bbb12 update translations 2023-06-09 07:14:44 +00:00
MariMakes
6727bb797b CURA-10674 Update Splash Screen 2023-06-09 09:09:26 +02:00
Jelle Spijker
1cf10f06f3
Merge branch '5.4'
# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cs_CZ/fdmextruder.def.json.po
#	resources/i18n/cs_CZ/fdmprinter.def.json.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/de_DE/fdmextruder.def.json.po
#	resources/i18n/de_DE/fdmprinter.def.json.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/es_ES/fdmextruder.def.json.po
#	resources/i18n/es_ES/fdmprinter.def.json.po
#	resources/i18n/fdmextruder.def.json.pot
#	resources/i18n/fdmprinter.def.json.pot
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fi_FI/fdmextruder.def.json.po
#	resources/i18n/fi_FI/fdmprinter.def.json.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/fr_FR/fdmextruder.def.json.po
#	resources/i18n/fr_FR/fdmprinter.def.json.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/hu_HU/fdmextruder.def.json.po
#	resources/i18n/hu_HU/fdmprinter.def.json.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/it_IT/fdmextruder.def.json.po
#	resources/i18n/it_IT/fdmprinter.def.json.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ja_JP/fdmextruder.def.json.po
#	resources/i18n/ja_JP/fdmprinter.def.json.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/ko_KR/fdmextruder.def.json.po
#	resources/i18n/ko_KR/fdmprinter.def.json.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/nl_NL/fdmextruder.def.json.po
#	resources/i18n/nl_NL/fdmprinter.def.json.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pl_PL/fdmextruder.def.json.po
#	resources/i18n/pl_PL/fdmprinter.def.json.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_BR/fdmextruder.def.json.po
#	resources/i18n/pt_BR/fdmprinter.def.json.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/pt_PT/fdmextruder.def.json.po
#	resources/i18n/pt_PT/fdmprinter.def.json.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/ru_RU/fdmextruder.def.json.po
#	resources/i18n/ru_RU/fdmprinter.def.json.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/tr_TR/fdmextruder.def.json.po
#	resources/i18n/tr_TR/fdmprinter.def.json.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_CN/fdmextruder.def.json.po
#	resources/i18n/zh_CN/fdmprinter.def.json.po
#	resources/i18n/zh_TW/cura.po
#	resources/i18n/zh_TW/fdmextruder.def.json.po
#	resources/i18n/zh_TW/fdmprinter.def.json.po
2023-06-08 16:52:20 +02:00
jellespijker
105aaf877e update translations 2023-06-08 14:47:35 +00:00
jellespijker
63f2695e6f update translations 2023-06-08 14:43:38 +00:00
Jelle Spijker
03753b5225
Update pot translations 2023-06-08 16:42:23 +02:00
Jelle Spijker
359fbddac4
Update pot translations 2023-06-08 16:36:19 +02:00
jellespijker
36cfa8a2e0 update translations 2023-06-08 10:41:26 +00:00
jellespijker
2328e76e92 update translations 2023-06-08 10:39:23 +00:00
Jelle Spijker
0f0d729549
Merge branch '5.4'
# Conflicts:
#	conanfile.py
#	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-06-08 12:36:46 +02:00
Jelle Spijker
58a9179d29
Merge branch '5.4' into CURA-9709_custom_icons_with_profiles 2023-06-08 12:32:24 +02:00
c.lamboo
046403f676 Update Annealing svg
CURA-10633
2023-06-07 19:01:09 +02:00
Jelle Spijker
22134f2d3c
Merge branch '5.4' into CURA-9709_custom_icons_with_profiles
# Conflicts:
#	cura/Machines/Models/IntentSelectionModel.py
2023-06-07 16:20:48 +02:00
Remco Burema
1f7c11667f Disable Small Skin Area feature for now :-/
We're not sure why this introduces a boatload of small segments into the infill, and we're out of time to try and fix this before the beta. Re-introducing after the beta seems like a bad idea, so this'll have to wait until 5.5 unfortunately.

Done as part of fixing for CURA-10500, but for the original Small Skin Area feature, see CURA-10201. For the ticket to (fix? and) reintroduce the feature, see CURA-10670.
2023-06-07 11:25:49 +02:00
c.lamboo
57bece831f Don't scroll beyond bounds in recommended menu
CURA-10650
2023-06-06 16:31:36 +02:00
jellespijker
2d7f968932 update translations 2023-06-06 13:48:34 +00:00
jellespijker
1bf5d740ef update translations 2023-06-06 13:47:34 +00:00
jellespijker
4d5002b038 Applied printer-linter format 2023-06-06 13:15:29 +00:00
Jelle Spijker
4a3c3155cf
Update rest preference label
Rest Preference
"Force Only Buildplate" can be "On Buildplate when possible",
Because Support can be created everywhere but as much as possible starting from the buildplate and in some case we can have some support starting from the model..
"On Model If Necessary" can be "On Model If required",
Because support can be created everywhere and if required you can have support starting on the model. And Sometimes Required means they start on the model because you have more direct or simple support if you start on the model.

As suggested by @5axes
2023-06-06 15:14:14 +02:00
nallath
8b5192c047 update translations 2023-06-06 10:46:57 +00:00
Jaime van Kessel
ea10a5acf2
Merge branch 'main' of github.com:Ultimaker/Cura 2023-06-06 12:42:32 +02:00
Jaime van Kessel
e2ac1ef810
Add anealing description and icon
CURA-10633
2023-06-06 12:42:09 +02:00
nallath
4e7a41b469 Applied printer-linter format 2023-06-06 09:36:32 +00:00
Jaime van Kessel
bb991e1e2c
Fix the formula for support_enable and support_extruder_nr
The formulas got mixed up somehow. Shows that devs shouldn't commit before
their morning coffee ;)

CURA-10633
2023-06-06 11:34:28 +02:00
Jelle Spijker
ee0e55cf97
Bump up fdmprinter and fdmextruder 2023-06-05 11:51:25 +02:00
Jelle Spijker
775266812b
Merge pull request #15661 from Ultimaker/CURA-10617_new_logo
Update the logo
2023-06-05 11:26:10 +02:00
Jelle Spijker
e3a4c84463
Merge remote-tracking branch 'origin/PP-336_Cleanup_infill_overlap_settings'
# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_TW/cura.po
2023-06-05 11:09:16 +02:00
Jelle Spijker
ba5cd429c0
Merge pull request #15632 from Ultimaker/PP-81_Easy_to_tear_of_brim
PP-81 easy to tear of brim
2023-06-05 10:56:39 +02:00
Jelle Spijker
b07e21cb1a
Merge remote-tracking branch 'origin/main' into PP-321_Cleanup_skin_overlap_settings
# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_TW/cura.po
2023-06-05 10:18:03 +02:00
Jelle Spijker
e3cbc37740
fixed mapping of support extruder nr
Contributes to PP-285 and CURA-10643
2023-06-05 09:16:56 +02:00
Jelle Spijker
20c2b2b4cd
Revert mapping value
Currently fails, will fix this after the weekend

Contributes to PP-285 and CURA-10643
2023-06-02 17:35:08 +02:00
Jaime van Kessel
e691d3d052
Update the logo
CURA-10617
2023-06-02 17:15:46 +02:00
Jelle Spijker
545914ca84
Merge branch 'main' into PP-285_Add_support_materials_tag 2023-06-02 16:03:18 +02:00
Jelle Spijker
d7aa3d5dc9
Merge branch 'main' into PP_328_Increase_speed_bottom_interface_layer 2023-06-02 15:42:31 +02:00
Remco Burema
7115cc35ed
Merge pull request #15651 from Ultimaker/PP-340_Filled_material_profiles
Profiles for filled material
2023-06-02 14:52:25 +02:00
nallath
68b51e842d update translations 2023-06-02 11:57:59 +00:00
Jaime van Kessel
d8a88739a6
Ensure that menu items for extruder are added to right spot in context menu
Fixes CURA-10649
2023-06-02 13:51:43 +02:00
Paul Kuiper
8e8e64f37b Added PET-CF quality and intent profiles.
Relates to: PP-340
2023-06-01 17:53:51 +02:00
goofoo3d
9ede831cd6
Merge branch 'main' into main 2023-06-01 08:57:26 +08:00
c.lamboo
bba1362bad Fix um s5 initially not showing up in printer list
CURA-10627
2023-05-31 13:30:26 +02:00