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

11463 Commits

Author SHA1 Message Date
Ghostkeeper
901b05d1a6
Merge branch '4.11' 2021-08-17 13:35:00 +02:00
Ghostkeeper
33edc4a8c9
Fix display of unlinking button 
It was not being displayed with Qt 5.15 due to the following error:
MaterialsView.qml:34:5: Unable to assign QStringList to QString
This is correct. And it should not just concatenate all of these material names; it should add a comma between them for human-readable display in the text label above the button.

Fixes #10235.
 2021-08-17 13:34:43 +02:00
Konstantinos Karmas
e0e4a3f2c0 Add shadow behind the what's new pages 
As discussed during the eCCB.
 2021-08-16 17:00:30 +02:00
Konstantinos Karmas
2299f90808 Add shadow behind the what's new pages 
As discussed during the eCCB.
 2021-08-16 16:57:57 +02:00
Jaime van Kessel
bb2651bc0b Merge branch 'master' of https://github.com/NilsRo/Cura 2021-08-16 11:11:46 +02:00
NilsRo
b33f4640ad Updated Acceleration to firmware default 
Updated Acceleration to firmware default to increase time estimation accuracy and match firmware default
 2021-08-12 22:10:37 +02:00
Jaime van Kessel
44ba8e3d1f Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 15:49:41 +02:00
Jaime van Kessel
3dec4e228b Use leftpadding instead of binding anchors outside of siblings 2021-08-12 15:48:58 +02:00
Jaime van Kessel
5bc6ed25da Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 15:28:12 +02:00
Jaime van Kessel
79ccccb1a1 Fix qml warning spam 2021-08-12 15:27:39 +02:00
Jaime van Kessel
7762def1ef Merge branch 'master' of https://github.com/heed818/Cura 2021-08-12 15:20:42 +02:00
AnnaKang0219
e7e5970647 Remove the files not CZ-300 
Remove the files not CZ-300
 2021-08-12 09:35:15 +08: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
8b2904ee3b Merge branch 'CURA-8441_campaign_links' of github.com:Ultimaker/Cura 2021-08-09 14:09:27 +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
AnnaKang0219
c86d1638e2 Fix bugs for definition 
modify Infill_pattern value setting
 2021-08-09 17:20:18 +08:00
AnnaKang0219
6a2120dbd3 update CrazyPrinter CZ-300 definitions 
update CrazyPrinter CZ-300 definitions
 2021-08-09 11:51:53 +08: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
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
b0515974a2
Merge remote-tracking branch 'origin/master' into CURA-8439_Replace_coloured_warning_icons 2021-08-04 11:17:28 +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
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
Jaime van Kessel
84b1aa39b7
Update the update_url's for firmware updates 
CURA-7689
 2021-07-29 15:21:46 +02:00
Konstantinos Karmas
83fe65b8eb Use the StatusIcon qml component for the warning icons 
CURA-8349
 2021-07-28 18:17:54 +02:00
Konstantinos Karmas
d41d68e6fa Replace warning icon in the unable to slice message 
With the new warning icon that has a solid background, similar to the warning icon used in the messages.

CURA-8439
 2021-07-28 16:57:15 +02:00
Konstantinos Karmas
01c4a0f72d Change warning icon background to the CircleSolid.svg 
CURA-8439
 2021-07-28 16:55:36 +02:00
Ghostkeeper
b7661659ae
Add setting for monotonic skin order 
Just a simple boolean setting for the skin now. Top surface and ironing will follow later.

Contributes to issue CURA-7928.
 2021-07-28 16:46:17 +02:00
AnnaKang0219
77913559d5 Update crazy3dprint_cz_300.def.json 
fix file errors
 2021-07-28 14:04:14 +08:00
SecKit 3DP Design
406e92b27d
Update resources/definitions/seckit_skgo.def.json 
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-07-28 03:28:59 +08:00
SecKit 3DP Design
25737447fb
Update resources/definitions/seckit_sktank.def.json 
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-07-28 03:28:49 +08:00
SecKit 3DP Design
2ca70b70ad
Update resources/extruders/seckit_sktank_extruder_0.def.json 
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-07-28 03:27:51 +08:00
SecKit 3DP Design
32d6ff7d3b
Update resources/extruders/seckit_skgo_extruder_0.def.json 
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-07-28 03:27:39 +08:00
Jaime van Kessel
d24b28c9b9
Fix two deprecated icons 2021-07-27 16:16:36 +02:00
Jaime van Kessel
11a32d13e7
Merge branch 'master' of github.com:Ultimaker/Cura 2021-07-27 15:29:08 +02:00
Jaime van Kessel
4470fa198e
Swap out warning icon 
CURA-8439
 2021-07-27 15:26:51 +02:00
Jelle Spijker
6a9760060d
Merge pull request #10190 from Ultimaker/CURA-8437_Wrap_text_in_license_window 
CURA-8437: Wrap the text in the license window
 2021-07-27 12:41:24 +02:00
Jaime van Kessel
45751efdd3
Fix overlap effect for extruderIcon 
CURA-8417
 2021-07-27 12:02:41 +02:00