3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
28475 commits 306 branches 270 tags 786 MiB
Commit graph

12854 commits

Author SHA1 Message Date
Mark Bernard
c5b903b2c2
Create anet_a6_extruder_0.def.json 
Add Anet A6 extruder to Cura printer definitions
 2019-05-02 12:11:15 -04:00
Mark Bernard
9e45493587
Create anet_a6.def.json 
Add Anet A6 printer to Cura printer definitions
 2019-05-02 12:10:25 -04:00
Diego Prado Gesto
be3f194aaa Use a disabled rectangle instead of an empty space in the XRay view 
To keep consistency with what happens in the prepare page when a printer doesn't have material or variants.

Contributes to CURA-6469.
 2019-05-02 16:00:17 +02:00
Diego Prado Gesto
5b9c4e402e Change the Back button to be a secondary button 
Change also some texts in the More information dialog and the font type of one of the titles in the first use flow

Contributes to CURA-6483.
 2019-05-02 15:38:19 +02:00
Lipu Fei
85822d6e73 Fix add by IP validator regex 
CURA-6483
 2019-05-02 15:30:11 +02:00
Lipu Fei
1e89ce3673 Merge remote-tracking branch 'origin/4.1' into CURA-6483_fix_add_by_ip 2019-05-02 14:06:07 +02:00
Lipu Fei
d0cc2dc8fa Remove unneeded TODO 
CURA-6495
 2019-05-02 12:47:48 +02:00
Ghostkeeper
d4b17735ad
Merge branch '4.1' 2019-05-02 08:51:22 +02:00
Ghostkeeper
038a5b5942
Fix background of g-code text boxes having zero size 2019-05-02 08:46:46 +02:00
Lipu Fei
71e32d94f7 Resolve merge conflicts 
CURA-6483
 2019-05-02 07:45:43 +02:00
Diego Prado Gesto
9500d2d6b8 Modify text in the Send Slice data dialog, according to the experts. 
Contributes to CURA-6434.
 2019-05-01 15:53:54 +02:00
Diego Prado Gesto
5b06efdd19 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-01 15:51:12 +02:00
Diego Prado Gesto
32c8bbfb3c Modify small UI things in the Add Printer dialog 2019-05-01 15:50:43 +02:00
Lipu Fei
0575fd283e Fix manual printer device not up-to-date 
CURA-6483
 2019-05-01 15:12:08 +02:00
Lipu Fei
2b5d78a01a Do not add unknown or non-host printers in add-by-ip 
CURA-6483
 2019-05-01 14:25:01 +02:00
Ghostkeeper
154efdf14d
Merge branch '4.1' 2019-05-01 14:13:44 +02:00
Ghostkeeper
e750315708
Merge branch 'restyle_send_data' into 4.1 2019-05-01 14:13:25 +02:00
Lipu Fei
383b474bd7 Fix typo 
CURA-6483
 2019-04-30 15:27:29 +02:00
Lipu Fei
0e2815a748 Fix back button on add printer page 
CURA-6483
 2019-04-30 15:27:11 +02:00
Lipu Fei
40d26bbb6e NetworkingUtil is included in Cura 1.5 QML 
CURA-6483
 2019-04-30 12:49:26 +02:00
Lipu Fei
e1766b72ec Only highlight the currently active machine 
CURA-6483
 2019-04-30 12:47:19 +02:00
Jaime van Kessel
c394ce74c3 Merge branch 'feature_amf_reader' of https://github.com/fieldOfView/Cura 2019-04-30 11:23:19 +02:00
Jaime van Kessel
4d1f5cc556 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-30 10:51:42 +02:00
Jaime van Kessel
6fbbed9c06 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-30 10:51:33 +02:00
Diego Prado Gesto
24d57f6168 Change text according to experts 
Also make the bottom text a bit longer so the link goes completely in the second line.

Contributes to CURA-6434.
 2019-04-30 09:51:21 +02:00
