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

9773 commits

Author SHA1 Message Date
Ghostkeeper
3636c4a51b
Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 11:44:41 +01:00
Ghostkeeper
daf77517ac
Merge branch 'master' of https://github.com/slundell/Cura into slundell-master 
Conflict in USBPrinterOutputDevice was caused by us adding a try-except block around a piece of code where Slundell removed one of the lines of code.
 2018-03-14 11:35:06 +01:00
Lipu Fei
4cc2d882d3 Fix merge conflicts 
CURA-4879
 2018-03-14 10:53:10 +01:00
Lipu Fei
86afd6f5ff Do not overwrite existing metadata with in material deserializeMetadata() 
CURA-5056
 2018-03-14 10:32:57 +01:00
Lipu Fei
dc427488a2 Fix extruder position check in project loading 
CURA-5056

The field is now "position" instead of "extruder"
 2018-03-14 10:30:32 +01:00
Jack Ha
7ebd83f815 CURA-4400 get setting type from definition instead of whole stack improves speed of this call by a factor of 10 2018-03-14 10:21:10 +01:00
fieldOfView
7e4cb1c36e Disable Support Eraser if anti_overhang_mesh is disabled 2018-03-14 10:08:00 +01:00
Jack Ha
1d4b2eac4b CURA-5048 solved merge conflict 2018-03-14 09:03:17 +01:00
fieldOfView
a536da503b Rename DepthPass to PickingPass 
The map created by the shader is not strictly a depth map; not only is the "depth" encoded in the rgb channels, but it is also a distance to the camera instead of a "scene depth".
 2018-03-13 20:40:41 +01:00
fieldOfView
d88724aff5 Move ray picking to DepthPass 2018-03-13 20:05:49 +01:00
fieldOfView
73558c9e36 Fix rendering depth pass 2018-03-13 19:44:53 +01:00
Jack Ha
406e546195 CURA-5048 fixed nozzle dependent settings to update after setting machine nozzle diameter in a crude way 2018-03-13 17:29:20 +01:00
Ian Paschal
4478989332
Merge pull request #3463 from Ultimaker/feature_sync_button 
[Feature] Sync Button
 2018-03-13 16:52:39 +01:00
Lipu Fei
493bfb6b17 Fix material serialization 
CURA-5086
 2018-03-13 16:37:04 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Lipu Fei
934d297e6c Split error checking into smaller sub-tasks 
CURA-5059

Split stack error checking into smaller sub-tasks so running them on the Qt
thread will not block GUI updates from happening for too long.
 2018-03-13 13:21:44 +01:00
Diego Prado Gesto
dfb903fb81 CURA-4870 Wait until the configuration has all the mandatory data before 
add it to the list of unique configurations.
Remove some connections to signals and reuse already defined listeners.
 2018-03-13 13:14:29 +01:00
fieldOfView
0caea24afc Add depth pass for picking a location 2018-03-13 12:14:05 +01:00
Ian Paschal
8db4396ee7
Merge pull request #3436 from Ultimaker/feature_enable_disable_extruder 
CURA-4400 Feature enable disable extruder
 2018-03-12 16:42:25 +01:00
Jaime van Kessel
522e297711 Add some more states to check if print_job is active 2018-03-12 16:33:32 +01:00
Lipu Fei
c54679ba2d Gix buildplate handling in Material profile 
CURA-4606
 2018-03-12 15:25:29 +01:00
Jack Ha
e0e2d3362b CURA-4400 fix for change in fdmprinter: move -1 from default_value to value 2018-03-12 13:30:31 +01:00
Jack Ha
aa3cd8ba9d Solved merge conflict 2018-03-12 11:39:39 +01:00
Jack Ha
3edc96ec8f CURA-4400 fixed wrongly converted expression 2018-03-12 10:47:23 +01:00
Diego Prado Gesto
9613103591 CURA-4870 Remove Monitor stage status icons 2018-03-12 10:45:49 +01:00
Lipu Fei
2c5cc17b49 Fix build plate compatibility check 
CURA-5078
 2018-03-12 10:34:18 +01:00
