3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 18:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
17030 commits 302 branches 270 tags 773 MiB
Commit graph

17030 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Aleksei S
c6c35a98b4 Merge branch 'master' of github.com:Ultimaker/cura 2018-04-04 11:10:50 +02:00
Aleksei S
43e535ea54 Rename expandAll to expandRecursive 
CURA-5190
 2018-04-04 11:04:54 +02:00
Ian Paschal
0cfcc8cd5f
Merge pull request #3618 from Ultimaker/feature_cura_package_api 
Backend of the Toolbox
 2018-04-04 11:01:05 +02:00
Lipu Fei
836cba9c03
Merge pull request #3617 from Ultimaker/feature_try_line_widths 
Add setting to try multiple line thicknesses
 2018-04-04 11:00:30 +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
Ghostkeeper
4ad9867591
Add setting to try multiple line thicknesses 
Engine implementation pending. This setting is intended for debugging problems with interrupted walls. It should probably not be published in a final release.

Contributes to issue CURA-5189.
 2018-04-03 16:38:19 +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
Fredrik Öhrn
569c5b3178 Set preferred material to proPLA which has a tuned quality profile. 2018-03-31 13:51:38 +02:00
Fredrik Öhrn
1b0848229e Add global quality profiles. 2018-03-31 13:51:38 +02:00
Fredrik Öhrn
a4a388eb4b Fix machine steps type. 2018-03-31 13:51:38 +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
6d10ac993e
Add option to collapse or expand all setting categories 
Sadly it doesn't display on the category headers themselves, but it works just as well.
 2018-03-30 15:07:50 +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
059761b781 Home only the head instead of homing both the head and the bed at the same time 2018-03-30 14:09:25 +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
Jörg Walter
f0f768cc74 fix bool for pedantic shader compilers 2018-03-29 21:07:12 +02:00
Jörg Walter
7f5fb5813b make Linux+NVidia fix fail gracefully 2018-03-29 21:06:49 +02:00
fieldOfView
c101fe005f Fix getting multiple extruder temperatures from USB printer 2018-03-29 18:28:15 +02:00
Diego Prado Gesto
1cf87ff12b Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-03-29 17:09:46 +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
Aleksei S
261945b469 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-29 17:05:51 +02:00
Aleksei S
1a1e65da1e Remove business case from 'homeHead' function for UM2 
CURA-4844
 2018-03-29 17:03:25 +02:00
Ghostkeeper
d244a37feb
Merge branch '3.3' 2018-03-29 16:57:55 +02:00
Jack Ha
2a3b25265b
CURA-5174 update camera zoom range 2018-03-29 16:57:36 +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
3a9371837c Merge branch 'master' into feature_separate_stage_qml 2018-03-29 14:47:58 +02:00
fieldOfView
272796fd95 Prevent QML warning 2018-03-29 14:46:33 +02:00
fieldOfView
07e1a21aeb Remove prepare items from Monitor stage 2018-03-29 14:46:11 +02:00
Diego Prado Gesto
41fc807e21 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-29 14:39:31 +02:00
Diego Prado Gesto
b2950eca51 CURA-5158 Fix some mistakes in previous confict fixing. 2018-03-29 14:37:55 +02:00