GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 23:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,268 Commits 291 Branches 265 Tags
Commit Graph

4268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
57a37cfb8f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-29 11:27:18 +02:00
fieldOfView
f584b49af2 Add "Close" button to (single) machine actions dialog 
CURA-2019
 2016-07-29 11:27:03 +02:00
Jaime van Kessel
d1a6420e1b Delete all object now clears Selection 
CURA-1891
 2016-07-29 11:07:16 +02:00
Jaime van Kessel
03aa4f9c6a Undo removing object from group now works correctly 
CURA-1891
 2016-07-29 11:05:11 +02:00
Jaime van Kessel
21d4e9b894 Delete selection now also removed group nodes when they only have one child left 
CURA-1891
 2016-07-29 11:00:28 +02:00
Jaime van Kessel
1ed0503e02 Backspace now triggers same action as delete 
CURA-1891
 2016-07-29 10:37:03 +02:00
Jaime van Kessel
a19123eb66 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-29 10:01:21 +02:00
Jaime van Kessel
b5d2533820 G-code writer no longer uses duplicate for flattening profile 
Spent to much time fixing this already, so we now just make a new profile by hand based on the profiles to be flattened

CURA-1933
 2016-07-29 09:59:57 +02:00
Tim Kuipers
4b192db1bf JSON: extruders cannot be more than 16 (CuraEngine hardcoded value) (CURA-2015) 2016-07-28 20:16:44 +02:00
Tim Kuipers
07cea792d9 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-28 19:52:54 +02:00
Tim Kuipers
27f160c220 JSON fix: made retraction_hop_only_when_collides and retraction_hop not children of retraction_hop_enabled 
retraction_hop_enabled was used by the engine, so it should never become disabled
 2016-07-28 19:52:43 +02:00
Thomas Karl Pietrowski
1b432b7b4f Removing debug print 
Contributes to CURA-1987
 2016-07-28 18:30:48 +02:00
fieldOfView
9d7ce210b3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-28 18:15:23 +02:00
fieldOfView
8fb6c9939a Add "offline" styling to sidebar/monitor 
CURA-1851
 2016-07-28 18:14:38 +02:00
Arjen Hiemstra
14d4b1f881 Fix setting the default path on OSX 
Contributes to CURA-1987
 2016-07-28 18:08:30 +02:00
Arjen Hiemstra
570a67556a Fix exporting and importing materials on OSX 
OSX's file dialog is stupid and does not understand extensions with
a . in them. So instead just use everything after the last .

Fixes CURA-1987
 2016-07-28 18:08:17 +02:00
Tim Kuipers
34ac8cf66f Merge branch 'feature_first_layer_travel_speed' 2016-07-28 17:05:07 +02:00
Tim Kuipers
20b96b4716 Merge branch 'master' into feature_first_layer_travel_speed 2016-07-28 16:48:42 +02:00
Jaime van Kessel
467f971dac When sending per object settings, we now also check if we need to send anything at all 
Adding a setting and then removing it caused some weird behavior issues CURA-1988
 2016-07-28 15:26:59 +02:00
Jaime van Kessel
4b9a78624d Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-28 15:00:29 +02:00
Jack Ha
4b0e1644ee Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-28 14:58:16 +02:00
Jack Ha
3d47e329a7 Fix convex hull being updated after removing CPU eating monster. 
CURA-2002.
 2016-07-28 14:57:17 +02:00
Jaime van Kessel
fe205b51f9 Per object settings now use correct stack 
CURA-1934
 2016-07-28 14:45:49 +02:00
Tim Kuipers
1f903b9fcc JSON renames: support_roof_... ==> support_interface... (CURA-1013) 2016-07-28 14:06:00 +02:00
Jaime van Kessel
305a47e9b0 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-28 14:03:25 +02:00
Jaime van Kessel
0794ddb58e Backend now listens to all machine extruders for changes 
CURA-1999
 2016-07-28 14:01:57 +02:00
