Commit graph

14646 commits

Author SHA1 Message Date
Casper Lamboo
837171ac5c Apply suggestions from code review 2023-03-20 17:35:42 +01:00
Jelle Spijker
5c0345a475
enable smart brim ordering by default 2023-03-20 15:46:12 +01:00
Jelle Spijker
8d2d12af80
Merge pull request #14927 from Ultimaker/CURA-10032
Add "smart brim" setting
2023-03-20 14:11:09 +01:00
casperlamboo
7a4f441a2d update translations 2023-03-20 12:57:20 +00:00
c.lamboo
1dfdf46d09 Use more predictable settings-name
CURA-10032
2023-03-20 13:46:55 +01:00
Joey de l'Arago
34c063ae72 add petg and remove abs definitions 2023-03-18 16:52:27 +01:00
Joey de l'Arago
b09397756c Add abs and asa configurations 2023-03-18 16:52:13 +01:00
Joey de l'Arago
855a63bfc9 add tpu configurations 2023-03-18 16:51:56 +01:00
Joey de l'Arago
bb7f598d30 Update elegoo pla definitions and add intents 2023-03-18 16:51:41 +01:00
c.lamboo
86d95f8375 Merge branch 'main' into CURA-10406_fix_project_loading
# 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-03-17 17:34:13 +01:00
nallath
7fa489968f update translations 2023-03-17 15:29:23 +00:00
casperlamboo
01df365d06 Applied printer-linter format 2023-03-17 15:24:30 +00:00
c.lamboo
1023eb8867 Add "smart brim" setting
CURA-10032
2023-03-17 16:23:16 +01:00
Remco Burema
169c370ff5
Merge branch 'main' into CURA-10389_update_qt 2023-03-17 14:43:27 +01:00
Jaime van Kessel
1e0fc60008
Merge branch '5.3' of github.com:Ultimaker/Cura 2023-03-17 10:42:36 +01:00
jellespijker
283363ec9a update translations 2023-03-16 17:19:42 +00:00
Vandresc
84ee66e409 update translations 2023-03-16 17:15:02 +00:00
Vandresc
733a926e05 Update_HoleHorizontalExpansion_CURA-8890
Small typo in setting description
2023-03-16 18:05:23 +01:00
c.lamboo
71a0044bf8 Fix extruder number
most important change was changing
```
        currentIndex: function () {
          ...
        }
```
to
        currentIndex: {
          ...
        }
```
This changed the behavior so that the variables inside the code blocked are watched so that `currentIndex` is automatically updated. No longer needed to set the `currentIndex` from any where else anymore.

CURA-10374
2023-03-15 18:18:31 +01:00
casperlamboo
0528e65be6 update translations 2023-03-15 11:59:07 +00:00
c.lamboo
61aff1756e Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter
# 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-03-15 12:50:29 +01:00
Jelle Spijker
5d41604a21
Merge branch '5.3' 2023-03-15 12:45:47 +01:00
c.lamboo
3edd6bc4c3 Add Hole Horizontal Expansion Max Diameter to expert visibility
CURA-8890
2023-03-15 12:01:44 +01:00
casperlamboo
0da0ceaa4e update translations 2023-03-15 10:57:47 +00:00
c.lamboo
cb8f66b5fd Update copy
CURA-8890
2023-03-15 11:48:37 +01:00
Jelle Spijker
905a40dc39
Set height to 1 if skirt gap is 0
Contributes to CURA-9826
2023-03-15 11:15:31 +01:00
Rijk van Manen
8b67c8eb16 Merge branch 'CURA-9826_add-skirt-height' of https://github.com/Ultimaker/Cura into CURA-9826_add-skirt-height 2023-03-15 09:08:46 +01:00
Rijk van Manen
e965788b7b add skirt height to settings visibility
CURA-9826
2023-03-15 09:08:33 +01:00
c.lamboo
37f4271c9b Fix comboboxes not updating the accosiated value
Was introduced by this commit: 788ab7da1b

CURA-10374
2023-03-14 19:28:01 +01:00
c.lamboo
035a609277 Boyscouting
CURA-10374
2023-03-14 19:27:57 +01:00
jellespijker
8d13e79f31 update translations 2023-03-14 17:27:58 +00:00
Jelle Spijker
f22d25e6e6
Merge branch 'main' into CURA-9826_add-skirt-height 2023-03-14 18:17:53 +01:00
Jaime van Kessel
e099304fce
Merge branch 'patch-1' of github.com:asteroids1975/Cura
CURA-10400
2023-03-14 12:51:09 +01:00
hyu7000
6866249429
Update cremaker_common.def.json 2023-03-14 09:19:44 +09:00
jellespijker
7356acc2ee update translations 2023-03-13 11:03:09 +00:00
Jelle Spijker
1eda386448
Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter 2023-03-13 11:54:21 +01:00
Jelle Spijker
58b88a2ab4
Merge remote-tracking branch 'origin/main' into CURA-10127-dont-allow-minimum-speed-to-be-zero 2023-03-13 11:26:25 +01:00
Paul Kuiper
b59db63a21
Merge branch 'main' into PP-324_Limit_bed_temperature_to_120C 2023-03-13 09:41:42 +01:00
rburema
d031451909 update translations 2023-03-09 11:03:45 +00:00
Remco Burema
5ed7a5da98 Merge branch '5.3' 2023-03-09 11:54:11 +01:00
Remco Burema
04c6f6bbcf Small layer temp: Have (more) sensible warning/limit values.
CURA-10377
2023-03-09 11:34:58 +01:00
Jaime van Kessel
aec8a9ad49
Fix the hover for SettingItem
This was broken due to the switch to Qt6

Fixes CURA-10375 and fixes #14790
2023-03-08 16:23:56 +01:00
Rijk van Manen
de7714ef7f Merge branch 'main' into CURA-8890-hole-horizontal-expansion-max-diameter 2023-03-08 10:40:56 +01:00
Rijk van Manen
011febc0f8 Merge branch 'main' into CURA-10127-dont-allow-minimum-speed-to-be-zero 2023-03-08 10:35:00 +01:00
Jelle Spijker
7fc7b238cd
Merge branch '5.3' 2023-03-08 09:09:02 +01:00
Jelle Spijker
c7d84dcb6c
Ensured that header has 20 lines
This allows for easy checking if the content is actally changed.
Since it then has the same amount of lines as cura.pot

Contributes to CURA-10376
2023-03-08 09:08:41 +01:00
jspijker
52a58374a8 Merge branch '5.3'
# Conflicts:
#	conanfile.py
2023-03-07 13:48:39 +01:00
jellespijker
5c5deac169 Applied printer-linter format 2023-03-07 10:13:36 +00:00
jspijker
325614907b Partially revert Geeetech PR
The following printers are back to their old behaviour:

- Geeetech A10
- Geeetech A10M
- Geeetech A10T
- Geeetech A20
- Geeetech A20M
- Geeetech A20T
- Geeetech A30

added:
- Geeetech Mizar S (legacy)

Contribute to CURA-10370
2023-03-07 11:12:08 +01:00
MariMakes
216a557527
Update Changelog from Beta period
Include bugfixes and update known issues.
2023-03-07 10:46:47 +01:00