GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-13 13:28:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,737 Commits 290 Branches 260 Tags
Commit Graph

4159 Commits

Author SHA1 Message Date
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 1538486e852e9208a1a447c87a23f9a88e33ff52.

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
Ghostkeeper
b30df14073
Merge branch '3.3' 2018-03-29 08:55:06 +02:00
Ruben D
c65e3656bd
Fix persistence of setting names with uppercase characters 
The problem was that Python's ConfigParser doesn't preserve case. Everything becomes lowercase. Some post-processing scripts have uppercase characters in their setting keys and these weren't preserved.
This fix configures the ConfigParser to pass the setting keys untransformed. The transformation function becomes the str() function which just passes the input through untransformed.
 2018-03-29 00:39:57 +02:00
Ian Paschal
138fc668a7 CURA-5035 First draft 2018-03-28 17:10:22 +02:00
Diego Prado Gesto
37520b26b8 CURA-5170 When the connection status of a printer output device changes, only add it to the list if the device belongs to the current printer. 2018-03-28 14:28:07 +02:00
Diego Prado Gesto
79daf3706b CURA-5158 Create a custom signal that is emitted when global container 
changes and output devices change.
 2018-03-28 11:07:48 +02:00
Diego Prado Gesto
bf7ab6d4ea Change target version of the dictionary of doom to be compliant with the 
new instance container's version number.
 2018-03-27 15:18:25 +02:00
Ghostkeeper
e174a015ce
Remove unused function 
It's not used anywhere so please let us not maintain this code.

Contributes to issue CURA-5045.
 2018-03-27 14:53:19 +02:00
Ghostkeeper
8b75a0e92b
Better error handling if there is no global stack 
It reports that the workspace failed to load instead of crashing the entire application then.

Contributes to issue CURA-5045.
 2018-03-27 14:51:34 +02:00
Ghostkeeper
d9e8d64e3f
Add typing for _determineGlobalAndExtruderStackFiles 
Contributes to issue CURA-5045.
 2018-03-27 14:46:21 +02:00
Lipu Fei
c6579b571a Merge remote-tracking branch 'origin/3.3' 2018-03-27 14:33:41 +02:00
Diego Prado Gesto
3fb14691a9 CURA-5160 Skip empty quality when load project file 2018-03-27 14:09:17 +02:00
Diego Prado Gesto
8c5673dd3c Change target version of the dictionary of doom to be compliant with the 
new instance container's version number.
 2018-03-27 11:44:24 +02:00
Ian Paschal
5e1f29ec1c CURA-5141 added persistent scripts 2018-03-27 10:40:27 +02:00
Ian Paschal
57991a44d5 CURA-5141 Suggestions from Terri 2018-03-26 16:59:24 +02:00
Ghostkeeper
6d3fed8f52
Allow getContainer() to return None 
And in the rest of the locations we must then check if it's None and handle that gracefully.
Here we assume that the getContainer message shows a message to the user if necessary. For now we'll just log it.

Contributes to issue CURA-5045.
 2018-03-26 15:48:03 +02:00
Ian Paschal
5b371ac375 CURA-5141 Update changelog to 3.3 2018-03-26 14:36:24 +02:00
Diego Prado Gesto
689f208615 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-26 14:15:10 +02:00
Diego Prado Gesto
2486303011 CURA-5134 Use the built-in windowClosed method instead of quit when 
finishing installing or uninstalling plugins, otherwise the temporary
data is not stored in the config file.
This caused some problems with the lazy uninstall plugins since the list
was never stored.
 2018-03-26 14:12:27 +02:00
jack
96842ea7e6
Merge pull request #3229 from Ultimaker/feature_persistent_postprocessing 
Persistent Post-Processing Scripts
 2018-03-26 14:01:07 +02:00
Ghostkeeper
e2724f53ad
Only check for loaded plug-ins at initial call to loadAllScripts 
Not for every call to loadScripts.
 2018-03-26 13:55:15 +02:00
Ghostkeeper
14936fdf21
Move looping over script directories to separate function 
Removes some code repetition.
 2018-03-26 13:50:29 +02:00