HomeAleph Objects Inc

Merge branch 'master' into T5263

Authored by Steven on Jan 24 2019, 11:59 AM.

Description

Merge branch 'master' into T5263

Fix merge conflict with EL-HR0166 by increasing the revision of the change.

Details

Committed
StevenJan 24 2019, 11:59 AM
Pushed
StevenJan 24 2019, 12:00 PM
Parents
rTAZQUIVER44f53c36c974: Merge branch 'T3537'
rTAZQUIVERa7fdde734f09: Add length to e1 motor wire and both heatsink fans
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
44f53c36c974kent
Merge branch 'T3537' 
Jan 23
3d80fbc41777kent
Merge branch 'master' into T3537 
Jan 23
a86d90e3bf78Steven
Merge branch 'master' into T5454 
Jan 23
1169a5050ffdSteven
Merge branch 'master' into T5014 
Jan 23
cfcd43c42045kent
Add v1.1 tool head alignment tool 
Jan 23
c77b763d3afeSteven
Merge branch 'master' into T5466 
Jan 23
89d8fe440365Steven
Merge branch 'master' into T5458 
Jan 23
cab440906030west
Remove bed spacer from repo T5466 
Jan 23
2a332a3af424west
Add image of 16 pos connector T5458 
Jan 22
4ff5668dc48bwest
Add image of 16 pos connector T5433 
Jan 22
497247e6926akent
Merge branch 'T5437' 
Jan 22
450fc6cc1e91kent
Merge branch 'T5437' of ssh://code.alephobjects.com/diffusion/TAZQUIVER/taz… 
Jan 22
f34fffa258b9Steven
Merge branch 'master' into T4956 
Jan 22
f799ea1aabc0oliver
Updated drawings with notes and format corrections 
Jan 22
396ab5ec3821Steven
Merge branch 'master' into T5446 
Jan 22
444ee2becf2eSteven
Merge branch 'master' into T5446 
Jan 22
f2cd668d16e8west
Change part number of heat shrink tubing to hd-tb0075 T5454 
Jan 22
a4620c7ef45ekent
Merge branch 'master' into T5437 
Jan 22
035da1d0252ckent
Merge branch 'T3607A' 
Jan 22
de754c3869d1Steven
Merge branch 'master' into T5222 
Jan 22
e7c4be10bc6dSteven
Merge branch 'master' into T5206 
Jan 22
1a8f326b2f9eoliver
Created drawings for the t-slot extrusions 
Jan 22
57dc46e470f7west
Change servo pinout from pin 7 to pin 8 T5446 
Jan 22
8dd71a7e6248Steven
Merge branch 'master' into T5253 
Jan 22
9ffef0a3245eSteven
Merge branch 'master' into T5315 
Jan 22
c2256a5f3441west
Remove old cable cover T5014 
Jan 22
4f817bd078b7west
Combine cbale cover and chain bracket into one part for easier harness… 
Jan 22
58382ca796f9logan
Updated half frame assembly fixture T3607 
Jan 21
3104d5f31613Steven
Move KiCad_Files to electronics directory 
Jan 21
2b0b7b58cafcSteven
Merge branch 'master' into T5379 
Jan 21
6d83ef6d0975Steven
Merge branch 'master' into T5316 
Jan 21
e1bc7b258c8bSteven
Merge branch 'master' into T5149 
Jan 21
d7681eec06b7Steven
Merge branch 'master' into T4866 
Jan 21
ae4f8150e4ebwest
Remove taz 6 drawing rename drawing to include pn EL-FA0061 T5379 
Jan 21
421fedc85104west
Move bottom screw hole to front of part 
Jan 21
30b6caba3f52kent
Merge branch 'master' into T3694 
Jan 18
f25a718889bclogan
Updated assemblies with all changes T3694 
Jan 18
03dea9908b91logan
Added test gcode for control box test stand T3694 
Jan 18
cd9cb8e39cfflogan
Added panel connector cushions T3694 
Jan 18
ed1441e8648dmjpelletier
Added Arduino Sketch for Filament Sensor Simulator Test Fixture 
Jan 18
c56f9221ed29mjpelletier
Added TAZ7 Wiring Diagram 
Jan 18
6526e617cab0kent
Merge branch 'master' into T5296A 
Jan 17
a5d1c5642118logan
Rewidened extruder connector port in front top right panel T3694 
Jan 17
22feda377752kent
Reformat BOM 
Jan 17
237ff161ff2alogan
Removed interference from mimic board mount with top frame extrusion T3694 
Jan 17
68a1b1593e3blogan
MBOM; combined frame front/back into frame final, moved serial number labels to… 
Jan 17
971b894f3952logan
Added lens for mimic board LEDs T3694 
Jan 17
8f8bb77bf3e0logan
Removed E motor splitter harness and changed internal filament sensor to… 
Jan 16
987838264250logan
Updated actuator panel stl with slots for better 1st layer T3694 
Jan 16
0d4ef9e6818akent
Relabel pins 
Jan 16

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.