GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-21 14:23:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,991 Commits 295 Branches 268 Tags
Commit Graph

11418 Commits

Author SHA1 Message Date
Jaime van Kessel
e363f1af94 Remove hardcoded references to Ultimaker machines in QML 
We shouldn't hardocode machines in QML in any case. It also created issues
for other monitor / connection flows.
 2019-05-03 14:10:21 +02:00
Jaime van Kessel
c786770a44 Remove usage of deprecated functions 2019-05-03 13:52:45 +02:00
Jaime van Kessel
c3a373e2a2 Remove usages of deprecated activeMachineName 2019-05-03 13:38:06 +02:00
Jaime van Kessel
08b79a93be Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-03 13:17:27 +02:00
Jaime van Kessel
d42f446d70 Remove usages of deprecated function 2019-05-03 13:17:10 +02:00
Ghostkeeper
4910bc006b
Move platform mesh a bit down 
This way it's outside of the build volume.

Contributes to issue CURA-6505.
 2019-05-03 10:58:48 +02:00
Ghostkeeper
9463a288d8
Merge branch 'master' of https://github.com/markbernard/Cura into markbernard-master 2019-05-03 10:53:06 +02:00
Lipu Fei
2601e485da Merge remote-tracking branch 'origin/4.1' 2019-05-03 10:47:16 +02:00
Jaime van Kessel
23e5a6090c Merge branch 'CURA-6492_change_prime_tower_resolve' of github.com:Ultimaker/Cura into 4.1 2019-05-03 10:40:31 +02:00
Satish
18630fa2f1 Added several ids to be used in integration tests: 
-Marketplace, printer pref, add/manage printer from main mnu, print settings
 2019-05-03 09:35:17 +02:00
Jaime van Kessel
6bbdfbb31d Merge branch 'CURA-6483_fix_add_by_ip' of github.com:Ultimaker/Cura into 4.1 2019-05-03 09:25:30 +02:00
Lipu Fei
f89ba25faa enable prime tower when adhesion is none or skirt 
CURA-6492
 2019-05-03 09:21:54 +02:00
Lipu Fei
7d4c821551 Prevent auto selecting an invalid printer 
CURA-6483
 2019-05-03 08:49:39 +02:00
Mark Bernard
7a010ead56
Add files via upload 
Add Anet A6 platform to Cura printer definitions
 2019-05-02 12:12:31 -04:00
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