GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-04 10:36:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,003 Commits 295 Branches 268 Tags
Commit Graph

894 Commits

Author SHA1 Message Date
fieldOfView
228f5be35a Fix order of machine actions on manage printers page 
MachineActionManager now uses lists instead of dicts because dicts don't maintain the order.
 2016-07-29 17:14:18 +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
Thomas Karl Pietrowski
1b432b7b4f Removing debug print 
Contributes to CURA-1987
 2016-07-28 18:30:48 +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
Jaime van Kessel
4b9a78624d Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-28 15:00:29 +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
Jack Ha
ce462ace17 Layout. CURA-1707 2016-07-28 13:48:43 +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
Arjen Hiemstra
823ab61cc5 Tweak convex hull node and transparent object shader 
Now we render at least a vague hint at lighting instead of nothing at
all.
 2016-07-27 18:03:20 +02:00
Jack Ha
bac3f73e6d Check ConvexHullHead vs ConvexHullHead collision. CURA-1776 2016-07-27 17:42:15 +02:00
Jaime van Kessel
762ea15e78 Global inherited settings now use target (instead of active) stack to copy values 
Fixes multiple issues with support settings not being updated properly
 2016-07-27 09:54:02 +02:00
Jaime van Kessel
05b2c147e0 Combined material & hotend message 
Even if all data is different, the update is correctly handled

CURA-1909
 2016-07-26 13:28:53 +02:00
Jaime van Kessel
beca64a5c2 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-26 12:10:58 +02:00
Jaime van Kessel
8540e10469 Updating multiple materials with one message box now works 
CURA-1909
 2016-07-26 12:10:25 +02:00
fieldOfView
336dd406b1 Add a reusable mechanism for plugins to add controls to designated areas in the GUI 
contributes to CURA-271
 2016-07-26 11:58:25 +02:00
Jack Ha
3703ed9eb0 Fix overlapping object with raft/brim/skirt in one-at-a-time mode. 
head_and_fans is extended by an extra margin to prevent overlapping.
CURA-1776

Also fixed: showing one-at-a-time head convex at start.
 2016-07-26 11:45:06 +02:00
Tim Kuipers
07e876d06f Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 17:46:57 +02:00
Jack Ha
d82249e260 Fix for one-at-a-time. CURA-1707 2016-07-25 17:09:06 +02:00
Jack Ha
d77f6e86e4 Added an extruded convex hull as a raft instead of a grey plane. 
- New shader transparent_object.shader
- Raft thickness is calculated in BuildVolume and used in
  ConvexHullDecorator, notified by a Signal.
- Removed old grey plane from BuildVolume.
- Vertex data below build plane is no longer discarded (caused convex
  hulls that are too small).
- Uses new functions in MeshBuilder (update Uranium as well).

CURA-1707
 2016-07-25 16:45:38 +02:00
Tim Kuipers
c6e9e62e73 Merge branch 'layerview_dev' of https://github.com/Johan3DV/Cura into Johan3DV-layerview_dev 2016-07-25 16:41:13 +02:00
Jaime van Kessel
70242ba502 Saving a file no longer causes a re-slice 
CURA-1933
 2016-07-25 15:44:16 +02:00
Jaime van Kessel
f51cffdf2e We now ask the stack for the position (instead of definition) 2016-07-25 13:50:47 +02:00
Jaime van Kessel
6883747671 Merge branch 'feature_remove_global_tab' of github.com:Ultimaker/Cura 2016-07-25 10:47:52 +02:00
Jaime van Kessel
000c4d5f41 Fixed issue where changing a setting would cause mismatch between stacks 
CURA-1758
 2016-07-25 09:58:33 +02:00
Ghostkeeper
3042b6af5f
Rename skirt size to bed adhesion size 
Because it concerns not only the skirt, but also the brim and raft (and X/Y offset but I didn't include that in the name).

Contributes to issue CURA-1678.
 2016-07-22 17:06:35 +02:00
Ghostkeeper
d4f96ab62d
Rename setting skirt_line_width to skirt_brim_line_width 
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
 2016-07-22 17:00:30 +02:00
Jaime van Kessel
be252fb84f We now check if a setting can also be removed to get the same state 
THis should prevent the reset buttons from showing up when there is nothing going on.

CURA-1758
 2016-07-22 15:31:37 +02:00
fieldOfView
a2972e26f5 Remove the "from" convert_function for extruder settings 
Fixes CURA-1974
 2016-07-22 13:45:53 +02:00
fieldOfView
1f53ce0d4d Fix weight calculation 
CURA-1038
 2016-07-22 13:43:26 +02:00
Jaime van Kessel
83ec6e849a Multiple changes when quality profiles have different values should no longer break the link 
CURA-1758
 2016-07-22 13:16:35 +02:00
Jaime van Kessel
df46a61d38 Active stack should no longer influence changing of targeted settings 
CURA-1758
 2016-07-22 11:44:37 +02:00
Jaime van Kessel
cafb46cb1d First container is now updated withouth recursion possible 
We now use a set of keys that we are handling in order to prevent the lock

CURA-1758
 2016-07-22 10:43:26 +02:00
Johan K
c6790981d6 Merge branch 'master' of https://github.com/Ultimaker/Cura into layerview_dev 2016-07-22 10:21:41 +02:00
Jaime van Kessel
8307dba643 Revert "Commented out 2 lines of code that caused issues with reset" 
This reverts commit 568d30d17b85dc1fd5bd4ab784e750ac237cdb39. Turned out this causes recursion issue when changing materials
 2016-07-22 09:33:44 +02:00
Jaime van Kessel
87b9b17f98 Now the right extruder is actually used (instead of randomly mixing it up) 
CURA-1758
 2016-07-21 21:42:02 +02:00
Jaime van Kessel
568d30d17b Commented out 2 lines of code that caused issues with reset 
The documentation doesn't mention why the code is there, so i've commented them out for the time beeing

CURA-1758
 2016-07-21 21:19:25 +02:00
Jaime van Kessel
4346d5a233 Settings now point to the right extruder stack 
CURA-1758
 2016-07-21 20:54:02 +02:00
fieldOfView
d4744735c6 Remove global inheritance for most settings 
CURA-1758
 2016-07-21 15:33:35 +02:00
fieldOfView
caa202e3d6 Make sure values from loaded profile permeate to other stacks 
CURA-1758
 2016-07-21 15:28:10 +02:00
fieldOfView
a64e0fa8e8 Fix copyValueToExtruders (rebase-accident) 
CURA-1758
 2016-07-21 15:12:31 +02:00
fieldOfView
baf9d81e47 Massively simplify the strategy 
This removes the *_global_variant, *_global_material and *_global_quality profiles and instead uses the same profiles for the global stack as for extrude 0.

CURA-1758
 2016-07-21 15:12:31 +02:00
fieldOfView
0857017ac6 Add a context-menu item to copy a value to all extruders. 
CURA-1758
 2016-07-21 15:12:30 +02:00
fieldOfView
89b601791d Fix possible error when a printer fails to load 
CURA-1758
 2016-07-21 15:12:30 +02:00