3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
26671 commits 340 branches 299 tags 734 MiB
Commit graph

11817 commits

Author SHA1 Message Date
Konstantinos Karmas
0bcea3f4cd Fix long material names overlapping with extruder icons 
Both the `preferredWidth` AND the `width` need to be set for the labels to be properly elided if there is no more room  in the ColumnLayout. In addition, the ColumnLayout that contains the variants and material names needs to be visible only if width>0, otherwise when the width is negative, for some reason the `materialTypeLabel` appears again.

CURA-8496
 2021-08-20 09:49:21 +02:00
Cláudio 'Patola' Sampaio
9affc9ac1d Updated pt_BR strings for 4.11 2021-08-20 03:38:21 +02:00
Ghostkeeper
b23b7119d2
Remove superfluous profile duplicates of all GreenTecPro colours for Weedo 
We match these profiles by material type. Since they are all the same, we only need to retain one.

All other profiles than the black one weren't being loaded because all of these quality profiles had their 'material' metadata field set to be the black one.

Contributes to issue CURA-8469.
 2021-08-19 16:56:15 +02:00
Ghostkeeper
a3b8b95ade
Remove stylised caps 
We don't condone stylized caps as they give an unfair advantage to some printers. We don't show logos here, just textual names.

Contributes to issue CURA-8469.
 2021-08-19 16:32:17 +02:00
Ghostkeeper
41a259228f
Merge branch 'master' of https://github.com/x40-Community/Cura into x40-Community-master 2021-08-19 16:23:03 +02:00
Jaime van Kessel
0348293f87 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-19 10:01:20 +02:00
Ghostkeeper
fcadba944a
Merge branch '4.11' into CURA-8491_sdk_upgrade_770 2021-08-19 09:17:17 +02:00
X40-Community
d199d2f297 USB connection and gerneric_pc removed 2021-08-18 20:13:04 +02:00
fvrmr
7493233e3f Update 4.html 
Fixed a typo's
 2021-08-18 17:27:16 +02:00
fvrmr
1d00f959c4 Update whats new pages 
Updated the links in the whats new pages
 2021-08-18 17:18:07 +02:00
Remco Burema
898abc92a8
Update SDK 7.6 -> 7.7 because of API changes in 4.11 
CURA-8491
 2021-08-18 16:56:29 +02:00
Ghostkeeper
8650dd9b0f
Merge branch '4.11' 2021-08-18 16:18:43 +02:00
fvrmr
57c6efd427 Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11 2021-08-18 12:08:14 +02:00
fvrmr
da92033666 Update change log + whats new pages 
Update change log 4.11 beta
Update whats new pages + img

Links in whats new pages still needs to be updated
 2021-08-18 12:08:09 +02:00
AnnaKang0219
40025c0d63 Fix machine_extruder_trains not set 
Fix machine_extruder_trains not set
 2021-08-18 13:04:23 +08:00
Konstantinos Karmas
e5374ada3b Merge branch '4.11' 2021-08-17 15:59:53 +02:00
Konstantinos Karmas
bbb1f0f0f3 Fix wrong icon mapping 
The deprecated icon "pencil" was being mapped to the new icon "Pencil" which is actually called "Pen".

This commit also replaces tabs with spaces in the deprecated_icons.json.

Fixes CURA-8488
 2021-08-17 15:32:21 +02:00
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
AnnaKang0219
1662398cda Add Jr.Pro Xe+ Definition 
Add Jr.Pro Xe+ Definition
 2021-08-17 17:17:40 +08:00
AnnaKang0219
778855c06f Add XYZprinting Printer Definitions 
Hi,
I just add Definitions for XYZprinting Printers,
Please help to check,thank you.
 2021-08-17 14:12:16 +08:00
X40-Community
0b666cce20 Error in line 24 fixed 2021-08-16 18:51:39 +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
nani
01aa6772fa minor changes 2021-08-16 16:07:54 +05:30
Jaime van Kessel
bb2651bc0b Merge branch 'master' of https://github.com/NilsRo/Cura 2021-08-16 11:11:46 +02:00
X40-Community
f848f1c937 Code corrected, duplicate parameters deleted 2021-08-15 19:08:32 +02:00
root
2939294018 Merge branch 'master' of https://github.com/x40-Community/Cura 
M192 removed from start code, parking position changed to X351 in start code
 2021-08-12 22:14:37 +02:00
root
742c8fed21 M192 removed from start code, parking position changed to X351 2021-08-12 22:12:49 +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
x40-Community
0c762dcd81
Merge branch 'Ultimaker:master' into master 2021-08-12 22:03:58 +02:00
root
9ea6dbf668 Since I can't program a phyton, the script author doesn't have time for a revision and I haven't found any in the X40 community either, I deleted the X40Snapshot.py script. 2021-08-12 22:01:48 +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
root
3ed8e6ee3f Quality profiles renamed 2021-08-11 19:59:16 +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
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
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