Merge branch 'develop' into Maintenance/Maroon-539_MoveAssetsScripts

GameLabGraz · Nov 13, 2024 · 4ba9198 · 4ba9198
2 parents 5421e9b + 2b9efe8
commit 4ba9198
Show file tree

Hide file tree

Showing 624 changed files with 115,872 additions and 16,906 deletions.
diff --git a/README.md b/README.md
@@ -27,6 +27,6 @@ Multi-User) illustrates the different forms of engagement Maroon supports or pla
 
 # Simulations and Experiments
 
-Maroon contains several physics experiments, but will be extended with computer science simulations and experiences from other subjects in the future. The physics experiments cover Van de Graaff Generator, Falling Coil, Faraday’s Law, Capacitor and Huygen's Principle.
+Maroon contains several physics, chemistry, and computer science experiments, but will be extended with experiences from other STEM fields in the future. The physics experiments cover Coulomb's Law, Falling Coil, Faraday's Law, Huygen's Principle, Point Wave, Pendulum, Van de Graaff Balloon, Van de Graaff Generator, Optics, 3D Motion Simulation, Cathode Ray Tube, and Falling Ball Viscosimeter. The chemistry experiments are represented by Titration and Catalyst. And Computer Science experiments include Sorting, State Machine, Path Finding, Minimum Spanning Tree, and Perlin Noise.
 
 <img src="/images/screenshots/experiment-room.jpg" width="600"/>
diff --git a/network/ListServer/ListServer.js b/network/ListServer/ListServer.js
diff --git a/network/ListServer/node_modules/ip-address/LICENSE b/network/ListServer/node_modules/ip-address/LICENSE
diff --git a/network/ListServer/node_modules/ip-address/README.md b/network/ListServer/node_modules/ip-address/README.md
diff --git a/network/ListServer/node_modules/ip-address/ip-address.js b/network/ListServer/node_modules/ip-address/ip-address.js
diff --git a/network/ListServer/node_modules/ip-address/lib/common.js b/network/ListServer/node_modules/ip-address/lib/common.js