Differences

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

--- demonstrations:4_thermodynamics:4a_thermal_properties_of_matter:ball_and_ring:start [2019/03/26 16:54] – demoroom
+++ demonstrations:4_thermodynamics:4a_thermal_properties_of_matter:ball_and_ring:start [2020/03/13 20:19] (current) – demoroom
@@ Line 1: / Line 1: @@
 ====== Ball And Ring ======
-{{tag>bimetallic_strip thermodynamics thermal_expansion unlocated}}
+{{tag>bimetallic thermodynamics thermal_expansion located}}
 <WRAP box right>
@@ Line 21: / Line 21: @@
   * Copper ring/plate with hole on stand
   * Steel ball
-  * Propane torch and striker
+  * [[demonstrations:9_equipment:propane_torch:start|Propane torch and striker]]
 ===== Setup =====
@@ Line 48: / Line 48: @@
 </WRAP>
 <WRAP tablewidth 100%>
-| **Location** | ---- |
+| **Location** | C4, torch on I6 |
 | **Maker** | Unknown |
 | **Current State** | Working |