summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-08-18 16:10:36 +0100
committerKHobbits <rob@khobbits.co.uk>2012-08-18 16:10:36 +0100
commit46b136e4e25231dce550184d9128f41742314ef0 (patch)
tree2f3fcb56f2a6bc6168fcf13d2007872512499c93
parent7a890c9e5cd5f9f7c43052a7f5003be95eb5a15e (diff)
parentfca82e7a26d0db53f879b59164ce2db89ff32251 (diff)
downloadEssentials-46b136e4e25231dce550184d9128f41742314ef0.tar
Essentials-46b136e4e25231dce550184d9128f41742314ef0.tar.gz
Essentials-46b136e4e25231dce550184d9128f41742314ef0.tar.lz
Essentials-46b136e4e25231dce550184d9128f41742314ef0.tar.xz
Essentials-46b136e4e25231dce550184d9128f41742314ef0.zip
Merge branch '2.9' of github.com:essentials/Essentials into 2.9
-rw-r--r--Essentials/src/items.csv24
1 files changed, 12 insertions, 12 deletions
diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index 30171d880..d0f0e2053 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -4967,10 +4967,10 @@ redmusicrecord,2259,0
redmusicdisk,2259,0
redmusicdisc,2259,0
redmusiccd,2259,0
-chripmusicrecord,2259,0
-chripmusicdisk,2259,0
-chripmusicdisc,2259,0
-chripmusiccd,2259,0
+chirpmusicrecord,2259,0
+chirpmusicdisk,2259,0
+chirpmusicdisc,2259,0
+chirpmusiccd,2259,0
remusicrecord,2259,0
remusicdisk,2259,0
remusicdisc,2259,0
@@ -4979,10 +4979,10 @@ redmrecord,2259,0
redmdisk,2259,0
redmdisc,2259,0
redmcd,2259,0
-chripmrecord,2259,0
-chripmdisk,2259,0
-chripmdisc,2259,0
-chripmcd,2259,0
+chirpmrecord,2259,0
+chirpmdisk,2259,0
+chirpmdisc,2259,0
+chirpmcd,2259,0
remrecord,2259,0
remdisk,2259,0
remdisc,2259,0
@@ -4991,10 +4991,10 @@ redrecord,2259,0
reddisk,2259,0
reddisc,2259,0
redcd,2259,0
-chriprecord,2259,0
-chripdisk,2259,0
-chripdisc,2259,0
-chripcd,2259,0
+chirprecord,2259,0
+chirpdisk,2259,0
+chirpdisc,2259,0
+chirpcd,2259,0
rerecord,2259,0
redisk,2259,0
redisc,2259,0