Differences

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

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
start [2020/01/13 18:21]
felix.h
start [2020/08/22 11:36] (current)
nick_gover
Line 15: Line 15:
  
 **Hackspace Rules** **Hackspace Rules**
-  * [[botlab:​policies:​hackspace_rules| Hackspace Rules]]+  * [[botlab:​policies:​hackspace_rules | Hackspace Rules]]
  
 **Guides** **Guides**
-  * [[botlab:​policies:​safe_working| Safe Working Guide]] +  * [[botlab:​policies:​safe_working | Safe Working Guide]] 
-  * [[botlab:​policies:​membership| Membership Guide]] +  * [[botlab:​policies:​membership | Membership Guide]] 
-  * [[botlab:​policies:​fair_use| Fair Use Guide]] +  * [[botlab:​policies:​fair_use | Fair Use Guide]] 
-  * [[botlab:​policies:​guests_and_children| Guests & Children Guide]] +  * [[botlab:​policies:​guests_and_children | Guests & Children Guide]] 
-  * [[botlab:​policies:​stuff_storage_stickers| Stuff, Storage, & Stickers Guide]] +  * [[botlab:​policies:​stuff_storage_stickers | Stuff, Storage, & Stickers Guide]] 
-  * [[botlab:​policies:​inductions|Inductions Guide]] +  * [[botlab:​policies:​inductions |Inductions Guide]] 
-  * [[botlab:​policies:​bv_studios_guide| BV Studios Guide]]+  * [[botlab:​policies:​bv_studios_guide | BV Studios Guide]]
  
 **BOTLab Policies** **BOTLab Policies**
-  * [[botlab:​policies:​conduct|Conduct Policy]]  +  * [[botlab:​policies:​conduct | Conduct Policy]]  
-  * [[botlab:​policies:​complaints|Complaints Policy]] +  * [[botlab:​policies:​complaints | Complaints Policy]] 
-  * [[botlab:​policies:​health_and_safety|Health & Safety Policy]]+  * [[botlab:​policies:​health_and_safety | Health & Safety Policy]]
  
 **About Hackspace** **About Hackspace**
-  * [[BOTlab:​|Bristol Open Technology Lab C.I.C.]] +  * [[BOTlab: | Bristol Open Technology Lab C.I.C.]] 
-  * [[botlab:​insurance|Insurance Information]] +  * [[botlab:​insurance | Insurance Information]] 
-  * [[botlab:openmeeting_20200128|Next Meeting Agenda]] +  * [[botlab:agm_20200903 ​| Next Meeting Agenda]] 
-  * [[botlab:​start#​past_meetings|Previous Meetings]]+  * [[botlab:​start#​past_meetings | Previous Meetings]]
  
 </​col>​ </​col>​
Line 59: Line 59:
   * [[equipment:​thermal_camera|FLIR Thermal Imaging Camera]]   * [[equipment:​thermal_camera|FLIR Thermal Imaging Camera]]
   * [[equipment:​sublimation_printer|Sublimation Printer and Heat Press]]   * [[equipment:​sublimation_printer|Sublimation Printer and Heat Press]]
 +  * [[equipment:​label_maker|Brother E110 Label Maker]]
 +  * [[equipment:​label_maker_QL_570|Brother QL-570 Label Maker]]
  
 **Electronics Equipment** **Electronics Equipment**
Line 66: Line 68:
   * [[equipment:​sig-gens| Signal Generators]]   * [[equipment:​sig-gens| Signal Generators]]
   * [[equipment:​spotwelder| Spot Welder]]   * [[equipment:​spotwelder| Spot Welder]]
 +  * [[equipment:​usb_microscope| USB Microscope]]
  
 **[[equipment:​start|Full Equipment List (Needs Updating!)]]** **[[equipment:​start|Full Equipment List (Needs Updating!)]]**
  • start.1578939684
  • Last modified: 9 months ago
  • by felix.h