Permalink
Browse files

Merge branch 'master' of https://github.com/essentials/Essentials

  • Loading branch information...
2 parents 93e80d7 + 20908c5 commit 7ed07dedba64347ac0f3907810432152eb9ef474 @ementalo ementalo committed Jun 28, 2012
Showing with 50 additions and 5 deletions.
  1. +50 −5 Essentials/src/items.csv
View
@@ -1799,14 +1799,59 @@ tdoor,96,0
doort,96,0
trapd,96,0
dtrap,96,0
-silverstone,97,0
+monstereggsmoothstone,97,0
+monstereggsstone,97,0
+meggsmoothstone,97,0
+meggsstone,97,0
+mesmoothstone,97,0
+messtone,97,0
+silverfishsmoothstone,97,0
+silverfishsstone,97,0
silverfishstone,97,0
-silverfishs,97,0
-sfstone,97,0
-stonesilverfish,97,0
+sfishsmoothstone,97,0
+sfishsstone,97,0
+sfishstone,97,0
+fishsmoothstone,97,0
+fishsstone,97,0
fishstone,97,0
+sfsmoothstone,97,0
+sfsstone,97,0
+sfstone,97,0
+trapsmoothstone,97,0
+trapsstone,97,0
trapstone,97,0
-silverfish,97,0
+monstereggcobblestone,97,1
+monstereggcstone,97,1
+meggcobblestone,97,1
+meggcstone,97,1
+mecobblestone,97,1
+mecstone,97,1
+silverfishcobblestone,97,1
+silverfishcstone,97,1
+sfishcobblestone,97,1
+sfishcstone,97,1
+fishcobblestone,97,1
+fishcstone,97,1
+sfcobblestone,97,1
+sfcstone,97,1
+trapcobblestone,97,1
+trapcstone,97,1
+monstereggstonebrick,97,2
+monstereggsbrick,97,2
+meggstonebrick,97,2
+meggsbrick,97,2
+mestonebrick,97,2
+mesbrick,97,2
+silverfishstonebrick,97,2
+silverfishsbrick,97,2
+sfishstonebrick,97,2
+sfishsbrick,97,2
+fishstonebrick,97,2
+fishsbrick,97,2
+sfstonebrick,97,2
+sfsbrick,97,2
+trapstonebrick,97,2
+trapsbrick,97,2
stonebrick,98,0
stonebricks,98,0
stonebrickblock,98,0

0 comments on commit 7ed07de

Please sign in to comment.