3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 12:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
18207 commits 306 branches 270 tags 779 MiB
Commit graph

5646 commits

Author SHA1 Message Date
ChrisTerBeke
7bbd43928a Fix more review comments 2019-01-11 16:38:25 +01:00
ChrisTerBeke
3c10cca0de Fixed all codestyle and nitpicks from review 2019-01-11 16:33:49 +01:00
ChrisTerBeke
e465bd771a Use toolpath instead of mesh, some review fixes 2019-01-11 16:18:47 +01:00
ChrisTerBeke
d8b5f75e2a Solve some review comments 2019-01-11 16:14:55 +01:00
ChrisTerBeke
2e3398e349 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-11 15:10:44 +01:00
Diego Prado Gesto
eaf4fefe00 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-11 14:46:47 +01:00
Diego Prado Gesto
e706020639 Improve the text when there is no configuration available 
It can happen that the list is empty because the data is still coming or because the connection has been lost.

There are also some improvements in the link to the compatibility chart. Now the two external links in Cura have the same behaviour.

Contributes to CURA-6011.
 2019-01-11 14:44:49 +01:00
Jaime van Kessel
2dead87593 Ensure that the installed & canUpdate properties get set correctly 
CURA-6053
 2019-01-11 14:43:56 +01:00
ChrisTerBeke
32ad50864e
Merge pull request #5029 from Ultimaker/STAR-347_update_cura_connect_models 
Star-347: Update Cura Connect models
 2019-01-10 17:46:26 +01:00
Jaime van Kessel
ff79e91686 Move the additional components for the save button out of the action panel 
CURA-6097
 2019-01-10 16:32:43 +01:00
ChrisTerBeke
36191fbe0f Fix typevar typing issue 2019-01-10 15:36:12 +01:00
ChrisTerBeke
56f0a341bc Fix merge conflicts 2019-01-10 15:17:53 +01:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin 
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
 2019-01-10 14:58:00 +01:00
ChrisTerBeke
764769f4bb Merge branch '4.0' into STAR-322_cloud-connection 2019-01-10 09:48:48 +01:00
Remco Burema
8f5309c5a5
Merge pull request #5128 from Ultimaker/4.0-Add_version_upgrade 
Add version upgrade for 4.0
 2019-01-09 17:42:17 +01:00
Ian Paschal
8831ba04e1 Fix missing extruder number 2019-01-09 17:05:10 +01:00
ChrisTerBeke
8813f10331 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-09 13:34:11 +01:00
Jaime van Kessel
366d2c8114 Prevent crash for firmware updater if the activePrinter is not set 2019-01-09 12:56:49 +01:00
Jaime van Kessel
e718bed151 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-09 12:51:53 +01:00
Jaime van Kessel
862c76a2ea Check if the optimised layer data is stored before attempting to delete it 2019-01-09 12:51:20 +01:00
ChrisTerBeke
edf64bef85 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-09 10:45:49 +01:00
Lipu Fei
520b34ab89 Use getPluginPath() 
CURA-6005
 2019-01-09 08:41:15 +01:00
Simon Edwards
0de84dad13
Merge pull request #5138 from Ultimaker/CL-1157_skeleton_loading_monitor_tab 
CL-1157 Add skeleton loading to the monitor tab
 2019-01-08 16:23:16 +01:00
Lipu Fei
aee4034e3e No caching preferences 
CURA-6005
 2019-01-08 15:49:36 +01:00
Ian Paschal
97e17d9fb8 Remove debug behavior 
Contributes to CL-1157
 2019-01-08 15:17:42 +01:00
Ian Paschal
8f37b65ffe Add skeleton loading to print job queue 
Contributes to CL-1157
 2019-01-08 15:15:21 +01:00
Ian Paschal
e81742d296 Add skeleton loading to printer cards 
Contributes to CL-1157
 2019-01-08 14:27:54 +01:00
Lipu Fei
a8fe5ced89 Remove unused import 
CURA-6005
 2019-01-08 13:33:49 +01:00
Lipu Fei
53cb2ce189 Add comments for http status >=300 check 
CURA-6005
 2019-01-08 13:29:48 +01:00
ChrisTerBeke
32415f4d8e Merge branch '4.0' into STAR-322_cloud-connection 2019-01-08 13:19:36 +01:00
ChrisTerBeke
b8da720c1d Move translations in-line 2019-01-08 13:10:42 +01:00
ChrisTerBeke
485b471522 Fix some review comments 2019-01-08 12:19:00 +01:00
ChrisTerBeke
7c7bca31c7 Fix renamed property connectionType 2019-01-08 11:52:27 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Lipu Fei
8e898148f6 Make checkboxes and texts more aligned 
CURA-6085
 2019-01-08 09:42:52 +01:00
Ian Paschal
4dbab88792 Add dummy printer for loading 2019-01-07 13:56:04 +01:00
Ian Paschal
18545e18ce Merge remote-tracking branch 'origin/4.0' into CL-1157_skeleton_loading_monitor_tab 2019-01-07 13:38:23 +01:00
Lipu Fei
ee34cd522d
Merge pull request #5017 from Ultimaker/add_comment_prime_tower 
Add time prime tower into Cura.proto
 2019-01-07 13:30:32 +01:00
Lipu Fei
d4b0c157aa Fix layers.shader to check feature prime_tower 
CURA-5932
 2019-01-07 13:20:46 +01:00
Lipu Fei
a43900b0ad Fix version upgrade for XMLMaterialProfile 
CURA-5995
 2019-01-07 11:17:12 +01:00
Jaime van Kessel
d21bf53230 Add version upgrade for 4.0 
Contributes to CURA-6011 and CURA-5995
 2019-01-07 10:34:22 +01:00
Nico Salvador
39cdb3ed0a
Fixed typo in ChangeAtZ.py 2019-01-06 10:19:21 +08:00
fieldOfView
f631332dc2 Fix z-fighting on bottom layer of x-ray view 2019-01-05 00:03:48 +01:00
Jaime van Kessel
4c1f68a447 Ensure that the connectiontype of a connected printer is set correctly 
CURA-6011
 2019-01-04 15:24:01 +01:00
Jaime van Kessel
ffce9bd172 Ensure that the primetower gets drawn in the right color again 
CURA-5932
 2019-01-04 14:59:26 +01:00
Jaime van Kessel
b4b7e1fc21 Codestyle & typing 2019-01-04 11:50:02 +01:00
Jaime van Kessel
b363be4afb Fix typing 2019-01-04 11:48:06 +01:00
Jaime van Kessel
3df9b369f7 Removed the divider as a seperate component 
Since it's only used in one place, there is no real point in making it a seperate file

CURA-6005
 2019-01-04 11:40:09 +01:00
Jaime van Kessel
c10b8b5c3f Fix crash when attempting to restore backup 
CURA-6005
 2019-01-04 11:37:52 +01:00
Jaime van Kessel
b4911478e3 Made the plugin depend more on the theme 
CURA-6005
 2019-01-04 11:35:34 +01:00