Merge branch 'experimental' into f(c)-customizable-sales

changelog

@@ -1041,7 +1041,7 @@ Version 0.10.1
     * Engine bugs:
       * Outfits with the "uninstallable" attribute are no longer sold alongside minables when using the "Sell All" button on the trading panel. (@TomGoodIdea)
       * The string truncation functions now properly handle inputs that would have previously hit an infinite loop check. (@warp-core)
-      * The location of outfit thumnails on the UI is now rounded to an integer, preventing blurry thumbnails. (@TomGoodIdea)
+      * The location of outfit thumbnails on the UI is now rounded to an integer, preventing blurry thumbnails. (@TomGoodIdea)
       * NPCs will no longer attempt to target flotsams that they cannot pick up. (@UnorderedSigh)
       * Surveillance ships now maintain the same target until they are finished scanning, preventing a bug where some surveillance ships would never succeed their scan. (@warp-core)
       * The shop will now properly report why it is that you can't "buy" an outfit from storage instead of saying that you can't place it into your cargo. (@alextd, @warp-core)

data/avgi/avgi.txt

@@ -722,7 +722,7 @@ phrase "avgi elements"
 		"Neon"
 		"Sodium"
 		"Magnesium"
-		"Aluminium"
+		"Aluminum"
 		"Silicon"
 		"Phosphorus"
 		"Sulfur"

data/avgi/windjammers.txt

@@ -160,7 +160,7 @@ ship "Windjammer"
 		"cooling" 30
 		"overheat damage threshold" 0.66
 		"overheat damage rate" -0.06
-		"disabled recovery timer" 720
+		"disabled recovery time" 720
 		"thrust" 44
 		"turn" 720
 		"hull repair rate" 3
@@ -316,7 +316,7 @@ ship "Bluejacket"
 		"cooling" 30
 		"overheat damage threshold" 0.66
 		"overheat damage rate" -0.06
-		"disabled recovery timer" 720
+		"disabled recovery time" 720
 		"thrust" 22
 		"turn" 1440
 		"hull repair rate" 3

data/governments.txt

@@ -16,6 +16,7 @@ government "Aberrant"
 	language "Ka'het"
 	color 0.4 0.4 0.7
 
+	"player reputation" -1000
 	"default attitude" -.01
 	"attitude toward"
 		"Author" 0