GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-20 01:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,010 Commits 291 Branches 260 Tags
Commit Graph

14010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Ha
2bf3fa35ac CURA-5174 update camera zoom range 2018-03-29 14:25:00 +02:00
Jack Ha
f9e7d119af CURA-5019 thumbnail: do not scale the second color of support meshes or the checkboard pattern is not visible anymore 2018-03-29 14:10:50 +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
c1bc078813 CURA-5019 support and infill type nodes are now correctly rendered in the thumbnail 2018-03-29 10:59:53 +02:00
Jack Ha
af7af29d6b Merge branch '3.3' 2018-03-29 10:25:59 +02:00
jack
049bab1341
Merge pull request #3585 from Ultimaker/fix_postprocessing_persistence 
Fix postprocessing persistence of setting names with uppercase characters
 2018-03-29 10:19:38 +02:00
jack
3108741b54
Merge pull request #3579 from Ultimaker/feature_show_config_errors 
Show configuration errors
 2018-03-29 09:22:34 +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
Ghostkeeper
cff32b63b5
Update translation files from template 
This puts all the new translations among the old translations in our translation files.

Contributes to issue CURA-5166.
 2018-03-29 08:53:16 +02:00
Ghostkeeper
853b5b8971
Update translation templates 
These are the translation templates for Cura 3.3.

Contributes to issue CURA-5166.
 2018-03-29 08:48:34 +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
acff530871 CURA-5169 Fix a typo 2018-03-28 15:54:42 +02:00
Diego Prado Gesto
2820dd3729 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-03-28 14:28:38 +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
Lipu Fei
9efad28599 Fix setQualityChangesGroup when quality_type is not_supported 
CURA-5169
 2018-03-28 12:55:43 +02:00
Lipu Fei
e3c578aa18 Revert "Use global_stack.extruders instead of ExtruderManager.extruderIds" 
CURA-5168

Causes side effects.
 2018-03-28 12:18:01 +02:00
Lipu Fei
90d2c29fb4 Use global_stack.extruders instead of ExtruderManager.extruderIds 
CURA-5168

We want to remove ExtruderManager eventually, and keeping two separate
pieces of data can cause it to be out of sync.
 2018-03-28 12:12:49 +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
Ghostkeeper
fce703536b
Move factory reset to Uranium 
This way it can be called from other crash handling routines there too, such as ConfigurationErrorMessage which may be triggered by arbitrary configuration errors in Uranium.

Contributes to issue CURA-5045.
 2018-03-28 08:43:46 +02:00
Lipu Fei
70f867c4f1 Merge remote-tracking branch 'origin/3.3' 2018-03-27 16:52:10 +02:00
Ghostkeeper
2214a5f40a
Remove duplicate imports 
Contributes to issue CURA-5045.
 2018-03-27 16:30:10 +02:00
Ghostkeeper
da0d7a25c3
Remove semicolon 
What is this? Java???

Contributes to issue CURA-5045.
 2018-03-27 16:02:43 +02:00
Diego Prado Gesto
35cd4eb572 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-03-27 15:19:09 +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
Lipu Fei
f15771856f Add parent for stacks and containers that are created 2018-03-27 15:03:11 +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
Ghostkeeper
d6205d5d85
Show configuration error when extruder positions don't match 
When any extruder position doesn't match when adding a container, don't add any of the extruders. Don't add faulty half-data to the registry!

Contributes to issue CURA-5045.
 2018-03-27 14:38:15 +02:00
Lipu Fei
c6579b571a Merge remote-tracking branch 'origin/3.3' 2018-03-27 14:33:41 +02:00
Lipu Fei
98eed89686 Remove global changed check that prevents signal emit 
CURA-5157
 2018-03-27 14:32:40 +02:00
Ghostkeeper
013bb04a7d
Show configuration error if finding definition to add wasn't found 
It must've gotten this ID from somewhere.

Contributes to issue CURA-5045.
 2018-03-27 14:32:13 +02:00
Ghostkeeper
544c2c69b4
Remove unused imports 
Contributes to issue CURA-5045.
 2018-03-27 14:30:48 +02:00
Ghostkeeper
4f56221126
Remove catch of RuntimeError 
The error is no longer thrown and the function has its own error message.

Contributes to issue CURA-5045.
 2018-03-27 14:28:17 +02:00
Ghostkeeper
dd3b49e80d
Remove check for if variant container is a variant container 
The filter on type=variant is right above it in the same function, 20 lines of code earlier. I think this check is superfluous then.

Contributes to issue CURA-5045.
 2018-03-27 14:26:05 +02:00
Ghostkeeper
bc0a3e7fe2
Show error when finding duplicated variant names 
Don't add the second variant we encounter then.

Contributes to issue CURA-5045.
 2018-03-27 14:23:54 +02:00
Ghostkeeper
727a164722
Only show error when quality is global with material/nozzle 
Don't crash. Only show an error message that indicates that there is a problem with this one.

Contributes to issue CURA-5045.
 2018-03-27 14:19:36 +02:00
Ghostkeeper
7af941541b
Check before adding quality changes node 
So you don't end up with half a node if we have to abort early. When this happens, show the configuration error message.

Contributes to issue CURA-5045.
 2018-03-27 14:15:29 +02:00
Diego Prado Gesto
3fb14691a9 CURA-5160 Skip empty quality when load project file 2018-03-27 14:09:17 +02:00
Jack Ha
ca4cb419ff CURA-5157 prevent some startup crash after upgrading from 2.7 2018-03-27 14:08:12 +02:00
Ghostkeeper
027f4b44bb
Don't crash when finding duplicated materials 
Only report it to the user.

Contributes to issue CURA-5045.
 2018-03-27 13:57:52 +02:00
Jack Ha
80676d80ba Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-03-27 13:04:50 +02:00
Jack Ha
04a135e6a3 CURA-5157 renamed extruder to position in addExtruderStackForSingleExtrusionMachine, fixes loading some upgrades from 3.0 2018-03-27 13:04:05 +02:00