GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 07:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,175 Commits 288 Branches 260 Tags
Commit Graph

14567 Commits

Author SHA1 Message Date
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
c.lamboo
62812393b0 Fix typos in translations 
CURA-10369
 2023-03-07 10:29:37 +01:00
nallath
702c317c4c Applied printer-linter format 2023-03-07 08:27:28 +00:00
Jaime van Kessel
2cf1fc6761
Merge pull request #14797 from ckvsoft/5.3 
[5.3] Fix VzBot Base definition file
 2023-03-07 09:25:28 +01:00
jspijker
d68f454a01 Update pot and po files 
Contribute to CURA-10208
 2023-03-07 09:02:18 +01:00
jspijker
3077eca978 Emptied translation str which weren't translated 
This should ensure that the next time they will be properly translated

Contribute to CURA-10208
 2023-03-07 09:00:57 +01:00
jspijker
d36613ecbf Removed wrong translation 
Contribute to CURA-10208
 2023-03-07 08:25:25 +01:00
jspijker
01eaa63e62 Removed fuzzy from zh_TW 
Contribute to CURA-10208
 2023-03-07 08:25:07 +01:00
jspijker
5dd576e964 Removed commented out translations 
Contribute to CURA-10208
 2023-03-07 08:17:10 +01:00
jspijker
cfc467ef7f Removed commented out translations 
Contribute to CURA-10208
 2023-03-07 08:16:38 +01:00
jspijker
9e3c35377a Removed commented out translations 
Contribute to CURA-10208
 2023-03-07 08:15:49 +01:00
jspijker
4cfe10514c Removed fuzzy from nl_NL 
Contribute to CURA-10208
 2023-03-07 08:15:06 +01:00
jspijker
3c8ac9c56b Removed fuzzy from pt_BR 
Contribute to CURA-10208
 2023-03-07 08:14:54 +01:00
jspijker
15bea381d9 Removed fuzzy from pl_PL 
Contribute to CURA-10208
 2023-03-07 08:07:04 +01:00
jspijker
5777fa6be9 restored translation from 4.13 
Contribute to CURA-10208
 2023-03-07 08:00:26 +01:00
jspijker
ea1a6d1a6e capitalize M 
Contribute to CURA-10208
 2023-03-07 07:57:59 +01:00
jspijker
a9801845f8 removed commented out translations 
Contribute to CURA-10208
 2023-03-07 07:50:05 +01:00
jspijker
c6fdbb0e62 removed fuzzy translations from fi_FI 
Contribute to CURA-10208
 2023-03-07 07:48:07 +01:00
jspijker
72e4a12b5d Change german translation for Save Changes 
See: https://github.com/Ultimaker/Cura/discussions/14637#discussioncomment-5222453

Contribute to CURA-10208
 2023-03-07 07:40:24 +01:00
jspijker
181ffddd17 Removed commented out translations 
Contribute to CURA-10208
 2023-03-07 07:37:24 +01:00
jspijker
3fcb809bca Removed fuzzy translations from hu_HU 
Contribute to CURA-10208
 2023-03-07 07:35:38 +01:00
jspijker
2e570ea29c Removed translations for Show Custom 
Contribute to CURA-10208
 2023-03-07 07:08:08 +01:00
Christian Kvasny
cc8c6611e7
Fix VzBot Base definition file 
The correct value should be -03 not 0.3 Should actually still in the 5.3. Maybe it works out.
 2023-03-07 00:09:57 +01:00
jspijker
4bc11c5138 Merge remote-tracking branch 'origin/5.3' 
# Conflicts:
#	conanfile.py
 2023-03-06 23:13:21 +01:00
jspijker
e9ce36d327 Reinstate string for enterprise wall 
Contribute to CURA-10208
 2023-03-06 23:09:50 +01:00
jspijker
02b90694da Update with latest pot 
Contribute to CURA-10208
 2023-03-06 23:03:14 +01:00
jspijker
8a38eb79e2 Merge remote-tracking branch 'origin/CURA-10182_add_sign_in_wall_enterprise' into 5.3 
# Conflicts:
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fr_FR/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/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
 2023-03-06 22:53:16 +01:00
jspijker
12de289dd7 Update with latest pot 
Contribute to CURA-10208
 2023-03-06 22:46:29 +01:00
jspijker
c67e86bfea Merge remote-tracking branch 'origin/CURA-10208II' into CURA-10208 
# Conflicts:
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
 2023-03-06 22:43:11 +01:00
jspijker
8733d41b25 Update cs_CZ with latest pot 
Contribute to CURA-10208
 2023-03-06 22:39:05 +01:00