GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 15:36:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,046 Commits 290 Branches 260 Tags
Commit Graph

26046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
b60ae92d60 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 11:15:38 +02:00
Jaime van Kessel
34905857ee
Merge pull request #10267 from Ultimaker/CURA-8473_backwards_compat_messages_411 
Digital Library plugin needs to be backwards compatible.
 2021-08-12 11:15:01 +02:00
Remco Burema
3061490675
Fix look for string in enum-type. 
CURA-8473
 2021-08-12 10:05:16 +02:00
Konstantinos Karmas
f5bf88e546 Fix crashing when clicking the "Manage in browser" 
The parenthesis should be placed at the end.
 2021-08-12 09:51:27 +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
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
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
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
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
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
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
Remco Burema
1e5ea055aa
Changed cloud-printer message into proposal from growth group. 
CURA-8436
 2021-08-04 13:20:43 +02:00
Remco Burema
7131bab90a
Merge branch 'CURA-8439_Replace_coloured_warning_icons' 2021-08-04 11:22:27 +02:00
Remco Burema
b0515974a2
Merge remote-tracking branch 'origin/master' into CURA-8439_Replace_coloured_warning_icons 2021-08-04 11:17:28 +02:00
Konstantinos Karmas
b0702e2312 Remove NativeRendering type in the MonitorInfoBlurb 
Since it makes the letters look weird.

CURA-8436
 2021-08-03 16:56:05 +02:00
Konstantinos Karmas
de9b1f82b9 Enable the tooltip when the camera button is disabled 
CURA-8436
 2021-08-03 16:55:11 +02:00
Konstantinos Karmas
310417bb5b
Merge pull request #10210 from Ultimaker/CURA-8412_fix_contextmenu_snapshot_crash 
[CURA-8412] Part of fix for crash on context menu open + click on slice.
 2021-08-03 15:11:22 +02:00
Jaime van Kessel
8c537fc4e6 Move update related preferences to their own category 
CURA-7689
 2021-08-03 13:09:19 +02:00
Jaime van Kessel
be59e701f2 Add seperate preference for plugin notifications check 
CURA-7689
 2021-08-03 13:07:11 +02:00
Konstantinos Karmas
b006d9111f Merge branch 'master' into CURA-7689_beta_release_notifications 2021-08-02 16:04:00 +02:00
Remco Burema
a2442919f4
Part of fix for crash on context menu open + click on slice. 
See also the backend (Uranium) fix/PR (needed for this to work properly). If the context menu is opened over the slice button, then it _may_ on some cases (on Windows) fail on the creation of the snapshot. Within this fix, the snapshot is then still not created, but at least it doesn't crash any more. (Also the snapshot _will_ be there if a reslice is done.)

part of CURA-8412
 2021-07-30 19:50:18 +02:00
Ghostkeeper
f5eb2ec74f
Ultimaker 2+ Connect doesn't support the exported material format 
So we can't get people to export their materials. Hide the button.
 2021-07-30 12:31:14 +02:00
Konstantinos Karmas
90d7005bc2
Merge pull request #10187 from SecKit/create_seckit_printers 
Add SecKit SK-Tank and SK-Go printer definitions.
 2021-07-30 11:44:13 +02:00
Victor Sanchez Martinez
d6d0db2f50
Added Kingroon K3P and K3PS definitions (#9972) 
* Added Kingroon KP3/KP3S printers

* Stock max_feedrate and max_acceleration

Fixed max_feedrate and max_acceleration to match stock firmware

* Update to Cura 4.10

* Delete kingroon_kp3s_v3.stl

* Delete kingroon_kp3s_v2.stl

* Delete kingroon_kp3s_v1.stl

* Delete kingroon_kp3.stl

* New meshes for KP3 and KP3S

* Delete kingroon_kp3s_v3.def.json

* Delete kingroon_kp3s_v2.def.json

* Delete kingroon_kp3s_v1.def.json

* Unified KP3S definitions

* Delete kingroon_kp3s_v3_0.2.inst.cfg

* Delete kingroon_kp3s_v3_0.3.inst.cfg

* Delete kingroon_kp3s_v3_0.4.inst.cfg

* Delete kingroon_kp3s_v3_0.5.inst.cfg

* Delete kingroon_kp3s_v3_0.6.inst.cfg

* Delete kingroon_kp3s_v3_0.8.inst.cfg

* Delete kingroon_kp3s_v3_1.0.inst.cfg

* Delete kingroon_kp3s_v2_1.0.inst.cfg

* Delete kingroon_kp3s_v2_0.8.inst.cfg

* Delete kingroon_kp3s_v2_0.6.inst.cfg

* Delete kingroon_kp3s_v2_0.5.inst.cfg

* Delete kingroon_kp3s_v2_0.4.inst.cfg

* Delete kingroon_kp3s_v2_0.3.inst.cfg

* Delete kingroon_kp3s_v2_0.2.inst.cfg

* Delete kingroon_kp3s_v1_1.0.inst.cfg

* Delete kingroon_kp3s_v1_0.8.inst.cfg

* Delete kingroon_kp3s_v1_0.6.inst.cfg

* Delete kingroon_kp3s_v1_0.5.inst.cfg

* Delete kingroon_kp3s_v1_0.4.inst.cfg

* Delete kingroon_kp3s_v1_0.3.inst.cfg

* Delete kingroon_kp3s_v1_0.2.inst.cfg

* Updated Variants

* KP3S buildplate fix

Fixed a misaligned part

* Simplified meshes

Simplified meshes to improve performance

* Delete kingroon_base_0.2.inst.cfg

* Delete kingroon_base_0.3.inst.cfg

* Delete kingroon_base_0.4.inst.cfg

* Delete kingroon_base_0.6.inst.cfg

* Delete kingroon_base_0.8.inst.cfg

* Delete kingroon_base_1.0.inst.cfg

* Added/deleted excluded materials

Deleted non-1.75mm materials and added missing ones.
 2021-07-30 10:41:57 +02:00
Ghostkeeper
0cdd9dd175
Add setting for monotonic top surface skin 
You can set it separately, but it defaults to be the same as the rest of the top surface.

Contributes to issue CURA-7928.
 2021-07-29 16:16:05 +02:00
Ghostkeeper
b63ccfd718
Add setting to apply monotonic ordering to ironing as well 
Contributes to issue CURA-7928.
 2021-07-29 15:45:23 +02:00