Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

# Conflicts:
#	ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs

ShiftOS.WinForms/Applications/ShiftSweeper.cs

@@ -35,7 +35,7 @@ using ShiftOS.Engine;
 
 namespace ShiftOS.WinForms.Applications
 {
-    [Launcher("ShiftSweeper", true, "shiftsweeper", "Games")]
+    [Launcher("ShiftSweeper", true, "al_shiftsweeper", "Games")]
     [RequiresUpgrade("shiftsweeper")]
     [WinOpen("shiftsweeper")]
     [DefaultIcon("iconShiftSweeper")]

ShiftOS.WinForms/Resources/Shiftorium.txt

@@ -218,12 +218,6 @@
 		Description: "Use TextPad to write Lua scripts!",
 		Dependencies: "textpad;file_skimmer",
 	},
-	{
-		Name: "TextPad Python Support",
-		Cost: 450,
-		Description: "Use TextPad to write Python scripts!",
-		Dependencies: "textpad;file_skimmer",	
-	},
 	{
 		Name: "App Launcher",
 		Cost: 7500,
@@ -266,12 +260,6 @@
 		Description: "Launch the Name Changer from the app launcher.",
 		Dependencies: "name_changer",
 	},
-	{
-		Name: "{UPGRADE_DEVELOPMENT}",
-		Cost: 20000,
-		Description: "Dont buy this upgrade yet, it does nothing",
-		Dependencies: "",
-	},
 	{
 		Name: "AL Shifter",
 		Cost: 150,
@@ -461,7 +449,7 @@
 		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"
+		Dependencies: "desktop;wm_free_placement;audio_player"
 	},
 
 	//SHIFTER SUBCATEGORIES
@@ -785,9 +773,15 @@
 	{
 		Name: "ShiftSweeper",
 		Cost: 800,
-		Dependencies: "app_launcher;shiftletters",
+		Dependencies: "shiftletters",
 		Description: "Getting bored with Pong and ShiftLetters? Try this BRAND NEW game called ShiftSweeper!"
 	},
+	{
+		Name: "AL ShiftSweeper",
+		Cost: 100,
+		Dependencies: "app_launcher;shiftsweeper",
+		Description: "Play ShiftSweeper quickly with this dandy applauncher!"
+	},
 	{
 		Name: "ShiftSweeper Medium",
 		Cost: 900,

ShiftOS_TheReturn/Resources/Shiftorium.txt

@@ -59,30 +59,12 @@
 		Description: "Use TextPad to write Lua scripts!",
 		Dependencies: "textpad;file_skimmer",
 	},
-	{
-		Name: "TextPad Python Support",
-		Cost: 450,
-		Description: "Use TextPad to write Python scripts!",
-		Dependencies: "textpad;file_skimmer",	
-	},
 	{
 		Name: "App Launcher",
 		Cost: 10000,
 		Description: "It may be expensive, but having an easy-access menu to all your apps is very valuable.",
 		Dependencies:"desktop;wm_unlimited_windows"
 	},
-	{
-		Name: "MUD Cracker",
-		Cost: 500,
-		Description: "An application for cracking the current multi-user domain's admin password.",
-		Dependencies: "mud_fundamentals"
-	},
-	{
-		Name: "AL MUD Cracker",
-		Cost: 100,
-		Description: "Add a launcher item for the MUD cracker.",
-		Dependencies: "mud_cracker;app_launcher"
-	},
 	{
 		Name: "Textpad",
 		Cost: 2500,
@@ -274,18 +256,6 @@
 		Description: "So you lost in pong, it must be sad to lose all the codepoints you've gained. With this upgrade you can save 1 percent of the loss, so at least you get something for losing!",
 		Dependencies: "mud_fundamentals;window_manager;pong_upgrade"
 	},
-	{
-		Name: "WAV 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",
-		Cost: 300,
-		Description: "Just another app launcher, making it easier to listen to your favorite songs!",
-		Dependencies: "desktop;wm_free_placement;wav_player"
-	},
 
 	//SHIFTER SUBCATEGORIES