Differences

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

--- machine_ecology [2015-08-18 19:47] – theunkarelse
+++ machine_ecology [2015-09-07 20:10] – theunkarelse
@@ Line 3: / Line 3: @@
 Project outline.\\
 **Locations:** FoAM's [[MidWest_Experimental_Station]] and Zone2Source in Amstelpark.\\
-**Partners:** FoAM Ams, [[http://zone2source.net/nl/|Zone2Source]], [[http://ivanhenriques.com/|Ivan Henriques]], [[http://www.ontaardeboom.nl/ |Daan van Geijlswijk]] .\\
+**Partners:** FoAM Ams, [[http://zone2source.net/nl/|Zone2Source]], [[http://ivanhenriques.com/|Ivan Henriques]], [[http://www.asthecrow.net/ |Judith van der Elst]] .\\
 [[Machine_Ecology_notes]]\\
 [[Machine_Ecology_PlanVanAanpak]]\\
@@ Line 27: / Line 27: @@
   * [[http://www.cartesiusmuseum.org/|Giep Hagoort]] plans a [[http://www.robots.nu/krijgt-nederland-een-eigen-robopark/|Dutch Robot Park]]
   * [[http://cargocollective.com/nonhumanagency|Non Human Space Agency]]
+  * [[http://www.plantasnomadas.com/|Plantas Nomadas]]
 Theory:
@@ Line 91: / Line 92: @@
   * [[http://www.fieldrobot.nl/|Field Robot competition]] in [[http://fre2015.um.si/index.php/event-program|Maribor]] June 15th
   * [[http://softroboticstoolkit.com/|Soft Robotics]] this years [[http://softroboticstoolkit.com/design-competition|challenge]]
+  * [[https://youtu.be/ZFWzmC7B-TE|Hebocon]] for the technically unskilled
 Conferences: