GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 05:09:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,955 Commits 295 Branches 268 Tags
Commit Graph

3955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Arjen Hiemstra
7971ffdc08 Properly ignore Arcus debug messages 2016-07-27 18:03:20 +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
Ghostkeeper
6af0f28f32
Only show draft shield height if draft shield enabled 
We must've missed that one previously.

Contributes to issue CURA-1295.
 2016-07-27 17:50:34 +02:00
Jack Ha
bac3f73e6d Check ConvexHullHead vs ConvexHullHead collision. CURA-1776 2016-07-27 17:42:15 +02:00
Tim Kuipers
cd26794155 JSON fix: retrieve globalish support settings from support extruder (CURA-2003) 2016-07-27 17:27:57 +02:00
Jaime van Kessel
b29ff7feeb Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-27 14:14:35 +02:00
Jaime van Kessel
afed6eed93 Print montior also handles wait_for_cleanup correctly now 2016-07-27 14:14:13 +02:00
Jack Ha
4175e51dbb Corrected gantry height for ultimaker2.json (extended and go inherit). 
CURA-1979

Made same change in resources/definitions/ultimaker2.def.json as in
the original resources/machines/ultimaker2.json
 2016-07-27 14:10:01 +02:00
Simon Edwards
1e2147522d Increase the size of the backend log. 
Contributes to CURA-1509 Cura in slicing loop, Arcus Error (8)
 2016-07-27 11:03:11 +02:00
Jaime van Kessel
32c5c1ad7a Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-27 09:54:47 +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
fieldOfView
35107742d6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-26 18:55:59 +02:00
fieldOfView
d64eff9947 Fix updating the Per Object Settings color swatch 
CURA-1971
 2016-07-26 18:54:55 +02:00
Jaime van Kessel
b3f0c257e4 Flattend profiles are now set to dirty 
This fixes issue where profiles used in g-code writer were saved
 2016-07-26 13:37:28 +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
9fc09e5bf3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-26 11:46:26 +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
fieldOfView
ac4b6c092f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-26 10:17:05 +02:00
Jaime van Kessel
76723c2412 Removed 50 ms delay in staring top layer calculation 2016-07-26 09:55:04 +02:00
fieldOfView
85f53be9e2 Tone down striped shader colors 2016-07-25 21:59:37 +02:00
fieldOfView
785d7cf6d1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 18:01:23 +02:00
fieldOfView
4014cb11f9 Reinstate UMO wizard 
CURA-1732
 2016-07-25 18:00:17 +02:00
Tim Kuipers
07e876d06f Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 17:46:57 +02:00
Tim Kuipers
8cdf20c6bf Merge branch 'Johan3DV-layerview_dev' 2016-07-25 17:44:24 +02:00
fieldOfView
5f26372b96 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 17:39:57 +02:00
fieldOfView
1057634e47 Remove (non-functional) layer number from print monitor 
CURA-1940
 2016-07-25 17:39:43 +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
2d34e2b28e Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 15:44:55 +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
fieldOfView
0e557feb4b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 14:58:22 +02:00
fieldOfView
7ce5e71b4c Code cleanup 2016-07-25 14:58:12 +02:00
Tim Kuipers
6b3a25a491 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 14:50:11 +02:00
Tim Kuipers
59e8525855 JSON fix: flow temp graph reenabled (CURA-1174) 2016-07-25 14:50:05 +02:00
Jaime van Kessel
b28cf14288 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 13:51:27 +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
Thomas Karl Pietrowski
93a0637b23 Merge pull request #866 from thopiekar/master-CURA-1445-only 
CURA-1445: Using getDisplayString(ISO8601) in SliceInfo
 2016-07-25 13:42:26 +02:00
Thomas Karl Pietrowski
d9839ee41d SliceInfo: Using getDisplayString(ISO8601) instead 2016-07-25 13:40:19 +02:00