summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ward <chris@chrisgward.com>2012-12-21 04:33:14 -0800
committerChris Ward <chris@chrisgward.com>2012-12-21 04:33:14 -0800
commitad3e8a3aba3b0114101e8637aff4874570c35240 (patch)
tree6b6f3057e0fc2cf94e762b80f0de8cf89ea58416
parent617959a11b23e0fe38d82be34247d71e9fcb525a (diff)
parent30bc5978513bafea1ab21b08c43073716fededea (diff)
downloadEssentials-ad3e8a3aba3b0114101e8637aff4874570c35240.tar
Essentials-ad3e8a3aba3b0114101e8637aff4874570c35240.tar.gz
Essentials-ad3e8a3aba3b0114101e8637aff4874570c35240.tar.lz
Essentials-ad3e8a3aba3b0114101e8637aff4874570c35240.tar.xz
Essentials-ad3e8a3aba3b0114101e8637aff4874570c35240.zip
Merge pull request #215 from necrodoom/patch-5
update items.csv to minecraft 1.4.6
-rw-r--r--Essentials/src/items.csv43
1 files changed, 37 insertions, 6 deletions
diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index 8b0f8b967..3991d2ee5 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -1878,17 +1878,23 @@ dwart,115,0
dplant,115,0
dcrop,115,0
enchantmenttable,116,0
-magictable,116,0
+enchantingtable,116,0
+enchanttable,116,0
etable,116,0
-booktable,116,0
-magicdesk,116,0
+magicaltable,116,0
+magictable,116,0
+mtable,116,0
enchantmentdesk,116,0
+enchantingdesk,116,0
+enchantdesk,116,0
edesk,116,0
+magicaldesk,116,0
+magicdesk,116,0
+mdesk,116,0
+booktable,116,0
bookdesk,116,0
btable,116,0
bdesk,116,0
-mtable,116,0
-mdesk,116,0
brewingstandblock,117,0
brewerblock,117,0
potionstandblock,117,0
@@ -5625,6 +5631,31 @@ pumpkincake,400,0
ppie,400,0
pcake,400,0
pie,400,0
+fireworkrocket,401,0
+fireworkmissle,401,0
+firework,401,0
+fworkrocket,401,0
+fworkmissle,401,0
+fwork,401,0
+fwrocket,401,0
+fwmissle,401,0
+fireworkstar,402,0
+fworkstar,402,0
+fwstar,402,0
+fireworkball,402,0
+fworkball,402,0
+fwball,402,0
+fireworkpowder,402,0
+fworkpowder,402,0
+fwpowder,402,0
+enchantmentbook,403,0
+enchantedbook,403,0
+enchantingbook,403,0
+enchantbook,403,0
+magicalbook,403,0
+magicbook,403,0
+ebook,403,0
+mbook,403,0
goldmusicrecord,2256,0
goldmusicdisk,2256,0
goldmusicdisc,2256,0
@@ -6164,4 +6195,4 @@ cd11,2266,0
11record,2266,0
11disk,2266,0
11disc,2266,0
-11cd,2266,0 \ No newline at end of file
+11cd,2266,0