Differences

This shows you the differences between two versions of the page.

--- unlv [2019/07/05 17:02] – dwallace
+++ unlv [2019/10/24 17:02] – dwallace
@@ Line 66: / Line 66: @@
 \\ [[dasl_unlv_3d_printers|DASL@UNLV 3D Printer Information]]
 ++\\ \\
-++3D Printing & Machining|\\
+++Fabrication: 3D Printing, CNC Machining, Laser Cutting, and Screenprinting|\\
-\\ - [[CNC hot-wire foam-cutter]]
 \\ - [[dasl_unlv_3d_printers|DASL@UNLV 3D Printer Information]]
+\\ - [[dasl_unlv_3d_printersviapc|DASL Robo3D Printer manual with PC]]
+\\ - [[CNC hot-wire foam-cutter]]
 \\ - [[balsa_air_glider|Balsa Wood Glider]]
 \\
-\\ **CNC Laser Cutter**
+\\ **CNC Tormach PCNC 1100**
+\\ - [[cnc_setting_up_tutorial_0|CNC "Setting up" Tutorial 0]]
+\\ - [[cnc_hello_world_tutorial_1|CNC "Hello World" Tutorial 1]]
+\\
+\\ - [[diary|CNC Diary]]
+\\
+\\ **Laser Cutting**
 \\ - [[Full Spectrum Laser Pro 36x24 Intro and Quick Start]]
 \\ - [[Full Spectrum Laser Pro 36x24 Rotary Attachment]]
@@ Line 81: / Line 88: @@
 \\ - [[Laser cutting a name plate]]
 \\ - [[balsa_air_glider|Balsa Wood Glider]]
+\\
+\\ **Screen Printing**
+\\ - [[Printing a T Shirt]]
 \\
 \\ **2D / 3D Modeling**
@@ Line 335: / Line 345: @@
 \\ - [[lego_pacbot_project|Lego NXT Pacbot]]
 \\ - [[light-up_pvc_speakers|LED Light-up PVC Speakers]]
+\\ - [[machines_and_mechanisms|Machines and Mechanisms 1-50]]
+\\ - [[machines_and_mechanisms_2|Machines and Mechanisms 51-100]]
+\\ - [[machines_and_mechanisms_3|Machines and Mechanisms 101-150]]
+\\ - [[machines_and_mechanisms_4|Machines and Mechanisms 151-200]]
+\\ - [[machines_and_mechanisms_5|Machines and Mechanisms 201-250]]
+\\ - [[machines_and_mechanisms_6|Machines and Mechanisms 251-300]]
 \\ - [[magic_carpet_ptv_build_process|Magic Carpet PTV]]
 \\ - [[making_the_darwin-op_walk|Making Darwin-OP Walk]]
@@ Line 347: / Line 363: @@
 \\ - [[opencv_tutorials|OpenCV Tutorials]]
 \\ - [[optitrack_mo-cap_system_manual|Optitrack Motion Capture]]
-\\ - [[machines_and_mechanisms|Machines and Mechanisms 1-50]]
-\\ - [[machines_and_mechanisms_2|Machines and Mechanisms 51-100]]
-\\ - [[machines_and_mechanisms_3|Machines and Mechanisms 101-150]]
-\\ - [[machines_and_mechanisms_4|Machines and Mechanisms 151-200]]
-\\ - [[machines_and_mechanisms_5|Machines and Mechanisms 201-250]]
-\\ - [[machines_and_mechanisms_6|Machines and Mechanisms 251-300]]
 \\ - [[Optitrack Motion Capture System]]
 \\ - [[pneumatics_ip|Pneumatics and Motion Controls]]