Ghostkeeper
d98cab48ac
Get scripts from either Resources or Preferences 
We must retain the old directory for legacy. People might still have scripts there.
 2018-03-12 09:48:03 +01:00
Ghostkeeper
a3efbc70fb
Merge branch 'fix_postprocessing_script_path' of https://github.com/fieldOfView/Cura into fieldOfView-fix_postprocessing_script_path 2018-03-12 09:42:21 +01:00
Ghostkeeper
15212d4426
Align for readability 2018-03-12 09:38:20 +01:00
Ghostkeeper
aae8a31f00
Don't display extruder count if you can't use it 
If your printer can only handle one extruder, don't display this drop-down. Don't let users get confused.
 2018-03-12 09:23:25 +01:00
Jack Ha
d70cc072e9 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 09:06:24 +01:00
Lipu Fei
7312ed8e3c Fix project loading for version upgrade 
CURA-5054
 2018-03-09 19:35:23 +01:00
Lipu Fei
e09325bf82 Fix project loading for version upgrade 
CURA-5054
 2018-03-09 17:16:27 +01:00
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
Lipu Fei
a81981a27a Better info on no profiles to import for gcode 
CIRA-4946

If a gcode is sliced with default profiles, there won't be any custom
profiles to import from that gcode. In that case, we show a info message
telling the user about this instead of showing an error message.
 2018-03-09 16:40:57 +01:00
Ghostkeeper
cf21e7c74b
Also upgrade definition_changes and user 
Because these files share their version numbers with quality changes.

Contributes to issue CURA-5054.
 2018-03-09 16:21:42 +01:00
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +01:00
Ghostkeeper
e18b1cde55
Store extruder position under 'position' instead of 'extruder' 
Otherwise it thinks it is still an extruder ID.

Contributes to issue CURA-5054.
 2018-03-09 15:37:30 +01:00
Ghostkeeper
71afbba789
Merge branch '3.2' 2018-03-09 15:36:51 +01:00
Ghostkeeper
c54ea00111
Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-09 15:22:13 +01:00
Ghostkeeper
2962e0e282
Upgrade to quality_changes rather than quality 
Oops.

Contributes to issue CURA-5054.
 2018-03-09 15:20:20 +01:00
Lipu Fei
206d20c440 Fix empty definition_changes check in MachineSettingsAction 
CURA-5060

Should check for both "empty" and "empty_definition_changes".
 2018-03-09 15:04:57 +01:00
Ghostkeeper
65591e7c26
Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-09 15:00:25 +01:00
Lipu Fei
c9905449eb Clean up MachineSettingsAction imports 
CURA-5060
 2018-03-09 14:54:13 +01:00
Ghostkeeper
fb814b6519
Implement upgrade for quality changes extruder metadata 
The metadata used to be the ID of the extruder. Now it's the position of the extruder stack.

Contributes to issue CURA-5054.
 2018-03-09 14:54:08 +01:00
Lipu Fei
8c7e413038 Remove unnecessary setGlobalContainerStack() in project loading 
CURA-5073
 2018-03-09 14:37:43 +01:00
Lipu Fei
48dae7b6c7 Remove commented code 
CURA-5060
 2018-03-09 14:35:43 +01:00
Lipu Fei
de72dd3455 Fix material update upon gcode flavour change 
CURA-5060
 2018-03-09 14:26:53 +01:00
Ghostkeeper
e30d15ab66
Implement getCfgVersion 
Mostly copied from the implementation in the 3.0 to 3.1 upgrade.

Contributes to issue CURA-5054.
 2018-03-09 14:02:15 +01:00
Ghostkeeper
60de2aff65
Basic upgrade module from 3.2 to 3.3 implementation 
'Basic' meaning no implementation at all.

Contributes to issue CURA-5054.
 2018-03-09 13:59:31 +01:00