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

32380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mariska
f0186ff9e3
Change Stalebot from Feature to Bugs 
Specifically targeting deferred issues.
 2023-06-29 13:48:18 +02:00
casperlamboo
fbf5288731 update translations 2023-06-29 08:59:12 +00:00
Casper Lamboo
305e006858
Merge pull request #15947 from Ultimaker/CURA-10662_Wider_Material_Estimation 
Increase Boxes for Printjob Information
 2023-06-29 10:54:43 +02:00
MariMakes
d181ade2af Increase Boxes for Printjob Information 
Proposed by contributed by @Diegovd
 2023-06-28 16:16:58 +02:00
Jaime van Kessel
d2e0ffc493
Merge pull request #15942 from Ultimaker/PP-353_Fix_exclude_materials 
PP-353 fix exclude materials
 2023-06-28 14:09:55 +02:00
Frederic Meeuwissen
f9e49d32f1 Exclude PET-CF on UM3 
There is are CC cores defined for the UM3
 2023-06-28 10:33:02 +02:00
Frederic Meeuwissen
d5de1d696c Don't exclude generic_petg on S3 2023-06-28 10:07:13 +02:00
Frederic Meeuwissen
df4d988b4b Don't exclude TPLA on UM2C 2023-06-28 10:00:16 +02:00
Frederic Meeuwissen
7357ebaba6 Exclude 3 new(ish) TPLA colors on UM2/UMO 2023-06-28 09:55:57 +02:00
Frederic Meeuwissen
e8db51844b Remove PET-CF from UMO/UM2 2023-06-28 09:13:29 +02:00
Jelle Spijker
3061ac0c0b
Merge pull request #15840 from Ultimaker/CURA-10709_remove_exclude_materials_from_3d_party_printers 
Remove exclude materials from 3rd party printers
 2023-06-27 11:01:19 +02:00
casperlamboo
7bdb5dfa50 Applied printer-linter format 2023-06-26 14:54:29 +00:00
c.lamboo
f9faf215e6 restore some exclude materials 
CURA-10709
 2023-06-26 16:52:48 +02:00
c.lamboo
de272845cb Revert "Restore exclude materials to some extent again" 
This reverts commit e5b60dcaed621853af2740d24028451551620ed8.
 2023-06-26 16:33:20 +02:00
c.lamboo
00db0b2f71 Revert "Applied printer-linter format" 
This reverts commit f590f4b02d096aabbd670c6c339deaedfa896b47.
 2023-06-26 16:33:20 +02:00
Casper Lamboo
faaabfcb87
Merge pull request #15910 from Patola/5.4 
Updated Brazilian Portuguese strings for Cura 5.4
 2023-06-26 12:49:59 +02:00
GregValiant
8b7339e399 Typographical Error 
Typo error.
 2023-06-26 11:59:23 +02:00
Jelle Spijker
6565295af4
Update cura-installer.yml 2023-06-26 10:13:11 +02:00
Jelle Spijker
802ece9bd1
Update cura-installer.yml 2023-06-26 09:08:02 +02:00
Jelle Spijker
a7a42eea6d
Show used Python dependencies 
Note: this is just a dumb list of everything in the
venv. This will contain more modules than actually shipped
 2023-06-26 08:42:32 +02:00
Cláudio 'Patola' Sampaio
a43a6e1ce8 Updated Brazilian Portuguese strings for Cura 5.4 2023-06-25 18:28:26 +02:00
Jelle Spijker
8781501262
Merge pull request #15863 from Ultimaker/CURA-10676_translation 
Update translations
 2023-06-23 08:07:32 +02:00
casperlamboo
7bc310c6c1 update translations 2023-06-22 14:44:07 +00:00
c.lamboo
08f3939c2c Update translations 
CURA-10676
 2023-06-22 16:40:23 +02:00
nallath
f590f4b02d Applied printer-linter format 2023-06-22 13:12:49 +00:00
Jaime van Kessel
e5b60dcaed
Restore exclude materials to some extent again 
These machines were 1.75 machines, so they should include those in their exclude list
(and not include 2.85 variants)

CURA-10709
 2023-06-22 15:10:49 +02:00
Casper Lamboo
7f62744e21
Merge pull request #15803 from Ultimaker/CURA-10713_bumpup_various_security_deps 
Cura 10713 bumpup various security deps
 2023-06-21 16:45:14 +02:00
