casperlamboo
|
0528e65be6
|
update translations
|
2023-03-15 11:59:07 +00:00 |
|
Casper Lamboo
|
0a317005d6
|
Merge pull request #13785 from Ultimaker/CURA-8890-hole-horizontal-expansion-max-diameter
CURA-8890-hole-horizontal-expansion-max-diameter
|
2023-03-15 12:50:52 +01: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 |
|
Jelle Spijker
|
dc22a4980c
|
Merge pull request #14885 from Ultimaker/CURA-10374_fix_combobobobobox
Cura 10374 fix combobobobobox
|
2023-03-15 12:44:55 +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
|
656a12b387
|
Merge pull request #14792 from Ultimaker/CURA-9826_add-skirt-height
CURA-9826_add-skirt-height
|
2023-03-15 11:17:22 +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 |
|
c.lamboo
|
84bb820e33
|
Update copy in pause at height to reflect that the first layer is 0
CURA-10391
|
2023-03-15 10:42:07 +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 |
|
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
|
41ca02737e
|
Merge pull request #14213 from Ultimaker/CURA-10127-dont-allow-minimum-speed-to-be-zero
dont allow minimum speed of zero
|
2023-03-13 11:51:17 +01:00 |
|
Jelle Spijker
|
97f98c9e8a
|
Merge branch 'main' into CURA-10127-dont-allow-minimum-speed-to-be-zero
|
2023-03-13 11:51:09 +01:00 |
|
Jelle Spijker
|
ac62608e73
|
Revert "Upload CCI packages"
This reverts commit 945ca5e55cfc516708cc5287511a928a3ab5f5b4.
|
2023-03-13 11:50:02 +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 |
|
Jelle Spijker
|
945ca5e55c
|
Upload CCI packages
|
2023-03-13 08:51:05 +01:00 |
|
Casper Lamboo
|
476b3e4944
|
Remove superfluous string quotes
|
2023-03-10 14:36:57 +01:00 |
|
Jelle Spijker
|
4f892a8858
|
One of us... One of us...
|
2023-03-10 09:17:46 +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 |
|
Jelle Spijker
|
315d579a25
|
add on
Contributes to CURA-10376
|
2023-03-09 09:28:40 +01:00 |
|
Jelle Spijker
|
a286c43f17
|
run on push to sources
Contributes to CURA-10376
|
2023-03-09 09:25:54 +01:00 |
|
Jelle Spijker
|
9a63b5ea35
|
renamed workflow
Contributes to CURA-10376
|
2023-03-09 09:23:01 +01:00 |
|
Jelle Spijker
|
dec8f90e51
|
fix workflow
Contributes to CURA-10376
|
2023-03-09 09:16:51 +01:00 |
|
Jelle Spijker
|
bbfda9e5c1
|
Merge branch '5.3'
|
2023-03-09 09:08:48 +01:00 |
|
Jelle Spijker
|
95e9919af9
|
Add workflow to commit translation changes
Contributes to CURA-10376
|
2023-03-09 09:08:05 +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 |
|
Jelle Spijker
|
7a15e5098f
|
Merge branch '5.3'
|
2023-03-08 13:25:22 +01:00 |
|
Jelle Spijker
|
2cf59073ea
|
Removed caching between jobs
Contributes to CURA-10376
|
2023-03-08 13:24:47 +01:00 |
|
Jelle Spijker
|
684da999f6
|
re-added the bindirs
For some reason the paths aren't found by the py_requires
Contributes to CURA-10376
|
2023-03-08 13:24:23 +01:00 |
|
Jelle Spijker
|
769ff3c736
|
Merge branch '5.3'
|
2023-03-08 11:28:58 +01:00 |
|
Jelle Spijker
|
c36ea10b08
|
Loop over tags
|
2023-03-08 11:28:36 +01:00 |
|
Jelle Spijker
|
b4632f67a2
|
run gettext with force_host_context
Contributes to CURA-10376
|
2023-03-08 11:05:04 +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
|
3536e4b87a
|
Merge branch '5.3'
# Conflicts:
# conanfile.py
|
2023-03-08 10:27:39 +01:00 |
|
Jelle Spijker
|
73e0fd74b5
|
fixed version determination on release branch after release
|
2023-03-08 10:26:46 +01:00 |
|
Jelle Spijker
|
d56edc2d16
|
Unpinned dependencies for the 5.3.1 development
|
2023-03-08 09:11:19 +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 |
|