Lipu Fei
ed8127777c Make a single NetworkingUtil 
CURA-6483
 2019-04-30 09:43:50 +02:00
Ghostkeeper
73f1b3fb50
Merge branch 'stereotech-master' 2019-04-30 09:40:43 +02:00
Ghostkeeper
7f3cedc12f
Merge branch 'master' of https://github.com/stereotech/Cura into stereotech-master 2019-04-30 09:29:19 +02:00
frylock34
0b364e8daf reduce platform size 2019-04-30 10:39:05 +04:00
Lipu Fei
bb1442a04e Update comments 
CURA-6483
 2019-04-30 07:40:35 +02:00
Diego Prado Gesto
9bf77e9302 Add icons for the send anonymous data welcome page 
Contributes to CURA-6434.
 2019-04-29 17:29:38 +02:00
Lipu Fei
c8872cb4a1 Use a separate function to validate IP address 
CURA-6483
 2019-04-29 15:53:08 +02:00
Lipu Fei
defcba6927 Fix that you can only cancel in WizardDialog 
CURA-6483
 2019-04-29 15:53:08 +02:00
Jaime van Kessel
56c0cae71f DoubleClick and drag no longer contradict eachother for expandable component 
CURA-6478
 2019-04-29 15:13:01 +02:00
Diego Prado Gesto
534a035841 Add a grid with images 
Those images indicate the type of data we are collecting anonymously.

Contributes to CURA-6434.
 2019-04-29 14:50:14 +02:00
Jaime van Kessel
a14b331cb7 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-29 13:47:34 +02:00
Diego Prado Gesto
9d48a90f8f Add two labels instead of one 
Change the link to adhere to the color scheme

Contributes to CURA-6434.
 2019-04-29 13:45:55 +02:00
Jaime van Kessel
5359293d7a Merge branch 'CURA-6156_build_volume_temperature' of github.com:Ultimaker/Cura 2019-04-29 13:29:35 +02:00
Ghostkeeper
25bbc1e66e
Set default infill density for tree support to 0% in profiles 
In profiles that overwrite the support infill density, also keep it 0% for tree support.
Except PVA profiles. Those are probably better off with their normal infill density.

Fixes #5297.
 2019-04-29 12:06:54 +02:00
Jaime van Kessel
e5d7387fed Updated the documentation of the contentAlignment property 2019-04-29 11:54:33 +02:00
Jaime van Kessel
79fbe12e92 Add an extra check to enforce min height of printSetupSelector 
CURA-6478
 2019-04-29 10:49:33 +02:00
Jaime van Kessel
db1a5ec8c0 Add mousearea to prevent clicking through the printSetupSelector 
CURA-6478
 2019-04-29 10:38:05 +02:00
Jaime van Kessel
8d0a31dcfb Show tooltip on the right side if the setting area is to far to the left 
CURA-6478
 2019-04-29 10:33:02 +02:00
Ghostkeeper
53d0dd282b
Merge branch 'master' of https://github.com/stereotech/Cura into stereotech-master 2019-04-29 08:54:05 +02:00
Ghostkeeper
1fb336ed3d
Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1 2019-04-26 14:15:07 +02:00
Diego Prado Gesto
17c06f200f Change the copy of the account benefits 
As per @mahtDFR request
 2019-04-26 14:04:46 +02:00
Diego Prado Gesto
c7bee73af6 Add cross cursor to the draggable expandable component. 
Contributes to CURA-6478.
 2019-04-26 13:49:55 +02:00
Lipu Fei
278d8ee587 Fix button enabled flags 
CURA-6483
 2019-04-26 13:30:26 +02:00
Lipu Fei
dbd8d4e74c Use IPv4 and IPv6 regex to validate IP input 
CURA-6483
 2019-04-26 12:48:30 +02:00
Aldo Hoeben
8276cf2352
Fix merge issue 
Merge accidentally reverted a cosmetic change.
 2019-04-26 11:53:50 +02:00