3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
32352 commits 306 branches 272 tags 787 MiB
Commit graph

14685 commits

Author SHA1 Message Date
Remco Burema
f272dda946
Merge pull request #16120 from Ultimaker/CURA-10687_Restore_Color_Picker 
Color Picker from Qt 6.4
 2023-07-13 13:20:27 +02:00
saumya.jain
9407345377 Color Picker from Qt 6.4 
Native platform dialog is available on iOS,Linux (when running with the GTK+ platform theme) and macOS

fixes: CURA-10687
 2023-07-12 16:04:56 +02:00
saumya.jain
3e18082db6 Code review comments 
fixes: CURA-8754
 2023-07-11 11:45:37 +02:00
saumya.jain
d12659f71f Added refresh moving icon for feedback purpose 
While refreshing the material sync, no feedback was provided before, now there is a refreshing icon animation available for "refresh in progress"

fixes: CURA-8754
 2023-07-10 14:36:14 +02:00
saumya.jain
cca33bb4a5 Added refresh moving icon for feedback purpose 
While refreshing the material sync, no feedback was provided before, now there is a refreshing icon animation available for "refresh in progress"

fixes: CURA-8754
 2023-07-10 13:50:37 +02:00
saumya.jain
3187ef14cf SpinBox fixed for values above the max value 
Review comments
Fixes CURA-10096
 2023-07-07 15:05:52 +02:00
saumya.jain
83bef10cfb Merge remote-tracking branch 'origin/CURA-10096_Multiply_Models_allows_entering_values_over_99_but_won't_multiply_higher_than_99' into CURA-10096_Multiply_Models_allows_entering_values_over_99_but_won't_multiply_higher_than_99 2023-07-07 11:46:56 +02:00
saumya.jain
1ebde31397 SpinBox fixed for values above the max value 
Review comments
Fixes CURA-10096
 2023-07-07 11:46:29 +02:00
Jelle Spijker
4185fbb88a
Merge remote-tracking branch 'origin/main' into CURA-10096_Multiply_Models_allows_entering_values_over_99_but_won't_multiply_higher_than_99 
# 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-07-06 16:59:26 +02:00
saumyaj3
082cdb0f25 update translations 2023-07-06 14:20:41 +00:00
saumya.jain
fe5893feb6 SpinBox fixed for values above the max value 
Spinbox now doesn't take values above the designated maximum
Fixes CURA-10096
 2023-07-06 16:07:40 +02:00
jellespijker
648b26ad90 update translations 2023-07-04 15:53:00 +00:00
Jelle Spijker
f2ac1ebe32
Merge branch '5.4' 
# Conflicts:
#	conanfile.py
 2023-07-04 17:47:53 +02:00
casperlamboo
0089b5e06c update translations 2023-07-04 11:55:10 +00:00
Casper Lamboo
2defc58b90
Merge pull request #15995 from Ultimaker/CURA-10752_New_Changelog_for_5.4 
Update Changelog for Cura 5.4 Stable
 2023-07-04 13:50:06 +02:00
c.lamboo
e14b6ec483 Add zh_CN translations 
CURA-10676
 2023-07-04 13:07:01 +02:00
MariMakes
320f927fba Update Changelog for Stable 
Update the changelog for the Stable release
 2023-07-04 12:19:57 +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
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 e5b60dcaed.
 2023-06-26 16:33:20 +02:00
c.lamboo
00db0b2f71 Revert "Applied printer-linter format" 
This reverts commit f590f4b02d.
 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
Cláudio 'Patola' Sampaio
a43a6e1ce8 Updated Brazilian Portuguese strings for Cura 5.4 2023-06-25 18:28:26 +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
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
Remco Burema
2670a22c0f Merge branch '5.4' 2023-06-15 22:44:03 +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
rburema
502a17b62c update translations 2023-06-15 13:37:58 +00:00
Remco Burema
d7b76e991e
Merge pull request #15739 from Ultimaker/CURA-10643_filter_extruder_by_material_prop 
[CURA-10643] filter extruder by material prop
 2023-06-15 15:30:15 +02:00
casperlamboo
fce6a66754 update translations 2023-06-14 11:57:47 +00:00
nallath
94686d64a6 update translations 2023-06-14 09:24:00 +00:00
nallath
4a38439886 update translations 2023-06-14 09:21:14 +00:00
Jaime van Kessel
076c3ee84e
Merge branch '5.4' of github.com:Ultimaker/Cura 2023-06-14 11:18:06 +02:00
Jaime van Kessel
e92db87e47
Add missing excludes for TPLA for UM2+C 
Discussed this with PP&M, these materials should have been excluded
but were overlooked.

CURA-10599
 2023-06-14 11:15:58 +02:00