26385 Commits

Author SHA1 Message Date
AnnaKang0219
e7e5970647 Remove the files not CZ-300
Remove the files not CZ-300
2021-08-12 09:35:15 +08:00
root
3ed8e6ee3f Quality profiles renamed 2021-08-11 19:59:16 +02:00
Konstantinos Karmas
7c8153eede Don't crash if the keyring password cannot be decoded
Fixes Sentry issue CURA-2S0
2021-08-11 17:25:45 +02:00
Konstantinos Karmas
0e26b9125a Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11 2021-08-11 17:05:46 +02:00
Konstantinos Karmas
71748bff8d Don't crash if the reply cannot be loaded
Fixes Sentry issue CURA-2RQ
2021-08-11 17:05:36 +02:00
Jaime van Kessel
fb18b278bf
Merge pull request #10245 from Ultimaker/CURA-7279_back_pressure_compensation
[CURA-7279] Back-Pressure Compensation
2021-08-11 15:52:32 +02:00
Jelle Spijker
fd79192055
Merge pull request #10266 from Ultimaker/CURA-8472_4.11_translations
CURA-8472: Prepare for the 4.11 translations
2021-08-11 13:19:58 +02:00
Remco Burema
ecf820f3db
Fix tests.
CURA-8473
2021-08-11 12:35:54 +02:00
Remco Burema
5d7804deae
Digital Library plugin needs to be backwards compatible.
Message-types are a new parameter to Messages, so they can't be used in SDK/API versions smaller than 7.7.0.

CURA-8473
2021-08-11 12:14:02 +02:00
Konstantinos Karmas
d36435db5f Update po files for 4.11 translations
CURA-8472
2021-08-11 11:12:25 +02:00
Konstantinos Karmas
df5dad3066 Update pot files for 4.11 translations
CURA-8472
2021-08-11 11:05:20 +02:00
Jaime van Kessel
2c2e7f2c16 Add even more logging to authorization service 2021-08-11 10:19:27 +02:00
Remco Burema
f019ad16ef
Merge pull request #10244 from Ultimaker/CURA-8458_Expose_distribution_radius
Expose distribution radius
2021-08-11 09:18:19 +02:00
Jaime van Kessel
317794920f Merge branch 'master' of github.com:Ultimaker/Cura 2021-08-09 17:43:55 +02:00
Jaime van Kessel
33b1d71183 Add definitions to known current versions
CURA-8468
2021-08-09 17:43:30 +02:00
Jaime van Kessel
a5d998224f Add definitions to known current versions
CURA-8468
2021-08-09 17:41:54 +02:00
Jaime van Kessel
988de58c4e Fix version upgrader for arachne
CURA-8468
2021-08-09 17:13:40 +02:00
Jaime van Kessel
5ea0344a65 Remove duplicated code from versionupgrader 2021-08-09 16:43:23 +02:00
Konstantinos Karmas
fc40ebd8a5 Fix unsupported operand types for QUrl + str
The parenthesis should be at the end.

CURA-8441
2021-08-09 16:39:04 +02:00
Jaime van Kessel
8b2904ee3b Merge branch 'CURA-8441_campaign_links' of github.com:Ultimaker/Cura 2021-08-09 14:09:27 +02:00
Konstantinos Karmas
e18a840c43 Change troubleshooting link
CURA-8441
2021-08-09 13:00:25 +02:00
Konstantinos Karmas
332475562b Change account signup link
CURA-8441
2021-08-09 13:00:03 +02:00
Konstantinos Karmas
b37716de58 Add missing campaign tags
CURA-8441
2021-08-09 12:59:29 +02:00
Konstantinos Karmas
5a8167cbff Fix unescaped &
CURa-8441
2021-08-09 12:48:07 +02:00
Konstantinos Karmas
3be4b1a441 Fix failing test
CURA-8441
2021-08-09 12:42:11 +02:00
Konstantinos Karmas
5bf24ed678 Add campaign tags to the logoff link
CURA-8441
2021-08-09 11:56:41 +02:00
AnnaKang0219
c86d1638e2 Fix bugs for definition
modify Infill_pattern value setting
2021-08-09 17:20:18 +08:00
Jaime van Kessel
f8df3facc5 Merge branch 'CURA-8444_Digital_Library_does_not_work_on_earlier_Cura_versions' of github.com:Ultimaker/Cura 2021-08-09 11:03:24 +02:00
Jaime van Kessel
176077c910 Merge branch 'CURA-8436_Inform_user_that_the_webcam_is_disabled_for_cloud_printers' of github.com:Ultimaker/Cura 2021-08-09 11:00:58 +02:00
AnnaKang0219
6a2120dbd3 update CrazyPrinter CZ-300 definitions
update CrazyPrinter CZ-300 definitions
2021-08-09 11:51:53 +08:00
root
099645fac8 Merge branch 'master' of https://github.com/x40-Community/Cura 2021-08-07 17:14:54 +02:00
root
db16d25aa1 Suppress all new materials without color information 2021-08-07 17:14:14 +02:00
x40-Community
bb229e13c4
Merge branch 'Ultimaker:master' into master 2021-08-07 16:26:42 +02:00
root
3526d61145 Add quality profiles 2021-08-07 16:24:44 +02:00
Remco Burema
694d9987d3
Correct superfluous commas,
Why does JSON not allow trailing comma's, Ugh,

