summaryrefslogtreecommitdiffstats
path: root/MCServer
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-12-01 14:43:03 +0100
committerHowaner <franzi.moos@googlemail.com>2014-12-01 14:43:03 +0100
commit677dde51bd3a8028dc28b004293b7c1b424ead0a (patch)
tree23e6e8357a96e0d3920ef00a9c15061f965d822e /MCServer
parentMerge branch 'master' into MobSpawner (diff)
parentMerge pull request #1624 from mc-server/LuaDeprecating (diff)
downloadcuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar
cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar.gz
cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar.bz2
cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar.lz
cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar.xz
cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.tar.zst
cuberite-677dde51bd3a8028dc28b004293b7c1b424ead0a.zip
Diffstat (limited to 'MCServer')
-rw-r--r--MCServer/Plugins/.gitignore2
-rw-r--r--MCServer/Plugins/APIDump/APIDesc.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/MCServer/Plugins/.gitignore b/MCServer/Plugins/.gitignore
index 8553945b5..92424459f 100644
--- a/MCServer/Plugins/.gitignore
+++ b/MCServer/Plugins/.gitignore
@@ -1,3 +1,3 @@
*.txt
*.md
-*/
+
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 5a64345ca..ecb8f6226 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2922,7 +2922,7 @@ end
StringToDamageType = {Params = "string", Return = "{{Globals#DamageType|DamageType}}", Notes = "Converts a string representation to a {{Globals#DamageType|DamageType}} enumerated value."},
StringToDimension = {Params = "string", Return = "{{Globals#WorldDimension|Dimension}}", Notes = "Converts a string representation to a {{Globals#WorldDimension|Dimension}} enumerated value"},
StringToItem = {Params = "string, {{cItem|cItem}}", Return = "bool", Notes = "Parses the given string and sets the item; returns true if successful"},
- StringToMobType = {Params = "string", Return = "{{Globals#MobType|MobType}}", Notes = "Converts a string representation to a {{Globals#MobType|MobType}} enumerated value"},
+ StringToMobType = {Params = "string", Return = "{{Globals#MobType|MobType}}", Notes = "<b>DEPRECATED!</b> Please use cMonster:StringToMobType(). Converts a string representation to a {{Globals#MobType|MobType}} enumerated value"},
StripColorCodes = {Params = "string", Return = "string", Notes = "Removes all control codes used by MC for colors and styles"},
TrimString = {Params = "string", Return = "string", Notes = "Trims whitespace at both ends of the string"},
md5 = {Params = "string", Return = "string", Notes = "converts a string to an md5 hash"},