Differences

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

--- tools_and_documentation [2023/05/31 21:13] – [Tools That Require Training] haley
+++ tools_and_documentation [2023/09/07 18:21] – [Other] bdincau
@@ Line 1: / Line 1: @@
 ====== Tools and Documentation ======
 ===== Tools That Require Training =====
 ==== 3D Printers ====
@@ Line 9: / Line 9: @@
 ^ Tool ^ Location ^ Training SOP ^
-|[[form2|FormLabs Form 2/3 SLA 3D Printer]]|IW 2448|[[form2sop|Form 2/3 SOP]] |
+|[[form3|FormLabs Form3 SLA 3D Printer]]|IW 2448|[[form2sop|Form 2/3 SOP]] |
 |[[ultimaker3_extended|Ultimaker3/S5 Extended Dual FDM 3D Printer]]|IW 2448| [[ultimaker_3_sop|FDM Training]] |
 |[[stratasys_f270|Stratsys F270 FDM 3D Printer]]|IW 2442|[[ultimaker_3_sop|FDM Training]] |
@@ Line 36: / Line 36: @@
 ^ Tool ^ Location ^ Training SOP ^
 |[[bandsaw|Bandsaw]]|IW 2448|[[bandsaw_sop|Bandsaw Safe Operating Procedure]]|
-|[[carbide3d_nomad|Carbide 3D Nomad]]|IW 2448|[[carbide_3d_nomad_883_training_sop|Carbide 3D Training SOP]]|
+|[[carbide3d_nomad|Carbide 3D Nomad]]|REMOVED|[[carbide_3d_nomad_883_training_sop|Carbide 3D Training SOP]]|
 |[[shopbot_desktop|ShopBot Desktop CNC Router]]|IW 2448|[[shopbotdesktoptrainingsop|ShopBot Desktop Training SOP]]|
 | [[Diamond Saw]] |uFL 3430|[[trimsaw2sop|Dimond TrimSaw 2 Training SOP]] |
@@ Line 57: / Line 57: @@
 | [[Sonoplot Multimaterial Writer]] |uFL 3430| |
 |[[trotec_speedy|Trotec Speedy 100]]|uFL 3430|[[laser_cutter_training_sop|Laser cutting SOP]] |
+|[[wazer_waterjet|Wazer Waterjet Cutter]]|IW 2448|[[waterjetsop|Waterjet SOP]] |
+|[[crystalmark|CrystalMark Etching Tool]]|uFL 3430|[[crystalmarksop|CrystalMark SOP]] |
 </datatables>