3 files changed, 97 insertions, 5 deletions
diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
-Subproject de53a607f30c583e08c06b6e5eb936cd278ab8c
+Subproject 9ec55bcdcaf8b3eea8e98e3e502890295dda14d
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 5132bf436..fe9a465d0 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -1,4 +1,3 @@
-
 # This file describes the crafting recipes that MCServer knows.
 # The syntax is as follows:
 #   <Line> = <Recipe>#<Comment>
@@ -380,8 +379,45 @@ GreenWool     = Wool, * | GreenDye, *
 RedWool       = Wool, * | RedDye, *
 BlackWool     = Wool, * | BlackDye, *
 
+#******************************************************#
+# Stained Glass:
+#
+WhiteStainedGlass, 8     = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BoneMeal, 2:2
+OrangeStainedGlass, 8    = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | OrangeDye, 2:2
+MagentaStainedGlass, 8   = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | MagentaDye, 2:2
+LightBlueStainedGlass, 8 = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LightBlueDye, 2:2
+YellowStainedGlass, 8    = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | YellowDye, 2:2
+LimeStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LimeDye, 2:2
+PinkStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | PinkDye, 2:2
+GrayStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | GrayDye, 2:2
+LightGrayStainedGlass, 8 = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | LightGrayDye, 2:2
+CyanStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | CyanDye, 2:2
+VioletStainedGlass, 8    = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | VioletDye, 2:2
+BlueStainedGlass, 8      = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BlueDye, 2:2
+BrownStainedGlass, 8     = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BrownDye, 2:2
+GreenStainedGlass, 8     = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | GreenDye, 2:2
+RedStainedGlass, 8       = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | RedDye, 2:2
+BlackStainedGlass, 8     = Glass, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | BlackDye, 2:2
 
-
+#******************************************************#
+# Stained Glass Pane:
+#
+WhiteStainedGlassPane, 16     = WhiteStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+OrangeStainedGlassPane, 16    = OrangeStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+MagentaStainedGlassPane, 16   = MagentaStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+LightBlueStainedGlassPane, 16 = LightBlueStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+YellowStainedGlassPane, 16    = YellowStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+LimeStainedGlassPane, 16      = LimeStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+PinkStainedGlassPane, 16      = PinkStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+GrayStainedGlassPane, 16      = GrayStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+LightGrayStainedGlassPane, 16 = LightGrayStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+CyanStainedGlassPane, 16      = CyanStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+VioletStainedGlassPane, 16    = VioletStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+BlueStainedGlassPane, 16      = BlueStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+BrownStainedGlassPane, 16     = BrownStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+GreenStainedGlassPane, 16     = GreenStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+RedStainedGlassPane, 16       = RedStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
+BlackStainedGlassPane , 16    = BlackStainedGlass, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
 
 
 #******************************************************#
diff --git a/MCServer/items.ini b/MCServer/items.ini
index c4e2466d8..7eb8f56b4 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -117,8 +117,8 @@ darkgreenwool=35:13
 dkgreenwool=35:13
 redwool=35:14
 blackwool=35:15
-flower=37
-rose=38
+dandelion=37
+flower=38
 brownmushroom=39
 redmushroom=40
 gold=41
@@ -208,7 +208,22 @@ portal=90
 jackolantern=91
 jacko=91
 cakeblock=92
-lockedchest=95
+whitestainedglass=95
+orangestainedglass=95:1
+magentastainedglass=95:2
+lightbluestainedglass=95:3
+yellowstainedglass=95:4
+limestainedglass=95:5
+pinkstainedglass=95:6
+graystainedglass=95:7
+lightgraystainedglass=95:8
+cyanstainedglass=95:9
+violetstainedglass=95:10
+bluestainedglass=95:11
+brownstainedglass=95:12
+greenstainedglass=95:13
+redstainedglass=95:14
+blackstainedglass=95:15
 trapdoor=96
 silverfishblock=97
 stonebricks=98
@@ -281,6 +296,42 @@ pillarquartzblock=155:2
 quartzstairs=156
 activatorrail=157
 dropper=158
+whitestainedclay=159
+orangestainedclay=159:1
+magentastainedclay=159:2
+lightbluestainedclay=159:3
+yellowstainedclay=159:4
+limestainedclay=159:5
+pinkstainedclay=159:6
+graystainedclay=159:7
+lightgraystainedclay=159:8
+cyanstainedclay=159:9
+violetstainedclay=159:10
+bluestainedclay=159:11
+brownstainedclay=159:12
+greenstainedclay=159:13
+redstainedclay=159:14
+blackstainedclay=159:15
+whitestainedglasspane=160
+orangestainedglasspane=160:1
+magentastainedglasspane=160:2
+lightbluestainedglasspane=160:3
+yellowstainedglasspane=160:4
+limestainedglasspane=160:5
+pinkstainedglasspane=160:6
+graystainedglasspane=160:7
+lightgraystainedglasspane=160:8
+cyanstainedglasspane=160:9
+violetstainedglasspane=160:10
+bluestainedglasspane=160:11
+brownstainedglasspane=160:12
+greenstainedglasspane=160:13
+redstainedglasspane=160:14
+blackstainedglasspane=160:15
+acaciawood=162
+darkoakwood=162:1
+acaciawoodenstairs=163
+darkoakwoodenstairs=164
 haybale=170
 carpet=171
 ironshovel=256
@@ -530,7 +581,12 @@ netherbrickitem=405
 netherquartz=406
 tntminecart=407
 hopperminecart=408
+ironhorsearmor=417
+goldhorsearmor=418
+diamondhorsearmor=419
 lead=420
+nametag=421
+commandblockminecart=422
 
 goldrecord=2256
 greenrecord=2257