3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18800 commits 302 branches 270 tags 770 MiB
Commit graph

5880 commits

Author SHA1 Message Date
Aleksei S
10ebabb7f6 Home head only by X- and Y axis, do extra bedHome (G28 Z) 
CURA-4844
 2018-04-09 13:13:52 +02:00
Ian Paschal
91001455ad Improved structure and enabled display by author 2018-04-06 17:26:25 +02:00
Ghostkeeper
572721e20d
Catch ContainerFormatError when deserialising containers 
Only the deserialize() functions themselves may pass the ContainerFormatError on, because their callers will have to handle those errors anyway.

Contributes to issue CURA-5045.
 2018-04-06 13:26:16 +02:00
Lipu Fei
872a029f99 Merge remote-tracking branch 'origin/feature_benchmarking' 2018-04-06 10:47:00 +02:00
Lipu Fei
c47fe52ca5 Merge 3.3 into master 2018-04-06 10:39:38 +02:00
Lipu Fei
19937d1be0 Fix version comparison in plugin browser 
CURA-5202

It was comparing with itself so there's never a version upgrade.
 2018-04-06 10:34:55 +02:00
Ian Paschal
dc00156410 CURA-5035 Added thumbnails and detail view 2018-04-05 15:33:07 +02:00
Diego Prado Gesto
877d700180 CURA-5197 Add log output with number of models in the buildplate after 
slice.
 2018-04-05 15:27:05 +02:00
Lipu Fei
19bc2b78f4 Add Version upgrade 3.3 to 3.4 
Need to distinguish between quality and quality_changes in the cura directory,
so we need to move all custom quality profiles into the quality_changes directory.
 2018-04-05 15:14:15 +02:00
Lipu Fei
c3fe53123b Create module cura.ReaderWriters 
CURA-4644

Move all reader writer classes into cura.ReaderWriters.
 2018-04-05 15:14:15 +02:00
Lipu Fei
8c4c52f915 Remove unused functions in PluginBrowser 2018-04-05 15:13:22 +02:00
Ian Paschal
15b8d18da8 CURA-5035 Small changes 2018-04-05 09:47:43 +02:00
Diego Prado Gesto
53c7e2a01e Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-05 08:55:45 +02:00
Diego Prado Gesto
deaff17a32 Merge branch '3.3' 2018-04-05 08:54:50 +02:00
Diego Prado Gesto
f0c36f8471 CURA-5137 Add the mock-up component for the loading. I forget it. 2018-04-04 18:23:32 +02:00
Diego Prado Gesto
2fe2c71754 CURA-5137 Adding a loading page while the data is not yet ready. 2018-04-04 18:20:49 +02:00
Jaime van Kessel
18551a4a72 Ensure that the "Slice info message disable button" actually disables the sending of info. 2018-04-04 17:39:22 +02:00
Diego Prado Gesto
79a66b43ab CURA-5175 Add the get_version function to the version upgrade. 2018-04-04 14:43:20 +02:00
Ian Paschal
20feabbb06 CURA-5035 Renaming 2018-04-04 13:53:09 +02:00
fieldOfView
bc84c1f6e6 Prevent preheat timeout from occurring during a print 2018-04-04 13:47:40 +02:00
Diego Prado Gesto
2bf6615b53 CURA-5137 Make some adjustments in the UI. 2018-04-04 10:51:19 +02:00
Lipu Fei
04571dcb9b Merge branch 'feature_try_line_widths' 2018-04-04 10:49:49 +02:00
Diego Prado Gesto
0e01e9a6a9 CURA-5137 Reset to the global view when switching tabs 2018-04-03 17:24:05 +02:00
Diego Prado Gesto
007529c9ec Merge branch 'feature_material_marketplace' into feature_cura_package_api 
Contributes to CURA-5137
 2018-04-03 17:13:36 +02:00
Diego Prado Gesto
b621b5ef6b CURA-5137 Add filtering for materials and plugins and change the 
behavior of switching tabs.
 2018-04-03 17:07:33 +02:00
Ian Paschal
8a7f9027c5 CURA-5035 Finished layout 2018-04-03 16:57:31 +02:00
Diego Prado Gesto
1ad34495b4 Merge branch 'feature_material_marketplace' into feature_cura_package_api 2018-04-03 11:42:56 +02:00
Ian Paschal
32eab05397 CURA-5035 Rename ToolboxDetailTile 2018-04-03 11:36:21 +02:00
Ian Paschal
229512e730 CURA-5035 More progress 2018-04-03 11:33:58 +02:00
Diego Prado Gesto
3d452d334b CURA-5137 Create the Cura Packages Model for the Toolbox. 
Fetch the data from the new server and create the model for show in the
toolbox.
 2018-04-03 11:21:15 +02:00
Diego Prado Gesto
89c27ae7f4 CURA-5137 Get the list of packages from the server 2018-03-30 15:13:10 +02:00
Ghostkeeper
60a217fc84
Rename expandAll to expandRecursive 
Because it doesn't expand all settings, just a category.
 2018-03-30 15:07:42 +02:00
Diego Prado Gesto
0416ba95ae CURA-5137 Add init file 2018-03-30 14:16:51 +02:00
Diego Prado Gesto
322fe7d61f CURA-5137 Rename Plugin Browser into Toolbox 2018-03-30 14:15:00 +02:00
fieldOfView
08d4200f92 Prevent sending next command before an "ok" is received 2018-03-30 14:07:53 +02:00
Jörg Walter
fa81ebeece GLES shader fixes 2018-03-29 21:07:51 +02:00
fieldOfView
c101fe005f Fix getting multiple extruder temperatures from USB printer 2018-03-29 18:28:15 +02:00
Diego Prado Gesto
f1e33f0cba CURA-5175 Remove version upgrade of the quality instance containers 
since they never get updated.
 2018-03-29 17:08:59 +02:00
Ghostkeeper
d244a37feb
Merge branch '3.3' 2018-03-29 16:57:55 +02:00
Diego Prado Gesto
a5e38bb486 CURA-5175 Add variants to the version upgrade. 
Upgrade the version number in the variants and add the hardware_type
metadata.
 2018-03-29 16:54:30 +02:00
Ian Paschal
f63e67dc22 CURA-5035 UI pretty much built 2018-03-29 16:52:28 +02:00
fieldOfView
a11bf31ce6 Use separate QML files for prepare and monitor stage 2018-03-29 13:47:46 +02:00
Jack Ha
54c85fd0ea CURA-4844 fix some typos 2018-03-29 13:25:26 +02:00
Ghostkeeper
a6d7a61c54
Merge branch '3.3' 2018-03-29 12:01:16 +02:00
Ghostkeeper
b3d652839d
Rename quality type from 'low' to 'fast' 
Not only the profile name was changed, but also the quality type.

See commit 1538486e85.

Contributes to issue CURA-5177.
 2018-03-29 12:00:59 +02:00
Ghostkeeper
50b4bac672
Upgrade quality profile names 
These files have been renamed.

Contributes to issue CURA-5177.
 2018-03-29 12:00:59 +02:00
Aleksei S
c81d5d9741 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-29 11:54:43 +02:00
Aleksei S
290adbd906 Fix: bed leveling for UM+ 
CURA-4844
 2018-03-29 11:53:31 +02:00
Jack Ha
af7af29d6b Merge branch '3.3' 2018-03-29 10:25:59 +02:00
Jack Ha
c9dc429b2b CURA-5045 solve merge conflicts 2018-03-29 09:22:19 +02:00