Merge branch 'master' of https://github.com/shiftos-game/ShiftOS

I should hire Ash Ketchum to do this for me. He'd do a better job.

11 files changed, 17 insertions, 0 deletions

diff --git a/ShiftOS.WinForms/Resources/Ambient1.mp3 b/ShiftOS.WinForms/Resources/Ambient1.mp3
new file mode 100644
index 0000000..d623b29
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient1.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient2.mp3 b/ShiftOS.WinForms/Resources/Ambient2.mp3
new file mode 100644
index 0000000..b16e72f
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient2.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient3.mp3 b/ShiftOS.WinForms/Resources/Ambient3.mp3
new file mode 100644
index 0000000..cf06069
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient3.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient4.mp3 b/ShiftOS.WinForms/Resources/Ambient4.mp3
new file mode 100644
index 0000000..7813b4f
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient4.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient5.mp3 b/ShiftOS.WinForms/Resources/Ambient5.mp3
new file mode 100644
index 0000000..521330e
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient5.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient6.mp3 b/ShiftOS.WinForms/Resources/Ambient6.mp3
new file mode 100644
index 0000000..86cb4a4
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient6.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient7.mp3 b/ShiftOS.WinForms/Resources/Ambient7.mp3
new file mode 100644
index 0000000..9c5047a
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient7.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient8.mp3 b/ShiftOS.WinForms/Resources/Ambient8.mp3
new file mode 100644
index 0000000..ac908b6
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient8.mp3
diff --git a/ShiftOS.WinForms/Resources/Ambient9.mp3 b/ShiftOS.WinForms/Resources/Ambient9.mp3
new file mode 100644
index 0000000..46cb670
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient9.mp3
diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt
index c3d27ae..4bd2e8d 100644
--- a/ShiftOS.WinForms/Resources/Shiftorium.txt
+++ b/ShiftOS.WinForms/Resources/Shiftorium.txt
@@ -8,6 +8,23 @@
 		Category: "Enhancements",
 	},
 	{
+<<<<<<< HEAD
+=======
+		Name: "Shift Progress Bar",
+		Cost: 150,
+		Description: "Want to customize the look of all ShiftOS Progress Bars? Buy this upgrade today and you'll get the ability to set the foreground and background color of the progress bar, and many more things!.",
+		Dependencies: "shifter;shift_buttons",
+		Category: "Customization"
+	},
+	{
+		Name: "Shift Buttons",
+		Cost: 150,
+		Description: "Want to customize the look of all ShiftOS buttons? This Shifter upgrade gives you a new \"Buttons\" category in the System category to do just that.",
+		Dependencies: "shifter",
+		Category: "Customization"
+	},
+	{
+>>>>>>> 9999324bd7751f536741c108322766421dae1a52
 		Name: "GUI Based Login Screen",
 		Cost: 500,
 		Description: "Tired of using the text-based login screen in ShiftOS? Well, we have a functioning window manager, and a functioning desktop, why not use these tools to create a functioning and awesome-looking login screen?",
diff --git a/ShiftOS.WinForms/Resources/notestate_connection_full.bmp b/ShiftOS.WinForms/Resources/notestate_connection_full.bmp
new file mode 100644
index 0000000..a4e15b3
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/notestate_connection_full.bmp