GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-14 16:08: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
Diego Prado Gesto
36c5e0ad15 CURA-4870 Change message of the dialog when the connection with a printer/group already exists 2018-03-16 12:07:05 +01:00
Ghostkeeper
32cee75e47
Respect order of preference of output formats 
Contributes to issue CURA-5097.
 2018-03-16 11:49:51 +01:00
Lipu Fei
d78e2d56f7 Fix quality and variant processing in project loading 
From version 22 to 24, there is an upgrade for "quality" that changes
it to "quality_changes", but for "quality", we don't have any upgrades.
 2018-03-16 10:33:22 +01:00
Lipu Fei
579df7537b Fix upgrade from 26 to 27 
Missing definition changes container.
 2018-03-16 10:03:38 +01:00
fieldOfView
2a811c62d8 Ignore the first press after the selection has been cleared 
if the selection is cleared with this tool active, there is no way to switch to another tool than to re-select an object (by clicking it) because the tool buttons in the toolbar will have been disabled. The mouse-event happens after the selection is changed, so we need to keep track of what the selection was previously by monitoring the selection state.
 2018-03-15 23:58:22 +01:00
fieldOfView
d1d1307e6e Merge branch 'master' into feature_support_eraser_ux 2018-03-15 22:43:24 +01:00
Diego Prado Gesto
99d653cea5 CURA-4870 Don't allow to connect more than one instance to the same 
group.
 2018-03-15 20:01:47 +01:00
Ghostkeeper
b0f7a5b358
Fix translation of there being no file formats available 
This entry said that it had a context, but it had none. As a result, the whole string was seen as a context.
 2018-03-15 16:53:26 +01:00
ChrisTerBeke
d4d9a58d04 Fix merge conflicts, add can_send_raw_gcode ability, rename to sendRawCommand, small fixes 2018-03-15 16:51:25 +01:00
Lipu Fei
440a56b7fa Fix settings export in gcode 2018-03-15 16:42:11 +01:00
ChrisTerBeke
5ee30e0c99 Merge branch 'master' into feature_custom_gcode_commands 2018-03-15 16:40:42 +01:00
Ian Paschal
f2512a92a7
Merge pull request #3154 from fieldOfView/fix_per_meshgroup_settings 
Enable setting per mesh group settings when printing One at a Time
 2018-03-15 16:38:50 +01:00
alekseisasin
67261ccd4b
Merge pull request #3144 from fieldOfView/feature_preheat_extruder 
Feature preheat extruder
 2018-03-15 16:38:18 +01:00
fieldOfView
b9bf78d36c Remove group when "parent" is the only node in the group 2018-03-15 15:05:56 +01:00
fieldOfView
c3c096aaa0 Select the picked node so the group does not get drawn 2018-03-15 14:57:11 +01:00
Lipu Fei
98b325c9d5 Fix material serialization crash 2018-03-15 14:54:37 +01:00
Jack Ha
50f9548da0 CURA-4557 setting up plugin 2018-03-15 14:33:31 +01:00
Aleksei S
097c97b6f8 Fix: Refresh list of available printers in network 
after clicking refresh button.
 2018-03-15 14:33:27 +01:00
fieldOfView
a0c44192da Add support eraser meshes to group so it does not drop 2018-03-15 14:27:33 +01:00
fieldOfView
c25711797e Click support eraser mesh to remove it from the scene 2018-03-15 12:46:22 +01:00
fieldOfView
dbabf3bda9 Merge branch 'master' into feature_preheat_extruder 
# Conflicts:
#	cura/PrinterOutput/ExtruderOutputModel.py
#	cura/PrinterOutput/PrinterOutputModel.py
 2018-03-15 11:21:37 +01:00
Jack Ha
d0609e97e4 CURA-4557 added material_shrinkage_ratio_percentage setting 2018-03-15 11:19:14 +01:00
fieldOfView
11be8f158f Merge branch 'master' into feature_support_eraser_ux 2018-03-15 11:10:49 +01:00
fieldOfView
dee70f35f4 Fix setting visibility when searching 2018-03-15 11:03:27 +01:00
fieldOfView
8fe2077413 Merge branch 'master' into fix_per_meshgroup_settings 2018-03-15 10:40:18 +01:00
Jack Ha
98b0559c9a Merge branch 'master' into speedup 2018-03-14 16:14:14 +01:00
Jack Ha
e3dd7a449d CURA-5090 speedups by using qtimers on updating mostly visual elements 2018-03-14 16:09:59 +01:00
Jaime van Kessel
0d23ea2194 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 14:45:20 +01:00
Jaime van Kessel
ad3c5466d1 Added bunch of typing to clusteroutput device 2018-03-14 14:45:01 +01:00
Jaime van Kessel
962c5f3260 Added bit of defensive coding to cluster output device 2018-03-14 14:39:06 +01:00
Lipu Fei
22573a685d Fix quality definition comparison in quality importing 
CURA-4946
 2018-03-14 14:31:30 +01:00
Ghostkeeper
877d061a1b
Catch FileNotFoundError when updating custom firmware 
In case there is a bug there, we won't crash the thread.
 2018-03-14 14:24:08 +01:00
Jaime van Kessel
fa9dc7a1df Fixed send custom firmware 2018-03-14 14:20:03 +01:00
Diego Prado Gesto
ff676c98a6 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 13:56:24 +01:00
Diego Prado Gesto
1111fbaa78 CURA-4870 Changing the version upgrade to include new metadata entries 
for the container stacks.
 2018-03-14 13:53:04 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles 
Setting Visibility Presets sidebar menu
 2018-03-14 13:25:59 +01:00
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