Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ShiftOS.WinForms/Resources/Shiftorium.txt

1 files changed, 20 insertions, 3 deletions

diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt
index 3833d75..3a73a01 100644
--- a/ShiftOS.WinForms/Resources/Shiftorium.txt
+++ b/ShiftOS.WinForms/Resources/Shiftorium.txt
@@ -7,6 +7,12 @@
 		Description: "Crazy math problems getting you down? Well, this calculator will take care of that!"
 	},
 	{
+		Name: "SL Operating Systems Wordlist",
+		Cost: 500,
+		Dependencies: "shiftletters",
+		Description: "Know a lot about computer operating systems? This upgrade adds a wordlist to ShiftLetters, full of various Linux distros, Windows codenames and other OS names. All for the low price of 500 Codepoints! It's an incredible value but it's true! Upgrade today... except out of ShiftOS!"
+	},
+	{
 		Name: "AL Calculator",
 		Cost: 150,
 		Dependencies: "calculator;app_launcher",
@@ -72,6 +78,8 @@
 		Dependencies: "app_launcher",
 		Description: "Want to open the Notifications application from within the App Launcher? This upgrade is for you."
 	},
+
+	// SHIFTLETTERS AND WORDLISTS
 	{
 		Name: "ShiftLetters",
 		Cost: 150,
@@ -85,6 +93,12 @@
 		Description: "This upgrade allows you to find ShiftLetters in your App Launcher."
 	},
 	{
+		Name: "SL Contributors Wordlist",
+		Cost: 250,
+		Dependencies: "shiftletters",
+		Description: "This nice wordlist lets you find out the people who contributed to the development of ShiftOS!"
+	},
+	{
 		Name: "Panel Notifications",
 		Cost: 150,
 		Description: "It's good to know what time it is, but how about knowing how many notifications you have? After all, notifications are a great way to tell what's going on! This upgrade adds a button that displays how many notifications you have. If you click it, you will open the Notifications app!",
@@ -95,6 +109,9 @@
 		Cost: 80,
 		Description: "Want to adjust the volume of ShiftOS's audio? This upgrade will let you."
 	},
+
+	// COLOR DEPTH AND DITHERING
+
 	{
 		Name: "Color Depth Dithering",
 		Cost: 1000,
@@ -435,13 +452,13 @@
 		Dependencies: "mud_fundamentals;window_manager;pong_upgrade"
 	},
 	{
-		Name: "WAV Player",
-		Cost: 6000,
+		Name: "Audio Player",
+		Cost: 10000,
 		Description: "Want to listen to the greatest tunes? Well get this app asap!",
 		Dependencies: "desktop;wm_free_placement"
 	},
 	{
-		Name: "WAV Player AL",
+		Name: "Audio Player AL",
 		Cost: 150,
 		Description: "Just another app launcher, making it easier to listen to your favorite songs!",
 		Dependencies: "desktop;wm_free_placement;wav_player"