From cf7e7dfa5a52c8d1a3e28efcc6e8b9862564fa6c Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sat, 8 Dec 2012 17:44:18 +0000
Subject: Added medicines model by Karvajalka, updated starsystem roadmap.

---
 doc/attributions.html       | 29 +++++++++++++++++++++--------
 doc/starsystem_roadmap.html | 18 ++++++++++++++++--
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/doc/attributions.html b/doc/attributions.html
index fce1f0d..c8ad5e9 100644
--- a/doc/attributions.html
+++ b/doc/attributions.html
@@ -406,6 +406,11 @@
 		<td>gold</td>
 		<td>Thorn</td>
 	</tr>
+	<tr>
+		<td>models/cargo</td>
+		<td>medicines</td>
+		<td>Karvajalka</td>
+	</tr>
 	<tr>
 		<td>models/cargo</td>
 		<td>pod</td>
@@ -498,7 +503,7 @@
 		<td>antwerp.png</td>
 		<td>
 			<a href="http://freebitmaps.blogspot.com/2010/10/srgb-planet-reststop.html">Reststop</a> by
-			<a href="http://freebitmaps.blogspot.com">Duael Designs &amp; Robert Stein III</a>
+			<a href="http://freebitmaps.blogspot.com">Duael Designs LLC &amp; Robert Stein III</a>
 
 		</td>
 	</tr>
@@ -507,7 +512,7 @@
 		<td>baden.png</td>
 		<td>
 			<a href="http://hameed.deviantart.com/art/Planet-texture-maps-01-116701701">Planet Texture Maps 01</a> by
-			<a href="http://hameed.deviantart.com/">Hameed</a>
+			<a href="http://hameed.deviantart.com/">Hameed Nawaz</a>
 		</td>
 	</tr>
 	<tr>
@@ -520,6 +525,14 @@
 			(released under CC-BY-SA-3.0 with permission)
 		</td>
 	</tr>
+	<tr>
+		<td>textures/planets</td>
+		<td>caledonia.png</td>
+		<td>
+			<a href="http://freebitmaps.blogspot.be/2010/11/srgb-planet-wight.html">Wight</a> by
+			<a href="http://freebitmaps.blogspot.com">Duael Designs LLC &amp; Robert Stein III</a>
+		</td>
+	</tr>
 	<tr>
 		<td>textures/planets</td>
 		<td>finnmark.png</td>
@@ -534,7 +547,7 @@
 		<td>ghant.png</td>
 		<td>
 			<a href="http://freebitmaps.blogspot.com/2010/12/srgb-planet-commerce-one.html">Commerce One</a> by
-			<a href="http://freebitmaps.blogspot.com">Duael Designs &amp; Robert Stein III</a>
+			<a href="http://freebitmaps.blogspot.com">Duael Designs LLC &amp; Robert Stein III</a>
 
 		</td>
 	</tr>
@@ -543,7 +556,7 @@
 		<td>krone.png</td>
 		<td>
 			<a href="http://freebitmaps.blogspot.com/2010/12/srgb-planet-dank.html">Planet Dank</a> by
-			<a href="http://freebitmaps.blogspot.com">Duael Designs &amp; Robert Stein III</a>
+			<a href="http://freebitmaps.blogspot.com">Duael Designs LLC &amp; Robert Stein III</a>
 
 		</td>
 	</tr>
@@ -552,7 +565,7 @@
 		<td>lindblade.png</td>
 		<td>
 			<a href="http://freebitmaps.blogspot.com/2010/12/srgb-planet-muunilinst.html">Muunilinst</a> by
-			<a href="http://freebitmaps.blogspot.com">Duael Designs &amp; Robert Stein III</a>
+			<a href="http://freebitmaps.blogspot.com">Duael Designs LLC &amp; Robert Stein III</a>
 
 		</td>
 	</tr>
@@ -561,16 +574,16 @@
 		<td>seymour.png</td>
 		<td>
 			<a href="http://freebitmaps.blogspot.com/2010/11/srgb-planet-miners-moon.html">Miner's Moon</a> by
-			<a href="http://freebitmaps.blogspot.com">Duael Designs &amp; Robert Stein III</a>
+			<a href="http://freebitmaps.blogspot.com">Duael Designs LLC &amp; Robert Stein III</a>
 
 		</td>
 	</tr>
-		<tr>
+	<tr>
 		<td>textures/planets</td>
 		<td>warsaw.png</td>
 		<td>
 			<a href="http://freebitmaps.blogspot.com/2010/12/srgb-planet-arnessk.html">Arnessk</a> by
-			<a href="http://freebitmaps.blogspot.com">Duael Designs &amp; Robert Stein III</a>
+			<a href="http://freebitmaps.blogspot.com">Duael Designs LLC &amp; Robert Stein III</a>
 
 		</td>
 	</tr>
diff --git a/doc/starsystem_roadmap.html b/doc/starsystem_roadmap.html
index fb5da6c..fb6f9c8 100644
--- a/doc/starsystem_roadmap.html
+++ b/doc/starsystem_roadmap.html
@@ -73,9 +73,12 @@
 </ul>
 	
 <h4 class="content">Albion system</h4>
+<p class="content">
+	Planet Albion is the home of the Albion University.
+</p>
 <ul class="content">
 	<li class="content">planet Albion
-	<li class="content">Brisbane station
+	<li class="content">Brisbane medical research
 </ul>
 
 <h4 class="content">Burton system</h4>
@@ -174,10 +177,17 @@
 </ul>
 
 <h4 class="content">Khorsand system</h4>
+<ul class="content">
+	<li class="content">Kerman refinery, niobium processing facility
+</ul>
 
 <h4 class="content">Vostok system</h4>
 	
 <h4 class="content">Warsaw system</h4>
+<p class="content">
+	Planet Warsaw is the headquarters of Micron Corporation.
+</p>
+
 <ul class="content">
 	<li class="content">planet Warsaw
 </ul>
@@ -262,8 +272,12 @@
 <h4 class="content">Colombus system</h4>
 	
 <h4 class="content">Camorra system</h4>
+<p class="content">
+	Camorra is a system claimed by pirates
+</p>
+
 <ul class="content">
-	<li class="content">Pirate base
+	<li class="content">Asteroid pirate base
 </ul>
 	
 <!-- Southern Rim ================================================== -->
-- 
cgit v1.2.3