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

8856 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jack Ha
82663a727f Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-08 10:51:29 +02:00
Jack Ha
1fe142ad1f Fix crashing Cura when switching multi extruder machine to single extruder machine while object selected. CURA-3776 2017-05-08 10:50:15 +02:00
fieldOfView
00f3cf409b Select newly created material 2017-05-08 10:38:25 +02:00
Jaime van Kessel
8ba0ee126e Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-08 10:31:10 +02:00
Jaime van Kessel
63eceda75e Added handling for if definition for error handling was not found 
CURA-3772
 2017-05-08 10:28:31 +02:00
fieldOfView
f3c2df3ab4 Properly return a string when creating/duplicating a material 2017-05-08 10:22:41 +02:00
Lipu Fei
887a9d377a Use setting name "Prime Blob" 
CURA-3634
 2017-05-08 10:13:59 +02:00
Lipu Fei
a039f9552e Trigger extruderTabsCount update when MachineSettings dialog shows 
CURA-3755
 2017-05-08 09:47:42 +02:00
Ghostkeeper
b1596b7811
Merge branch 'rmcolbert-master' 2017-05-08 09:45:37 +02:00
Jaime van Kessel
b14dfadeb4 Merge pull request #1802 from Shaische/patch-1 
Update delta_go.def.json
 2017-05-08 09:41:12 +02:00
Ghostkeeper
6f0b81d046
Merge branch 'master' of https://github.com/rmcolbert/Cura into rmcolbert-master 2017-05-08 09:38:56 +02:00
Lipu Fei
319f5f73fe Rename "prime_enable" to "prime_poop_enable" 
CURA-3634
 2017-05-08 08:12:49 +02:00
Shaische
d0e4554b59 Update delta_go.def.json 2017-05-06 18:24:35 -04:00
Mark
e3b17579e8 Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura into feature_extra_gradual_infill_icon 2017-05-05 19:21:13 +02:00
Ghostkeeper
6b74b0d499
Set default gradual infill step height to 1.5mm 
All of the profiles currently in Cura that set the gradual infill steps also set the step height (to 3 to 5 layer heights). I'd have chosen 4 layer heights as default based on that, but our material experts say that 1.5mm is about right for most models.

Contributes to issue CURA-3732.
 2017-05-05 17:25:34 +02:00
Ghostkeeper
fc1a5e89c3
Change gradual infill upon clicking infill buttons 
It sets the gradual infill to the value stored in the listmodel.

Contributes to issue CURA-3732.
 2017-05-05 17:16:18 +02:00
Ghostkeeper
ad1b1e0455
Detect whether the current infill is gradual 
And highlight the correct infill button in that case.

Contributes to issue CURA-3732.
 2017-05-05 17:13:32 +02:00
Ghostkeeper
df0a971326
Improve tooltip wording for gradual infill button 
Contributes to issue CURA-3732.
 2017-05-05 16:59:35 +02:00
Ghostkeeper
bd276a4d70
Convert Prusa i3 platform to binary STL 
Smaller file size, and apparently there were some syntax errors in the original ASCII STL file as far as numpy-stl was concerned.
 2017-05-05 14:56:45 +02:00
Ghostkeeper
c08eb043f0
Merge branch 'fix_float_number_line_width_um3' 2017-05-05 14:45:35 +02:00
Ghostkeeper
ce3b0d9fe4
Convert Kossel platform to binary STL 
There were reportedly some errors in the file format. I've opened it and re-saved it in CloudCompare to fix these. And I also converted it to binary STL to reduce the file size somewhat.
 2017-05-05 14:26:01 +02:00
14bitVoid
e9d70a8a70 Translate features for time estimates 2017-05-05 02:36:22 +02:00
14bitVoid
05f46c47f7 Dynamically fill tooltip with time estimates 2017-05-05 02:31:16 +02:00
14bitVoid
69a95e37a5 Show time estimates per feature in tooltip 2017-05-05 01:34:09 +02:00
14bitVoid
f15aa66751 Receive time estimates per feature 2017-05-05 00:05:17 +02:00
Ghostkeeper
eb52e4fb7e
Ignore default name of ProfileFlattener too 
It already ignored FlatProfileExporter, but that's just a renamed version of what is now called ProfileFlattener.
 2017-05-04 17:57:55 +02:00
Ghostkeeper
81ea9556eb
Fix showing layer view if there is no material 
The layer view would request the colour of the material. If there is no material, that would give an error.

Contributes to issue CURA-3497.
 2017-05-04 17:56:57 +02:00
Jack Ha
7d787a2188 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-04 16:31:43 +02:00
Jack Ha
0b0011fc88 Multiply dialog now has focus on #, added shortcut Ctrl-M 2017-05-04 16:31:33 +02:00
Lipu Fei
91b22edb06 Fix missing imports in CuraContainerRegistry 
CURA-3497
 2017-05-04 16:19:18 +02:00
Arjen Hiemstra
51b76acc6d Fix unit test 
CuraContainerRegistry::load now has a dependency on the ContainerStack
so we need to account for it in our mocks.
 2017-05-04 15:57:47 +02:00
Arjen Hiemstra
230740ed64 Fixup extruders that were converted from ContainerStack on load 
We need to make sure the extruder stacks get the proper next stack set,
even when converting them from ContainerStack. Since the conversion can
make no guarantees about the loading order, we need to add an extra step
to post-process the extruders.

Contributes to CURA-3497
 2017-05-04 15:44:16 +02:00
Lipu Fei
314fa8b1c8 Fix Enter key trigger for UM3 Add Printer dialog 2017-05-04 15:27:29 +02:00
Lipu Fei
0171d9637c Fix mode switching issue in LayerView 
CURA-3730
 2017-05-04 15:15:38 +02:00
Lipu Fei
f06562bc6e Remove kitten image and related text from CrashDialog 2017-05-04 14:33:19 +02:00
MaukCC
7ee1498962 Update cartesio.def.json 2017-05-04 14:11:00 +02:00
MaukCC
3c4d3779b1 Update cartesio.def.json 2017-05-04 13:47:14 +02:00
Arjen Hiemstra
fe112d5d81 Fix extruderstack test on CI 
We do not need a complete CuraApplication just so registerExtruder
can work. Instead, we just mock away the extruder manager so the rest of
the test can proceed.
 2017-05-04 13:06:34 +02:00
Ghostkeeper
45a369e31b
Merge branch 'Sidebar-fix' 2017-05-04 13:00:03 +02:00
Lipu Fei
25be8d9abb Fix default Line Width float value representation for UM3 2017-05-04 12:55:37 +02:00
Ghostkeeper
c25e2b9b95
Revert "Include recommended/custom switch in theme" 
This reverts commit a1f32b74e5. The fix was correct but we allow the honour for Randyxxl.
 2017-05-04 12:53:05 +02:00
Mark
baf10a3441 Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura into feature_extra_gradual_infill_icon 2017-05-04 12:36:04 +02:00
Mark
68f5995b19 [WIP] Add place for the extra gradual infill icon 
CURA-3732
 2017-05-04 12:35:40 +02:00
Mark Burton
53b7e1a8ca Add smooth_spiralized_contours setting to control smoothing of contours when spiralizing. 
Smoothing the contours minimises the visibility of the z-seam and for most models is
probably a good idea. Where it is less good is when the model has a fine surface details
which will get mangled by the smoothing. So we should let the user decide whether they
want to smooth or not. The default is true as most of the time it's a good thing.

# Conflicts:
#	resources/definitions/fdmprinter.def.json
 2017-05-04 09:02:38 +01:00
Ghostkeeper
a1f32b74e5
Include recommended/custom switch in theme 
Otherwise it stays white.
 2017-05-04 09:48:54 +02:00
Robert Colbert
7d7b0eaabb Delete slnx.sqlite 2017-05-03 14:58:35 -05:00
Robert Colbert
c5bcaf2d72 Delete ProjectSettings.json 2017-05-03 14:58:27 -05:00
Ghostkeeper
945486ade9
Merge branch 'cura_containerstack' 
Contributes to issue CURA-3497.
 2017-05-03 17:11:55 +02:00
Ghostkeeper
ea9e0e2e9c
Replace material without needing to find its index 
We have an easy setter for this.

Contributes to issue CURA-3497.
 2017-05-03 17:09:33 +02:00
Mark
b590e7b86c [WIP] Add place for the extra gradual infill icon 
CURA-3732
 2017-05-03 17:05:56 +02:00