Tim Kuipers
2ab9531f83 Merge branch 'master' into feature_support_bottoms 2016-07-28 13:53:43 +02:00
Jack Ha
ce462ace17 Layout. CURA-1707 2016-07-28 13:48:43 +02:00
fieldOfView
5d2033722a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-28 13:45:27 +02:00
fieldOfView
1bbf987921 Fix SettingComboBox and SettingExtruder in some contexts 
Use propertyProvider instead of provider; fixes comboboxes in PostProcessing plugin.
 2016-07-28 13:45:11 +02:00
Ghostkeeper
40932a3ad2
Set default of draft shield height to 10mm 
This is a fairly arbitrary default until we have tests from materials. The draft shield height is now only used by the engine if the draft shield is enabled and limited.

Contributes to issue CURA-1295.
 2016-07-28 13:33:27 +02:00
Jaime van Kessel
a1bd8f59ed Slicing no longer occurs when stack is invalid 
CURA-1998
 2016-07-28 13:14:07 +02:00
Jaime van Kessel
614d4bb21a Merge branch 'feature_additional_components' of github.com:Ultimaker/Cura 2016-07-28 12:42:39 +02:00
Jaime van Kessel
cab1dc7a13 Fix merge mistake 2016-07-28 12:35:36 +02:00
Jaime van Kessel
c6d1caaf0f Convex hull is no longer needlessly re-calculated 
CURA-2002
 2016-07-28 11:47:56 +02:00
Jaime van Kessel
b663fa2824 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-28 09:28:08 +02:00
Jaime van Kessel
1147e915c1 Setting a instance to the same state no longer causes display to break 
CURA-1985
 2016-07-28 09:27:20 +02:00
Jack Ha
dc6d415cf5 Disabled duplicate material, because it has a lot of issues. 
CURA-1969.
 2016-07-28 09:13:35 +02:00
fieldOfView
329a3dce00 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-28 07:49:16 +02:00
fieldOfView
b9857a6975 Partially solve setting the UMO heated bed kit option 
CURA-580
 2016-07-28 07:48:23 +02:00
Thomas Karl Pietrowski
5f540a7a78 Revert "Revert "Clean up __init__"" 
This reverts commit d99827109ab836963d523322ef00b0e6cf9675bd.
 2016-07-27 21:22:30 +02:00
Thomas Karl Pietrowski
d99827109a Revert "Clean up __init__" 
This reverts commit 44c64c4ac766fc7e085d338cb1f21c949851c9ba.
 2016-07-27 21:22:16 +02:00
Thomas Karl Pietrowski
9f280717d8 Clean up __init__ 2016-07-27 21:22:08 +02:00
Thomas Karl Pietrowski
b699efa55e Revert "Clean up __init__" 
This reverts commit 44c64c4ac766fc7e085d338cb1f21c949851c9ba.
 2016-07-27 21:20:55 +02:00
Thomas Karl Pietrowski
44c64c4ac7 Clean up __init__ 2016-07-27 21:14:21 +02:00
Thomas Karl Pietrowski
c7956542c4 CURA-1923: Rename SliceInfoThread to SliceInfoJob 2016-07-27 20:39:55 +02:00
Thomas Karl Pietrowski
dd9220068e CURA-1923: Using super.__init__() 2016-07-27 20:34:52 +02:00
Thomas Karl Pietrowski
7581aded7a CURA-1923: Remove tracking of jobs 
Like suggested by @awhiemstra.

Contributes to CURA-1923
 2016-07-27 20:32:44 +02:00
Thomas Karl Pietrowski
d4861ee626 CURA-1223: Checking whether the bounding box is correct 
Adds an additional check, like suggested by @awhiemstra.

Contributes to CURA-1223
 2016-07-27 20:21:35 +02:00
Thomas Karl Pietrowski
4dbe895c15 3MF_Reader: Optionally use cElementTree 
This should make reading the XML faster
 2016-07-27 20:16:12 +02:00