CURA-7279
2021-08-06 18:31:04 +02:00
Remco Burema
562be41bd0
Also remove not-existing-anymore settings from definitions and the like.
CURA-7279
2021-08-06 18:23:10 +02:00
Jaime van Kessel
c18f37b0f3 Add wall_distribution_count
CURA-8458
2021-08-06 17:05:27 +02:00
Remco Burema
586198c628
Remove direct flow equalization in favour of line-width based.
CURA-7279
2021-08-06 16:56:56 +02:00
goofoo3d
d709b86c16
add goofoo,renkforce printf (#8959)
* add goofoo,renkforce printf

* 优化PVA打印的配置

* 修正双喷打印不能重叠的问题

* 修改配置信息

* 添加机型配置

* 新增 goofoo 2-1混色脚本,优化机型配置.

* 优化goofoo 2-1混色脚本

* 调整了机型配置

* 添加不同口径喷嘴

* 添加喷嘴口径

* 修改机器名称不对的问题

* modify setting_version = 16 to setting_version = 17

* modify renkforce & goofoo's files setting_version = 16 to 17

* modify pva support_pattern & e-one size

* modify pva support pattern to grid

Co-authored-by: laiqiqi <laiqiqi886@163.com>
2021-08-06 15:14:24 +02:00
Remco Burema
dbaeaa8f74
Flow eqalization width factor should be off by default for now.
CURA-7279
2021-08-06 13:49:40 +02:00
Remco Burema
fbbec8c012
Merge branch 'libArachne_rebased' into back_pressure_compensation 2021-08-06 13:08:35 +02:00
Konstantinos Karmas
97c779cc53 Use the old icon names
So that they can still be found in 4.9 and 4.10 Cura version.

CURA-8444
2021-08-06 09:50:04 +02:00
Konstantinos Karmas
10ec9e2754 Remove the tooltipWidth property
The `tooltipWidth` property is not available in 4.9 and 4.10. This property was added to make sure that the tooltip has a smaller width than the DigitalLibrary window, or else the tooltip doesn't get drawn at all, which is confusing. Since it was not available in 4.9 and 4.10, the tooltip text smaller had to become smaller to make sure that it will fit.

CURA-8444
2021-08-06 09:49:29 +02:00
Konstantinos Karmas
22e407207f Manually add the magnifier icon in the search bar in DL
The `leftIcon` property, which is not available in 4.9 and 4.10, so the DigitalLibrary window wasn't getting drawn. To keep having the icon, I manually added the RecolorImage in the search textfield.

CURA-8444
2021-08-06 09:47:47 +02:00
Jaime van Kessel
57e66a5796 Add campaign links
CURA-8441
2021-08-05 15:42:23 +02:00
Ghostkeeper
b78651e45f
Add monotonic settings to advanced and expert visibility
Contributes to issue CURA-7928.
2021-08-05 14:10:52 +02:00
Konstantinos Karmas
c3f26d4daa Move layer.enabled inside the child item in ExtruderIcon
When it was in the outer item, it was causing the label to disappear when then extruder icon was getting disabled. Moving it inside the child item which has the opacity change seems to fix that issue.

CURA-8417
2021-08-05 09:52:03 +02:00
Konstantinos Karmas
b86e6ddfe6
Merge pull request #10189 from Ultimaker/CURA-7689_beta_release_notifications
Allow update checking for BETA and stable releases
2021-08-04 15:59:08 +02:00
Jaime van Kessel
0bc3ebbd46
Merge pull request #10222 from Ultimaker/CURA-7928_monotonic_order
Monotonic ordering of skin, top surface and ironing
2021-08-04 15:38:35 +02:00
Ghostkeeper
4c35259c72
Allow monotonic skin if initial layer pattern is not concentric
Contributes to issue CURA-7928.

Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2021-08-04 15:19:00 +02:00