casperlamboo
38a684fe05 Applied printer-linter format 2023-06-21 09:38:32 +00:00
c.lamboo
cd58703dca Remove exclude materials from 3rd party printers 
With the changes from https://github.com/Ultimaker/Cura/pull/15692 logic regarding the exclude materials printer setting changed. It has never worked properly before. Now that it works properly again a ton of materials were excluded that were never intended to be excluded.

As we can never be sure if an exclude material was intended or not we decided to be pretty agressive in removing exclude materials. This way the behavior is closed to the behavior prior to the exclude material fix.

There was one case were we decide to leave an exclude material in. If a printer has a material diameter of `175` *and* the material would specifically specify the `175` substring (e.g. `dsm_arnitel2045_175`). When this is the case we were pretty certain it was intended to exclude this material.

CURA-10599
 2023-06-21 11:37:08 +02:00
Casper Lamboo
84b914a811
Merge pull request #15793 from Ultimaker/CURA-10701_bumpup_shapely 
Bump up version of Shapely
 2023-06-20 12:06:28 +02:00
Jelle Spijker
c49a215372
Bump down version of keyring 
SecretStorage 3.3.3 requires 23.0.1

Fixes CURA-10713
 2023-06-19 11:02:18 +02:00
Jelle Spijker
14aaf10aa7
Merge branch 'bumpcryptography' into CURA-10713_bumpup_various_security_deps 2023-06-19 10:41:57 +02:00
Jelle Spijker
eb75207577
Merge branch 'CURA-10700_bumpup_secretstorage' into CURA-10702_bumpup_keyring 
# Conflicts:
#	requirements.txt
 2023-06-18 14:16:59 +02:00
Jelle Spijker
eb07777f83
Bump up version of keyring 
Fixes CURA-10702
 2023-06-18 14:08:14 +02:00
Jelle Spijker
4d88265ebd
Bump up version of Shapely 
Fixes CURA-10701
 2023-06-18 13:59:29 +02:00
Jelle Spijker
f73cbb84de
Bump up version of SecretStorage 
Fixes CURA-10700
 2023-06-18 13:54:15 +02:00
Jelle Spijker
dc26217992
Bump up version of cryptography 
We were using a version of 3 years ago
 2023-06-18 13:42:30 +02:00
Jelle Spijker
831bda4139
One namechange a year is enough 2023-06-18 13:30:11 +02:00
Jelle Spijker
91410f51fe
Merge pull request #15745 from Ultimaker/CURA-8513 
Update certifi requirement
 2023-06-18 13:27:50 +02:00
Jelle Spijker
5b8e9af49a
Merge branch 'main' into CURA-8513 
# 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-18 13:19:36 +02:00
Jelle Spijker
b5e2018092
Use latest/stable for future developement of 5.4 2023-06-18 13:18:54 +02:00
Jelle Spijker
2a8c2768d8
Merge remote-tracking branch 'origin/5.4' 
# Conflicts:
#	conanfile.py
 2023-06-18 13:16:47 +02:00
Jelle Spijker
e61f2f3d75
Update to latest certifi package 
The ticket mentioned that the current
 version is 2021.5.30 but the ticket
 was created in 2021; Updating to the
 latest version is the proper way

 Contributes to CURA-8513
 2023-06-18 13:14:43 +02:00
Remco Burema
fa8e48152e Pause-at-height: Under rare circumstances T might not be an extruder switch. 
Some printers accept commands like TIMELAPSE_TAKE_FRAME or whatever, after all. Make it explciti that a line should start with T<number> in order to qualify.

Should fix #15729
 2023-06-16 09:09:01 +02:00
c.lamboo
791f70dfe7 Pin dependencies 5.4.0-beta.1 2023-06-15 23:32:17 +02:00
Remco Burema
2670a22c0f Merge branch '5.4' 2023-06-15 22:44:03 +02:00
Remco Burema
99e1fcd4f8 Pause-at-height: Under rare circumstances, T might not be temperature. 
Some printers accept commands like TIMELAPSE_TAKE_FRAME or whatever.

Should fix #15729
 2023-06-15 22:34:39 +02:00
Remco Burema
bbcc626537 Bump SDK version to 8.4.0 2023-06-15 22:28:31 +02:00
Casper Lamboo
4fa9460007
Merge pull request #15705 from Ultimaker/CURA-10677_Releasenotes54 
Updated Changelog for Cura 5.4
 2023-06-15 17:15:11 +02:00
c.lamboo
c18061911b Add pyqt upgrade to changelog 
CURA-10677
 2023-06-15 17:14:25 +02:00