From 1acd03f96f9b1133e1f76d76004f5fcddd0c4788 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 28 Jul 2014 17:09:39 +0200
Subject: Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index e65da1d16..f29c47338 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -529,6 +529,7 @@ end
 				GetPlayer = { Params = "", Return = "{{cPlayer|cPlayer}}", Notes = "Returns the player object connected to this client. Note that this may be nil, for example if the player object is not yet spawned." },
 				GetUniqueID = { Params = "", Return = "number", Notes = "Returns the UniqueID of the client used to identify the client in the server" },
 				GetUUID = { Params = "", Return = "string", Notes = "Returns the authentication-based UUID of the client. This UUID should be used to identify the player when persisting any player-related data." },
+				GetUUIDsFromPlayerNames = { Params = "PlayerNames", Return = "table", Notes = "(STATIC) Returns a table that contains the map, 'PlayerName' -> 'UUID', for all valid playernames in the input array-table. PlayerNames not recognized will not be set in the returned map. Queries the Mojang servers for the results. <b>WARNING</b>: Do NOT use this function while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely. <b>NOTE</b>: Mojang API has a limit of 100 names per query and 600 queries per 10 minutes (may change)" },
 				GetUsername = { Params = "", Return = "string", Notes = "Returns the username that the client has provided" },
 				GetViewDistance = { Params = "", Return = "number", Notes = "Returns the viewdistance (number of chunks loaded for the player in each direction)" },
 				HasPluginChannel = { Params = "ChannelName", Return = "bool", Notes = "Returns true if the client has registered to receive messages on the specified plugin channel." },
-- 
cgit v1.2.3


From b6677efecdd026a7eb8d652a067e4770182cd7c1 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 28 Jul 2014 17:14:23 +0200
Subject: Debuggers: Added an example for
 cClientHandle:GetUUIDsFromPlayerNames().

---
 MCServer/Plugins/Debuggers/Debuggers.lua | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index b402c1867..80416acc7 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -80,6 +80,7 @@ function Initialize(Plugin)
 	
 	TestBlockAreasString()
 	TestStringBase64()
+	TestUUIDFromName()
 
 	--[[
 	-- Test cCompositeChat usage in console-logging:
@@ -275,6 +276,36 @@ end
 
 
 
+function TestUUIDFromName()
+	LOG("Testing UUID-from-Name resolution...")
+	
+	-- Test by querying a few existing names, along with a non-existent one:
+	local PlayerNames =
+	{
+		"xoft",
+		"aloe_vera",
+		"nonexistent_player",
+	}
+	-- WARNING: Blocking operation! DO NOT USE IN TICK THREAD!
+	local UUIDs = cClientHandle:GetUUIDsFromPlayerNames(PlayerNames)
+	
+	-- Log the results:
+	for _, name in ipairs(PlayerNames) do
+		local UUID = UUIDs[name]
+		if (UUID == nil) then
+			LOG("  UUID(" .. name .. ") not found.")
+		else
+			LOG("  UUID(" .. name .. ") = \"" .. UUID .. "\"")
+		end
+	end
+	
+	LOG("UUID-from-Name resolution test finished.")
+end
+
+
+
+
+
 function TestSQLiteBindings()
 	LOG("Testing SQLite bindings...");
 	
-- 
cgit v1.2.3


From 6476bd0e2ee7e128e3eaa56159f169f0a53736ff Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 30 Jul 2014 13:44:03 +0200
Subject: Exported cMojangAPI to Lua.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index f29c47338..e5114784e 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -529,7 +529,6 @@ end
 				GetPlayer = { Params = "", Return = "{{cPlayer|cPlayer}}", Notes = "Returns the player object connected to this client. Note that this may be nil, for example if the player object is not yet spawned." },
 				GetUniqueID = { Params = "", Return = "number", Notes = "Returns the UniqueID of the client used to identify the client in the server" },
 				GetUUID = { Params = "", Return = "string", Notes = "Returns the authentication-based UUID of the client. This UUID should be used to identify the player when persisting any player-related data." },
-				GetUUIDsFromPlayerNames = { Params = "PlayerNames", Return = "table", Notes = "(STATIC) Returns a table that contains the map, 'PlayerName' -> 'UUID', for all valid playernames in the input array-table. PlayerNames not recognized will not be set in the returned map. Queries the Mojang servers for the results. <b>WARNING</b>: Do NOT use this function while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely. <b>NOTE</b>: Mojang API has a limit of 100 names per query and 600 queries per 10 minutes (may change)" },
 				GetUsername = { Params = "", Return = "string", Notes = "Returns the username that the client has provided" },
 				GetViewDistance = { Params = "", Return = "number", Notes = "Returns the viewdistance (number of chunks loaded for the player in each direction)" },
 				HasPluginChannel = { Params = "ChannelName", Return = "bool", Notes = "Returns true if the client has registered to receive messages on the specified plugin channel." },
@@ -1607,6 +1606,31 @@ a_Player:OpenWindow(Window);
 
 		}, -- cMapManager
 
+		cMojangAPI =
+		{
+			Desc = [[
+				Provides interface to various API functions that Mojang provides through their servers. Note that
+				some of these calls will wait for a response from the network, and so shouldn't be used while the
+				server is fully running (or at least when there are players connected) to avoid percepted lag.</p>
+				<p>
+				Some functions are static and do not require an instance to be called. For others, you need to get
+				the singleton instance of this class using {{cRoot}}'s GetMojangAPI() function.</p>
+				<p>
+				Mojang uses two formats for UUIDs, short and dashed. MCServer works with short UUIDs internally, but
+				will convert to dashed UUIDs where needed - in the protocol login for example. The MakeUUIDShort()
+				and MakeUUIDDashed() functions are provided for plugins to use for conversion between the two
+				formats.
+			]],
+			Functions =
+			{
+				AddPlayerNameToUUIDMapping = { Params = "PlayerName, UUID", Return = "", Notes = "Adds the specified PlayerName-to-UUID mapping into the cache, with current timestamp." },
+				GetUUIDsFromPlayerNames = { Params = "PlayerNames", Return = "table", Notes = "Returns a table that contains the map, 'PlayerName' -> 'UUID', for all valid playernames in the input array-table. PlayerNames not recognized will not be set in the returned map. Queries the Mojang servers for the results. <b>WARNING</b>: Do NOT use this function while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely." },
+				MakeUUIDDashed = { Params = "UUID", Return = "DashedUUID", Notes = "(STATIC) Converts the UUID to a dashed format (\"01234567-8901-2345-6789-012345678901\"). Accepts both dashed and short UUIDs. Logs a warning and returns an empty string if UUID format not recognized." },
+				MakeUUIDShort = { Params = "UUID", Return = "ShortUUID", Notes = "(STATIC) Converts the UUID to a short format (without dashes, \"01234567890123456789012345678901\"). Accepts both dashed and short UUIDs. Logs a warning and returns an empty string if UUID format not recognized." },
+			},
+
+		},
+
 		cMonster =
 		{
 			Desc = [[
@@ -2002,6 +2026,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				GetFurnaceFuelBurnTime = { Params = "{{cItem|Fuel}}", Return = "number", Notes = "(STATIC) Returns the number of ticks for how long the item would fuel a furnace. Returns zero if not a fuel." },
 				GetFurnaceRecipe = { Params = "{{cItem|InItem}}", Return = "{{cItem|OutItem}}, NumTicks, {{cItem|InItem}}", Notes = "(STATIC) Returns the furnace recipe for smelting the specified input. If a recipe is found, returns the smelted result, the number of ticks required for the smelting operation, and the input consumed (note that MCServer supports smelting M items into N items and different smelting rates). If no recipe is found, returns no value." },
 				GetGroupManager = { Params = "", Return = "{{cGroupManager|cGroupManager}}", Notes = "Returns the cGroupManager object." },
+				GetMojangAPI = { Params = "", Return = "{{cMojangAPI}}", Notes = "Returns the {{cMojangAPI}} object." },
 				GetPhysicalRAMUsage = { Params = "", Return = "number", Notes = "Returns the amount of physical RAM that the entire MCServer process is using, in KiB. Negative if the OS doesn't support this query." },
 				GetPluginManager = { Params = "", Return = "{{cPluginManager|cPluginManager}}", Notes = "Returns the cPluginManager object." },
 				GetPrimaryServerVersion = { Params = "", Return = "number", Notes = "Returns the servers primary server version." },
-- 
cgit v1.2.3


From afef7a79d7a214eec66e427da589172a40a18fef Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 30 Jul 2014 13:53:23 +0200
Subject: Debuggers: Updated for the new cMojangAPI changes.

---
 MCServer/Plugins/Debuggers/Debuggers.lua | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index 80416acc7..575d696cb 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -287,7 +287,7 @@ function TestUUIDFromName()
 		"nonexistent_player",
 	}
 	-- WARNING: Blocking operation! DO NOT USE IN TICK THREAD!
-	local UUIDs = cClientHandle:GetUUIDsFromPlayerNames(PlayerNames)
+	local UUIDs = cMojangAPI:GetUUIDsFromPlayerNames(PlayerNames)
 	
 	-- Log the results:
 	for _, name in ipairs(PlayerNames) do
@@ -299,6 +299,15 @@ function TestUUIDFromName()
 		end
 	end
 	
+	-- Test once more with the same players, valid-only. This should go directly from cache, so fast.
+	LOG("Testing again with the same valid players...")
+	local ValidPlayerNames =
+	{
+		"xoft",
+		"aloe_vera",
+	}
+	UUIDs = cMojangAPI:GetUUIDsFromPlayerNames(ValidPlayerNames);
+	
 	LOG("UUID-from-Name resolution test finished.")
 end
 
-- 
cgit v1.2.3


From 1793644feff66b076980c669ede94d7b03eceafe Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 30 Jul 2014 14:02:36 +0200
Subject: APIDump: Fixed UUID-related documentation.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index e5114784e..692ca80ac 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -523,12 +523,12 @@ end
 
 			Functions =
 			{
-				GenerateOfflineUUID = { Params = "Username", Return = "string", Notes = "(STATIC) Generates an UUID based on the player name provided. This is used for the offline (non-auth) mode, when there's no UUID source. Each username generates a unique and constant UUID, so that when the player reconnects with the same name, their UUID is the same. Returns a 36-char UUID (with dashes)." },
+				GenerateOfflineUUID = { Params = "Username", Return = "string", Notes = "(STATIC) Generates an UUID based on the player name provided. This is used for the offline (non-auth) mode, when there's no UUID source. Each username generates a unique and constant UUID, so that when the player reconnects with the same name, their UUID is the same. Returns a 32-char UUID (no dashes)." },
 				GetLocale = { Params = "", Return = "Locale", Notes = "Returns the locale string that the client sends as part of the protocol handshake. Can be used to provide localized strings." },
 				GetPing = { Params = "", Return = "number", Notes = "Returns the ping time, in ms" },
 				GetPlayer = { Params = "", Return = "{{cPlayer|cPlayer}}", Notes = "Returns the player object connected to this client. Note that this may be nil, for example if the player object is not yet spawned." },
 				GetUniqueID = { Params = "", Return = "number", Notes = "Returns the UniqueID of the client used to identify the client in the server" },
-				GetUUID = { Params = "", Return = "string", Notes = "Returns the authentication-based UUID of the client. This UUID should be used to identify the player when persisting any player-related data." },
+				GetUUID = { Params = "", Return = "string", Notes = "Returns the authentication-based UUID of the client. This UUID should be used to identify the player when persisting any player-related data. Returns a 32-char UUID (no dashes)" },
 				GetUsername = { Params = "", Return = "string", Notes = "Returns the username that the client has provided" },
 				GetViewDistance = { Params = "", Return = "number", Notes = "Returns the viewdistance (number of chunks loaded for the player in each direction)" },
 				HasPluginChannel = { Params = "ChannelName", Return = "bool", Notes = "Returns true if the client has registered to receive messages on the specified plugin channel." },
-- 
cgit v1.2.3


From a71c2da3f8ee329977902a36274d720908a77c48 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 30 Jul 2014 17:07:57 +0200
Subject: APIDump: Added notes about cache to cMojangAPI.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 692ca80ac..2a8ae90f9 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1619,7 +1619,13 @@ a_Player:OpenWindow(Window);
 				Mojang uses two formats for UUIDs, short and dashed. MCServer works with short UUIDs internally, but
 				will convert to dashed UUIDs where needed - in the protocol login for example. The MakeUUIDShort()
 				and MakeUUIDDashed() functions are provided for plugins to use for conversion between the two
-				formats.
+				formats.</p>
+				<p>
+				This class will cache values returned by the API service. The cache will hold the values for 7 days
+				by default, after that, they will no longer be available. This is in order to not let the server get
+				banned from using the API service, since they are rate-limited to 600 queries per 10 minutes. The
+				cache contents also gets updated whenever a player successfully joins, since that makes the server
+				contact the API service, too, and retrieve the relevant data.</p>
 			]],
 			Functions =
 			{
-- 
cgit v1.2.3


From 66d34b83d27a72ed4cc2598527c25dfb8c1a873c Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Wed, 30 Jul 2014 22:31:43 +0200
Subject: Added beacon documentation.

---
 MCServer/Plugins/APIDump/APIDesc.lua               |  1 +
 MCServer/Plugins/APIDump/Classes/BlockEntities.lua | 26 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index e65da1d16..2a592e1e1 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2244,6 +2244,7 @@ end
 				DigBlock = { Params = "X, Y, Z", Return = "", Notes = "Replaces the specified block with air, without dropping the usual pickups for the block. Wakes up the simulators for the block and its neighbors." },
 				DoExplosionAt = { Params = "Force, X, Y, Z, CanCauseFire, Source, SourceData", Return = "", Notes = "Creates an explosion of the specified relative force in the specified position. If CanCauseFire is set, the explosion will set blocks on fire, too. The Source parameter specifies the source of the explosion, one of the esXXX constants. The SourceData parameter is specific to each source type, usually it provides more info about the source." },
 				DoWithBlockEntityAt = { Params = "X, Y, Z, CallbackFunction, [CallbackData]", Return = "bool", Notes = "If there is a block entity at the specified coords, calls the CallbackFunction with the {{cBlockEntity}} parameter representing the block entity. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cBlockEntity|BlockEntity}}, [CallbackData])</pre> The function returns false if there is no block entity, or if there is, it returns the bool value that the callback has returned. Use {{tolua}}.cast() to cast the Callback's BlockEntity parameter to the correct {{cBlockEntity}} descendant." },
+				DoWithBeaconAt = { Params = "X, Y, Z, CallbackFunction, [CallbackData]", Return = "bool", Notes = "If there is a beacon at the specified coords, calls the CallbackFunction with the {{cBeaconEntity}} parameter representing the beacon. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cBeaconEntity|BeaconEntity}}, [CallbackData])</pre> The function returns false if there is no beacon, or if there is, it returns the bool value that the callback has returned." },
 				DoWithChestAt = { Params = "X, Y, Z, CallbackFunction, [CallbackData]", Return = "bool", Notes = "If there is a chest at the specified coords, calls the CallbackFunction with the {{cChestEntity}} parameter representing the chest. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cChestEntity|ChestEntity}}, [CallbackData])</pre> The function returns false if there is no chest, or if there is, it returns the bool value that the callback has returned." },
 				DoWithCommandBlockAt = { Params = "X, Y, Z, CallbackFunction, [CallbackData]", Return = "bool", Notes = "If there is a command block at the specified coords, calls the CallbackFunction with the {{cCommandBlockEntity}} parameter representing the command block. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cCommandBlockEntity|CommandBlockEntity}}, [CallbackData])</pre> The function returns false if there is no command block, or if there is, it returns the bool value that the callback has returned." },
 				DoWithDispenserAt = { Params = "X, Y, Z, CallbackFunction, [CallbackData]", Return = "bool", Notes = "If there is a dispenser at the specified coords, calls the CallbackFunction with the {{cDispenserEntity}} parameter representing the dispenser. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cDispenserEntity|DispenserEntity}}, [CallbackData])</pre> The function returns false if there is no dispenser, or if there is, it returns the bool value that the callback has returned." },
diff --git a/MCServer/Plugins/APIDump/Classes/BlockEntities.lua b/MCServer/Plugins/APIDump/Classes/BlockEntities.lua
index de42f66df..294d47295 100644
--- a/MCServer/Plugins/APIDump/Classes/BlockEntities.lua
+++ b/MCServer/Plugins/APIDump/Classes/BlockEntities.lua
@@ -50,6 +50,32 @@ return
 		},
 	},
 
+	cBeaconEntity =
+	{
+		Desc = [[
+			A beacon entity is a {{cBlockEntityWithItems|cBlockEntityWithItems}} descendant that represents a beacon
+			in the world.
+		]],
+
+		Inherits = "cBlockEntityWithItems",
+
+		Functions =
+		{
+			IsActive = { Params = "", Return = "bool", Notes = "Is the beacon active?" },
+			GetBeaconLevel = { Params = "", Return = "number", Notes = "Returns the beacon level. (0 - 4)" },
+			GetPrimaryPotion = { Params = "", Return = "EffectType", Notes = "Returns the primary potion." },
+			GetSecondaryPotion = { Params = "", Return = "EffectType", Notes = "Returns the secondary potion." },
+			SelectPrimaryPotion = { Params = "EffectType", Return = "bool", Notes = "Select the primary potion. Returns false when the potion is invalid." },
+			SelectSecondaryPotion = { Params = "EffectType", Return = "bool", Notes = "Select the secondary potion. Returns false when the potion is invalid." },
+			CalculatePyramidLevel = { Params = "", Return = "number", Notes = "Calculate the amount of layers the pyramid below the beacon has." },
+			IsBeaconBlocked = { Params = "", Return = "bool", Notes = "Is the beacon blocked by non-transparent blocks that are higher than the beacon?" },
+			UpdateBeacon = { Params = "", Return = "", Notes = "Update the beacon." },
+			GiveEffects = { Params = "", Return = "", Notes = "Give the near-players the effects." },
+			IsMineralBlock = { Params = "BLOCKTYPE", Return = "bool", Notes = "Returns true if the block is a diamond block, a golden block, an iron block or an emerald block." },
+			IsValidPotion = { Params = "EffectType", Return = "bool", Notes = "Returns true if the potion can be used." },
+		},
+	},
+
 	cChestEntity =
 	{
 		Desc = [[
-- 
cgit v1.2.3


From 8b519bf6e20a987c9544ef11f0df6467831cc069 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Thu, 31 Jul 2014 10:02:50 +0200
Subject: MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames().

---
 MCServer/Plugins/APIDump/APIDesc.lua     |  2 +-
 MCServer/Plugins/Debuggers/Debuggers.lua | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 2a8ae90f9..9d0e90999 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1630,7 +1630,7 @@ a_Player:OpenWindow(Window);
 			Functions =
 			{
 				AddPlayerNameToUUIDMapping = { Params = "PlayerName, UUID", Return = "", Notes = "Adds the specified PlayerName-to-UUID mapping into the cache, with current timestamp." },
-				GetUUIDsFromPlayerNames = { Params = "PlayerNames", Return = "table", Notes = "Returns a table that contains the map, 'PlayerName' -> 'UUID', for all valid playernames in the input array-table. PlayerNames not recognized will not be set in the returned map. Queries the Mojang servers for the results. <b>WARNING</b>: Do NOT use this function while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely." },
+				GetUUIDsFromPlayerNames = { Params = "PlayerNames, [UseOnlyCached]", Return = "table", Notes = "Returns a table that contains the map, 'PlayerName' -> 'UUID', for all valid playernames in the input array-table. PlayerNames not recognized will not be set in the returned map. If UseOnlyCached is false (the default), queries the Mojang servers for the results that are not in the cache. <br /><b>WARNING</b>: Do NOT use this function with UseOnlyCached set to false while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely." },
 				MakeUUIDDashed = { Params = "UUID", Return = "DashedUUID", Notes = "(STATIC) Converts the UUID to a dashed format (\"01234567-8901-2345-6789-012345678901\"). Accepts both dashed and short UUIDs. Logs a warning and returns an empty string if UUID format not recognized." },
 				MakeUUIDShort = { Params = "UUID", Return = "ShortUUID", Notes = "(STATIC) Converts the UUID to a short format (without dashes, \"01234567890123456789012345678901\"). Accepts both dashed and short UUIDs. Logs a warning and returns an empty string if UUID format not recognized." },
 			},
diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index 575d696cb..075cfa40c 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -307,8 +307,38 @@ function TestUUIDFromName()
 		"aloe_vera",
 	}
 	UUIDs = cMojangAPI:GetUUIDsFromPlayerNames(ValidPlayerNames);
+
+	-- Log the results:
+	for _, name in ipairs(ValidPlayerNames) do
+		local UUID = UUIDs[name]
+		if (UUID == nil) then
+			LOG("  UUID(" .. name .. ") not found.")
+		else
+			LOG("  UUID(" .. name .. ") = \"" .. UUID .. "\"")
+		end
+	end
+
+	-- Test yet again, cache-only:
+	LOG("Testing once more, cache only...")
+	local PlayerNames3 =
+	{
+		"xoft",
+		"aloe_vera",
+		"notch",  -- Valid player name, but not cached (most likely :)
+	}
+	UUIDs = cMojangAPI:GetUUIDsFromPlayerNames(PlayerNames3, true)
 	
-	LOG("UUID-from-Name resolution test finished.")
+	-- Log the results:
+	for _, name in ipairs(PlayerNames3) do
+		local UUID = UUIDs[name]
+		if (UUID == nil) then
+			LOG("  UUID(" .. name .. ") not found.")
+		else
+			LOG("  UUID(" .. name .. ") = \"" .. UUID .. "\"")
+		end
+	end
+
+	LOG("UUID-from-Name resolution tests finished.")
 end
 
 
-- 
cgit v1.2.3


From c49d4fd215170da29b5c285cc6a344ec102764c6 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Thu, 31 Jul 2014 12:15:18 +0200
Subject: Updated documentation.

---
 MCServer/Plugins/APIDump/Classes/BlockEntities.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Classes/BlockEntities.lua b/MCServer/Plugins/APIDump/Classes/BlockEntities.lua
index 294d47295..524087a8e 100644
--- a/MCServer/Plugins/APIDump/Classes/BlockEntities.lua
+++ b/MCServer/Plugins/APIDump/Classes/BlockEntities.lua
@@ -63,16 +63,16 @@ return
 		{
 			IsActive = { Params = "", Return = "bool", Notes = "Is the beacon active?" },
 			GetBeaconLevel = { Params = "", Return = "number", Notes = "Returns the beacon level. (0 - 4)" },
-			GetPrimaryPotion = { Params = "", Return = "EffectType", Notes = "Returns the primary potion." },
-			GetSecondaryPotion = { Params = "", Return = "EffectType", Notes = "Returns the secondary potion." },
-			SelectPrimaryPotion = { Params = "EffectType", Return = "bool", Notes = "Select the primary potion. Returns false when the potion is invalid." },
-			SelectSecondaryPotion = { Params = "EffectType", Return = "bool", Notes = "Select the secondary potion. Returns false when the potion is invalid." },
+			GetPrimaryEffect = { Params = "", Return = "EffectType", Notes = "Returns the primary potion." },
+			GetSecondaryEffect = { Params = "", Return = "EffectType", Notes = "Returns the secondary potion." },
+			SelectPrimaryEffect = { Params = "EffectType", Return = "bool", Notes = "Select the primary effect. Returns false when the effect is invalid." },
+			SelectSecondaryEffect = { Params = "EffectType", Return = "bool", Notes = "Select the secondary effect. Returns false when the effect is invalid." },
 			CalculatePyramidLevel = { Params = "", Return = "number", Notes = "Calculate the amount of layers the pyramid below the beacon has." },
 			IsBeaconBlocked = { Params = "", Return = "bool", Notes = "Is the beacon blocked by non-transparent blocks that are higher than the beacon?" },
 			UpdateBeacon = { Params = "", Return = "", Notes = "Update the beacon." },
 			GiveEffects = { Params = "", Return = "", Notes = "Give the near-players the effects." },
 			IsMineralBlock = { Params = "BLOCKTYPE", Return = "bool", Notes = "Returns true if the block is a diamond block, a golden block, an iron block or an emerald block." },
-			IsValidPotion = { Params = "EffectType", Return = "bool", Notes = "Returns true if the potion can be used." },
+			IsValidEffect = { Params = "EffectType", Return = "bool", Notes = "Returns true if the effect can be used." },
 		},
 	},
 
-- 
cgit v1.2.3


From c138d19c31ee85a38fe758bc2c69591bcfe42230 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Thu, 31 Jul 2014 18:16:52 +0200
Subject: Updated documentation again.

---
 MCServer/Plugins/APIDump/Classes/BlockEntities.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Classes/BlockEntities.lua b/MCServer/Plugins/APIDump/Classes/BlockEntities.lua
index 524087a8e..90ebf12e6 100644
--- a/MCServer/Plugins/APIDump/Classes/BlockEntities.lua
+++ b/MCServer/Plugins/APIDump/Classes/BlockEntities.lua
@@ -63,10 +63,10 @@ return
 		{
 			IsActive = { Params = "", Return = "bool", Notes = "Is the beacon active?" },
 			GetBeaconLevel = { Params = "", Return = "number", Notes = "Returns the beacon level. (0 - 4)" },
-			GetPrimaryEffect = { Params = "", Return = "EffectType", Notes = "Returns the primary potion." },
-			GetSecondaryEffect = { Params = "", Return = "EffectType", Notes = "Returns the secondary potion." },
-			SelectPrimaryEffect = { Params = "EffectType", Return = "bool", Notes = "Select the primary effect. Returns false when the effect is invalid." },
-			SelectSecondaryEffect = { Params = "EffectType", Return = "bool", Notes = "Select the secondary effect. Returns false when the effect is invalid." },
+			GetPrimaryEffect = { Params = "", Return = "EffectType", Notes = "Returns the primary effect." },
+			GetSecondaryEffect = { Params = "", Return = "EffectType", Notes = "Returns the secondary effect." },
+			SetPrimaryEffect = { Params = "EffectType", Return = "bool", Notes = "Select the primary effect. Returns false when the effect is invalid." },
+			SetSecondaryEffect = { Params = "EffectType", Return = "bool", Notes = "Select the secondary effect. Returns false when the effect is invalid." },
 			CalculatePyramidLevel = { Params = "", Return = "number", Notes = "Calculate the amount of layers the pyramid below the beacon has." },
 			IsBeaconBlocked = { Params = "", Return = "bool", Notes = "Is the beacon blocked by non-transparent blocks that are higher than the beacon?" },
 			UpdateBeacon = { Params = "", Return = "", Notes = "Update the beacon." },
-- 
cgit v1.2.3


From c865fc8ca501e7405da2ce8353628373e4526053 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri, 1 Aug 2014 22:05:40 +0100
Subject: Improved endermen code a little

---
 MCServer/monsters.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/monsters.ini b/MCServer/monsters.ini
index b631fc1a9..d29b01d8f 100644
--- a/MCServer/monsters.ini
+++ b/MCServer/monsters.ini
@@ -44,7 +44,7 @@ MaxHealth=10
 AttackRange=2.0
 AttackRate=1  
 AttackDamage=4.0
-SightDistance=25.0
+SightDistance=64.0
 MaxHealth=40
 
 [ZombiePigman]
-- 
cgit v1.2.3


From 003f18bd0f7593bddf5c6af89e3f6fc13632300d Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sun, 3 Aug 2014 12:12:28 +0200
Subject: Added cMojangAPI:GetUUIDFromPlayerName().

This is a simpler way to ask for a single name -> uuid conversion.
---
 MCServer/Plugins/APIDump/APIDesc.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 1fa2608b3..4f8567530 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1630,6 +1630,7 @@ a_Player:OpenWindow(Window);
 			Functions =
 			{
 				AddPlayerNameToUUIDMapping = { Params = "PlayerName, UUID", Return = "", Notes = "Adds the specified PlayerName-to-UUID mapping into the cache, with current timestamp." },
+				GetUUIDFromPlayerName = { Params = "PlayerName, [UseOnlyCached]", Return = "UUID", Notes = "Returns the UUID that corresponds to the given playername, or an empty string on error. If UseOnlyCached is false (the default), queries the Mojang servers if the playername is not in the cache. <br /><b>WARNING</b>: Do NOT use this function with UseOnlyCached set to false while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely." },
 				GetUUIDsFromPlayerNames = { Params = "PlayerNames, [UseOnlyCached]", Return = "table", Notes = "Returns a table that contains the map, 'PlayerName' -> 'UUID', for all valid playernames in the input array-table. PlayerNames not recognized will not be set in the returned map. If UseOnlyCached is false (the default), queries the Mojang servers for the results that are not in the cache. <br /><b>WARNING</b>: Do NOT use this function with UseOnlyCached set to false while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely." },
 				MakeUUIDDashed = { Params = "UUID", Return = "DashedUUID", Notes = "(STATIC) Converts the UUID to a dashed format (\"01234567-8901-2345-6789-012345678901\"). Accepts both dashed and short UUIDs. Logs a warning and returns an empty string if UUID format not recognized." },
 				MakeUUIDShort = { Params = "UUID", Return = "ShortUUID", Notes = "(STATIC) Converts the UUID to a short format (without dashes, \"01234567890123456789012345678901\"). Accepts both dashed and short UUIDs. Logs a warning and returns an empty string if UUID format not recognized." },
-- 
cgit v1.2.3


From 21f52676f3848d58ff1e4eb511c691d4a4ed824b Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sun, 3 Aug 2014 21:32:20 +0200
Subject: cMojangAPI: Added UUID-to-Name lookup.

Also fixed the bindings, now all functions are static-like.
---
 MCServer/Plugins/APIDump/APIDesc.lua | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 4f8567530..ad3b24ca5 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1613,8 +1613,7 @@ a_Player:OpenWindow(Window);
 				some of these calls will wait for a response from the network, and so shouldn't be used while the
 				server is fully running (or at least when there are players connected) to avoid percepted lag.</p>
 				<p>
-				Some functions are static and do not require an instance to be called. For others, you need to get
-				the singleton instance of this class using {{cRoot}}'s GetMojangAPI() function.</p>
+				All the functions are static, call them using the <code>cMojangAPI:Function()</code> convention.</p>
 				<p>
 				Mojang uses two formats for UUIDs, short and dashed. MCServer works with short UUIDs internally, but
 				will convert to dashed UUIDs where needed - in the protocol login for example. The MakeUUIDShort()
@@ -1629,11 +1628,12 @@ a_Player:OpenWindow(Window);
 			]],
 			Functions =
 			{
-				AddPlayerNameToUUIDMapping = { Params = "PlayerName, UUID", Return = "", Notes = "Adds the specified PlayerName-to-UUID mapping into the cache, with current timestamp." },
-				GetUUIDFromPlayerName = { Params = "PlayerName, [UseOnlyCached]", Return = "UUID", Notes = "Returns the UUID that corresponds to the given playername, or an empty string on error. If UseOnlyCached is false (the default), queries the Mojang servers if the playername is not in the cache. <br /><b>WARNING</b>: Do NOT use this function with UseOnlyCached set to false while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely." },
-				GetUUIDsFromPlayerNames = { Params = "PlayerNames, [UseOnlyCached]", Return = "table", Notes = "Returns a table that contains the map, 'PlayerName' -> 'UUID', for all valid playernames in the input array-table. PlayerNames not recognized will not be set in the returned map. If UseOnlyCached is false (the default), queries the Mojang servers for the results that are not in the cache. <br /><b>WARNING</b>: Do NOT use this function with UseOnlyCached set to false while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely." },
-				MakeUUIDDashed = { Params = "UUID", Return = "DashedUUID", Notes = "(STATIC) Converts the UUID to a dashed format (\"01234567-8901-2345-6789-012345678901\"). Accepts both dashed and short UUIDs. Logs a warning and returns an empty string if UUID format not recognized." },
-				MakeUUIDShort = { Params = "UUID", Return = "ShortUUID", Notes = "(STATIC) Converts the UUID to a short format (without dashes, \"01234567890123456789012345678901\"). Accepts both dashed and short UUIDs. Logs a warning and returns an empty string if UUID format not recognized." },
+				AddPlayerNameToUUIDMapping = { Params = "PlayerName, UUID", Return = "", Notes = "(STATIC) Adds the specified PlayerName-to-UUID mapping into the cache, with current timestamp. Accepts both short or dashed UUIDs. " },
+				GetPlayerNameFromUUID = { Params = "UUID, [UseOnlyCached]", Return = "PlayerName", Notes = "(STATIC) Returns the playername that corresponds to the given UUID, or an empty string on error. If UseOnlyCached is false (the default), queries the Mojang servers if the UUID is not in the cache. The UUID can be either short or dashed. <br /><b>WARNING</b>: Do NOT use this function with UseOnlyCached set to false while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely." },
+				GetUUIDFromPlayerName = { Params = "PlayerName, [UseOnlyCached]", Return = "UUID", Notes = "(STATIC) Returns the (short) UUID that corresponds to the given playername, or an empty string on error. If UseOnlyCached is false (the default), queries the Mojang servers if the playername is not in the cache. <br /><b>WARNING</b>: Do NOT use this function with UseOnlyCached set to false while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely." },
+				GetUUIDsFromPlayerNames = { Params = "PlayerNames, [UseOnlyCached]", Return = "table", Notes = "(STATIC) Returns a table that contains the map, 'PlayerName' -> '(short) UUID', for all valid playernames in the input array-table. PlayerNames not recognized will not be set in the returned map. If UseOnlyCached is false (the default), queries the Mojang servers for the results that are not in the cache. <br /><b>WARNING</b>: Do NOT use this function with UseOnlyCached set to false while the server is running. Only use it when the server is starting up (inside the Initialize() method), otherwise you will lag the server severely." },
+				MakeUUIDDashed = { Params = "UUID", Return = "DashedUUID", Notes = "(STATIC) Converts the UUID to a dashed format (\"01234567-8901-2345-6789-012345678901\"). Accepts both dashed or short UUIDs. Logs a warning and returns an empty string if UUID format not recognized." },
+				MakeUUIDShort = { Params = "UUID", Return = "ShortUUID", Notes = "(STATIC) Converts the UUID to a short format (without dashes, \"01234567890123456789012345678901\"). Accepts both dashed or short UUIDs. Logs a warning and returns an empty string if UUID format not recognized." },
 			},
 
 		},
@@ -2017,7 +2017,6 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 			]],
 			Functions =
 			{
-				Get = { Params = "", Return = "Root object", Notes = "(STATIC)This function returns the cRoot object." },
 				BroadcastChat = { Params = "Message", Return = "", Notes = "Broadcasts a message to every player in the server. No formatting is done by the server." },
 				BroadcastChatFailure = { Params = "Message", Return = "", Notes = "Prepends Rose [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For a command that failed to run because of insufficient permissions, etc." },
 				BroadcastChatFatal = { Params = "Message", Return = "", Notes = "Prepends Red [FATAL] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For a plugin that crashed, or similar." },
@@ -2028,12 +2027,12 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				FindAndDoWithPlayer = { Params = "PlayerName, CallbackFunction", Return = "", Notes = "Calls the given callback function for all players with names partially (or fully) matching the name string provided." },
 				ForEachPlayer = { Params = "CallbackFunction", Return = "", Notes = "Calls the given callback function for each player. The callback function has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cPlayer|cPlayer}})</pre>" },
 				ForEachWorld = { Params = "CallbackFunction", Return = "", Notes = "Calls the given callback function for each world. The callback function has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cWorld|cWorld}})</pre>" },
+				Get = { Params = "", Return = "Root object", Notes = "(STATIC)This function returns the cRoot object." },
 				GetCraftingRecipes = { Params = "", Return = "{{cCraftingRecipe|cCraftingRecipe}}", Notes = "Returns the CraftingRecipes object" },
 				GetDefaultWorld = { Params = "", Return = "{{cWorld|cWorld}}", Notes = "Returns the world object from the default world." },
 				GetFurnaceFuelBurnTime = { Params = "{{cItem|Fuel}}", Return = "number", Notes = "(STATIC) Returns the number of ticks for how long the item would fuel a furnace. Returns zero if not a fuel." },
 				GetFurnaceRecipe = { Params = "{{cItem|InItem}}", Return = "{{cItem|OutItem}}, NumTicks, {{cItem|InItem}}", Notes = "(STATIC) Returns the furnace recipe for smelting the specified input. If a recipe is found, returns the smelted result, the number of ticks required for the smelting operation, and the input consumed (note that MCServer supports smelting M items into N items and different smelting rates). If no recipe is found, returns no value." },
 				GetGroupManager = { Params = "", Return = "{{cGroupManager|cGroupManager}}", Notes = "Returns the cGroupManager object." },
-				GetMojangAPI = { Params = "", Return = "{{cMojangAPI}}", Notes = "Returns the {{cMojangAPI}} object." },
 				GetPhysicalRAMUsage = { Params = "", Return = "number", Notes = "Returns the amount of physical RAM that the entire MCServer process is using, in KiB. Negative if the OS doesn't support this query." },
 				GetPluginManager = { Params = "", Return = "{{cPluginManager|cPluginManager}}", Notes = "Returns the cPluginManager object." },
 				GetPrimaryServerVersion = { Params = "", Return = "number", Notes = "Returns the servers primary server version." },
-- 
cgit v1.2.3


From f5aaf52210369862a045c074429428012607c445 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sun, 3 Aug 2014 21:32:53 +0200
Subject: Debuggers: Added a Name-from-UUID cMojangAPI test.

---
 MCServer/Plugins/Debuggers/Debuggers.lua | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index 075cfa40c..7e220952e 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -339,6 +339,13 @@ function TestUUIDFromName()
 	end
 
 	LOG("UUID-from-Name resolution tests finished.")
+	
+	LOG("Performing a Name-from-UUID test...")
+	-- local NameToTest = "aloe_vera"
+	local NameToTest = "xoft"
+	local Name = cMojangAPI:GetPlayerNameFromUUID(UUIDs[NameToTest])
+	LOG("Name(" .. UUIDs[NameToTest] .. ") = '" .. Name .. "', expected '" .. NameToTest .. "'.")
+	LOG("Name-from-UUID test finished.")
 end
 
 
-- 
cgit v1.2.3


From 01e9d6311a4c27af044e8c9be3c67000124321e9 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon, 4 Aug 2014 14:24:46 +0100
Subject: Updated submodules

---
 MCServer/Plugins/Core            | 2 +-
 MCServer/Plugins/ProtectionAreas | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
index 3790f78d3..1b16c23c2 160000
--- a/MCServer/Plugins/Core
+++ b/MCServer/Plugins/Core
@@ -1 +1 @@
-Subproject commit 3790f78d3f7503ff33a423b8e73e81a275562783
+Subproject commit 1b16c23c216d359e9fe0334c63deeecc347e69bd
diff --git a/MCServer/Plugins/ProtectionAreas b/MCServer/Plugins/ProtectionAreas
index 9edfee930..7765048fa 160000
--- a/MCServer/Plugins/ProtectionAreas
+++ b/MCServer/Plugins/ProtectionAreas
@@ -1 +1 @@
-Subproject commit 9edfee93048f214175cbed7eb2a3f77f7ac4abb2
+Subproject commit 7765048fa740b8f119db72a4ccc546504f86b2ab
-- 
cgit v1.2.3


From 43de9af8786243c90832b78f8c19ec92fb218392 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 5 Aug 2014 13:54:04 +0200
Subject: Added api documentation for Clamp()

---
 MCServer/Plugins/APIDump/APIDesc.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index ad3b24ca5..64ba80c5f 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2760,15 +2760,16 @@ end
 			Functions =
 			{
 				AddFaceDirection = {Params = "BlockX, BlockY, BlockZ, BlockFace, [IsInverse]", Return = "BlockX, BlockY, BlockZ", Notes = "Returns the coords of a block adjacent to the specified block through the specified {{Globals#BlockFaces|face}}"},
-				BlockFaceToString = { Params = "{{Globals#BlockFaces|eBlockFace}}", Return = "string", Notes = "Returns the string representation of the {{Globals#BlockFaces|eBlockFace}} constant. Uses the axis-direction-based names, such as BLOCK_FACE_XP." },
+				BlockFaceToString = {Params = "{{Globals#BlockFaces|eBlockFace}}", Return = "string", Notes = "Returns the string representation of the {{Globals#BlockFaces|eBlockFace}} constant. Uses the axis-direction-based names, such as BLOCK_FACE_XP." },
 				BlockStringToType = {Params = "BlockTypeString", Return = "BLOCKTYPE", Notes = "Returns the block type parsed from the given string"},
+				Clamp = {Params = "Number, Min, Max", Return = "number", Notes = "Clamp the number to the specified range."},
 				ClickActionToString = {Params = "{{Globals#ClickAction|ClickAction}}", Return = "string", Notes = "Returns a string description of the ClickAction enumerated value"},
 				DamageTypeToString = {Params = "{{Globals#DamageType|DamageType}}", Return = "string", Notes = "Converts the {{Globals#DamageType|DamageType}} enumerated value to a string representation "},
 				EscapeString = {Params = "string", Return = "string", Notes = "Returns a copy of the string with all quotes and backslashes escaped by a backslash"},
 				GetChar = {Params = "String, Pos", Return = "string", Notes = "Returns one character from the string, specified by position "},
 				GetIniItemSet = { Params = "IniFile, SectionName, KeyName, DefaultValue", Return = "{{cItem}}", Notes = "Returns the item that has been read from the specified INI file value. If the value is not present in the INI file, the DefaultValue is stored in the file and parsed as the result. Returns empty item if the value cannot be parsed. " },
 				GetTime = {Return = "number", Notes = "Returns the current OS time, as a unix time stamp (number of seconds since Jan 1, 1970)"},
-				IsBiomeNoDownfall = { Params = "Biome", Return = "bool", Notes = "Returns true if the biome is 'dry', that is, there is no precipitation during rains and storms." },
+				IsBiomeNoDownfall = {Params = "Biome", Return = "bool", Notes = "Returns true if the biome is 'dry', that is, there is no precipitation during rains and storms." },
 				IsValidBlock = {Params = "BlockType", Return = "bool", Notes = "Returns true if BlockType is a known block type"},
 				IsValidItem = {Params = "ItemType", Return = "bool", Notes = "Returns true if ItemType is a known item type"},
 				ItemToFullString = {Params = "{{cItem|cItem}}", Return = "string", Notes = "Returns the string representation of the item, in the format 'ItemTypeText:ItemDamage * Count'"},
-- 
cgit v1.2.3


From 251f0d5b97bc36fa3c335bf6a1b03aa22503fa47 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 8 Aug 2014 23:13:43 +0200
Subject: Debuggers: Simple cRankManager test case.

---
 MCServer/Plugins/Debuggers/Debuggers.lua | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index 7e220952e..a87511fb9 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -81,6 +81,7 @@ function Initialize(Plugin)
 	TestBlockAreasString()
 	TestStringBase64()
 	TestUUIDFromName()
+	TestRankMgr()
 
 	--[[
 	-- Test cCompositeChat usage in console-logging:
@@ -352,6 +353,18 @@ end
 
 
 
+function TestRankMgr()
+	LOG("Testing the rank manager")
+	cRankManager:AddRank("LuaRank")
+	cRankManager:AddGroup("LuaTestGroup")
+	cRankManager:AddGroupToRank("LuaTestGroup", "LuaRank")
+	cRankManager:AddPermissionToGroup("luaperm", "LuaTestGroup")
+end
+
+
+
+
+
 function TestSQLiteBindings()
 	LOG("Testing SQLite bindings...");
 	
-- 
cgit v1.2.3


From af202c2363131d343d38a1f04850cfd711aef61e Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sat, 9 Aug 2014 22:55:38 +0200
Subject: Debuggers: Disabled UUID and RankMgr tests.

---
 MCServer/Plugins/Debuggers/Debuggers.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index a87511fb9..81cf02f3c 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -80,8 +80,8 @@ function Initialize(Plugin)
 	
 	TestBlockAreasString()
 	TestStringBase64()
-	TestUUIDFromName()
-	TestRankMgr()
+	-- TestUUIDFromName()
+	-- TestRankMgr()
 
 	--[[
 	-- Test cCompositeChat usage in console-logging:
-- 
cgit v1.2.3


From f7726317c9c1c27fa3d0b9b7c2df35ffff6f1f1a Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Mon, 11 Aug 2014 18:57:41 +0200
Subject: Add entry for bat in monsters.ini

---
 MCServer/monsters.ini | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/monsters.ini b/MCServer/monsters.ini
index d29b01d8f..c4bc8c810 100644
--- a/MCServer/monsters.ini
+++ b/MCServer/monsters.ini
@@ -185,4 +185,10 @@ AttackDamage=6.0
 SightDistance=25.0
 MaxHealth=100
 
+[Bat]
+AttackRange=2.0
+AttackRate=1
+AttackDamage=0.0
+SightDistance=25.0
+MaxHealth=6
 
-- 
cgit v1.2.3


From 6c8baf66c81e043710e70d8de584ab93d1cbbfc8 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sat, 16 Aug 2014 18:49:24 +0200
Subject: Updated HOOK_PLAYER_MOVING documentation.

---
 MCServer/Plugins/APIDump/Hooks/OnPlayerMoving.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Hooks/OnPlayerMoving.lua b/MCServer/Plugins/APIDump/Hooks/OnPlayerMoving.lua
index 2756529ef..4385bf94d 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnPlayerMoving.lua
+++ b/MCServer/Plugins/APIDump/Hooks/OnPlayerMoving.lua
@@ -11,9 +11,11 @@ return
 		Params =
 		{
 			{ Name = "Player", Type = "{{cPlayer}}", Notes = "The player who has moved. The object already has the new position stored in it." },
+			{ Name = "OldPosition", Type = "{{Vector3d}}", Notes = "The old position." },
+			{ Name = "NewPosition", Type = "{{Vector3d}}", Notes = "The new position." },
 		},
 		Returns = [[
-			If the function returns true, movement is prohibited. FIXME: The player's client is not informed.</p>
+			If the function returns true, movement is prohibited.</p>
 			<p>
 			If the function returns false or no value, other plugins' callbacks are called and finally the new
 			position is permanently stored in the cPlayer object.</p>
-- 
cgit v1.2.3


From 9f8eee578cf2834de8221cecb2c753a06a912739 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Wed, 20 Aug 2014 19:09:45 +0200
Subject: APIDump: Added cRankManager documentation.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 56 ++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 64ba80c5f..ce3303087 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2004,6 +2004,62 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 			},
 		},  -- cPluginManager
 
+		cRankManager =
+		{
+			Desc = [[
+				Manages the players' permissions. The players are assigned a single rank, which contains groups of
+				permissions. The functions in this class query or modify these.</p>
+				<p>
+				All the functions are static, call them using the <code>cRankManager:Function()</code> convention.</p>
+				<p>
+				The players are identified by their UUID, to support player renaming.</p>
+				<p>
+				The rank also contains specific "mesage visuals" - bits that are used for formatting messages from the
+				players. There's a message prefix, which is put in front of every message the player sends, and the
+				message suffix that is appended to each message. There's also a PlayerNameColorCode, which holds the
+				color that is used for the player's name in the messages.</p>
+				<p>
+				Each rank can contain any number of permission groups. These groups allow for an easier setup of the
+				permissions - you can share groups among ranks, so the usual approach is to group similar permissions
+				together and add that group to any rank that should use those permissions.</p>
+				<p>
+				Permissions are added to individual groups. Each group can support unlimited permissions. Note that
+				adding a permission to a group will make the permission available to all the ranks that contain that
+				permission group.
+			]],
+			Functions =
+			{
+				AddGroup = { Params = "GroupName", Return = "", Notes = "Adds the group of the specified name. Logs a warning and does nothing if the group already exists." },
+				AddGroupToRank = { Params = "GroupName, RankName", Return = "bool", Notes = "Adds the specified group to the specified rank. Returns true on success, false on failure - if the group name or the rank name is not found." },
+				AddPermissionToGroup = { Params = "Permission, GroupName", Return = "bool", Notes = "Adds the specified permission to the specified group. Returns true on success, false on failure - if the group name is not found." },
+				AddRank = { Params = "RankName, MsgPrefix, MsgSuffix, MsgNameColorCode", Return = "", Notes = "Adds a new rank of the specified name and with the specified message visuals. Logs an info message and does nothing if the rank already exists." },
+				GetAllGroups = { Params = "", Return = "array-table of groups' names", Notes = "Returns an array-table containing the names of all the groups that are known to the manager." },
+				GetAllPermissions = { Params = "", Return = "array-table of permissions", Notes = "Returns an array-table containing all the permissions that are known to the manager." },
+				GetAllRanks = { Params = "", Return = "array-table of ranks' names", Notes = "Returns an array-table containing the names of all the ranks that are known to the manager." },
+				GetGroupPermissions = { Params = "GroupName", Return = "array-table of permissions", Notes = "Returns an array-table containing the permissions that the specified group contains." },
+				GetPlayerGroups = { Params = "PlayerUUID", Return = "array-table of groups' names", Notes = "Returns an array-table of the names of the groups that are assigned to the specified player through their rank. Returns an empty table if the player is not known or has no rank or groups assigned to them." },
+				GetPlayerMsgVisuals = { Params = "PlayerUUID", Return = "MsgPrefix, MsgSuffix, MsgNameColorCode", Notes = "Returns the message visuals assigned to the player. If the player is not known or has no rank assigned, doesn't return any value." },
+				GetPlayerPermissions = { Params = "PlayerUUID", Return = "array-table of permissions", Notes = "Returns the permissions that the specified player is assigned through their rank. Returns an empty table if the player is not known." },
+				GetPlayerRankName = { Params = "PlayerUUID", Return = "RankName", Notes = "Returns the name of the rank that is assigned to the specified player. An empty string is returned if the player has no rank assigned to them." },
+				GetRankGroups = { Params = "RankName", Return = "array-table of groups' names", Notes = "Returns an array-table of the names of all the groups that are assigned to the specified rank. Returns an empty table if there is no such rank." },
+				GetRankPermissions = { Params = "RankName", Return = "array-table of permissions", Notes = "Returns an array-table of all the permissions that are assigned to the specified rank through its groups. Returns an empty table if there is no such rank." },
+				GetRankVisuals = { Params = "RankName", Return = "MsgPrefix, MsgSuffix, MsgNameColorCode", Notes = "Returns the message visuals for the specified rank. Returns no value if the specified rank does not exist." },
+				GroupExists = { Params = "GroupName", Return = "bool", Notes = "Returns true iff the specified group exists." },
+				IsGroupInRank = { Params = "GroupName, RankName", Return = "bool", Notes = "Returns true iff the specified group is assigned to the specified rank." },
+				IsPermissionInGroup = { Params = "Permission, GroupName", Return = "bool", Notes = "Returns true iff the specified permission is assigned to the specified group." },
+				IsPlayerRankSet = { Params = "PlayerUUID", Return = "bool", Notes = "Returns true iff the specified player has a rank assigned to them." },
+				RankExists = { Params = "RankName", Return = "bool", Notes = "Returns true iff the specified rank exists." },
+				RemoveGroup = { Params = "GroupName", Return = "", Notes = "Removes the specified group completely. The group will be removed from all the ranks using it and then erased from the manager. Logs an info message and does nothing if the group doesn't exist." },
+				RemoveGroupFromRank = { Params = "GroupName, RankName", Return = "", Notes = "Removes the specified group from the specified rank. The group will still exist, even if it isn't assigned to any rank. Logs an info message and does nothing if the group or rank doesn't exist." },
+				RemovePermissionFromGroup = { Params = "Permission, GroupName", Return = "", Notes = "Removes the specified permission from the specified group. Logs an info message and does nothing if the group doesn't exist." },
+				RemoveRank = { Params = "RankName, [ReplacementRankName]", Return = "", Notes = "Removes the specified rank. If ReplacementRankName is given, the players that have RankName will get their rank set to ReplacementRankName. If it isn't given, or is an invalid rank, the players will be removed from the manager, their ranks will be unset completely. Logs an info message and does nothing if the rank is not found." },
+				RenameGroup = { Params = "OldName, NewName", Return = "", Notes = "Renames the specified group. Logs an info message and does nothing if the group is not found." },
+				RenameRank = { Params = "OldName, NewName", Return = "", Notes = "Renames the specified rank. Logs an info message and does nothing if the rank is not found." },
+				SetPlayerRank = { Params = "PlayerUUID, PlayerName, RankName", Return = "", Notes = "Updates the rank for the specified player. The player name is provided for reference, the UUID is used for identification. Logs a warning and does nothing if the rank is not found." },
+				SetRankVisuals = { Params = "RankName, MsgPrefix, MsgSuffix, MsgNameColorCode", Return = "", Notes = "Updates the rank's message visuals. Logs an info message and does nothing if rank not found." },
+			},
+		},  -- cRankManager
+
 		cRoot =
 		{
 			Desc = [[
-- 
cgit v1.2.3


From 2218f31cde5d04157469de0d5164059ffb8a6bca Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Wed, 20 Aug 2014 22:21:41 +0200
Subject: Exported cServer:ShouldAuthenticate to Lua API.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index ce3303087..90d95bba2 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2172,10 +2172,11 @@ end
 			{
 				GetDescription = { Return = "string", Notes = "Returns the server description set in the settings.ini." },
 				GetMaxPlayers = { Return = "number", Notes = "Returns the max amount of players who can join the server." },
-				SetMaxPlayers = { Params = "number", Notes = "Sets the max amount of players who can join." },
 				GetNumPlayers = { Return = "number", Notes = "Returns the amount of players online." },
 				GetServerID = { Return = "string", Notes = "Returns the ID of the server?" },
 				IsHardcore = { Params = "", Return = "bool", Notes = "Returns true if the server is hardcore (players get banned on death)." },
+				SetMaxPlayers = { Params = "number", Notes = "Sets the max amount of players who can join." },
+				ShouldAuthenticate = { Params = "", Return = "bool", Notes = "Returns true iff the server is set to authenticate players (\"online mode\")." },
 			},
 		},  -- cServer
 
-- 
cgit v1.2.3


From b7ec75add6c0904b3950ce13ebe16888fd237c05 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Wed, 20 Aug 2014 22:27:58 +0200
Subject: Updated the Core.

---
 MCServer/Plugins/Core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
index 1b16c23c2..6627e570a 160000
--- a/MCServer/Plugins/Core
+++ b/MCServer/Plugins/Core
@@ -1 +1 @@
-Subproject commit 1b16c23c216d359e9fe0334c63deeecc347e69bd
+Subproject commit 6627e570a5265ae270aae978a1cad80dfb8a2b18
-- 
cgit v1.2.3


From 011ff52407fc3eee80319f7f3bd22558824763a1 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 21 Aug 2014 15:46:43 +0200
Subject: APIDump: Removed the cGroup and cGroupManager classes.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 90d95bba2..c474b5eb0 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -942,24 +942,6 @@ cFile:Delete("/usr/bin/virus.exe");
 			Inherits = "cEntity",
 		},
 		
-		cGroup =
-		{
-			Desc = [[
-				This class represents a group {{cPlayer|players}} can be in. Groups define the permissions players
-				have, and optionally the color of their name in the chat.
-			]],
-			Functions =
-			{
-				SetName = { Return = "" },
-				GetName = { Return = "string" },
-				SetColor = { Return = "" },
-				GetColor = { Return = "string" },
-				AddCommand = { Return = "" },
-				AddPermission = { Return = "" },
-				InheritFrom = { Return = "" },
-			},
-		},  -- cGroup
-
 		cIniFile =
 		{
 			Desc = [[
@@ -1760,7 +1742,6 @@ a_Player:OpenWindow(Window);
 			Functions =
 			{
 				AddFoodExhaustion = { Params = "Exhaustion", Return = "", Notes = "Adds the specified number to the food exhaustion. Only positive numbers expected." },
-				AddToGroup = { Params = "GroupName", Return = "", Notes = "Temporarily adds the player to the specified group. The assignment is lost when the player disconnects." },
 				CalcLevelFromXp = { Params = "XPAmount", Return = "number", Notes = "(STATIC) Returns the level which is reached with the specified amount of XP. Inverse of XpForLevel()." },
 				CanFly = { Return = "bool", Notes = "Returns if the player is able to fly." },
 				CloseWindow = { Params = "[CanRefuse]", Return = "", Notes = "Closes the currently open UI window. If CanRefuse is true (default), the window may refuse the closing." },
@@ -1770,7 +1751,7 @@ a_Player:OpenWindow(Window);
 				FoodPoison = { Params = "NumTicks", Return = "", Notes = "Starts the food poisoning for the specified amount of ticks; if already foodpoisoned, sets FoodPoisonedTicksRemaining to the larger of the two" },
 				ForceSetSpeed = { Params = "{{Vector3d|Direction}}", Notes = "Forces the player to move to the given direction." },
 				GetClientHandle = { Params = "", Return = "{{cClientHandle}}", Notes = "Returns the client handle representing the player's connection. May be nil (AI players)." },
-				GetColor = { Return = "string", Notes = "Returns the full color code to be used for this player (based on the first group). Prefix player messages with this code." },
+				GetColor = { Return = "string", Notes = "Returns the full color code to be used for this player's messages (based on their rank). Prefix player messages with this code." },
 				GetCurrentXp = { Params = "", Return = "number", Notes = "Returns the current amount of XP" },
 				GetEffectiveGameMode = { Params = "", Return = "{{Globals#GameMode|GameMode}}", Notes = "(OBSOLETE) Returns the current resolved game mode of the player. If the player is set to inherit the world's gamemode, returns that instead. See also GetGameMode() and IsGameModeXXX() functions. Note that this function is the same as GetGameMode(), use that function instead." },
 				GetEquippedItem = { Params = "", Return = "{{cItem}}", Notes = "Returns the item that the player is currently holding; empty item if holding nothing." },
@@ -1784,7 +1765,6 @@ a_Player:OpenWindow(Window);
 				GetFoodSaturationLevel = { Params = "", Return = "number", Notes = "Returns the food saturation (overcharge of the food level, is depleted before food level)" },
 				GetFoodTickTimer = { Params = "", Return = "", Notes = "Returns the number of ticks past the last food-based heal or damage action; when this timer reaches 80, a new heal / damage is applied." },
 				GetGameMode = { Return = "{{Globals#GameMode|GameMode}}", Notes = "Returns the player's gamemode. The player may have their gamemode unassigned, in which case they inherit the gamemode from the current {{cWorld|world}}.<br /> <b>NOTE:</b> Instead of comparing the value returned by this function to the gmXXX constants, use the IsGameModeXXX() functions. These functions handle the gamemode inheritance automatically."},
-				GetGroups = { Return = "array-table of {{cGroup}}", Notes = "Returns all the groups that this player is member of, as a table. The groups are stored in the array part of the table, beginning with index 1."},
 				GetIP = { Return = "string", Notes = "Returns the IP address of the player, if available. Returns an empty string if there's no IP to report."},
 				GetInventory = { Return = "{{cInventory|Inventory}}", Notes = "Returns the player's inventory"},
 				GetMaxSpeed = { Params = "", Return = "number", Notes = "Returns the player's current maximum speed, relative to the game default speed. Takes into account the sprinting / flying status." },
@@ -1807,15 +1787,13 @@ a_Player:OpenWindow(Window);
 				IsGameModeAdventure = { Params = "", Return = "bool", Notes = "Returns true if the player is in the gmAdventure gamemode, or has their gamemode unset and the world is a gmAdventure world." },
 				IsGameModeCreative = { Params = "", Return = "bool", Notes = "Returns true if the player is in the gmCreative gamemode, or has their gamemode unset and the world is a gmCreative world." },
 				IsGameModeSurvival = { Params = "", Return = "bool", Notes = "Returns true if the player is in the gmSurvival gamemode, or has their gamemode unset and the world is a gmSurvival world." },
-				IsInGroup = { Params = "GroupNameString", Return = "bool", Notes = "Returns true if the player is a member of the specified group." },
 				IsOnGround = { Params = "", Return = "bool", Notes = "Returns true if the player is on ground (not falling, not jumping, not flying)" },
 				IsSatiated = { Params = "", Return = "bool", Notes = "Returns true if the player is satiated (cannot eat)." },
 				IsVisible = { Params = "", Return = "bool", Notes = "Returns true if the player is visible to other players" },
-				LoadPermissionsFromDisk = { Params = "", Return = "", Notes = "Reloads the player's permissions from the disk. This loses any temporary changes made to the player's groups." },
+				LoadRank = { Params = "", Return = "", Notes = "Reloads the player's rank, message visuals and permissions from the {{cRankManager}}, based on the player's current rank." },
 				MoveTo = { Params = "{{Vector3d|NewPosition}}", Return = "Tries to move the player into the specified position." },
 				MoveToWorld = { Params = "WorldName", Return = "bool", Return = "Moves the player to the specified world. Returns true if successful." },
 				OpenWindow = { Params = "{{cWindow|Window}}", Return = "", Notes = "Opens the specified UI window for the player." },
-				RemoveFromGroup = { Params = "GroupName", Return = "", Notes = "Temporarily removes the player from the specified group. This change is lost when the player disconnects." },
 				Respawn = { Params = "", Return = "", Notes = "Restores the health, extinguishes fire, makes visible and sends the Respawn packet." },
 				SendMessage = { Params = "Message", Return = "", Notes = "Sends the specified message to the player." },
 				SendMessageFailure = { Params = "Message", Return = "", Notes = "Prepends Rose [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. For a command that failed to run because of insufficient permissions, etc." },
@@ -2088,7 +2066,6 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				GetDefaultWorld = { Params = "", Return = "{{cWorld|cWorld}}", Notes = "Returns the world object from the default world." },
 				GetFurnaceFuelBurnTime = { Params = "{{cItem|Fuel}}", Return = "number", Notes = "(STATIC) Returns the number of ticks for how long the item would fuel a furnace. Returns zero if not a fuel." },
 				GetFurnaceRecipe = { Params = "{{cItem|InItem}}", Return = "{{cItem|OutItem}}, NumTicks, {{cItem|InItem}}", Notes = "(STATIC) Returns the furnace recipe for smelting the specified input. If a recipe is found, returns the smelted result, the number of ticks required for the smelting operation, and the input consumed (note that MCServer supports smelting M items into N items and different smelting rates). If no recipe is found, returns no value." },
-				GetGroupManager = { Params = "", Return = "{{cGroupManager|cGroupManager}}", Notes = "Returns the cGroupManager object." },
 				GetPhysicalRAMUsage = { Params = "", Return = "number", Notes = "Returns the amount of physical RAM that the entire MCServer process is using, in KiB. Negative if the OS doesn't support this query." },
 				GetPluginManager = { Params = "", Return = "{{cPluginManager|cPluginManager}}", Notes = "Returns the cPluginManager object." },
 				GetPrimaryServerVersion = { Params = "", Return = "number", Notes = "Returns the servers primary server version." },
-- 
cgit v1.2.3


From 326dd7e4c6baa6070d35a2a46ca20404c623c8e1 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 21 Aug 2014 16:55:39 +0200
Subject: RankMgr: Added cRankManager::RemovePlayerRank().

---
 MCServer/Plugins/APIDump/APIDesc.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index c474b5eb0..6138f945a 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2030,6 +2030,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				RemoveGroup = { Params = "GroupName", Return = "", Notes = "Removes the specified group completely. The group will be removed from all the ranks using it and then erased from the manager. Logs an info message and does nothing if the group doesn't exist." },
 				RemoveGroupFromRank = { Params = "GroupName, RankName", Return = "", Notes = "Removes the specified group from the specified rank. The group will still exist, even if it isn't assigned to any rank. Logs an info message and does nothing if the group or rank doesn't exist." },
 				RemovePermissionFromGroup = { Params = "Permission, GroupName", Return = "", Notes = "Removes the specified permission from the specified group. Logs an info message and does nothing if the group doesn't exist." },
+				RemovePlayerRank = { Params = "PlayerUUID", Return = "", Notes = "Removes the player's rank; the player's left without a rank. Note that this doesn't change the {{cPlayer}} instances for the already connected players, you need to update all the instances manually. No action if the player has no rank assigned to them already." },
 				RemoveRank = { Params = "RankName, [ReplacementRankName]", Return = "", Notes = "Removes the specified rank. If ReplacementRankName is given, the players that have RankName will get their rank set to ReplacementRankName. If it isn't given, or is an invalid rank, the players will be removed from the manager, their ranks will be unset completely. Logs an info message and does nothing if the rank is not found." },
 				RenameGroup = { Params = "OldName, NewName", Return = "", Notes = "Renames the specified group. Logs an info message and does nothing if the group is not found." },
 				RenameRank = { Params = "OldName, NewName", Return = "", Notes = "Renames the specified rank. Logs an info message and does nothing if the rank is not found." },
-- 
cgit v1.2.3


From f569826a95f8e405661a41e872eccd517fe1116a Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Thu, 21 Aug 2014 21:38:50 +0200
Subject: Added missing blocks in item.ini

---
 MCServer/items.ini | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/items.ini b/MCServer/items.ini
index 7b8fcf4ee..8f169157c 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -17,6 +17,11 @@ birchplanks=5:2
 lightplanks=5:2
 jungleplanks=5:3
 redplanks=5:3
+acaciaplanks=5:4
+darkoakplanks=5:5
+bigoakplanks=5:5
+roofedoakplanks=5:5
+
 
 ; Obsolete: do not use "wood", as its meaning is not clear - wiki uses log as wood, we use planks as wood.
 wood=5
@@ -274,13 +279,47 @@ redstonelamp=123
 redstonelampoff=123
 redstonelampon=124
 woodendoubleslab=125
+appledoublewood=125:0
+oakwooddoubleslab=125:0
+coniferwooddoubleslab=125:1
+pinewooddoubleslab=125:1
+sprucewooddoubleslab=125:1
+darkwooddoubleslab=125:1
+birchwooddoubleslab=125:2
+whitewooddoubleslab=125:2
+junglewooddoubleslab=125:3
+acaciawooddoubleslab=125:4
+bigoakwooddoubleslab=125:5
+darkoakwooddoubleslab=125:5
+roofedwooddoubleslab=125:5
 woodenslab=126
+applewood=126:0
+oakwoodslab=126:0
+coniferwoodslab=126:1
+pinewoodslab=126:1
+sprucewoodslab=126:1
+darkwoodslab=126:1
+birchwoodslab=126:2
+whitewoodslab=126:2
+junglewoodslab=126:3
+acaciawoodslab=126:4
+bigoakwoodslab=126:5
+darkoakwoodslab=126:5
+roofedwoodslab=126:5
+cocoabeans=127
 sandstonestairs=128
 emeraldore=129
 enderchest=130
 tripwirehook=131
 tripwire=132
 emeraldblock=133
+coniferwoodstairs=134
+pinewoodstairs=134
+sprucewoodstairs=134
+darkwoodstairs=134
+birchwoodstairs=135
+whitewoodstairs=135
+junglewoodstairs=136
 commandblock=137
 beacon=138
 cobblestonewall=139
@@ -343,10 +382,18 @@ brownstainedglasspane=160:12
 greenstainedglasspane=160:13
 redstainedglasspane=160:14
 blackstainedglasspane=160:15
+acacialeaves=161
+bigoakleaves=161:1
+darkoakleaves=161:1
+roofedoakleaves=161:1
 acaciawood=162
+bigoakwood=162:1
 darkoakwood=162:1
-acaciawoodenstairs=163
-darkoakwoodenstairs=164
+roofedoakwood=162:1
+acaciawoodstairs=163
+bigoakwoodstiars=164
+darkoakwoodstairs=164
+roofedoakwoodstairs=164
 haybale=170
 carpet=171
 ironshovel=256
-- 
cgit v1.2.3


From 81492f70d1b1c11b7e9c73874cf497b786dff90d Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Thu, 21 Aug 2014 21:41:43 +0200
Subject: Changed new logs from wood to log!

---
 MCServer/items.ini | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/items.ini b/MCServer/items.ini
index 8f169157c..c4ee2c6e6 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -386,10 +386,10 @@ acacialeaves=161
 bigoakleaves=161:1
 darkoakleaves=161:1
 roofedoakleaves=161:1
-acaciawood=162
-bigoakwood=162:1
-darkoakwood=162:1
-roofedoakwood=162:1
+acacialog=162
+bigoaklog=162:1
+darkoaklog=162:1
+roofedoaklog=162:1
 acaciawoodstairs=163
 bigoakwoodstiars=164
 darkoakwoodstairs=164
-- 
cgit v1.2.3


From b4cc3a118b19f52b8a98b4322e10e1d6ffd75b71 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Thu, 21 Aug 2014 21:50:32 +0200
Subject: Added missing recipes for stairs and slabs!

---
 MCServer/crafting.txt | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 60cda0673..c1a4b725e 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -44,6 +44,8 @@ ApplePlanks, 4   = AppleLog, *
 ConiferPlanks, 4 = ConiferLog, *
 BirchPlanks, 4   = BirchLog, *
 JunglePlanks, 4  = JungleLog, *
+AcaciaPlanks, 4  = AcaciaLog, *
+DarkOakPlanks, 4 = DarkOakLog, *
 Stick, 4         = Planks, 2:2, 2:3
 Torch, 4         = Stick, 1:2 | Coal, 1:1
 Workbench        = Planks, 1:1, 1:2, 2:1, 2:2
@@ -74,11 +76,25 @@ PillarQuartzBlock = QuartzSlab, 1:1, 1:2
 ChiseledQuartzBlock, 2 = QuartzBlock, 1:1, 1:2
 CoalBlock        = Coal, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 HayBale          = Wheat, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+SnowBlock        = SnowBall,  1:1, 1:2, 2:1, 2:2
+ClayBlock        = Clay,      1:1, 1:2, 2:1, 2:2
+BrickBlock       = Brick,     1:1, 1:2, 2:1, 2:2
+StoneBrick, 4    = Stone,     1:1, 1:2, 2:1, 2:2
+BookShelf        = Planks,    1:1, 2:1, 3:1, 1:3, 2:3, 3:3 | Book, 1:2, 2:2, 3:2
+Sandstone, 4     = Sand,      1:1, 1:2, 2:1, 2:2
+SmoothSandstone, 4 = Sandstone, 1:1, 1:2, 2:1, 2:2
+OrnamentSandstone = SandstoneSlab, 1:1, 1:2
+JackOLantern     = Pumpkin, 1:1 | Torch, 1:2
 
 # Slabs:
 StoneSlab,       6  = Stone,             1:1, 2:1, 3:1
 SandstoneSlab,   6  = Sandstone,         1:1, 2:1, 3:1
-WoodSlab,        6  = Planks,            1:1, 2:1, 3:1
+OakWoodSlab,     6  = OakPlanks,         1:1, 2:1, 3:1
+SpruceWoodSlab,  6  = SprucePlanks,      1:1, 2:1, 3:1
+BirchWoodSlab,   6  = BirchPlanks,       1:1, 2:1, 3:1
+JungleWoodSlab,  6  = JunglePlanks,      1:1, 2:1, 3:1
+AcacaciaWoodSlab,6  = AcaciaPlanks,      1:1, 2:1, 3:1
+DarkOakWoodSlab, 6  = DarkOakPlanks,     1:1, 2:1, 3:1
 CobblestoneSlab, 6  = Cobblestone,       1:1, 2:1, 3:1
 BrickSlab,       6  = BrickBlock,        1:1, 2:1, 3:1
 StonebrickSlab,  6  = StoneBrick,        1:1, 2:1, 3:1
@@ -86,9 +102,20 @@ NetherbrickSlab, 6  = NetherBrick,       1:1, 2:1, 3:1
 Quartzslab,      6  = QuartzBlock,       1:1, 2:1, 3:1
 snow,			 6  = SnowBlock,         1:1, 2:1, 3:1
 
+
 # Stairs:
-WoodStairs, 4    = Planks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-WoodStairs, 4    = Planks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+WoodStairs, 4        = Planks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+WoodStairs, 4        = Planks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+SpruceWoodStairs, 4  = SprucePlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+SpruceWoodStairs, 4  = SprucePlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+BirchWoodStairs, 4   = BirchPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+BirchWoodStairs, 4   = BirchPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+JungleWoodStairs, 4  = JunglePlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+JungleWoodStairs, 4  = JunglePlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+AcaciaWoodStairs, 4  = AcaciaPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+AcaciaWoodStairs, 4  = AcaciaPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+DarkOakWoodStairs, 4 = DarkOakPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+DarkOakWoodStairs, 4 = DarkOakPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 cobblestoneStairs, 4 = Cobblestone, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 cobblestoneStairs, 4 = Cobblestone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 BrickStairs, 4       = BrickBlock,  1:1, 1:2, 2:2, 1:3, 2:3, 3:3
@@ -101,15 +128,6 @@ quartzstairs, 4      = QuartzBlock, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 quartzstairs, 4      = QuartzBlock, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 StoneBrickStairs, 4  = StoneBrick,  1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 StoneBrickStairs, 4  = StoneBrick,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
-SnowBlock          = SnowBall,  1:1, 1:2, 2:1, 2:2
-ClayBlock          = Clay,      1:1, 1:2, 2:1, 2:2
-BrickBlock         = Brick,     1:1, 1:2, 2:1, 2:2
-StoneBrick, 4      = Stone,     1:1, 1:2, 2:1, 2:2
-BookShelf          = Planks,    1:1, 2:1, 3:1, 1:3, 2:3, 3:3 | Book, 1:2, 2:2, 3:2
-Sandstone, 4       = Sand,      1:1, 1:2, 2:1, 2:2
-SmoothSandstone, 4 = Sandstone, 1:1, 1:2, 2:1, 2:2
-OrnamentSandstone  = SandstoneSlab, 1:1, 1:2
-JackOLantern       = Pumpkin, 1:1 | Torch, 1:2
 
 # Other
 Carpet             = Wool, 1:3, 2:3
-- 
cgit v1.2.3


From 940304bc64e6b64de7d9cd3f90362738c49df4ab Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Thu, 21 Aug 2014 22:08:34 +0200
Subject: Added missing recipes for stairs and slabs!

---
 MCServer/crafting.txt | 8 ++++----
 MCServer/items.ini    | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index c1a4b725e..3cda9052b 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -89,12 +89,12 @@ JackOLantern     = Pumpkin, 1:1 | Torch, 1:2
 # Slabs:
 StoneSlab,       6  = Stone,             1:1, 2:1, 3:1
 SandstoneSlab,   6  = Sandstone,         1:1, 2:1, 3:1
-OakWoodSlab,     6  = OakPlanks,         1:1, 2:1, 3:1
 SpruceWoodSlab,  6  = SprucePlanks,      1:1, 2:1, 3:1
 BirchWoodSlab,   6  = BirchPlanks,       1:1, 2:1, 3:1
 JungleWoodSlab,  6  = JunglePlanks,      1:1, 2:1, 3:1
-AcacaciaWoodSlab,6  = AcaciaPlanks,      1:1, 2:1, 3:1
+AcaciaWoodSlab,  6  = AcaciaPlanks,      1:1, 2:1, 3:1
 DarkOakWoodSlab, 6  = DarkOakPlanks,     1:1, 2:1, 3:1
+OakWoodSlab,     6  = OakPlanks,         1:1, 2:1, 3:1
 CobblestoneSlab, 6  = Cobblestone,       1:1, 2:1, 3:1
 BrickSlab,       6  = BrickBlock,        1:1, 2:1, 3:1
 StonebrickSlab,  6  = StoneBrick,        1:1, 2:1, 3:1
@@ -104,8 +104,6 @@ snow,			 6  = SnowBlock,         1:1, 2:1, 3:1
 
 
 # Stairs:
-WoodStairs, 4        = Planks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-WoodStairs, 4        = Planks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 SpruceWoodStairs, 4  = SprucePlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 SpruceWoodStairs, 4  = SprucePlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 BirchWoodStairs, 4   = BirchPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
@@ -116,6 +114,8 @@ AcaciaWoodStairs, 4  = AcaciaPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 AcaciaWoodStairs, 4  = AcaciaPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 DarkOakWoodStairs, 4 = DarkOakPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 DarkOakWoodStairs, 4 = DarkOakPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+WoodStairs, 4        = OakPlanks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
+WoodStairs, 4        = OakPlanks, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 cobblestoneStairs, 4 = Cobblestone, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 cobblestoneStairs, 4 = Cobblestone, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 BrickStairs, 4       = BrickBlock,  1:1, 1:2, 2:2, 1:3, 2:3, 3:3
diff --git a/MCServer/items.ini b/MCServer/items.ini
index c4ee2c6e6..9a61688ba 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -174,6 +174,7 @@ torch=50
 fire=51
 mobspawner=52
 woodstairs=53
+oakwoodstairs=53
 chest=54
 redstonedust=55
 redstonewire=55
-- 
cgit v1.2.3


From f71c76cf0559b5c5a932a8fd4a2c4038e24feb24 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Thu, 21 Aug 2014 22:13:12 +0200
Subject: Fixed slab name

---
 MCServer/items.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/items.ini b/MCServer/items.ini
index 9a61688ba..d3ae721f3 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -280,7 +280,7 @@ redstonelamp=123
 redstonelampoff=123
 redstonelampon=124
 woodendoubleslab=125
-appledoublewood=125:0
+appledoublewoodslab=125:0
 oakwooddoubleslab=125:0
 coniferwooddoubleslab=125:1
 pinewooddoubleslab=125:1
-- 
cgit v1.2.3


From 0daacd14d9ab678c08c45a1a1562d5ec160a3ff3 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sat, 23 Aug 2014 03:44:04 +0200
Subject: RankMgr: Implemented default rank, added defaults.

---
 MCServer/Plugins/Core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
index 6627e570a..7cc99285a 160000
--- a/MCServer/Plugins/Core
+++ b/MCServer/Plugins/Core
@@ -1 +1 @@
-Subproject commit 6627e570a5265ae270aae978a1cad80dfb8a2b18
+Subproject commit 7cc99285ae5117418f657c3b295ca71f2b75b4f4
-- 
cgit v1.2.3


From 3977d53b8301108c4b121467647ddd6e2f2ddaea Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 24 Aug 2014 20:05:28 +0200
Subject: RankMgr: Exported the default-rank functions.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 6138f945a..fe56ecee8 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2003,7 +2003,13 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				<p>
 				Permissions are added to individual groups. Each group can support unlimited permissions. Note that
 				adding a permission to a group will make the permission available to all the ranks that contain that
-				permission group.
+				permission group.</p>
+				<p>
+				One rank is reserved as the Default rank. All players that don't have an explicit rank assigned to them
+				will behave as if assigned to this rank. The default rank can be changed to any other rank at any time.
+				Note that the default rank cannot be removed from the RankManager - RemoveRank() will change the default
+				rank to the replacement rank, if specified, and fail if no replacement rank is specified. Renaming the
+				default rank using RenameRank() will change the default rank to the new name.
 			]],
 			Functions =
 			{
@@ -2014,11 +2020,12 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				GetAllGroups = { Params = "", Return = "array-table of groups' names", Notes = "Returns an array-table containing the names of all the groups that are known to the manager." },
 				GetAllPermissions = { Params = "", Return = "array-table of permissions", Notes = "Returns an array-table containing all the permissions that are known to the manager." },
 				GetAllRanks = { Params = "", Return = "array-table of ranks' names", Notes = "Returns an array-table containing the names of all the ranks that are known to the manager." },
+				GetDefaultRank = { Params = "", Return = "string", Notes = "Returns the name of the default rank. " },
 				GetGroupPermissions = { Params = "GroupName", Return = "array-table of permissions", Notes = "Returns an array-table containing the permissions that the specified group contains." },
 				GetPlayerGroups = { Params = "PlayerUUID", Return = "array-table of groups' names", Notes = "Returns an array-table of the names of the groups that are assigned to the specified player through their rank. Returns an empty table if the player is not known or has no rank or groups assigned to them." },
-				GetPlayerMsgVisuals = { Params = "PlayerUUID", Return = "MsgPrefix, MsgSuffix, MsgNameColorCode", Notes = "Returns the message visuals assigned to the player. If the player is not known or has no rank assigned, doesn't return any value." },
-				GetPlayerPermissions = { Params = "PlayerUUID", Return = "array-table of permissions", Notes = "Returns the permissions that the specified player is assigned through their rank. Returns an empty table if the player is not known." },
-				GetPlayerRankName = { Params = "PlayerUUID", Return = "RankName", Notes = "Returns the name of the rank that is assigned to the specified player. An empty string is returned if the player has no rank assigned to them." },
+				GetPlayerMsgVisuals = { Params = "PlayerUUID", Return = "MsgPrefix, MsgSuffix, MsgNameColorCode", Notes = "Returns the message visuals assigned to the player. If the player is not explicitly assigned a rank, the default rank's visuals are returned. If there is an error, no value is returned at all." },
+				GetPlayerPermissions = { Params = "PlayerUUID", Return = "array-table of permissions", Notes = "Returns the permissions that the specified player is assigned through their rank. Returns the default rank's permissions if the player has no explicit rank assigned to them. Returns an empty array on error." },
+				GetPlayerRankName = { Params = "PlayerUUID", Return = "RankName", Notes = "Returns the name of the rank that is assigned to the specified player. An empty string (NOT the default rank) is returned if the player has no rank assigned to them." },
 				GetRankGroups = { Params = "RankName", Return = "array-table of groups' names", Notes = "Returns an array-table of the names of all the groups that are assigned to the specified rank. Returns an empty table if there is no such rank." },
 				GetRankPermissions = { Params = "RankName", Return = "array-table of permissions", Notes = "Returns an array-table of all the permissions that are assigned to the specified rank through its groups. Returns an empty table if there is no such rank." },
 				GetRankVisuals = { Params = "RankName", Return = "MsgPrefix, MsgSuffix, MsgNameColorCode", Notes = "Returns the message visuals for the specified rank. Returns no value if the specified rank does not exist." },
@@ -2032,8 +2039,9 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				RemovePermissionFromGroup = { Params = "Permission, GroupName", Return = "", Notes = "Removes the specified permission from the specified group. Logs an info message and does nothing if the group doesn't exist." },
 				RemovePlayerRank = { Params = "PlayerUUID", Return = "", Notes = "Removes the player's rank; the player's left without a rank. Note that this doesn't change the {{cPlayer}} instances for the already connected players, you need to update all the instances manually. No action if the player has no rank assigned to them already." },
 				RemoveRank = { Params = "RankName, [ReplacementRankName]", Return = "", Notes = "Removes the specified rank. If ReplacementRankName is given, the players that have RankName will get their rank set to ReplacementRankName. If it isn't given, or is an invalid rank, the players will be removed from the manager, their ranks will be unset completely. Logs an info message and does nothing if the rank is not found." },
-				RenameGroup = { Params = "OldName, NewName", Return = "", Notes = "Renames the specified group. Logs an info message and does nothing if the group is not found." },
-				RenameRank = { Params = "OldName, NewName", Return = "", Notes = "Renames the specified rank. Logs an info message and does nothing if the rank is not found." },
+				RenameGroup = { Params = "OldName, NewName", Return = "", Notes = "Renames the specified group. Logs an info message and does nothing if the group is not found or the new name is already used." },
+				RenameRank = { Params = "OldName, NewName", Return = "", Notes = "Renames the specified rank. Logs an info message and does nothing if the rank is not found or the new name is already used." },
+				SetDefaultRank = { Params = "RankName", Return = "bool", Notes = "Sets the specified rank as the default rank. Returns true on success, false on failure (rank doesn't exist)." },
 				SetPlayerRank = { Params = "PlayerUUID, PlayerName, RankName", Return = "", Notes = "Updates the rank for the specified player. The player name is provided for reference, the UUID is used for identification. Logs a warning and does nothing if the rank is not found." },
 				SetRankVisuals = { Params = "RankName, MsgPrefix, MsgSuffix, MsgNameColorCode", Return = "", Notes = "Updates the rank's message visuals. Logs an info message and does nothing if rank not found." },
 			},
-- 
cgit v1.2.3


From 7146ed3065796e3f719745d7169b77340f26dc37 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Tue, 26 Aug 2014 16:36:01 +0300
Subject: VS Profiling: Shutdown the profiler on error.

---
 MCServer/profile_run.cmd | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/profile_run.cmd b/MCServer/profile_run.cmd
index 58efea64a..1ed47ac11 100644
--- a/MCServer/profile_run.cmd
+++ b/MCServer/profile_run.cmd
@@ -45,7 +45,7 @@ if %outputdir%n == n (
 
 
 
-::Create the output directory, if it didn't exist
+:: Create the output directory, if it didn't exist
 mkdir %outputdir%
 
 
@@ -60,7 +60,7 @@ if errorlevel 1 goto haderror
 
 :: Launch the application via the profiler
 %pt%\vsperfcmd /launch:%app%
-if errorlevel 1 goto haderror
+if errorlevel 1 goto haderrorshutdown
 
 :: Shut down the profiler (this command waits, until the application is terminated)
 %pt%\vsperfcmd /shutdown
@@ -86,6 +86,10 @@ goto finished
 
 
 
+:haderrorshutdown
+echo An error was encountered, shutting down the profiler
+%pt%\vsperfcmd /shutdown
+
 :haderror
 echo An error was encountered
 pause
-- 
cgit v1.2.3


From 3a60f2cd83ea265a0a59eec12b24fae11a36e998 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Tue, 26 Aug 2014 16:55:43 +0300
Subject: Profiling: Added profiling script for x64 executable.

---
 MCServer/profile_run.cmd       | 11 ++++++-----
 MCServer/profile_run_debug.cmd |  2 +-
 MCServer/profile_run_x64.cmd   |  5 +++++
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 MCServer/profile_run_x64.cmd

(limited to 'MCServer')

diff --git a/MCServer/profile_run.cmd b/MCServer/profile_run.cmd
index 1ed47ac11..6137e9d4d 100644
--- a/MCServer/profile_run.cmd
+++ b/MCServer/profile_run.cmd
@@ -12,7 +12,8 @@
 :: It expects the MS Performance tools installed in C:\Program Files\Microsoft Visual Studio 9.0\Team Tools\Performance Tools
 :: You can override this path by setting the pt environment variable prior to launching this script
 ::
-:: By default it will launch the release version of MCServer; set the app environment variable to another executable to run that instead.
+:: By default it will launch the 32-bit release version of MCServer; set the app environment variable to another executable to run that instead.
+:: Set the IsExecutablex64 env variable to \x64 to profile a 64-bit executable instead (available as the profile_run_x64.cmd script)
 :: Note that the app needs to be compiled with the "/PROFILE" flag in order for the profiling to work
 
 
@@ -55,15 +56,15 @@ mkdir %outputdir%
 :: Start the profiler
 set outputname=profile.vsp
 set output=%outputdir%\%outputname%
-%pt%\vsperfcmd /start:sample /output:%output%
+%pt%%IsExecutablex64%\vsperfcmd /start:sample /output:%output%
 if errorlevel 1 goto haderror
 
 :: Launch the application via the profiler
-%pt%\vsperfcmd /launch:%app%
+%pt%%IsExecutablex64%\vsperfcmd /launch:%app%
 if errorlevel 1 goto haderrorshutdown
 
 :: Shut down the profiler (this command waits, until the application is terminated)
-%pt%\vsperfcmd /shutdown
+%pt%%IsExecutablex64%\vsperfcmd /shutdown
 if errorlevel 1 goto haderror
 
 
@@ -88,7 +89,7 @@ goto finished
 
 :haderrorshutdown
 echo An error was encountered, shutting down the profiler
-%pt%\vsperfcmd /shutdown
+%pt%%IsExecutablex64%\vsperfcmd /shutdown
 
 :haderror
 echo An error was encountered
diff --git a/MCServer/profile_run_debug.cmd b/MCServer/profile_run_debug.cmd
index 8bf85f049..a9792541a 100644
--- a/MCServer/profile_run_debug.cmd
+++ b/MCServer/profile_run_debug.cmd
@@ -2,4 +2,4 @@
 :: This script uses the profile_run.cmd script to run profiling on the DebugProfile executable
 
 set app=MCServer_debug_profile.exe
-call profile_run.cmd
\ No newline at end of file
+call profile_run.cmd
diff --git a/MCServer/profile_run_x64.cmd b/MCServer/profile_run_x64.cmd
new file mode 100644
index 000000000..242136f4b
--- /dev/null
+++ b/MCServer/profile_run_x64.cmd
@@ -0,0 +1,5 @@
+@echo off
+:: This script uses the profile_run.cmd script to run profiling on a x64 release executable
+
+set IsExecutablex64=\x64
+call profile_run.cmd
-- 
cgit v1.2.3


From fe3d8fd8100ed93a35fe5a7f4080cbab1f913490 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Wed, 27 Aug 2014 15:41:29 +0300
Subject: Debuggers: Added a testcase for OnProjectileHitBlock.

This is a test for #1326.
---
 MCServer/Plugins/Debuggers/Debuggers.lua | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index 81cf02f3c..179935c08 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -33,6 +33,7 @@ function Initialize(Plugin)
 	PM:AddHook(cPluginManager.HOOK_PROJECTILE_HIT_BLOCK,         OnProjectileHitBlock);
 	PM:AddHook(cPluginManager.HOOK_CHUNK_UNLOADING,              OnChunkUnloading);
 	PM:AddHook(cPluginManager.HOOK_WORLD_STARTED,                OnWorldStarted);
+	PM:AddHook(cPluginManager.HOOK_PROJECTILE_HIT_BLOCK,         OnProjectileHitBlock);
 
 	-- _X: Disabled so that the normal operation doesn't interfere with anything
 	-- PM:AddHook(cPluginManager.HOOK_CHUNK_GENERATED,              OnChunkGenerated);
@@ -1545,3 +1546,15 @@ end
 
 
 
+
+function OnProjectileHitBlock(a_ProjectileEntity, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_BlockHitPos)
+	-- This simple test is for testing issue #1326 - simply declaring this hook would crash the server upon call
+	LOG("Projectile hit block")
+	LOG("  Projectile EntityID: " .. a_ProjectileEntity:GetUniqueID())
+	LOG("  Block: {" .. a_BlockX .. ", " .. a_BlockY .. ", " .. a_BlockZ .. "}, face " .. a_BlockFace)
+	LOG("  HitPos: {" .. a_BlockHitPos.x .. ", " .. a_BlockHitPos.y .. ", " .. a_BlockHitPos.z .. "}")
+end
+
+
+
+
-- 
cgit v1.2.3


From e555cb4ab3a783f9dc8980bd5f7e4523bd6711ce Mon Sep 17 00:00:00 2001
From: Hownaer <franzi.moos@googlemail.com>
Date: Thu, 28 Aug 2014 00:05:11 +0200
Subject: Fixed ItemCategory code example.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index fe56ecee8..3e1a6e3bb 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2570,8 +2570,8 @@ World:ForEachEntity(
 						The following code snippet checks if the player holds a shovel.
 <pre class="prettyprint lang-lua">
 -- a_Player is a {{cPlayer}} object, possibly received as a hook param
-local HeldItem = a_Player:GetEquippedItem();
-if (cItemCategory:IsShovel(HeldItem.m_ItemType)) then
+local HeldItem = a_Player:GetEquippedItem()
+if (ItemCategory.IsShovel(HeldItem.m_ItemType)) then
 	-- It's a shovel
 end
 </pre>
-- 
cgit v1.2.3


From 4ff34b9f10368587b7d7ade58977fb8ec7692d73 Mon Sep 17 00:00:00 2001
From: Hownaer <franzi.moos@googlemail.com>
Date: Thu, 28 Aug 2014 18:18:21 +0200
Subject: APIDump: Added missing cItem things.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 3e1a6e3bb..d75911666 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1188,7 +1188,7 @@ These ItemGrids are available in the API and can be manipulated by the plugins,
 				constructor =
 				{
 					{ Params = "", Return = "cItem", Notes = "Creates a new empty cItem object" },
-					{ Params = "ItemType, Count, Damage, EnchantmentString", Return = "cItem", Notes = "Creates a new cItem object of the specified type, count (1 by default), damage (0 by default) and enchantments (non-enchanted by default)" },
+					{ Params = "ItemType, Count, Damage, EnchantmentString, CustomName, Lore", Return = "cItem", Notes = "Creates a new cItem object of the specified type, count (1 by default), damage (0 by default), enchantments (non-enchanted by default), CustomName (empty by default) and Lore (string, empty by default)" },
 					{ Params = "cItem", Return = "cItem", Notes = "Creates an exact copy of the cItem object in the parameter" },
 				} ,
 				AddCount = { Params = "AmountToAdd", Return = "cItem", Notes = "Adds the specified amount to the item count. Returns self (useful for chaining)." },
@@ -1207,6 +1207,9 @@ These ItemGrids are available in the API and can be manipulated by the plugins,
 				IsBothNameAndLoreEmpty = { Params = "", Return = "bool", Notes = "Returns if both the custom name and lore are not set." },
 				IsCustomNameEmpty = { Params = "", Return = "bool", Notes = "Returns if the custom name of the cItem is empty." },
 				IsLoreEmpty = { Params = "", Return = "", Notes = "Returns if the lore of the cItem is empty." },
+				GetEnchantability = { Params = "", Return = "number", Notes = "Returns the enchantability of the item. When the item hasn't a enchantability, it will returns 0" },
+				EnchantByXPLevels = { Params = "NumXPLevels", Return = "bool", Notes = "Enchants the item using the specified number of XP levels. Returns true if item enchanted, false if not." },
+				IsEnchantable = { Params = "ItemType, WithBook", Return = "bool", Notes = "(STATIC) Returns true if the specified item type is enchantable." },
 			},
 			Variables =
 			{
@@ -1214,8 +1217,10 @@ These ItemGrids are available in the API and can be manipulated by the plugins,
 				m_ItemCount    = { Type = "number", Notes = "Number of items in this stack" },
 				m_ItemDamage   = { Type = "number", Notes = "The damage of the item. Zero means no damage. Maximum damage can be queried with GetMaxDamage()" },
 				m_ItemType     = { Type = "number", Notes = "The item type. One of E_ITEM_ or E_BLOCK_ constants" },
-				m_CustomName = { Type = "string", Notes = "The custom name for an item." },
-				m_Lore = { Type = "string", Notes = "The lore for an item. Line breaks are represented by the ` character." },
+				m_CustomName   = { Type = "string", Notes = "The custom name for an item." },
+				m_Lore         = { Type = "string", Notes = "The lore for an item. Line breaks are represented by the ` character." },
+				m_RepairCost   = { Type = "number", Notes = "The repair cost of the item. The anvil need this value" },
+				m_Enchantments = { Type = "{{cEnchantments|cEnchantments}}}", Notes = "The enchantments of the item." },
 			},
 			AdditionalInfo =
 			{
-- 
cgit v1.2.3


From c4d7f7996b0dcd784f5e1ccc8553b062c3ac96b6 Mon Sep 17 00:00:00 2001
From: Hownaer <franzi.moos@googlemail.com>
Date: Fri, 29 Aug 2014 00:42:33 +0200
Subject: Hotfixed recipe.txt loading.

---
 MCServer/crafting.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 60cda0673..684294bb3 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -84,7 +84,7 @@ BrickSlab,       6  = BrickBlock,        1:1, 2:1, 3:1
 StonebrickSlab,  6  = StoneBrick,        1:1, 2:1, 3:1
 NetherbrickSlab, 6  = NetherBrick,       1:1, 2:1, 3:1
 Quartzslab,      6  = QuartzBlock,       1:1, 2:1, 3:1
-snow,			 6  = SnowBlock,         1:1, 2:1, 3:1
+snow,            6  = SnowBlock,         1:1, 2:1, 3:1
 
 # Stairs:
 WoodStairs, 4    = Planks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
-- 
cgit v1.2.3


From 9c1fadd50cc935615bb776919ef1ff0587f2590b Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri, 29 Aug 2014 15:13:47 +0100
Subject: Updated Core

---
 MCServer/Plugins/Core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
index 7cc99285a..bd23915df 160000
--- a/MCServer/Plugins/Core
+++ b/MCServer/Plugins/Core
@@ -1 +1 @@
-Subproject commit 7cc99285ae5117418f657c3b295ca71f2b75b4f4
+Subproject commit bd23915df763b182610c6163c5ff2d64a0756560
-- 
cgit v1.2.3


From 04653b45394a9e95fddcae274cca0c422f21cfdc Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sat, 30 Aug 2014 12:53:19 +0200
Subject: Added GetWalkSpeed() and SetWalkSpeed() documentation.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 2 ++
 MCServer/Plugins/SexyMotd            | 1 +
 2 files changed, 3 insertions(+)
 create mode 120000 MCServer/Plugins/SexyMotd

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 3e1a6e3bb..434dd8a90 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1636,6 +1636,8 @@ a_Player:OpenWindow(Window);
 				MobTypeToString = { Params = "{{cMonster#MobType|MobType}}", Return = "string", Notes = "(STATIC) Returns the string representing the given mob type ({{cMonster#MobType|mtXXX}} constant), or empty string if unknown type." },
 				MoveToPosition = { Params = "Position", Return = "", Notes = "Moves mob to the specified position" },
 				StringToMobType = { Params = "string", Return = "{{cMonster#MobType|MobType}}", Notes = "(STATIC) Returns the mob type ({{cMonster#MobType|mtXXX}} constant) parsed from the string type (\"creeper\"), or mtInvalidType if unrecognized." },
+				GetWalkSpeed = { Params = "", Return = "number", Notes = "Returns the walk speed of this mob. Standard is 1.0" },
+				SetWalkSpeed = { Params = "number", Return = "", Notes = "Sets the walk speed of this mob. Standard is 1.0" },
 			},
 			Constants =
 			{
diff --git a/MCServer/Plugins/SexyMotd b/MCServer/Plugins/SexyMotd
new file mode 120000
index 000000000..b6af08265
--- /dev/null
+++ b/MCServer/Plugins/SexyMotd
@@ -0,0 +1 @@
+/home/franz/Schreibtisch/MCServer Plugins/SexyMotd/
\ No newline at end of file
-- 
cgit v1.2.3


From c5be3e0b6673c03c9a4dba109454af8bcaefc4e5 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sat, 30 Aug 2014 12:55:43 +0200
Subject: Removed SexyMotd link

---
 MCServer/Plugins/SexyMotd | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 MCServer/Plugins/SexyMotd

(limited to 'MCServer')

diff --git a/MCServer/Plugins/SexyMotd b/MCServer/Plugins/SexyMotd
deleted file mode 120000
index b6af08265..000000000
--- a/MCServer/Plugins/SexyMotd
+++ /dev/null
@@ -1 +0,0 @@
-/home/franz/Schreibtisch/MCServer Plugins/SexyMotd/
\ No newline at end of file
-- 
cgit v1.2.3


From 3ee3a59e75ac1e6eb9284983a05a459aab5be1fd Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sat, 30 Aug 2014 15:06:43 +0200
Subject: Changed the IsEnchantable() comment.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index d75911666..da8f9cd74 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1209,7 +1209,7 @@ These ItemGrids are available in the API and can be manipulated by the plugins,
 				IsLoreEmpty = { Params = "", Return = "", Notes = "Returns if the lore of the cItem is empty." },
 				GetEnchantability = { Params = "", Return = "number", Notes = "Returns the enchantability of the item. When the item hasn't a enchantability, it will returns 0" },
 				EnchantByXPLevels = { Params = "NumXPLevels", Return = "bool", Notes = "Enchants the item using the specified number of XP levels. Returns true if item enchanted, false if not." },
-				IsEnchantable = { Params = "ItemType, WithBook", Return = "bool", Notes = "(STATIC) Returns true if the specified item type is enchantable." },
+				IsEnchantable = { Params = "ItemType, WithBook", Return = "bool", Notes = "(STATIC) Returns true if the specified item type is enchantable. If WithBook is true, the function checks the enchantments with a book too." },
 			},
 			Variables =
 			{
-- 
cgit v1.2.3


From 55907376d5806415fe60b933ed076efc505e2f83 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Sat, 30 Aug 2014 21:36:20 +0200
Subject: Fixed missing slab name in line 297

---
 MCServer/items.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/items.ini b/MCServer/items.ini
index d3ae721f3..4f4df220e 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -294,7 +294,7 @@ bigoakwooddoubleslab=125:5
 darkoakwooddoubleslab=125:5
 roofedwooddoubleslab=125:5
 woodenslab=126
-applewood=126:0
+applewoodslab=126:0
 oakwoodslab=126:0
 coniferwoodslab=126:1
 pinewoodslab=126:1
-- 
cgit v1.2.3


From 8934ab487e92d070301617298b3856cddafab643 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sun, 31 Aug 2014 14:20:42 +0200
Subject: WebAdmin: Added login template

---
 MCServer/webadmin/files/mc-logo.png   | Bin 0 -> 66137 bytes
 MCServer/webadmin/login_template.html |  24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 MCServer/webadmin/files/mc-logo.png
 create mode 100644 MCServer/webadmin/login_template.html

(limited to 'MCServer')

diff --git a/MCServer/webadmin/files/mc-logo.png b/MCServer/webadmin/files/mc-logo.png
new file mode 100644
index 000000000..9a77a490f
Binary files /dev/null and b/MCServer/webadmin/files/mc-logo.png differ
diff --git a/MCServer/webadmin/login_template.html b/MCServer/webadmin/login_template.html
new file mode 100644
index 000000000..dd456607c
--- /dev/null
+++ b/MCServer/webadmin/login_template.html
@@ -0,0 +1,24 @@
+<html>
+<head>
+	<title>MCServer WebAdmin - Login</title>
+	<meta charset="UTF-8">
+	<style type="text/css">
+		header {
+			margin: 0 auto;
+			text-align: center;
+			vertical-align: middle;
+		}
+	</style>
+</head>
+
+<body>
+	<header>
+		<img src="mc-logo.png" alt="MCServer Logo" class="logo">
+		<h1>MCServer - WebAdmin</h1>
+		<form method="get" action="webadmin/">
+			<input type="submit" value="Log in">
+		</form>
+	</header>
+</body>
+
+</html>
-- 
cgit v1.2.3


From 9a95b006488e2813cf5f7fc73c5bff1b2fb54964 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sun, 31 Aug 2014 14:39:58 +0200
Subject: WebAdmin: Exported stylesheet in a own file.

---
 MCServer/webadmin/files/style.css | 326 ++++++++++++++++++++++++++++++++++++
 MCServer/webadmin/template.lua    | 336 +-------------------------------------
 2 files changed, 329 insertions(+), 333 deletions(-)
 create mode 100644 MCServer/webadmin/files/style.css

(limited to 'MCServer')

diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css
new file mode 100644
index 000000000..044204084
--- /dev/null
+++ b/MCServer/webadmin/files/style.css
@@ -0,0 +1,326 @@
+/* reset CSS */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-size: 100%;
+	vertical-align: baseline;
+	background: transparent;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+
+/* remove textarea resize at Safari */
+textarea { 
+	resize: none;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+	text-decoration: none;
+}
+del {
+	text-decoration: line-through;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+
+
+/*
+	Origional from http://www.perspectived.com/
+	Modified by Ben Phelps
+	Made for FakeTruth - MCServer
+*/
+
+/* Basic  ---------------------------------------- */
+
+.clear { clear: both; }
+
+body {
+	background: white;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #646464;
+	text-align: center;
+}
+
+#wrapper {
+	text-align: left;
+	width: 930px;
+	margin: 0 auto;
+}
+
+/* Logo  ---------------------------------------- */
+
+h1 {
+	margin: 15px 0 10px 5px;
+	width: 180px;
+	height: 36px;
+	background: url(data:image/png;base64,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) no-repeat left top;
+}
+
+h1 a {
+	display: block;
+	width: 225px;
+	height: 28px;
+}
+
+h1 span { display: none; }
+
+a {
+	color: #646464;
+}
+
+/* Container ---------------------------------------- */
+
+#containerHolder {
+	background: #eee;
+	padding: 5px;
+}
+
+
+#container {
+	background: #fff url(data:image/gif;base64,R0lGODlhtAABAIAAAN3d3f///yH5BAAAAAAALAAAAAC0AAEAAAIMjI+py+0Po5y0WgYKADs%3D) repeat-y left top;
+	border: 1px solid #ddd;
+	width: 918px;
+
+}
+
+#connectHolder {
+	background: #eee;
+	padding: 5px;
+	margin-bottom:8px;
+}
+
+
+#connect {
+	border: 1px solid #ddd;
+	background-color: #fff;
+	padding:5px;
+	width: 908px;
+}
+
+.pics {  
+	height:  375px;
+	width:   600px;
+} 
+
+.pics img {  
+	padding: 5px;  
+	border:  1px solid #ddd;  
+	background-color: #eee;  
+	width:  600px; 
+	height: 375px;
+	margin-left: 15px;
+}
+
+/* Login -------------------------------------- */
+
+#loginLogo {
+	margin: 0 auto;
+	margin-top:100px;
+	width: 180px;
+	height: 36px;
+	background-image: url(data:image/png;base64,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);
+}
+
+#loginHolder {
+	background: #eee;
+	padding: 5px;
+	width: 310px;
+	margin: 0 auto;
+	height: 90px;
+	margin-top:20px;
+}
+
+#login {
+	padding:10px;
+	width: 288px;
+	height: 68px;
+	border: 1px solid #ddd;
+	background:#fff;
+	text-align: left;
+}
+
+
+/* Sidebar ---------------------------------------- */
+
+#sidebar {
+	width: 179px;
+	float: left;
+}
+
+#sidebar .sideNav { width: 179px; }
+
+#sidebar .sideNav li { border-bottom: 1px solid #ddd; width: 179px; }
+
+#sidebar .sideNav li a {
+	display: block;
+	color: #646464;
+	background: #f6f6f6;
+	text-decoration: none;
+	height: 29px;
+	line-height: 29px;
+	padding: 0 19px;
+	width: 141px;
+}
+
+#sidebar .sideNav li a:hover { background: #fdfcf6; }
+
+#sidebar .sideNav li a.active, #sidebar .sideNav li a.active:hover {
+	background: #f0f7fa;
+	color: #c66653;
+}
+
+/* Breadcrumb ---------------------------------------- */
+
+h2 {
+	width: 718px;
+	float: right;
+	color: #646464;
+	font-size: 16px;
+	line-height: 16px;
+	font-weight: bold;
+	margin: 20px 0 0 0;
+	padding: 0 0 10px 0;
+	border-bottom: 1px solid #ddd;
+}
+
+h2 a {
+	color: #646464;
+	text-decoration: none;
+}
+
+h2 a.active { color: #c66653; }
+
+h2 a:hover { text-decoration: underline; }
+
+/* Content ---------------------------------------- */
+
+#main {
+	width: 700px;
+	float: right;
+	padding: 0 19px 0 0;
+}
+
+#main p {
+
+	padding: 10px;
+
+}
+
+h3 {
+	font-size: 14px;
+	line-height: 14px;
+	font-weight: bold;
+	color: #5494af;
+	padding: 0 0 0 10px;
+	margin: 20px 0 10px;
+}
+
+h4 {
+	padding: 0 0 0 10px;
+	margin: 20px 0 10px;
+}
+
+#main ul {
+	padding: 0 0 0 10px;
+	list-style-type: circle;
+	list-style-position: inside;
+}
+
+#main table {
+	border-top: 1px solid #ddd;
+	width: 700px;
+}
+
+#main table tr th {
+	text-align: left;
+	background: #f6f6f6;
+	padding: 0px 20px;
+	height: 20px;
+	line-height: 20px;
+	border-bottom: 1px solid #ddd;
+}
+
+#main table tr td {
+	background: #f6f6f6;
+	padding: 0px 20px;
+	height: 29px;
+	line-height: 29px;
+	border-bottom: 1px solid #ddd;
+}
+
+#main table tr.odd td {
+	background: #fbfbfb;
+}
+
+#main table tr:hover td { background: #fdfcf6; }
+
+#main table .action {
+	text-align: right;
+	padding: 0 20px 0 10px;
+}
+
+#main table tr .action a { margin: 0 0 0 10px; text-decoration: none; color: #9b9b9b; }
+#main table tr:hover .action .edit { color: #c5a059; }
+#main table tr:hover .action .delete { color: #a02b2b; }
+#main table tr:hover .action .view { color: #55a34a; }
+
+#main table tr:hover .action a:hover { text-decoration: underline; }
+
+fieldset {
+	border: 1px solid #ddd;
+	padding: 19px;
+	margin: 0 0 20px 0;
+	background: #fbfbfb;
+}
+
+form p { margin: 0 0 14px 0; float: left; width: 100%;  }
+
+label {
+	display: block;
+	width: 100%;
+	margin: 0 0 7px 0;
+	line-height: 12px;
+}
+
+/* Footer ---------------------------------------- */
+
+#footer {
+	margin: 10px 0 30px 0;
+	font-size: 11px;
+	line-height: 11px;
+	color: #9B9B9B;
+	padding: 0 0 0 5px;
+}
+
+#footer a { color: #9B9B9B; }
+
+#footer a:hover { text-decoration: none; }
diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua
index a066d8b33..5d5ac7b20 100644
--- a/MCServer/webadmin/template.lua
+++ b/MCServer/webadmin/template.lua
@@ -57,7 +57,7 @@ end
 function ShowPage(WebAdmin, TemplateRequest)
 	SiteContent = {}
 	local BaseURL = WebAdmin:GetBaseURL(TemplateRequest.Request.Path)
-	local Title = "MCServer"
+	local Title = "MCServer WebAdmin"
 	local MemoryUsageKiB = cRoot:GetPhysicalRAMUsage()
 	local NumChunks = cRoot:Get():GetTotalChunkCount()
 	local PluginPage = WebAdmin:GetPage(TemplateRequest.Request)
@@ -76,337 +76,7 @@ function ShowPage(WebAdmin, TemplateRequest)
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="icon" href="data:application/octet-stream;base64,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">
 <title>]] .. Title .. [[</title>
-
-<style type="text/css" media="screen">
-
-	/* reset CSS */
-	
-	html, body, div, span, applet, object, iframe,
-	h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-	a, abbr, acronym, address, big, cite, code,
-	del, dfn, em, font, img, ins, kbd, q, s, samp,
-	small, strike, strong, sub, sup, tt, var,
-	b, u, i, center,
-	dl, dt, dd, ol, ul, li,
-	fieldset, form, label, legend,
-	table, caption, tbody, tfoot, thead, tr, th, td {
-		margin: 0;
-		padding: 0;
-		border: 0;
-		outline: 0;
-		font-size: 100%;
-		vertical-align: baseline;
-		background: transparent;
-	}
-	body {
-		line-height: 1;
-	}
-	ol, ul {
-		list-style: none;
-	}
-	blockquote, q {
-		quotes: none;
-	}
-
-	/* remember to define focus styles! */
-	:focus {
-		outline: 0;
-	}
-
-	/* remove textarea resize at Safari */
-	textarea { 
-		resize: none;
-	}
-
-	/* remember to highlight inserts somehow! */
-	ins {
-		text-decoration: none;
-	}
-	del {
-		text-decoration: line-through;
-	}
-
-	/* tables still need 'cellspacing="0"' in the markup */
-	table {
-		border-collapse: collapse;
-		border-spacing: 0;
-	}
-
-
-	/*
-		Origional from http://www.perspectived.com/
-		Modified by Ben Phelps
-		Made for FakeTruth - MCServer
-	*/
-
-	/* Basic  ---------------------------------------- */
-
-	.clear { clear: both; }
-
-	body {
-		background: white;
-		font-family: Arial, Helvetica, sans-serif;
-		font-size: 12px;
-		color: #646464;
-		text-align: center;
-	}
-
-	#wrapper {
-		text-align: left;
-		width: 930px;
-		margin: 0 auto;
-	}
-
-	/* Logo  ---------------------------------------- */
-
-	h1 {
-		margin: 15px 0 10px 5px;
-		width: 180px;
-		height: 36px;
-		background: url(data:image/png;base64,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) no-repeat left top;
-	}
-
-	h1 a {
-		display: block;
-		width: 225px;
-		height: 28px;
-	}
-
-	h1 span { display: none; }
-
-	a {
-		color: #646464;
-	}
-
-	/* Container ---------------------------------------- */
-
-	#containerHolder {
-		background: #eee;
-		padding: 5px;
-	}
-
-
-	#container {
-		background: #fff url(data:image/gif;base64,R0lGODlhtAABAIAAAN3d3f///yH5BAAAAAAALAAAAAC0AAEAAAIMjI+py+0Po5y0WgYKADs%3D) repeat-y left top;
-		border: 1px solid #ddd;
-		width: 918px;
-
-	}
-
-	#connectHolder {
-		background: #eee;
-		padding: 5px;
-		margin-bottom:8px;
-	}
-
-
-	#connect {
-		border: 1px solid #ddd;
-		background-color: #fff;
-		padding:5px;
-		width: 908px;
-	}
-
-	.pics {  
-	    height:  375px;
-	    width:   600px;
-	} 
-
-	.pics img {  
-	    padding: 5px;  
-	    border:  1px solid #ddd;  
-	    background-color: #eee;  
-	    width:  600px; 
-	    height: 375px;
-		margin-left: 15px;
-	}
-
-	/* Login -------------------------------------- */
-
-	#loginLogo {
-		margin: 0 auto;
-		margin-top:100px;
-		width: 180px;
-		height: 36px;
-		background-image: url(data:image/png;base64,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);
-	}
-
-	#loginHolder {
-		background: #eee;
-		padding: 5px;
-		width: 310px;
-		margin: 0 auto;
-		height: 90px;
-		margin-top:20px;
-	}
-
-	#login {
-		padding:10px;
-		width: 288px;
-		height: 68px;
-		border: 1px solid #ddd;
-		background:#fff;
-		text-align: left;
-	}
-
-
-	/* Sidebar ---------------------------------------- */
-
-	#sidebar {
-		width: 179px;
-		float: left;
-	}
-
-	#sidebar .sideNav { width: 179px; }
-
-	#sidebar .sideNav li { border-bottom: 1px solid #ddd; width: 179px; }
-
-	#sidebar .sideNav li a {
-		display: block;
-		color: #646464;
-		background: #f6f6f6;
-		text-decoration: none;
-		height: 29px;
-		line-height: 29px;
-		padding: 0 19px;
-		width: 141px;
-	}
-
-	#sidebar .sideNav li a:hover { background: #fdfcf6; }
-
-	#sidebar .sideNav li a.active, #sidebar .sideNav li a.active:hover {
-		background: #f0f7fa;
-		color: #c66653;
-	}
-
-	/* Breadcrumb ---------------------------------------- */
-
-	h2 {
-		width: 718px;
-		float: right;
-		color: #646464;
-		font-size: 16px;
-		line-height: 16px;
-		font-weight: bold;
-		margin: 20px 0 0 0;
-		padding: 0 0 10px 0;
-		border-bottom: 1px solid #ddd;
-	}
-
-	h2 a {
-		color: #646464;
-		text-decoration: none;
-	}
-
-	h2 a.active { color: #c66653; }
-
-	h2 a:hover { text-decoration: underline; }
-
-	/* Content ---------------------------------------- */
-
-	#main {
-		width: 700px;
-		float: right;
-		padding: 0 19px 0 0;
-	}
-
-	#main p {
-
-		padding: 10px;
-
-	}
-
-	h3 {
-		font-size: 14px;
-		line-height: 14px;
-		font-weight: bold;
-		color: #5494af;
-		padding: 0 0 0 10px;
-		margin: 20px 0 10px;
-	}
-	
-	h4 {
-		padding: 0 0 0 10px;
-		margin: 20px 0 10px;
-	}
-	
-	#main ul {
-		padding: 0 0 0 10px;
-		list-style-type: circle;
-		list-style-position: inside;
-	}
-
-	#main table {
-		border-top: 1px solid #ddd;
-		width: 700px;
-	}
-
-	#main table tr th {
-		text-align: left;
-		background: #f6f6f6;
-		padding: 0px 20px;
-		height: 20px;
-		line-height: 20px;
-		border-bottom: 1px solid #ddd;
-	}
-	
-	#main table tr td {
-		background: #f6f6f6;
-		padding: 0px 20px;
-		height: 29px;
-		line-height: 29px;
-		border-bottom: 1px solid #ddd;
-	}
-
-	#main table tr.odd td {
-		background: #fbfbfb;
-	}
-
-	#main table tr:hover td { background: #fdfcf6; }
-
-	#main table .action {
-		text-align: right;
-		padding: 0 20px 0 10px;
-	}
-
-	#main table tr .action a { margin: 0 0 0 10px; text-decoration: none; color: #9b9b9b; }
-	#main table tr:hover .action .edit { color: #c5a059; }
-	#main table tr:hover .action .delete { color: #a02b2b; }
-	#main table tr:hover .action .view { color: #55a34a; }
-
-	#main table tr:hover .action a:hover { text-decoration: underline; }
-
-	fieldset {
-		border: 1px solid #ddd;
-		padding: 19px;
-		margin: 0 0 20px 0;
-		background: #fbfbfb;
-	}
-
-	form p { margin: 0 0 14px 0; float: left; width: 100%;  }
-
-	label {
-		display: block;
-		width: 100%;
-		margin: 0 0 7px 0;
-		line-height: 12px;
-	}
-	
-	/* Footer ---------------------------------------- */
-
-	#footer {
-		margin: 10px 0 30px 0;
-		font-size: 11px;
-		line-height: 11px;
-		color: #9B9B9B;
-		padding: 0 0 0 5px;
-	}
-
-	#footer a { color: #9B9B9B; }
-
-	#footer a:hover { text-decoration: none; }
-</style>
-
+<link rel="stylesheet" type="text/css" media="screen" href="/style.css">
 </head>
 
 <body>
@@ -464,4 +134,4 @@ function ShowPage(WebAdmin, TemplateRequest)
 	]])
 	
 	return table.concat(SiteContent)
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From fca986ec7139100939c3290a5f211d868320510f Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sun, 31 Aug 2014 14:51:07 +0200
Subject: WebAdmin: Exported favicon.

---
 MCServer/webadmin/files/favicon.ico | Bin 0 -> 32038 bytes
 MCServer/webadmin/template.lua      |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 MCServer/webadmin/files/favicon.ico

(limited to 'MCServer')

diff --git a/MCServer/webadmin/files/favicon.ico b/MCServer/webadmin/files/favicon.ico
new file mode 100644
index 000000000..ea4bde926
Binary files /dev/null and b/MCServer/webadmin/files/favicon.ico differ
diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua
index 5d5ac7b20..a7480f83e 100644
--- a/MCServer/webadmin/template.lua
+++ b/MCServer/webadmin/template.lua
@@ -74,7 +74,7 @@ function ShowPage(WebAdmin, TemplateRequest)
 <!DOCTYPE html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="icon" href="data:application/octet-stream;base64,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">
+<link rel="icon" href="/favicon.ico">
 <title>]] .. Title .. [[</title>
 <link rel="stylesheet" type="text/css" media="screen" href="/style.css">
 </head>
@@ -91,16 +91,16 @@ function ShowPage(WebAdmin, TemplateRequest)
 					<ul class="sideNav">
 	]])
 
-	
+
 	local AllPlugins = WebAdmin:GetPlugins()
 	for key,value in pairs(AllPlugins) do
 		local PluginWebTitle = value:GetWebTitle()
 		local TabNames = value:GetTabNames()
 		if (GetTableSize(TabNames) > 0) then
-			Output("<li>"..PluginWebTitle.."</li>");
+			Output("<li>"..PluginWebTitle.."</li>\n");
 			
 			for webname,prettyname in pairs(TabNames) do
-				Output("<li><a href='" .. BaseURL .. PluginWebTitle .. "/" .. webname .. "'>" .. prettyname .. "</a></li>")
+				Output("<li><a href='" .. BaseURL .. PluginWebTitle .. "/" .. webname .. "'>" .. prettyname .. "</a></li>\n")
 			end
 		end
 	end
-- 
cgit v1.2.3


From ceb1a464497ad8babf079278b1b6eca446eaf141 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sun, 31 Aug 2014 14:52:44 +0200
Subject: WebAdmin: Added favicon to the login template.

---
 MCServer/webadmin/login_template.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/webadmin/login_template.html b/MCServer/webadmin/login_template.html
index dd456607c..913a85db0 100644
--- a/MCServer/webadmin/login_template.html
+++ b/MCServer/webadmin/login_template.html
@@ -2,6 +2,7 @@
 <head>
 	<title>MCServer WebAdmin - Login</title>
 	<meta charset="UTF-8">
+	<link rel="icon" href="favicon.ico">
 	<style type="text/css">
 		header {
 			margin: 0 auto;
-- 
cgit v1.2.3


From 1ec8c12799e1a930a95da4a12e4cabea3131e146 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sun, 31 Aug 2014 15:25:40 +0200
Subject: WebAdmin: Exported logo and background.

---
 MCServer/webadmin/files/background.gif | Bin 0 -> 57 bytes
 MCServer/webadmin/files/logo.png       | Bin 0 -> 3315 bytes
 MCServer/webadmin/files/style.css      |   6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 MCServer/webadmin/files/background.gif
 create mode 100644 MCServer/webadmin/files/logo.png

(limited to 'MCServer')

diff --git a/MCServer/webadmin/files/background.gif b/MCServer/webadmin/files/background.gif
new file mode 100644
index 000000000..cab9bed56
Binary files /dev/null and b/MCServer/webadmin/files/background.gif differ
diff --git a/MCServer/webadmin/files/logo.png b/MCServer/webadmin/files/logo.png
new file mode 100644
index 000000000..50733e824
Binary files /dev/null and b/MCServer/webadmin/files/logo.png differ
diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css
index 044204084..e7ffe3999 100644
--- a/MCServer/webadmin/files/style.css
+++ b/MCServer/webadmin/files/style.css
@@ -82,7 +82,7 @@ h1 {
 	margin: 15px 0 10px 5px;
 	width: 180px;
 	height: 36px;
-	background: url(data:image/png;base64,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) no-repeat left top;
+	background: url(logo.png) no-repeat left top;
 }
 
 h1 a {
@@ -106,7 +106,7 @@ a {
 
 
 #container {
-	background: #fff url(data:image/gif;base64,R0lGODlhtAABAIAAAN3d3f///yH5BAAAAAAALAAAAAC0AAEAAAIMjI+py+0Po5y0WgYKADs%3D) repeat-y left top;
+	background: #fff url(background.gif) repeat-y left top;
 	border: 1px solid #ddd;
 	width: 918px;
 
@@ -147,7 +147,7 @@ a {
 	margin-top:100px;
 	width: 180px;
 	height: 36px;
-	background-image: url(data:image/png;base64,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);
+	background-image: url(logo.png);
 }
 
 #loginHolder {
-- 
cgit v1.2.3


From 9ee5229833d45eafaf9ef46e5b9c098ea3f5f1f1 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Sun, 31 Aug 2014 15:28:01 +0200
Subject: Added 1.8 blocks and items!

---
 MCServer/items.ini | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/items.ini b/MCServer/items.ini
index 4f4df220e..1ad722a29 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -1,9 +1,17 @@
 [Items]
 air=0
 rock=1
+granite=1:1
+polishedgranite=1:2
+diorite=1:3
+polisheddiorite=1:4
+andesite=1:5
+polishedandesite=1:6
 stone=1
 grass=2
 dirt=3
+coarseddirt=3:1
+podzol=3:2
 cobblestone=4
 cobble=4
 planks=5
@@ -69,6 +77,7 @@ spruceleaves=18:1
 birchleaves=18:2
 jungleleaves=18:3
 sponge=19
+wetsponge=19:1
 glass=20
 lapisore=21
 lapisblock=22
@@ -395,8 +404,41 @@ acaciawoodstairs=163
 bigoakwoodstiars=164
 darkoakwoodstairs=164
 roofedoakwoodstairs=164
+slimeblock=165
+irontrapdoor=167
+prismarine=168
+prismarinebricks=168:1
+darkprismarine=168:2
+sealantern=169
 haybale=170
 carpet=171
+redsandstone=179
+chiseledredsandstone=179:1
+smoothredsandstone=179:2
+redsandstonestairs=180
+redsandstoneslab=182
+coniferfencegate=183
+pinefencegate=183
+sprucefencegate=183
+darkfencegate=183
+birchfencegate=184
+whitefencegate=184
+junglefencegate=185
+darkoakfencegate=186
+bigoakfencegate=186
+roofedoakfencegate=186
+acaciafence=187
+coniferfence=188
+pinefence=188
+sprucefence=188
+darkfence=188
+birchfence=189
+whitefence=189
+junglefence=190
+darkoakfence=191
+bigoakfence=191
+roofedoakfence=191
+acaciafence=192
 ironshovel=256
 ironspade=256
 ironpickaxe=257
@@ -644,13 +686,35 @@ netherbrickitem=405
 netherquartz=406
 tntminecart=407
 hopperminecart=408
+prismarineshard=409
+prismarinecrystals=410
+rawrabbit=411
+cookedrabbit=412
+rabbitstew=413
+rabbitsoup=413
+rabbitsfood=414
+rabbithide=415
+armorstand=416
 ironhorsearmor=417
 goldhorsearmor=418
 diamondhorsearmor=419
 lead=420
 nametag=421
 commandblockminecart=422
-
+rawmutton=423
+cookedmutton=424
+banner=425
+coniferdoor=427
+pinedoor=427
+sprucedoor=427
+darkdoor=427
+birchdoor=428
+whitedoor=428
+jungledoor=429
+acaciadoor=430
+bigoakdoor=431
+darkoakdoor=431
+roofedoakdoor=431
 goldrecord=2256
 greenrecord=2257
 blocksrecord=2258
-- 
cgit v1.2.3


From b13f10aabf0f808143d205c60cf720d9d4582b4f Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Sun, 31 Aug 2014 16:25:12 +0200
Subject: Added 1.8 recipes!

---
 MCServer/crafting.txt | 66 +++++++++++++++++++++++++++++++++++++++++++++++----
 MCServer/items.ini    | 22 +++++++++++++----
 2 files changed, 80 insertions(+), 8 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 5bb0569f3..944cb15f3 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -85,6 +85,19 @@ Sandstone, 4     = Sand,      1:1, 1:2, 2:1, 2:2
 SmoothSandstone, 4 = Sandstone, 1:1, 1:2, 2:1, 2:2
 OrnamentSandstone = SandstoneSlab, 1:1, 1:2
 JackOLantern     = Pumpkin, 1:1 | Torch, 1:2
+PolishedGranite, 4= Granite, 1:1, 1:2, 2:1, 2:2
+PolishedDiorite, 4= Diorite, 1:1, 1:2, 2:1, 2:2
+PolishedAndesite, 4= Andesite, 1:1, 1:2, 2:1, 2:2
+CoarsedDirt, 4   = Dirt, 1:1, 2:2 | Gravel 1:2, 2:1
+CoarsedDirt, 4   = Gravel, 1:1, 2:2 | Dirt 1:2, 2:1
+SlimeBlock       = Slimeball, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+Prismarine       = PrismarineShard, 1:1, 1:2, 2:1, 2:2
+PrismarineBricks = PrismarineShard, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+DarkPrismarine   = PrismarineShard, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Inksac, 2:2
+SeaLantern       = PrismarineShard, 1:1, 1:3, 3:1, 3:3, PrismarineCrystal, 1:2, 2:1, 2:2, 2:3, 3:2
+RedSandstone, 4  = RedSand, 1:1, 1:2, 2:1, 2:2
+ChiseledRedSandstone, 4= RedSandstoneSlab, 1:1, 1:2
+SmoothRedSandstone, 4= RedSand, 1:1, 1:2, 2:1, 2:2
 
 # Slabs:
 StoneSlab,       6  = Stone,             1:1, 2:1, 3:1
@@ -101,6 +114,7 @@ StonebrickSlab,  6  = StoneBrick,        1:1, 2:1, 3:1
 NetherbrickSlab, 6  = NetherBrick,       1:1, 2:1, 3:1
 Quartzslab,      6  = QuartzBlock,       1:1, 2:1, 3:1
 snow,            6  = SnowBlock,         1:1, 2:1, 3:1
+RedSandstoneSlab, 6 = RedSandstone,      1:1, 2:1, 3:1
 
 
 # Stairs:
@@ -128,6 +142,8 @@ quartzstairs, 4      = QuartzBlock, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 quartzstairs, 4      = QuartzBlock, 3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 StoneBrickStairs, 4  = StoneBrick,  1:1, 1:2, 2:2, 1:3, 2:3, 3:3
 StoneBrickStairs, 4  = StoneBrick,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+RedSandstoneStairs, 4 = RedSandstone,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
+RedSandstoneStairs, 4 = RedSandstone,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 
 # Other
 Carpet             = Wool, 1:3, 2:3
@@ -262,11 +278,19 @@ ActivatorRail, 6 = IronIngot, 1:1, 1:2, 1:3, 3:1, 3:2, 3:3 | Stick, 2:1, 2:3 | R
 #******************************************************#
 # Mechanisms
 #
-WoodenDoor       = Planks,    1:1, 1:2, 1:3, 2:1, 2:2, 2:3
-IronDoor         = IronIngot, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+WoodenDoor, 3    = OakPlanks,    1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+SpruceDoor, 3    = SprucePlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+BirchDoor, 3     = BirchPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+JungleDoor, 3    = JunglePlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+AcaciaDoor, 3    = AcaciaPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+DarkOakDoor, 3   = DarkOakPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
+IronDoor, 3      = IronIngot, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3
 TrapDoor, 2      = Planks,    1:1, 2:1, 3:1, 1:2, 2:2, 3:2
+IronTrapDoor     = IronIngot, 1:1, 1:2, 2:1, 2:2
 WoodPlate        = Planks,  1:1, 2:1
 StonePlate       = Stone,   1:1, 2:1
+lightweightedpressureplate = IronIngot, 1:1, 2:1
+heavyweightedpressureplate = GoldIngot, 1:1, 2:1
 StoneButton      = Stone,   1:1
 WoodenButton     = Planks,  1:1
 RedstoneTorchOn  = Stick, 1:2        | RedstoneDust, 1:1
@@ -304,6 +328,8 @@ MelonSeeds           = MelonSlice, *
 PumpkinSeeds, 4      = Pumpkin, *
 PumpkinPie           = Pumpkin, * | Sugar, * | egg, *
 Wheat, 9             = Haybale, *
+MushroomStew         = Cooked Rabbit, 2:1 | Carrot, 1:2 | BakedPotato 2:2 | BrownMushroom 3:2 | Bowl, 2:3
+MushroomStew         = Cooked Rabbit, 2:1 | Carrot, 1:2 | BakedPotato 2:2 | RedMushroom 3:2 | Bowl, 2:3
 
 
 
@@ -332,17 +358,49 @@ IronBars, 16        = IronIngot, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
 Paper, 3            = Sugarcane, 1:1, 2:1, 3:1
 Book                = Paper, *, *, * | leather, *
 Bookandquill        = Book, * | feather, * | inksac, *
-Fence, 2            = Stick,       1:1, 2:1, 3:1, 1:2, 2:2, 3:2
+Fence, 3            = OakPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+SpruceFence, 3      = SprucePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+BirchFence, 3       = BirchPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+JungleFence, 3      = JunglePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+DarkOakFence, 3     = DarkOakPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
+AcaciaFence, 3      = AcaciaPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2
 Cobblestonewall, 6  = cobblestone, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
 mossycobblestonewall, 6  = mossycobblestone, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3
 NetherBrickFence, 6 = NetherBrick, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
-FenceGate           = Stick,       1:1, 1:2, 3:1, 3:2  | Planks, 2:1, 2:2
+FenceGate           = Stick,       1:1, 1:2, 3:1, 3:2  | OakPlanks, 2:1, 2:2
+SpruceFenceGate     = Stick,       1:1, 1:2, 3:1, 3:2  | SprucePlanks, 2:1, 2:2
+BirchFenceGate      = Stick,       1:1, 1:2, 3:1, 3:2  | BirchPlanks, 2:1, 2:2
+JungleFenceGate     = Stick,       1:1, 1:2, 3:1, 3:2  | JunglePlanks, 2:1, 2:2
+DarkOakFenceGate    = Stick,       1:1, 1:2, 3:1, 3:2  | DarkOakPlanks, 2:1, 2:2
+AcaciaFenceGate     = Stick,       1:1, 1:2, 3:1, 3:2  | AcaciaPlanks, 2:1, 2:2
 Bed                 = Planks,            1:2, 2:2, 3:2 | Wool,   1:1, 2:1, 3:1
 GoldIngot           = GoldNugget, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 EyeOfEnder          = EnderPearl, *                 | BlazePowder, *
 Beacon              = Glass, 1:1, 1:2, 2:1, 3:1, 3:2 | Obsidian, 1:3, 2:3, 3:3 | NetherStar, 2:2
 Anvil               = IronBlock, 1:1, 2:1, 3:1 | IronIngot, 2:2, 1:3, 2:3, 3:3
 FlowerPot           = Brick, 1:2, 2:3, 3:2
+ArmorStand          = Stick, 1:1, 1:3, 2:1, 2:2, 3:1, 3:3 | StoneSlab, 2:3
+
+# These are just the basic ones, you can add various shapes and stuff to each of them
+# ToDo: Add the various shapes (saved in NBT-Tags, not in meta)
+# Banners:
+
+WhiteBanner         = Stick, 2:3 | WhiteWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+OrangeBanner        = Stick, 2:3 | OrangeWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+MagentaBanner       = Stick, 2:3 | MagentaWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+LightBlueBanner     = Stick, 2:3 | LightBlueWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+YellowBanner        = Stick, 2:3 | YellowWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+LimeBanner          = Stick, 2:3 | LimeWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+PinkBanner          = Stick, 2:3 | PinkWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+GrayBanner          = Stick, 2:3 | GrayWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+LightGrayBanner     = Stick, 2:3 | LightGrayWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+CyanBanner          = Stick, 2:3 | CyanWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+PurpleBanner        = Stick, 2:3 | PurpleWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+BlueBanner          = Stick, 2:3 | BlueWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+BrownBanner         = Stick, 2:3 | BrownWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+GreenBanner         = Stick, 2:3 | GreenWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+RedBanner           = Stick, 2:3 | RedWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
+BlackBanner         = Stick, 2:3 | BlackWool, 1:1, 1:2, 2:1, 2:2, 2:1, 2:2
 
 
 
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 1ad722a29..3be2da96a 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -53,6 +53,7 @@ stilllava=11
 slava=11
 stationarylava=11
 sand=12
+redsand=12:1
 gravel=13
 goldore=14
 ironore=15
@@ -114,12 +115,8 @@ pinkwool=35:6
 graywool=35:7
 greywool=35:7
 darkgraywool=35:7
-darkgreywool=35:7
-dkgraywool=35:7
 dkgreywool=35:7
 lightgraywool=35:8
-lightgreywool=35:8
-ltgraywool=35:8
 ltgreywool=35:8
 cyanwool=35:9
 purplewool=35:10
@@ -704,6 +701,23 @@ commandblockminecart=422
 rawmutton=423
 cookedmutton=424
 banner=425
+blackbanner=415:0
+redbanner=415:1
+greenbanner=415:2
+brownbanner=415:3
+bluebanner=415:4
+purplebanner=415:5
+cyanbanner=415:6
+silverbanner=415:7
+lightgraybanner=415:7
+graybanner=415:8
+pinkbanner=415:9
+limebanner=415:10
+yellowbanner=415:11
+lightbluebanner=415:12
+magentabanner=415:13
+orangebanner=415:14
+whitebanner=415:15
 coniferdoor=427
 pinedoor=427
 sprucedoor=427
-- 
cgit v1.2.3


From ec259eeef0058e5acc92ff1c2556eb68f1238fb2 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Sun, 31 Aug 2014 16:33:19 +0200
Subject: Added missing mossy stonebrick recipe!

---
 MCServer/crafting.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 944cb15f3..d5b8a7365 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -98,6 +98,7 @@ SeaLantern       = PrismarineShard, 1:1, 1:3, 3:1, 3:3, PrismarineCrystal, 1:2,
 RedSandstone, 4  = RedSand, 1:1, 1:2, 2:1, 2:2
 ChiseledRedSandstone, 4= RedSandstoneSlab, 1:1, 1:2
 SmoothRedSandstone, 4= RedSand, 1:1, 1:2, 2:1, 2:2
+MossyStoneBrick  = Stonebrick, * | Vines, *
 
 # Slabs:
 StoneSlab,       6  = Stone,             1:1, 2:1, 3:1
-- 
cgit v1.2.3


From 90d39fd9176a32df2fc7f5ca107d39bd351c1ef0 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Sun, 31 Aug 2014 16:50:05 +0200
Subject: Added furnace recipes!

---
 MCServer/furnace.txt | 45 +++++++++++++++++++++++++++++----------------
 MCServer/items.ini   |  2 +-
 2 files changed, 30 insertions(+), 17 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/furnace.txt b/MCServer/furnace.txt
index d6177184b..8d7577ff9 100644
--- a/MCServer/furnace.txt
+++ b/MCServer/furnace.txt
@@ -39,22 +39,25 @@
 #--------------------------
 # Smelting recipes
 
-4:1   @ 200 = 1:1      # 1 Cobblestone  -> 1 Rock
-15:1  @ 200 = 265:1    # 1 Iron Ore     -> 1 Iron Ingot
-14:1  @ 200 = 266:1    # 1 Gold Ore     -> 1 Gold Ingot
-153:1 @ 200 = 406:1    # 1 Quartz Ore   -> 1 Quartz
-12:1  @ 200 = 20:1     # 1 Sand         -> 1 Glass
-319:1 @ 200 = 320:1    # 1 Raw Pork     -> 1 Cooked Pork
-363:1 @ 200 = 364:1    # 1 Raw Beef     -> 1 Cooked Beef (steak)
-365:1 @ 200 = 366:1    # 1 Raw Chicken  -> 1 Cooked Chicken
-337:1 @ 200 = 336:1    # 1 Clay         -> 1 Clay Brick
-82:1  @ 200 = 172:1    # 1 Clay Block   -> 1 Hardened Clay
-87:1  @ 200 = 405:1    # 1 NetherRack   -> 1 NetherBrick
-349:1 @ 200 = 350:1    # 1 Raw Fish     -> 1 Cooked Fish
-17:1  @ 200 = 263:1:1  # 1 Log          -> 1 Charcoal
-81:1  @ 200 = 351:1:2  # 1 Cactus       -> 1 Green Dye
-
-
+4:1     @ 200 = 1:1      # 1 Cobblestone  -> 1 Rock
+15:1    @ 200 = 265:1    # 1 Iron Ore     -> 1 Iron Ingot
+14:1    @ 200 = 266:1    # 1 Gold Ore     -> 1 Gold Ingot
+153:1   @ 200 = 406:1    # 1 Quartz Ore   -> 1 Quartz
+12:1    @ 200 = 20:1     # 1 Sand         -> 1 Glass
+319:1   @ 200 = 320:1    # 1 Raw Pork     -> 1 Cooked Pork
+363:1   @ 200 = 364:1    # 1 Raw Beef     -> 1 Cooked Beef (steak)
+365:1   @ 200 = 366:1    # 1 Raw Chicken  -> 1 Cooked Chicken
+337:1   @ 200 = 336:1    # 1 Clay         -> 1 Clay Brick
+82:1    @ 200 = 172:1    # 1 Clay Block   -> 1 Hardened Clay
+87:1    @ 200 = 405:1    # 1 NetherRack   -> 1 NetherBrick
+349:1   @ 200 = 350:1    # 1 Raw Fish     -> 1 Cooked Fish
+349:1:1 @ 200 = 350:1:1  # 1 Raw Salmon   -> 1 Cooked Salmon
+17:1    @ 200 = 263:1:1  # 1 Log          -> 1 Charcoal
+81:1    @ 200 = 351:1:2  # 1 Cactus       -> 1 Green Dye
+19:1:1  @ 200 = 19:1     # 1 Wet Sponge   -> 1 Sponge
+98:1    @ 200 = 98:1:2   # 1 Stonebrick   -> 1 Cracked Stonebrick
+411:1   @ 200 = 412:1    # 1 Raw Rabbit   -> 1 Cooked Rabbit
+423:1   @ 200 = 424:1    # 1 Raw Mutton   -> 1 Cooked Mutton
 
 
 
@@ -67,6 +70,11 @@
 ! 5:1      = 300    # 1 Planks          -> 15 sec
 ! 280:1    = 100    # 1 Stick           -> 5 sec
 ! 85:1     = 300    # 1 Fence           -> 15 sec
+! 188:1    = 300    # 1 Spruce Fence    -> 15 sec
+! 189:1    = 300    # 1 Birch Fence     -> 15 sec
+! 190:1    = 300    # 1 Jungle Fence    -> 15 sec
+! 191:1    = 300    # 1 Dark Oak Fence  -> 15 sec
+! 192:1    = 300    # 1 Acacia Fence    -> 15 sec
 ! 53:1     = 300    # 1 Wooden Stairs   -> 15 sec
 ! 58:1     = 300    # 1 Crafting Table  -> 15 sec
 ! 47:1     = 300    # 1 Bookshelf       -> 15 sec
@@ -80,6 +88,11 @@
 ! 25:1     = 300    # 1 Note Block      -> 15 sec
 ! 151:1    = 300    # 1 Daylight Sensor -> 15 sec
 ! 107:1    = 300    # 1 Fence Gate      -> 15 sec
+! 183:1    = 300    # 1 Spruce Fence Gate -> 15 sec
+! 184:1    = 300    # 1 Birch Fence Gate -> 15 sec
+! 185:1    = 300    # 1 Jungle Fence Gate -> 15 sec
+! 186:1    = 300    # 1 Dark Oak Fence Gate -> 15 sec
+! 187:1    = 300    # 1 Acacia Fence Gate -> 15 sec
 ! 167:1    = 300    # 1 Trapdoor        -> 15 sec
 ! 146:1    = 300    # 1 Trapped Chest   -> 15 sec
 ! 72:1     = 300    # 1 Pressure Plate  -> 15 sec
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 3be2da96a..3216085a9 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -424,7 +424,7 @@ junglefencegate=185
 darkoakfencegate=186
 bigoakfencegate=186
 roofedoakfencegate=186
-acaciafence=187
+acaciafencegate=187
 coniferfence=188
 pinefence=188
 sprucefence=188
-- 
cgit v1.2.3


From 3d7b8d3598c11d43f706038913864efb2a1fb60d Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sun, 31 Aug 2014 19:28:36 +0200
Subject: Rewrited furnace.txt

---
 MCServer/furnace.txt | 101 ++++++++++++++++++++++++++-------------------------
 MCServer/items.ini   |   1 +
 2 files changed, 53 insertions(+), 49 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/furnace.txt b/MCServer/furnace.txt
index d6177184b..9a8cf59e5 100644
--- a/MCServer/furnace.txt
+++ b/MCServer/furnace.txt
@@ -10,25 +10,28 @@
 # An Item is defined by an Item Type, an amount (and damage)
 # The damage is optional, and if not specified it's assumed to be 0
 #
-# -Cactus Green:
-#    351     :   1    ( :   2    )
-#   ItemType : Amount ( : Damage )
+# Cactus Green example:
+#    351     :   2    ( ,   1    )
+#   ItemType : Damage ( , Amount )
+# or simple use the item name (marked in items.ini):
+#   CactusGreen ( , 1 )
 #
 #
 # **** Recipe and result ****
 #
-# 4:1@200=1:1 -> Produces 1 smooth stone from 1 cobblestone in 200 ticks (10 seconds)
+# Cobble @ 200 = Stone -> Produces 1 smooth stone from 1 cobblestone in 200 ticks (10 seconds)
 #
-#   4      :    1   @  200  =   1    :   1
-# ItemType : Amount @ ticks = ItemID : Amount
+# Write in full:
+#    Cobble  :   0    ,   1    @  200  =    1     :   1    ,   1
+#   ItemType : Damage , Amount @ ticks = ItemType : Damage , Amount
 #
 #
 # **** Fuel ****
 #
 # !17:1 = 300 -> 1 Wood burns for 300 ticks (15 s)
 #
-#  !     17   :   1    =  300
-# Fuel ItemType : Amount = ticks
+#  !     Wood   ,   1    =  300
+# Fuel ItemType , Amount = ticks
 #
 #******************************************************#
 
@@ -39,20 +42,20 @@
 #--------------------------
 # Smelting recipes
 
-4:1   @ 200 = 1:1      # 1 Cobblestone  -> 1 Rock
-15:1  @ 200 = 265:1    # 1 Iron Ore     -> 1 Iron Ingot
-14:1  @ 200 = 266:1    # 1 Gold Ore     -> 1 Gold Ingot
-153:1 @ 200 = 406:1    # 1 Quartz Ore   -> 1 Quartz
-12:1  @ 200 = 20:1     # 1 Sand         -> 1 Glass
-319:1 @ 200 = 320:1    # 1 Raw Pork     -> 1 Cooked Pork
-363:1 @ 200 = 364:1    # 1 Raw Beef     -> 1 Cooked Beef (steak)
-365:1 @ 200 = 366:1    # 1 Raw Chicken  -> 1 Cooked Chicken
-337:1 @ 200 = 336:1    # 1 Clay         -> 1 Clay Brick
-82:1  @ 200 = 172:1    # 1 Clay Block   -> 1 Hardened Clay
-87:1  @ 200 = 405:1    # 1 NetherRack   -> 1 NetherBrick
-349:1 @ 200 = 350:1    # 1 Raw Fish     -> 1 Cooked Fish
-17:1  @ 200 = 263:1:1  # 1 Log          -> 1 Charcoal
-81:1  @ 200 = 351:1:2  # 1 Cactus       -> 1 Green Dye
+Cobble           = Stone
+IronOre          = IronIngot
+GoldOre          = GoldIngot
+NetherQuartzOre  = NetherQuartz
+Sand             = Glass
+Pork             = CookedPork
+RawBeef          = Steak
+RawChicken       = CookedChicken
+Clay             = Brick
+ClayBlock        = HardenedClay
+TallGrass        = NetherBrickItem
+RawFish          = CookedFish
+Log              = CharCoal
+Cactus           = GreenDye
 
 
 
@@ -61,31 +64,31 @@
 #--------------------------
 # Fuels
 
-! 263:1    = 1600   # 1 Coal            -> 80 sec
-! 263:1:1  = 1600   # 1 Charcoal        -> 80 sec
-! 126:1    = 15     # 1 Halfslab        -> 7.5 sec
-! 5:1      = 300    # 1 Planks          -> 15 sec
-! 280:1    = 100    # 1 Stick           -> 5 sec
-! 85:1     = 300    # 1 Fence           -> 15 sec
-! 53:1     = 300    # 1 Wooden Stairs   -> 15 sec
-! 58:1     = 300    # 1 Crafting Table  -> 15 sec
-! 47:1     = 300    # 1 Bookshelf       -> 15 sec
-! 54:1     = 300    # 1 Chest           -> 15 sec
-! 84:1     = 300    # 1 Jukebox         -> 15 sec
-! 327:1    = 20000  # 1 Lava Bucket     -> 1000 sec
-! 17:1     = 300    # 1 Wood            -> 15 sec
-! 6:1      = 100    # 1 Sapling         -> 5 sec
-! 173:1    = 16000  # 1 Coal Block      -> 800 sec
-! 369:1    = 2400   # 1 Blaze Rod       -> 120 sec
-! 25:1     = 300    # 1 Note Block      -> 15 sec
-! 151:1    = 300    # 1 Daylight Sensor -> 15 sec
-! 107:1    = 300    # 1 Fence Gate      -> 15 sec
-! 167:1    = 300    # 1 Trapdoor        -> 15 sec
-! 146:1    = 300    # 1 Trapped Chest   -> 15 sec
-! 72:1     = 300    # 1 Pressure Plate  -> 15 sec
-! 270:1    = 200    # 1 Wooden Pickaxe  -> 10 sec
-! 271:1    = 200    # 1 Wooden Axe      -> 10 sec
-! 269:1    = 200    # 1 Wooden Shovel   -> 10 sec
-! 290:1    = 200    # 1 Wooden Hoe      -> 10 sec
-! 268:1    = 200    # 1 Wooden Sword    -> 10 sec
+! CharCoal       = 1600   # -> 80 sec
+! Coal           = 1600   # -> 80 sec
+! WoodenSlab     = 15     # -> 7.5 sec
+! Planks         = 300    # -> 15 sec
+! Stick          = 100    # -> 5 sec
+! Fence          = 300    # -> 15 sec
+! WoodStairs     = 300    # -> 15 sec
+! Workbench      = 300    # -> 15 sec
+! Bookshelf      = 300    # -> 15 sec
+! Chest          = 300    # -> 15 sec
+! Jukebox        = 300    # -> 15 sec
+! Lavabucket     = 20000  # -> 1000 sec
+! Log            = 300    # -> 15 sec
+! Sapling        = 100    # -> 5 sec
+! CoalBlock      = 16000  # -> 800 sec
+! BlazeRod       = 2400   # -> 120 sec
+! NoteBlock      = 300    # -> 15 sec
+! DaylightSensor = 300    # -> 15 sec
+! FenceGate      = 300    # -> 15 sec
+! Trapdoor       = 300    # -> 15 sec
+! TrappedChest   = 300    # -> 15 sec
+! WoodPlate      = 300    # -> 15 sec
+! WoodPickaxe    = 200    # -> 10 sec
+! WoodAxe        = 200    # -> 10 sec
+! WoodShovel     = 200    # -> 10 sec
+! WoodHoe        = 200    # -> 10 sec
+! WoodSword      = 200    # -> 10 sec
 
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 4f4df220e..979e02396 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -397,6 +397,7 @@ darkoakwoodstairs=164
 roofedoakwoodstairs=164
 haybale=170
 carpet=171
+hardenedclay=172
 ironshovel=256
 ironspade=256
 ironpickaxe=257
-- 
cgit v1.2.3


From 959f89f5bc59538c6047a1dcee8c8d283768f1b6 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Mon, 1 Sep 2014 00:42:40 +0200
Subject: Fixed ReplaceString() documentation.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 3e1a6e3bb..e7f9e9b18 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2846,7 +2846,7 @@ end
 				MirrorBlockFaceY = { Params = "{{Globals#BlockFaces|eBlockFace}}", Return = "{{Globals#BlockFaces|eBlockFace}}", Notes = "Returns the {{Globals#BlockFaces|eBlockFace}} that corresponds to the given {{Globals#BlockFaces|eBlockFace}} after mirroring it around the Y axis (or rotating 180 degrees around it)." },
 				NoCaseCompare = {Params = "string, string", Return = "number", Notes = "Case-insensitive string comparison; returns 0 if the strings are the same"},
 				NormalizeAngleDegrees = { Params = "AngleDegrees", Return = "AngleDegrees", Notes = "Returns the angle, wrapped into the [-180, +180) range." },
-				ReplaceString = {Params = "full-string, to-be-replaced-string, to-replace-string", Notes = "Replaces *each* occurence of to-be-replaced-string in full-string with to-replace-string"},
+				ReplaceString = {Params = "full-string, to-be-replaced-string, to-replace-string", Return = "string", Notes = "Replaces *each* occurence of to-be-replaced-string in full-string with to-replace-string"},
 				RotateBlockFaceCCW = { Params = "{{Globals#BlockFaces|eBlockFace}}", Return = "{{Globals#BlockFaces|eBlockFace}}", Notes = "Returns the {{Globals#BlockFaces|eBlockFace}} that corresponds to the given {{Globals#BlockFaces|eBlockFace}} after rotating it around the Y axis 90 degrees counter-clockwise." },
 				RotateBlockFaceCW = { Params = "{{Globals#BlockFaces|eBlockFace}}", Return = "{{Globals#BlockFaces|eBlockFace}}", Notes = "Returns the {{Globals#BlockFaces|eBlockFace}} that corresponds to the given {{Globals#BlockFaces|eBlockFace}} after rotating it around the Y axis 90 degrees clockwise." },
 				StringSplit = {Params = "string, SeperatorsString", Return = "array table of strings", Notes = "Seperates string into multiple by splitting every time any of the characters in SeperatorsString is encountered."},
-- 
cgit v1.2.3


From 9674224e32daa1059a5d53a6e7101fbd485a4fc6 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Mon, 1 Sep 2014 19:08:29 +0200
Subject: Fixed spacing and light gray wool name!

---
 MCServer/crafting.txt | 76 +++++++++++++++++++++++++--------------------------
 MCServer/items.ini    |  2 ++
 2 files changed, 40 insertions(+), 38 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index d5b8a7365..078dc3925 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -61,44 +61,44 @@ Furnace          = Cobblestone, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3
 #******************************************************#
 # Blocks
 #
-IronBlock        = IronIngot,   1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-GoldBlock        = GoldIngot,   1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-DiamondBlock     = Diamond,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-LapisBlock       = LapisLazuli, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-EmeraldBlock     = Emerald,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-RedstoneBlock    = RedstoneDust,    1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-QuartzBlock      = NetherQuartz, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-NetherBrick      = netherbrickitem, 1:1, 1:2, 2:1, 2:2
-Glowstone        = GlowstoneDust, 1:1, 1:2, 2:1, 2:2
-Wool             = String,    1:1, 1:2, 2:1, 2:2
-TNT              = Gunpowder, 1:1, 3:1, 2:2, 1:3, 3:3 | Sand, 2:1, 1:2, 3:2, 2:3
-PillarQuartzBlock = QuartzSlab, 1:1, 1:2
-ChiseledQuartzBlock, 2 = QuartzBlock, 1:1, 1:2
-CoalBlock        = Coal, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-HayBale          = Wheat, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-SnowBlock        = SnowBall,  1:1, 1:2, 2:1, 2:2
-ClayBlock        = Clay,      1:1, 1:2, 2:1, 2:2
-BrickBlock       = Brick,     1:1, 1:2, 2:1, 2:2
-StoneBrick, 4    = Stone,     1:1, 1:2, 2:1, 2:2
-BookShelf        = Planks,    1:1, 2:1, 3:1, 1:3, 2:3, 3:3 | Book, 1:2, 2:2, 3:2
-Sandstone, 4     = Sand,      1:1, 1:2, 2:1, 2:2
-SmoothSandstone, 4 = Sandstone, 1:1, 1:2, 2:1, 2:2
-OrnamentSandstone = SandstoneSlab, 1:1, 1:2
-JackOLantern     = Pumpkin, 1:1 | Torch, 1:2
-PolishedGranite, 4= Granite, 1:1, 1:2, 2:1, 2:2
-PolishedDiorite, 4= Diorite, 1:1, 1:2, 2:1, 2:2
-PolishedAndesite, 4= Andesite, 1:1, 1:2, 2:1, 2:2
-CoarsedDirt, 4   = Dirt, 1:1, 2:2 | Gravel 1:2, 2:1
-CoarsedDirt, 4   = Gravel, 1:1, 2:2 | Dirt 1:2, 2:1
-SlimeBlock       = Slimeball, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-Prismarine       = PrismarineShard, 1:1, 1:2, 2:1, 2:2
-PrismarineBricks = PrismarineShard, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
-DarkPrismarine   = PrismarineShard, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Inksac, 2:2
-SeaLantern       = PrismarineShard, 1:1, 1:3, 3:1, 3:3, PrismarineCrystal, 1:2, 2:1, 2:2, 2:3, 3:2
-RedSandstone, 4  = RedSand, 1:1, 1:2, 2:1, 2:2
-ChiseledRedSandstone, 4= RedSandstoneSlab, 1:1, 1:2
-SmoothRedSandstone, 4= RedSand, 1:1, 1:2, 2:1, 2:2
-MossyStoneBrick  = Stonebrick, * | Vines, *
+IronBlock               = IronIngot,   1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+GoldBlock               = GoldIngot,   1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+DiamondBlock            = Diamond,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+LapisBlock              = LapisLazuli, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+EmeraldBlock            = Emerald,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+RedstoneBlock           = RedstoneDust,    1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+QuartzBlock             = NetherQuartz, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+NetherBrick             = netherbrickitem, 1:1, 1:2, 2:1, 2:2
+Glowstone               = GlowstoneDust, 1:1, 1:2, 2:1, 2:2
+Wool                    = String,    1:1, 1:2, 2:1, 2:2
+TNT                     = Gunpowder, 1:1, 3:1, 2:2, 1:3, 3:3 | Sand, 2:1, 1:2, 3:2, 2:3
+PillarQuartzBlock       = QuartzSlab, 1:1, 1:2
+ChiseledQuartzBlock, 2  = QuartzBlock, 1:1, 1:2
+CoalBlock               = Coal, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+HayBale                 = Wheat, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+SnowBlock               = SnowBall,  1:1, 1:2, 2:1, 2:2
+ClayBlock               = Clay,      1:1, 1:2, 2:1, 2:2
+BrickBlock              = Brick,     1:1, 1:2, 2:1, 2:2
+StoneBrick, 4           = Stone,     1:1, 1:2, 2:1, 2:2
+BookShelf               = Planks,    1:1, 2:1, 3:1, 1:3, 2:3, 3:3 | Book, 1:2, 2:2, 3:2
+Sandstone, 4            = Sand,      1:1, 1:2, 2:1, 2:2
+SmoothSandstone, 4      = Sandstone, 1:1, 1:2, 2:1, 2:2
+OrnamentSandstone       = SandstoneSlab, 1:1, 1:2
+JackOLantern            = Pumpkin, 1:1 | Torch, 1:2
+PolishedGranite, 4      = Granite, 1:1, 1:2, 2:1, 2:2
+PolishedDiorite, 4      = Diorite, 1:1, 1:2, 2:1, 2:2
+PolishedAndesite, 4     = Andesite, 1:1, 1:2, 2:1, 2:2
+CoarsedDirt, 4          = Dirt, 1:1, 2:2 | Gravel 1:2, 2:1
+CoarsedDirt, 4          = Gravel, 1:1, 2:2 | Dirt 1:2, 2:1
+SlimeBlock              = Slimeball, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+Prismarine              = PrismarineShard, 1:1, 1:2, 2:1, 2:2
+PrismarineBricks        = PrismarineShard, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+DarkPrismarine          = PrismarineShard, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3 | Inksac, 2:2
+SeaLantern              = PrismarineShard, 1:1, 1:3, 3:1, 3:3, PrismarineCrystal, 1:2, 2:1, 2:2, 2:3, 3:2
+RedSandstone, 4         = RedSand, 1:1, 1:2, 2:1, 2:2
+ChiseledRedSandstone, 4 = RedSandstoneSlab, 1:1, 1:2
+SmoothRedSandstone, 4   = RedSand, 1:1, 1:2, 2:1, 2:2
+MossyStoneBrick         = Stonebrick, * | Vines, *
 
 # Slabs:
 StoneSlab,       6  = Stone,             1:1, 2:1, 3:1
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 3216085a9..1a9591347 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -117,6 +117,8 @@ greywool=35:7
 darkgraywool=35:7
 dkgreywool=35:7
 lightgraywool=35:8
+lightgreywool=35:8
+ltgraywool=35:8
 ltgreywool=35:8
 cyanwool=35:9
 purplewool=35:10
-- 
cgit v1.2.3


From 8f58cc50dd75d279d90727136bd51f780b9d3fc5 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Mon, 1 Sep 2014 21:34:04 +0200
Subject: Added missing leather recipe!

---
 MCServer/crafting.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index d471f2cac..d29344b64 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -99,6 +99,7 @@ RedSandstone, 4         = RedSand, 1:1, 1:2, 2:1, 2:2
 ChiseledRedSandstone, 4 = RedSandstoneSlab, 1:1, 1:2
 SmoothRedSandstone, 4   = RedSand, 1:1, 1:2, 2:1, 2:2
 MossyStoneBrick         = Stonebrick, * | Vines, *
+Leather                 = RabbitHide, 1:1, 1:2, 2:1, 2:2
 
 # Slabs:
 StoneSlab,       6  = Stone,             1:1, 2:1, 3:1
-- 
cgit v1.2.3


From 7fb9cbcfb2fb0b042861b98bb93dc38d4a8c73b2 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Tue, 2 Sep 2014 08:34:23 +0200
Subject: Re-updated the Core.

---
 MCServer/Plugins/Core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
index 7cc99285a..bd23915df 160000
--- a/MCServer/Plugins/Core
+++ b/MCServer/Plugins/Core
@@ -1 +1 @@
-Subproject commit 7cc99285ae5117418f657c3b295ca71f2b75b4f4
+Subproject commit bd23915df763b182610c6163c5ff2d64a0756560
-- 
cgit v1.2.3


From 4837d41368407cfd9b568bed8536ac05e4b300bc Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Tue, 2 Sep 2014 08:35:58 +0200
Subject: Re-added alternate spellings of darkgraywool.

---
 MCServer/items.ini | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/items.ini b/MCServer/items.ini
index e2b1a95b6..6eb9eee6e 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -115,6 +115,8 @@ pinkwool=35:6
 graywool=35:7
 greywool=35:7
 darkgraywool=35:7
+darkgreywool=35:7
+dkgraywool=35:7
 dkgreywool=35:7
 lightgraywool=35:8
 lightgreywool=35:8
-- 
cgit v1.2.3


From c8953d165c037684b1373e090dea56daddc6e636 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 2 Sep 2014 19:13:36 +0200
Subject: Added a custom name test to the debuggers plugin.

---
 MCServer/Plugins/Debuggers/Debuggers.lua | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index 179935c08..65ce0993a 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -38,6 +38,7 @@ function Initialize(Plugin)
 	-- _X: Disabled so that the normal operation doesn't interfere with anything
 	-- PM:AddHook(cPluginManager.HOOK_CHUNK_GENERATED,              OnChunkGenerated);
 
+	PM:BindCommand("/cm",      "debuggers", HandleCustomNameCmd,   "- Gives you a custom name");
 	PM:BindCommand("/le",      "debuggers", HandleListEntitiesCmd, "- Shows a list of all the loaded entities");
 	PM:BindCommand("/ke",      "debuggers", HandleKillEntitiesCmd, "- Kills all the loaded entities");
 	PM:BindCommand("/wool",    "debuggers", HandleWoolCmd,         "- Sets all your armor to blue wool");
@@ -768,6 +769,22 @@ end
 
 
 
+function HandleCustomNameCmd(Split, Player)
+	if (Split[2] == nil) then
+		Player:SendMessage("Usage: /cm [CustomName]");
+		return true;
+	end
+
+	local NewName = Split[2]
+	Player:SetCustomName(NewName);
+	Player:SendMessageSuccess("Custom name setted to " .. Player:GetCustomName() .. "!")
+	return true
+end
+
+
+
+
+
 function HandleListEntitiesCmd(Split, Player)
 	local NumEntities = 0;
 	
-- 
cgit v1.2.3


From 079634d18cf63abad05db0fda9a4510aa75c0522 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 2 Sep 2014 19:20:59 +0200
Subject: Added the new functions to APIDump.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index e7f9e9b18..f109638e9 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1629,6 +1629,11 @@ a_Player:OpenWindow(Window);
 			]],
 			Functions =
 			{
+				HasCustomName = { Params = "", Return = "bool", Notes = "Returns true if the monster has a custom name." },
+				GetCustomName = { Params = "", Return = "string", Notes = "Gets the custom name of the monster. If no custom name is set, the function returns an empty string." },
+				SetCustomName = { Params = "string", Return = "", Notes = "Sets the custom name of the monster. You see the name over the monster. If you want to disable the custom name, simply set an empty string." },
+				IsCustomNameAlwaysVisible = { Params = "", Return = "bool", Notes = "Is the custom name of this monster always visible? If not, you only see the name when you sight the mob." },
+				SetCustomNameAlwaysVisible = { Params = "bool", Return = "", Notes = "Sets the custom name visiblity of this monster. If it's false, you only see the name when you sight the mob. If it's true, you always see the custom name." },
 				FamilyFromType = { Params = "{{cMonster#MobType|MobType}}", Return = "{{cMonster#MobFamily|MobFamily}}", Notes = "(STATIC) Returns the mob family ({{cMonster#MobFamily|mfXXX}} constants) based on the mob type ({{cMonster#MobType|mtXXX}} constants)" },
 				GetMobFamily = { Params = "", Return = "{{cMonster#MobFamily|MobFamily}}", Notes = "Returns this mob's family ({{cMonster#MobFamily|mfXXX}} constant)" },
 				GetMobType = { Params = "", Return = "{{cMonster#MobType|MobType}}", Notes = "Returns the type of this mob ({{cMonster#MobType|mtXXX}} constant)" },
@@ -1752,6 +1757,7 @@ a_Player:OpenWindow(Window);
 				ForceSetSpeed = { Params = "{{Vector3d|Direction}}", Notes = "Forces the player to move to the given direction." },
 				GetClientHandle = { Params = "", Return = "{{cClientHandle}}", Notes = "Returns the client handle representing the player's connection. May be nil (AI players)." },
 				GetColor = { Return = "string", Notes = "Returns the full color code to be used for this player's messages (based on their rank). Prefix player messages with this code." },
+				GetTabListName = { Return = "string", Notes = "Returns the name that is used in the tablist." },
 				GetCurrentXp = { Params = "", Return = "number", Notes = "Returns the current amount of XP" },
 				GetEffectiveGameMode = { Params = "", Return = "{{Globals#GameMode|GameMode}}", Notes = "(OBSOLETE) Returns the current resolved game mode of the player. If the player is set to inherit the world's gamemode, returns that instead. See also GetGameMode() and IsGameModeXXX() functions. Note that this function is the same as GetGameMode(), use that function instead." },
 				GetEquippedItem = { Params = "", Return = "{{cItem}}", Notes = "Returns the item that the player is currently holding; empty item if holding nothing." },
@@ -1802,6 +1808,9 @@ a_Player:OpenWindow(Window);
 				SendMessagePrivateMsg = { Params = "Message, SenderName", Return = "", Notes = "Prepends Light Blue [MSG: *SenderName*] / prepends SenderName and colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. For private messaging." },
 				SendMessageSuccess = { Params = "Message", Return = "", Notes = "Prepends Green [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. Success notification." },
 				SendMessageWarning = { Params = "Message, Sender", Return = "", Notes = "Prepends Rose [WARN] / colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. Denotes that something concerning, such as plugin reload, is about to happen." },
+				HasCustomName = { Params = "", Return = "bool", Notes = "Returns true if the player has a custom name." },
+				GetCustomName = { Params = "", Return = "string", Notes = "Returns the custom name of this player. If the player hasn't a custom name, it will return an empty string." },
+				SetCustomName = { Params = "string", Return = "", Notes = "Sets the custom name of this player. If you want to disable the custom name, simply set an empty string. The custom name will be used in the tab-list, in the player nametag and in the tab-completion." },
 				SetCanFly = { Params = "CanFly", Notes = "Sets if the player can fly or not." },
 				SetCrouch = { Params = "IsCrouched", Return = "", Notes = "Sets the crouch state, broadcasts the change to other players." },
 				SetCurrentExperience = { Params = "XPAmount", Return = "", Notes = "Sets the current amount of experience (and indirectly, the XP level)." },
-- 
cgit v1.2.3


From 38e824dbcfa66ee63670f6e8aa708e7a4aa58f5e Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 2 Sep 2014 20:10:41 +0200
Subject: Renamed SetWalkSpeed() to SetRelativeWalkSpeed()

---
 MCServer/Plugins/APIDump/APIDesc.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 337ce47c3..18fb7acad 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1636,8 +1636,8 @@ a_Player:OpenWindow(Window);
 				MobTypeToString = { Params = "{{cMonster#MobType|MobType}}", Return = "string", Notes = "(STATIC) Returns the string representing the given mob type ({{cMonster#MobType|mtXXX}} constant), or empty string if unknown type." },
 				MoveToPosition = { Params = "Position", Return = "", Notes = "Moves mob to the specified position" },
 				StringToMobType = { Params = "string", Return = "{{cMonster#MobType|MobType}}", Notes = "(STATIC) Returns the mob type ({{cMonster#MobType|mtXXX}} constant) parsed from the string type (\"creeper\"), or mtInvalidType if unrecognized." },
-				GetWalkSpeed = { Params = "", Return = "number", Notes = "Returns the walk speed of this mob. Standard is 1.0" },
-				SetWalkSpeed = { Params = "number", Return = "", Notes = "Sets the walk speed of this mob. Standard is 1.0" },
+				GetRelativeWalkSpeed = { Params = "", Return = "number", Notes = "Returns the relative walk speed of this mob. Standard is 1.0" },
+				SetRelativeWalkSpeed = { Params = "number", Return = "", Notes = "Sets the relative walk speed of this mob. Standard is 1.0" },
 			},
 			Constants =
 			{
-- 
cgit v1.2.3


From c19b2befa88bfe5549a3630c997070d5e1d37941 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 2 Sep 2014 20:17:31 +0200
Subject: Changed the IsEnchantable() comment again.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index eec731c34..ffd228d1a 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1201,7 +1201,6 @@ These ItemGrids are available in the API and can be manipulated by the plugins,
 				IsDamageable = { Params = "", Return = "bool", Notes = "Returns true if this item does account for its damage" },
 				IsEmpty = { Params = "", Return = "bool", Notes = "Returns true if this object represents an empty item (zero count or invalid ID)" },
 				IsEqual = { Params = "cItem", Return = "bool", Notes = "Returns true if the item in the parameter is the same as the one stored in the object (type, damage, lore, name and enchantments)" },
-				IsEnchantable = { Params = "", Return = "bool", Notes = "Returns true if the item is enchantable" },
 				IsFullStack = { Params = "", Return = "bool", Notes = "Returns true if the item is stacked up to its maximum stacking" },
 				IsSameType = { Params = "cItem", Return = "bool", Notes = "Returns true if the item in the parameter is of the same ItemType as the one stored in the object. This is true even if the two items have different enchantments" },
 				IsBothNameAndLoreEmpty = { Params = "", Return = "bool", Notes = "Returns if both the custom name and lore are not set." },
@@ -1209,7 +1208,7 @@ These ItemGrids are available in the API and can be manipulated by the plugins,
 				IsLoreEmpty = { Params = "", Return = "", Notes = "Returns if the lore of the cItem is empty." },
 				GetEnchantability = { Params = "", Return = "number", Notes = "Returns the enchantability of the item. When the item hasn't a enchantability, it will returns 0" },
 				EnchantByXPLevels = { Params = "NumXPLevels", Return = "bool", Notes = "Enchants the item using the specified number of XP levels. Returns true if item enchanted, false if not." },
-				IsEnchantable = { Params = "ItemType, WithBook", Return = "bool", Notes = "(STATIC) Returns true if the specified item type is enchantable. If WithBook is true, the function checks the enchantments with a book too." },
+				IsEnchantable = { Params = "ItemType, WithBook", Return = "bool", Notes = "(STATIC) Returns true if the specified item type is enchantable. If WithBook is true, the function is used in the anvil inventory with book enchantments. So it checks the \"only book enchantments\" too. Example: You can only enchant a hoe with a book." },
 			},
 			Variables =
 			{
-- 
cgit v1.2.3


From cdec89d924c60f242c6945d1ff129593a8154af9 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Tue, 2 Sep 2014 21:00:26 +0200
Subject: Seperated "custom" names list from the normal list in items.ini!

---
 MCServer/crafting.txt |   4 +-
 MCServer/items.ini    | 521 +++++++++++++++++++++++++++++++-------------------
 2 files changed, 328 insertions(+), 197 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index d29344b64..6c0c79e0a 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -40,8 +40,8 @@
 
 # Need to list each of the four log types, otherwise all logs would get converted into apple planks (^0)
 
-ApplePlanks, 4   = AppleLog, * 
-ConiferPlanks, 4 = ConiferLog, *
+OakPlanks, 4     = OakLog, * 
+SprucePlanks, 4  = SpruceLog, *
 BirchPlanks, 4   = BirchLog, *
 JunglePlanks, 4  = JungleLog, *
 AcaciaPlanks, 4  = AcaciaLog, *
diff --git a/MCServer/items.ini b/MCServer/items.ini
index 6eb9eee6e..67a3020ae 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -15,42 +15,28 @@ podzol=3:2
 cobblestone=4
 cobble=4
 planks=5
-appleplanks=5:0
 oakplanks=5:0
-coniferplanks=5:1
-pineplanks=5:1
 spruceplanks=5:1
-darkplanks=5:1
 birchplanks=5:2
-lightplanks=5:2
 jungleplanks=5:3
-redplanks=5:3
 acaciaplanks=5:4
 darkoakplanks=5:5
-bigoakplanks=5:5
-roofedoakplanks=5:5
 
 
 ; Obsolete: do not use "wood", as its meaning is not clear - wiki uses log as wood, we use planks as wood.
 wood=5
 
 sapling=6
-applesapling=6:0
 oaksapling=6:0
-conifersapling=6:1
-pinesapling=6:1
 sprucesapling=6:1
 birchsapling=6:2
 junglesapling=6:3
-adminium=7
+acaciasapling=6:4
+darkoaksapling=6:5
 bedrock=7
 water=8
-stillwater=9
-swater=9
 stationarywater=9
 lava=10
-stilllava=11
-slava=11
 stationarylava=11
 sand=12
 redsand=12:1
@@ -58,22 +44,13 @@ gravel=13
 goldore=14
 ironore=15
 coalore=16
-tree=17
 log=17
-applelog=17:0
 oaklog=17:0
-coniferlog=17:1
-pinelog=17:1
 sprucelog=17:1
-darklog=17:1
 birchlog=17:2
-whitelog=17:2
 junglelog=17:3
 leaves=18
-appleleaves=18:0
 oakleaves=18:0
-coniferleaves=18:1
-pineleaves=18:1
 spruceleaves=18:1
 birchleaves=18:2
 jungleleaves=18:3
@@ -85,8 +62,7 @@ lapisblock=22
 dispenser=23
 sandstone=24
 normalsandstone=24:0
-ornamentsandstone=24:1
-decorativesandstone=24:1
+chiseledsandstone=24:1
 smoothsandstone=24:2
 noteblock=25
 bedblock=26
@@ -100,8 +76,6 @@ tallgrasstwo=31:2
 deadbush=32
 piston=33
 pistonextension=34
-pistonhead=34
-cloth=35
 wool=35
 whitewool=35:0
 orangewool=35:1
@@ -109,39 +83,21 @@ magentawool=35:2
 lightbluewool=35:3
 yellowwool=35:4
 limewool=35:5
-lightgreenwool=35:5
-ltgreenwool=35:5
 pinkwool=35:6
 graywool=35:7
-greywool=35:7
-darkgraywool=35:7
-darkgreywool=35:7
-dkgraywool=35:7
-dkgreywool=35:7
 lightgraywool=35:8
-lightgreywool=35:8
-ltgraywool=35:8
-ltgreywool=35:8
 cyanwool=35:9
 purplewool=35:10
-violetwool=35:10
 bluewool=35:11
-darkbluewool=35:11
 brownwool=35:12
 greenwool=35:13
-darkgreenwool=35:13
-dkgreenwool=35:13
 redwool=35:14
 blackwool=35:15
 dandelion=37
-
-; Renamed in 1.7, use "poppy" instead; kept for compatibility reasons, will be removed later on.
-rose=38
-
-flower=38
 poppy=38
 blueorchid=38:1
 allium=38:2
+azurebluet=38:3
 redtulip=38:4
 orangetulip=38:5
 whitetulip=38:6
@@ -149,9 +105,7 @@ pinktulip=38:7
 oxeyedaisy=38:8
 brownmushroom=39
 redmushroom=40
-gold=41
 goldblock=41
-iron=42
 ironblock=42
 doubleslab=43
 stonedoubleslab=43:0
@@ -163,7 +117,6 @@ stonebrickdoubleslab=43:5
 netherbrickdoubleslab=43:6
 quartzdoubleslab=43:7
 slab=44
-step=44
 stoneslab=44:0
 sandstoneslab=44:1
 woodslab=44:2
@@ -173,44 +126,31 @@ stonebrickslab=44:5
 netherbrickslab=44:6
 quartzslab=44:7
 brickblock=45
-brickwall=45
 tnt=46
 bookshelf=47
-bookcase=47
 mossycobblestone=48
-mossy=48
 obsidian=49
 torch=50
 fire=51
 mobspawner=52
-woodstairs=53
 oakwoodstairs=53
 chest=54
-redstonedust=55
 redstonewire=55
 diamondore=56
 diamondblock=57
 workbench=58
 crop=59
 crops=59
-soil=60
 farmland=60
-tilleddirt=60
 furnace=61
 litfurnace=62
 signblock=63
 wooddoorblock=64
 ladder=65
 rails=66
-rail=66
-track=66
-tracks=66
 cobblestonestairs=67
-stairs=67
-signblocktop=68
 wallsign=68
 lever=69
-rockplate=70
 stoneplate=70
 irondoorblock=71
 woodplate=72
@@ -228,16 +168,11 @@ reedblock=83
 jukebox=84
 fence=85
 pumpkin=86
-netherstone=87
 netherrack=87
-hellrock=87
-slowsand=88
 soulsand=88
-lightstone=89
 glowstone=89
 portal=90
 jackolantern=91
-jacko=91
 cakeblock=92
 whitestainedglass=95
 orangestainedglass=95:1
@@ -249,7 +184,7 @@ pinkstainedglass=95:6
 graystainedglass=95:7
 lightgraystainedglass=95:8
 cyanstainedglass=95:9
-violetstainedglass=95:10
+purplestainedglass=95:10
 bluestainedglass=95:11
 brownstainedglass=95:12
 greenstainedglass=95:13
@@ -257,7 +192,6 @@ redstainedglass=95:14
 blackstainedglass=95:15
 trapdoor=96
 silverfishblock=97
-stonebricks=98
 stonebrick=98
 mossystonebrick=98:1
 crackedstonebrick=98:2
@@ -287,36 +221,21 @@ endportalframe=120
 endstone=121
 dragonegg=122
 redstonelamp=123
-redstonelampoff=123
-redstonelampon=124
+litredstonelamp=124
 woodendoubleslab=125
-appledoublewoodslab=125:0
 oakwooddoubleslab=125:0
-coniferwooddoubleslab=125:1
-pinewooddoubleslab=125:1
 sprucewooddoubleslab=125:1
-darkwooddoubleslab=125:1
 birchwooddoubleslab=125:2
-whitewooddoubleslab=125:2
 junglewooddoubleslab=125:3
 acaciawooddoubleslab=125:4
-bigoakwooddoubleslab=125:5
 darkoakwooddoubleslab=125:5
-roofedwooddoubleslab=125:5
 woodenslab=126
-applewoodslab=126:0
 oakwoodslab=126:0
-coniferwoodslab=126:1
-pinewoodslab=126:1
 sprucewoodslab=126:1
-darkwoodslab=126:1
 birchwoodslab=126:2
-whitewoodslab=126:2
 junglewoodslab=126:3
 acaciawoodslab=126:4
-bigoakwoodslab=126:5
 darkoakwoodslab=126:5
-roofedwoodslab=126:5
 cocoabeans=127
 sandstonestairs=128
 emeraldore=129
@@ -324,12 +243,9 @@ enderchest=130
 tripwirehook=131
 tripwire=132
 emeraldblock=133
-coniferwoodstairs=134
-pinewoodstairs=134
 sprucewoodstairs=134
 darkwoodstairs=134
 birchwoodstairs=135
-whitewoodstairs=135
 junglewoodstairs=136
 commandblock=137
 beacon=138
@@ -342,8 +258,7 @@ woodenbutton=143
 skeletonhead=144
 witherhead=144:1
 zombiehead=144:2
-humanhead=144:3
-stevehead=144:3
+playerhead=144:3
 creeperhead=144:4
 anvil=145
 trappedchest=146
@@ -371,7 +286,7 @@ pinkstainedclay=159:6
 graystainedclay=159:7
 lightgraystainedclay=159:8
 cyanstainedclay=159:9
-violetstainedclay=159:10
+purplestainedclay=159:10
 bluestainedclay=159:11
 brownstainedclay=159:12
 greenstainedclay=159:13
@@ -387,24 +302,20 @@ pinkstainedglasspane=160:6
 graystainedglasspane=160:7
 lightgraystainedglasspane=160:8
 cyanstainedglasspane=160:9
-violetstainedglasspane=160:10
+purplestainedglasspane=160:10
 bluestainedglasspane=160:11
 brownstainedglasspane=160:12
 greenstainedglasspane=160:13
 redstainedglasspane=160:14
 blackstainedglasspane=160:15
-acacialeaves=161
-bigoakleaves=161:1
+newleaves=161
+acacialeaves=161:0
 darkoakleaves=161:1
-roofedoakleaves=161:1
-acacialog=162
-bigoaklog=162:1
+newlog=162
+acacialog=162:0
 darkoaklog=162:1
-roofedoaklog=162:1
 acaciawoodstairs=163
-bigoakwoodstiars=164
 darkoakwoodstairs=164
-roofedoakwoodstairs=164
 slimeblock=165
 irontrapdoor=167
 prismarine=168
@@ -413,107 +324,88 @@ darkprismarine=168:2
 sealantern=169
 haybale=170
 carpet=171
+whitecarpet=171:0
+orangecarpet=171:1
+magentacarpet=171:2
+lightbluecarpet=171:3
+yellowcarpet=171:4
+limecarpet=171:5
+pinkcarpet=171:6
+graycarpet=171:7
+lightgraycarpet=171:8
+cyancarpet=171:9
+purplecarpet=171:10
+bluecarpet=171:11
+browncarpet=171:12
+greencarpet=171:13
+redcarpet=171:14
+blackcarpet=171:15
 hardenedclay=172
+coalblock=173
+packedice=174
+doubleplant=175
+sunflower=175:0
+lilac=175:1
+doubletallgrass=175:2
+doubletallfern=175:3
+rosebush=175:4
+peony=175:5
 redsandstone=179
 chiseledredsandstone=179:1
 smoothredsandstone=179:2
 redsandstonestairs=180
 redsandstoneslab=182
-coniferfencegate=183
-pinefencegate=183
 sprucefencegate=183
-darkfencegate=183
 birchfencegate=184
-whitefencegate=184
 junglefencegate=185
 darkoakfencegate=186
-bigoakfencegate=186
-roofedoakfencegate=186
 acaciafencegate=187
-coniferfence=188
-pinefence=188
 sprucefence=188
-darkfence=188
 birchfence=189
-whitefence=189
 junglefence=190
 darkoakfence=191
-bigoakfence=191
-roofedoakfence=191
 acaciafence=192
 ironshovel=256
-ironspade=256
 ironpickaxe=257
-ironpick=257
 ironaxe=258
 flintandsteel=259
-lighter=259
 apple=260
-redapple=260
 bow=261
 arrow=262
 coal=263
-coalblock=173
 charcoal=263:1
 diamond=264
 ironingot=265
-ironbar=265
 goldingot=266
-goldeningot=266
-goldbar=266
-goldenbar=266
 ironsword=267
 woodensword=268
-woodsword=268
 woodenshovel=269
-woodshovel=269
-woodenspade=269
-woodspade=269
 woodenpickaxe=270
-woodpickaxe=270
-woodenpick=270
-woodpick=270
 woodenaxe=271
-woodaxe=271
 stonesword=272
 stoneshovel=273
-stonespade=273
 stonepickaxe=274
-stonepick=274
 stoneaxe=275
 diamondsword=276
 diamondshovel=277
 diamondspade=277
 diamondpickaxe=278
-diamondpick=278
 diamondaxe=279
 stick=280
 bowl=281
 mushroomstew=282
-bowlwithsoup=282
-soupbowl=282
-soup=282
 goldensword=283
-goldsword=283
 goldenshovel=284
-goldshovel=284
 goldenspade=284
-goldspade=284
 goldenpickaxe=285
-goldpickaxe=285
-goldenpick=285
-goldpick=285
 goldenaxe=286
-goldaxe=286
 string=287
 feather=288
 gunpowder=289
-woodhoe=290
 woodenhoe=290
 stonehoe=291
 ironhoe=292
 diamondhoe=293
-goldhoe=294
 goldenhoe=294
 seeds=295
 wheat=296
@@ -535,26 +427,16 @@ diamondchestplate=311
 diamondpants=312
 diamondboots=313
 goldenhelmet=314
-goldhelmet=314
 goldenchestplate=315
-goldchestplate=315
 goldenpants=316
-goldpants=316
 goldenboots=317
-goldboots=317
 flint=318
-meat=319
-pork=319
-cookedmeat=320
-cookedpork=320
+porkchop=319
+cookedporkchop=320
 painting=321
-paintings=321
 goldenapple=322
-goldapple=322
 enchantedgoldenapple=322:1
-enchantedgoldapple=322:1
 sign=323
-wooddoor=324
 woodendoor=324
 bucket=325
 waterbucket=326
@@ -569,11 +451,9 @@ leather=334
 milkbucket=335
 brick=336
 clay=337
-reed=338
 sugarcane=338
 paper=339
 book=340
-slimeorb=341
 slimeball=341
 storageminecart=342
 poweredminecart=343
@@ -581,57 +461,31 @@ egg=344
 compass=345
 fishingrod=346
 watch=347
-lightstonedust=348
-lightdust=348
 glowstonedust=348
-glowdust=348
-rawfish=349
 fish=349
 cookedfish=350
 dye=351
 inksac=351:0
-blackdye=351:0
-reddye=351:1
 rosered=351:1
-greendye=351:2
 cactusgreen=351:2
 cocoabeans=351:3
-browndye=351:3
 lapislazuli=351:4
-bluedye=351:4
-darkbluedye=351:4
-dkbluedye=351:4
 purpledye=351:5
-violetdye=351:5
 cyandye=351:6
-lightgreydye=351:7
 lightgraydye=351:7
-ltgreydye=351:7
-ltgraydye=351:7
-greydye=351:8
 graydye=351:8
-darkgreydye=351:8
-darkgraydye=351:8
-dkgreydye=351:8
-dkgraydye=351:8
 pinkdye=351:9
 limedye=351:10
-lightgreendye=351:10
-ltgreendye=351:10
 dandellionyellow=351:11
-yellowdye=351:11
 lightbluedye=351:12
-ltbluedye=351:12
 magentadye=351:13
 orangedye=351:14
 bonemeal=351:15
-whitedye=351:15
 bone=352
 sugar=353
 cake=354
 bed=355
 repeater=356
-diode=356
 cookie=357
 map=358
 shears=359
@@ -675,7 +529,7 @@ goldencarrot=396
 skeletonhead=397
 witherhead=397:1
 zombiehead=397:2
-stevehead=397:3
+playerhead=397:3
 creeperhead=397:4
 carrotonastick=398
 netherstar=399
@@ -693,7 +547,6 @@ prismarinecrystals=410
 rawrabbit=411
 cookedrabbit=412
 rabbitstew=413
-rabbitsoup=413
 rabbitsfood=414
 rabbithide=415
 armorstand=416
@@ -713,7 +566,6 @@ brownbanner=415:3
 bluebanner=415:4
 purplebanner=415:5
 cyanbanner=415:6
-silverbanner=415:7
 lightgraybanner=415:7
 graybanner=415:8
 pinkbanner=415:9
@@ -723,17 +575,11 @@ lightbluebanner=415:12
 magentabanner=415:13
 orangebanner=415:14
 whitebanner=415:15
-coniferdoor=427
-pinedoor=427
 sprucedoor=427
-darkdoor=427
 birchdoor=428
-whitedoor=428
 jungledoor=429
 acaciadoor=430
-bigoakdoor=431
 darkoakdoor=431
-roofedoakdoor=431
 goldrecord=2256
 greenrecord=2257
 blocksrecord=2258
@@ -746,6 +592,291 @@ stradrecord=2264
 wardrecord=2265
 11record=2266
 
+; ----------
+; Custom Names
+
+appleplanks=5:0
+coniferplanks=5:1
+pineplanks=5:1
+darkplanks=5:1
+lightplanks=5:2
+redplanks=5:3
+bigoakplanks=5:5
+roofedoakplanks=5:5
+applesapling=6:0
+conifersapling=6:1
+pinesapling=6:1
+whitesapling=6:2
+redsapling=6:3
+bigoaksapling=6:5
+roofedoaksapling=6:5
+adminium=7
+flowingwater=8
+swater=9
+stillwater=9
+stilllava=11
+slava=11
+tree=17
+applelog=17:0
+coniferlog=17:1
+pinelog=17:1
+darklog=17:1
+whitelog=17:2
+appleleaves=18:0
+coniferleaves=18:1
+pineleaves=18:1
+whiteleaves=18:2
+decorativesandstone=24:1
+ornamentsandstone=24:1
+pistonhead=34
+cloth=35
+ltbluewool=35:3
+lightgreenwool=35:5
+ltgreenwool=35:5
+greywool=35:7
+darkgraywool=35:7
+darkgreywool=35:7
+dkgraywool=35:7
+dkgreywool=35:7
+lightgreywool=35:8
+ltgraywool=35:8
+ltgreywool=35:8
+silverwool=35:8
+violetwool=35:10
+darkbluewool=35:11
+dkbluewool=35:11
+darkgreenwool=35:13
+dkgreenwool=35:13
+rose=38
+flower=38
+gold=41
+iron=42
+step=44
+brickwall=45
+bookcase=47
+mossy=48
+woodstairs=53
+redstonedust=55
+tilleddirt=60
+soil=60
+rail=66
+track=66
+tracks=66
+stairs=67
+signblocktop=68
+rockplate=70
+hellrock=87
+netherstone=87
+slowsand=88
+lightstone=89
+jacko=91
+ltbluestainedglass=95:3
+lightgreenstainedglass=95:5
+ltgreenstainedglass=95:5
+greystainedglass=95:7
+darkgraystainedglass=95:7
+darkgreystainedglass=95:7
+dkgraystainedglass=95:7
+dkgreystainedglass=95:7
+lightgreystainedglass=95:8
+ltgraystainedglass=95:8
+ltgreystainedglass=95:8
+silverstainedglass=95:8
+violetstainedglass=95:10
+darkbluestainedglass=95:11
+dkbluestainedglass=95:11
+darkgreenstainedglass=95:13
+dkgreenstainedglass=95:13
+stonebricks=98
+redstonelampoff=123
+redstonelampon=124
+appledoublewoodslab=125:0
+coniferwooddoubleslab=125:1
+pinewooddoubleslab=125:1
+darkwooddoubleslab=125:1
+whitewooddoubleslab=125:2
+bigoakwooddoubleslab=125:5
+roofedwooddoubleslab=125:5
+applewoodslab=126:0
+coniferwoodslab=126:1
+pinewoodslab=126:1
+darkwoodslab=126:1
+whitewoodslab=126:2
+roofedwoodslab=126:5
+bigoakwoodslab=126:5
+coniferwoodstairs=134
+pinewoodstairs=134
+whitewoodstairs=135
+humanhead=144:3
+stevehead=144:3
+ltbluestainedclay=159:3
+lightgreenstainedclay=159:5
+ltgreenstainedclay=159:5
+greystainedclay=159:7
+darkgraystainedclay=159:7
+darkgreystainedclay=159:7
+dkgraystainedclay=159:7
+dkgreystainedclay=159:7
+lightgreystainedclay=159:8
+ltgraystainedclay=159:8
+ltgreystainedclay=159:8
+silvertsainedclay=159:8
+violetstainedclay=159:10
+darkbluestainedclay=159:11
+dkbluestainedclay=159:11
+darkgreenstainedclay=159:13
+dkgreenstainedclay=159:13
+ltbluestainedglasspane=160:3
+lightgreenstainedglasspane=160:5
+ltgreenstainedglasspane=160:5
+greystainedglasspane=160:7
+darkgraystainedglasspane=160:7
+darkgreystainedglasspane=160:7
+dkgraystainedglasspane=160:7
+dkgreystainedglasspane=160:7
+lightgreystainedglasspane=160:8
+ltgraystainedglasspane=160:8
+ltgreystainedglasspane=160:8
+silverstainedglasspane=160:8
+violetstainedglasspane=160:10
+darkbluestainedglasspane=160:11
+dkbluestainedglasspane=160:11
+darkgreenstainedglasspane=160:13
+dkgreenstainedglasspane=160:13
+bigoakleaves=161:1
+roofedoakleaves=161:1
+bigoaklog=162:1
+roofedoaklog=162:1
+bigoakwoodstiars=164
+roofedoakwoodstairs=164
+ltbluecarpet=171:3
+lightgreencarpet=171:5
+ltgreencarpet=171:5
+greycarpet=171:7
+darkgraycarpet=171:7
+darkgreycarpet=171:7
+dkgraycarpet=171:7
+dkgreycarpet=171:7
+lightgreycarpet=171:8
+ltgraycarpet=171:8
+ltgreycarpet=171:8
+silvercarpet=171:8
+violetcarpet=171:10
+darkbluecarpet=171:11
+dkbluecarpet=171:11
+darkgreencarpet=171:13
+dkgreencarpet=171:13
+coniferfencegate=183
+pinefencegate=183
+darkfencegate=183
+whitefencegate=184
+bigoakfencegate=186
+roofedoakfencegate=186
+coniferfence=188
+pinefence=188
+darkfence=188
+whitefence=189
+bigoakfence=191
+roofedoakfence=191
+ironspade=256
+ironpick=257
+lighter=259
+redapple=260
+ironbar=265
+goldeningot=266
+goldbar=266
+goldenbar=266
+woodsword=268
+woodspade=269
+woodshovel=269
+woodenspade=269
+woodpickaxe=270
+woodenpick=270
+woodpick=270
+woodaxe=271
+stonespade=273
+stonepick=274
+diamondpick=278
+bowlwithsoup=282
+soupbowl=282
+soup=282
+goldsword=283
+goldshovel=284
+goldspade=284
+goldpickaxe=285
+goldenpick=285
+goldpick=285
+goldaxe=286
+woodhoe=290
+goldhoe=294
+goldhelmet=314
+goldchestplate=315
+goldpants=316
+goldboots=317
+meat=319
+pork=319
+cookedmeat=320
+cookedpork=320
+paintings=321
+goldapple=322
+enchantedgoldapple=322:1
+wooddoor=324
+reed=338
+slimeorb=341
+lightstonedust=348
+lightdust=348
+glowdust=348
+rawfish=349
+blackdye=351:0
+reddye=351:1
+greendye=351:2
+darkgreendye=351:2
+dkgreendye=351:2
+browndye=351:3
+bluedye=351:4
+darkbluedye=351:4
+dkbluedye=351:4
+violetdye=351:5
+ltgreydye=351:7
+ltgraydye=351:7
+lightgreydye=351:7
+silverdye=351:7
+greydye=351:8
+darkgreydye=351:8
+darkgraydye=351:8
+dkgreydye=351:8
+dkgraydye=351:8
+lightgreendye=351:10
+ltgreendye=351:10
+yellowdye=351:11
+ltbluedye=351:12
+whitedye=351:15
+diode=356
+stevehead=397:3
+rabbitsoup=413
+darkgreenbanner=415:2
+dkgreenbanner=415:2
+darkbluebanner=415:4
+dkbluebanner=415:4
+violetbanner=415:5
+lightgreybanner=415:7
+ltgraybanner=415:7
+ltgreybanner=415:7
+silverbanner=415:7
+greybanner=415:8
+darkgraybanner=415:8
+darkgreybanner=415:8
+dkgraybanner=415:8
+dkgreybanner=415:8
+lightgreenbanner=415:10
+ltgreenbanner=415:10
+ltbluebanner=415:12
+coniferdoor=427
+pinedoor=427
+darkdoor=427
+whitedoor=428
+bigoakdoor=431
+roofedoakdoor=431
 
 
 
-- 
cgit v1.2.3


From 96f5b3c4651ff05b3605bac9e9fdb499dec3dbd3 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Tue, 2 Sep 2014 21:09:32 +0200
Subject: Added new recipes!

---
 MCServer/crafting.txt | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 6c0c79e0a..b7218927e 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -67,6 +67,7 @@ DiamondBlock            = Diamond,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3
 LapisBlock              = LapisLazuli, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 EmeraldBlock            = Emerald,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 RedstoneBlock           = RedstoneDust,    1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+CoalBlock               = Coal, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 QuartzBlock             = NetherQuartz, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 NetherBrick             = netherbrickitem, 1:1, 1:2, 2:1, 2:2
 Glowstone               = GlowstoneDust, 1:1, 1:2, 2:1, 2:2
@@ -147,9 +148,6 @@ StoneBrickStairs, 4  = StoneBrick,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 RedSandstoneStairs, 4 = RedSandstone,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 RedSandstoneStairs, 4 = RedSandstone,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 
-# Other
-Carpet             = Wool, 1:3, 2:3
-
 
 
 #******************************************************#
@@ -451,13 +449,30 @@ PinkWool      = Wool, * | PinkDye, *
 GrayWool      = Wool, * | GrayDye, *
 LightGrayWool = Wool, * | LightGrayDye, *
 CyanWool      = Wool, * | CyanDye, *
-VioletWool    = Wool, * | VioletDye, *
+PurpleWool    = Wool, * | PurpleDye, *
 BlueWool      = Wool, * | BlueDye, *
 BrownWool     = Wool, * | BrownDye, *
 GreenWool     = Wool, * | GreenDye, *
 RedWool       = Wool, * | RedDye, *
 BlackWool     = Wool, * | BlackDye, *
 
+WhiteCrapet, 3     = WhiteWool, 1:1, 2:1
+OrangeCarpet, 3    = OrangeWool, 1:1, 2:1
+MagentaCarpet, 3   = MagentaWool, 1:1, 2:1
+LightBlueCarpet, 3 = LightBlueWool, 1:1, 2:1
+YellowCarpet, 3    = YellowWool, 1:1, 2:1
+LimeCarpet, 3      = LimeWool, 1:1, 2:1
+PinkCarpet, 3      = PinkWool, 1:1, 2:1
+GrayCarpet, 3      = GrayWool, 1:1, 2:1
+LightGrayCarpet, 3 = LightGrayWool, 1:1, 2:1
+CyanCarpet, 3      = CyanWool, 1:1, 2:1
+PurpleCarpet, 3    = PurpleWool, 1:1, 2:1
+BlueCarpet, 3      = BlueWool, 1:1, 2:1
+BrownCarpet, 3     = BrownWool, 1:1, 2:1
+GreenCarpet, 3     = GreenWool, 1:1, 2:1
+RedCarpet, 3       = RedWool, 1:1, 2:2
+BlackCarpet, 3     = BlackWool, 1:1, 2:1
+
 #******************************************************#
 # Stained Glass:
 #
-- 
cgit v1.2.3


From 20678ec542dcfdd9fbcdff614378fb0f98e85602 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Tue, 2 Sep 2014 21:36:32 +0200
Subject: Seperated the "custom" names from the normal list!

---
 MCServer/items.ini | 519 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 326 insertions(+), 193 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/items.ini b/MCServer/items.ini
index e2b1a95b6..67a3020ae 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -15,42 +15,28 @@ podzol=3:2
 cobblestone=4
 cobble=4
 planks=5
-appleplanks=5:0
 oakplanks=5:0
-coniferplanks=5:1
-pineplanks=5:1
 spruceplanks=5:1
-darkplanks=5:1
 birchplanks=5:2
-lightplanks=5:2
 jungleplanks=5:3
-redplanks=5:3
 acaciaplanks=5:4
 darkoakplanks=5:5
-bigoakplanks=5:5
-roofedoakplanks=5:5
 
 
 ; Obsolete: do not use "wood", as its meaning is not clear - wiki uses log as wood, we use planks as wood.
 wood=5
 
 sapling=6
-applesapling=6:0
 oaksapling=6:0
-conifersapling=6:1
-pinesapling=6:1
 sprucesapling=6:1
 birchsapling=6:2
 junglesapling=6:3
-adminium=7
+acaciasapling=6:4
+darkoaksapling=6:5
 bedrock=7
 water=8
-stillwater=9
-swater=9
 stationarywater=9
 lava=10
-stilllava=11
-slava=11
 stationarylava=11
 sand=12
 redsand=12:1
@@ -58,22 +44,13 @@ gravel=13
 goldore=14
 ironore=15
 coalore=16
-tree=17
 log=17
-applelog=17:0
 oaklog=17:0
-coniferlog=17:1
-pinelog=17:1
 sprucelog=17:1
-darklog=17:1
 birchlog=17:2
-whitelog=17:2
 junglelog=17:3
 leaves=18
-appleleaves=18:0
 oakleaves=18:0
-coniferleaves=18:1
-pineleaves=18:1
 spruceleaves=18:1
 birchleaves=18:2
 jungleleaves=18:3
@@ -85,8 +62,7 @@ lapisblock=22
 dispenser=23
 sandstone=24
 normalsandstone=24:0
-ornamentsandstone=24:1
-decorativesandstone=24:1
+chiseledsandstone=24:1
 smoothsandstone=24:2
 noteblock=25
 bedblock=26
@@ -100,8 +76,6 @@ tallgrasstwo=31:2
 deadbush=32
 piston=33
 pistonextension=34
-pistonhead=34
-cloth=35
 wool=35
 whitewool=35:0
 orangewool=35:1
@@ -109,37 +83,21 @@ magentawool=35:2
 lightbluewool=35:3
 yellowwool=35:4
 limewool=35:5
-lightgreenwool=35:5
-ltgreenwool=35:5
 pinkwool=35:6
 graywool=35:7
-greywool=35:7
-darkgraywool=35:7
-dkgreywool=35:7
 lightgraywool=35:8
-lightgreywool=35:8
-ltgraywool=35:8
-ltgreywool=35:8
 cyanwool=35:9
 purplewool=35:10
-violetwool=35:10
 bluewool=35:11
-darkbluewool=35:11
 brownwool=35:12
 greenwool=35:13
-darkgreenwool=35:13
-dkgreenwool=35:13
 redwool=35:14
 blackwool=35:15
 dandelion=37
-
-; Renamed in 1.7, use "poppy" instead; kept for compatibility reasons, will be removed later on.
-rose=38
-
-flower=38
 poppy=38
 blueorchid=38:1
 allium=38:2
+azurebluet=38:3
 redtulip=38:4
 orangetulip=38:5
 whitetulip=38:6
@@ -147,9 +105,7 @@ pinktulip=38:7
 oxeyedaisy=38:8
 brownmushroom=39
 redmushroom=40
-gold=41
 goldblock=41
-iron=42
 ironblock=42
 doubleslab=43
 stonedoubleslab=43:0
@@ -161,7 +117,6 @@ stonebrickdoubleslab=43:5
 netherbrickdoubleslab=43:6
 quartzdoubleslab=43:7
 slab=44
-step=44
 stoneslab=44:0
 sandstoneslab=44:1
 woodslab=44:2
@@ -171,44 +126,31 @@ stonebrickslab=44:5
 netherbrickslab=44:6
 quartzslab=44:7
 brickblock=45
-brickwall=45
 tnt=46
 bookshelf=47
-bookcase=47
 mossycobblestone=48
-mossy=48
 obsidian=49
 torch=50
 fire=51
 mobspawner=52
-woodstairs=53
 oakwoodstairs=53
 chest=54
-redstonedust=55
 redstonewire=55
 diamondore=56
 diamondblock=57
 workbench=58
 crop=59
 crops=59
-soil=60
 farmland=60
-tilleddirt=60
 furnace=61
 litfurnace=62
 signblock=63
 wooddoorblock=64
 ladder=65
 rails=66
-rail=66
-track=66
-tracks=66
 cobblestonestairs=67
-stairs=67
-signblocktop=68
 wallsign=68
 lever=69
-rockplate=70
 stoneplate=70
 irondoorblock=71
 woodplate=72
@@ -226,16 +168,11 @@ reedblock=83
 jukebox=84
 fence=85
 pumpkin=86
-netherstone=87
 netherrack=87
-hellrock=87
-slowsand=88
 soulsand=88
-lightstone=89
 glowstone=89
 portal=90
 jackolantern=91
-jacko=91
 cakeblock=92
 whitestainedglass=95
 orangestainedglass=95:1
@@ -247,7 +184,7 @@ pinkstainedglass=95:6
 graystainedglass=95:7
 lightgraystainedglass=95:8
 cyanstainedglass=95:9
-violetstainedglass=95:10
+purplestainedglass=95:10
 bluestainedglass=95:11
 brownstainedglass=95:12
 greenstainedglass=95:13
@@ -255,7 +192,6 @@ redstainedglass=95:14
 blackstainedglass=95:15
 trapdoor=96
 silverfishblock=97
-stonebricks=98
 stonebrick=98
 mossystonebrick=98:1
 crackedstonebrick=98:2
@@ -285,36 +221,21 @@ endportalframe=120
 endstone=121
 dragonegg=122
 redstonelamp=123
-redstonelampoff=123
-redstonelampon=124
+litredstonelamp=124
 woodendoubleslab=125
-appledoublewoodslab=125:0
 oakwooddoubleslab=125:0
-coniferwooddoubleslab=125:1
-pinewooddoubleslab=125:1
 sprucewooddoubleslab=125:1
-darkwooddoubleslab=125:1
 birchwooddoubleslab=125:2
-whitewooddoubleslab=125:2
 junglewooddoubleslab=125:3
 acaciawooddoubleslab=125:4
-bigoakwooddoubleslab=125:5
 darkoakwooddoubleslab=125:5
-roofedwooddoubleslab=125:5
 woodenslab=126
-applewoodslab=126:0
 oakwoodslab=126:0
-coniferwoodslab=126:1
-pinewoodslab=126:1
 sprucewoodslab=126:1
-darkwoodslab=126:1
 birchwoodslab=126:2
-whitewoodslab=126:2
 junglewoodslab=126:3
 acaciawoodslab=126:4
-bigoakwoodslab=126:5
 darkoakwoodslab=126:5
-roofedwoodslab=126:5
 cocoabeans=127
 sandstonestairs=128
 emeraldore=129
@@ -322,12 +243,9 @@ enderchest=130
 tripwirehook=131
 tripwire=132
 emeraldblock=133
-coniferwoodstairs=134
-pinewoodstairs=134
 sprucewoodstairs=134
 darkwoodstairs=134
 birchwoodstairs=135
-whitewoodstairs=135
 junglewoodstairs=136
 commandblock=137
 beacon=138
@@ -340,8 +258,7 @@ woodenbutton=143
 skeletonhead=144
 witherhead=144:1
 zombiehead=144:2
-humanhead=144:3
-stevehead=144:3
+playerhead=144:3
 creeperhead=144:4
 anvil=145
 trappedchest=146
@@ -369,7 +286,7 @@ pinkstainedclay=159:6
 graystainedclay=159:7
 lightgraystainedclay=159:8
 cyanstainedclay=159:9
-violetstainedclay=159:10
+purplestainedclay=159:10
 bluestainedclay=159:11
 brownstainedclay=159:12
 greenstainedclay=159:13
@@ -385,24 +302,20 @@ pinkstainedglasspane=160:6
 graystainedglasspane=160:7
 lightgraystainedglasspane=160:8
 cyanstainedglasspane=160:9
-violetstainedglasspane=160:10
+purplestainedglasspane=160:10
 bluestainedglasspane=160:11
 brownstainedglasspane=160:12
 greenstainedglasspane=160:13
 redstainedglasspane=160:14
 blackstainedglasspane=160:15
-acacialeaves=161
-bigoakleaves=161:1
+newleaves=161
+acacialeaves=161:0
 darkoakleaves=161:1
-roofedoakleaves=161:1
-acacialog=162
-bigoaklog=162:1
+newlog=162
+acacialog=162:0
 darkoaklog=162:1
-roofedoaklog=162:1
 acaciawoodstairs=163
-bigoakwoodstiars=164
 darkoakwoodstairs=164
-roofedoakwoodstairs=164
 slimeblock=165
 irontrapdoor=167
 prismarine=168
@@ -411,107 +324,88 @@ darkprismarine=168:2
 sealantern=169
 haybale=170
 carpet=171
+whitecarpet=171:0
+orangecarpet=171:1
+magentacarpet=171:2
+lightbluecarpet=171:3
+yellowcarpet=171:4
+limecarpet=171:5
+pinkcarpet=171:6
+graycarpet=171:7
+lightgraycarpet=171:8
+cyancarpet=171:9
+purplecarpet=171:10
+bluecarpet=171:11
+browncarpet=171:12
+greencarpet=171:13
+redcarpet=171:14
+blackcarpet=171:15
 hardenedclay=172
+coalblock=173
+packedice=174
+doubleplant=175
+sunflower=175:0
+lilac=175:1
+doubletallgrass=175:2
+doubletallfern=175:3
+rosebush=175:4
+peony=175:5
 redsandstone=179
 chiseledredsandstone=179:1
 smoothredsandstone=179:2
 redsandstonestairs=180
 redsandstoneslab=182
-coniferfencegate=183
-pinefencegate=183
 sprucefencegate=183
-darkfencegate=183
 birchfencegate=184
-whitefencegate=184
 junglefencegate=185
 darkoakfencegate=186
-bigoakfencegate=186
-roofedoakfencegate=186
 acaciafencegate=187
-coniferfence=188
-pinefence=188
 sprucefence=188
-darkfence=188
 birchfence=189
-whitefence=189
 junglefence=190
 darkoakfence=191
-bigoakfence=191
-roofedoakfence=191
 acaciafence=192
 ironshovel=256
-ironspade=256
 ironpickaxe=257
-ironpick=257
 ironaxe=258
 flintandsteel=259
-lighter=259
 apple=260
-redapple=260
 bow=261
 arrow=262
 coal=263
-coalblock=173
 charcoal=263:1
 diamond=264
 ironingot=265
-ironbar=265
 goldingot=266
-goldeningot=266
-goldbar=266
-goldenbar=266
 ironsword=267
 woodensword=268
-woodsword=268
 woodenshovel=269
-woodshovel=269
-woodenspade=269
-woodspade=269
 woodenpickaxe=270
-woodpickaxe=270
-woodenpick=270
-woodpick=270
 woodenaxe=271
-woodaxe=271
 stonesword=272
 stoneshovel=273
-stonespade=273
 stonepickaxe=274
-stonepick=274
 stoneaxe=275
 diamondsword=276
 diamondshovel=277
 diamondspade=277
 diamondpickaxe=278
-diamondpick=278
 diamondaxe=279
 stick=280
 bowl=281
 mushroomstew=282
-bowlwithsoup=282
-soupbowl=282
-soup=282
 goldensword=283
-goldsword=283
 goldenshovel=284
-goldshovel=284
 goldenspade=284
-goldspade=284
 goldenpickaxe=285
-goldpickaxe=285
-goldenpick=285
-goldpick=285
 goldenaxe=286
-goldaxe=286
 string=287
 feather=288
 gunpowder=289
-woodhoe=290
 woodenhoe=290
 stonehoe=291
 ironhoe=292
 diamondhoe=293
-goldhoe=294
 goldenhoe=294
 seeds=295
 wheat=296
@@ -533,26 +427,16 @@ diamondchestplate=311
 diamondpants=312
 diamondboots=313
 goldenhelmet=314
-goldhelmet=314
 goldenchestplate=315
-goldchestplate=315
 goldenpants=316
-goldpants=316
 goldenboots=317
-goldboots=317
 flint=318
-meat=319
-pork=319
-cookedmeat=320
-cookedpork=320
+porkchop=319
+cookedporkchop=320
 painting=321
-paintings=321
 goldenapple=322
-goldapple=322
 enchantedgoldenapple=322:1
-enchantedgoldapple=322:1
 sign=323
-wooddoor=324
 woodendoor=324
 bucket=325
 waterbucket=326
@@ -567,11 +451,9 @@ leather=334
 milkbucket=335
 brick=336
 clay=337
-reed=338
 sugarcane=338
 paper=339
 book=340
-slimeorb=341
 slimeball=341
 storageminecart=342
 poweredminecart=343
@@ -579,57 +461,31 @@ egg=344
 compass=345
 fishingrod=346
 watch=347
-lightstonedust=348
-lightdust=348
 glowstonedust=348
-glowdust=348
-rawfish=349
 fish=349
 cookedfish=350
 dye=351
 inksac=351:0
-blackdye=351:0
-reddye=351:1
 rosered=351:1
-greendye=351:2
 cactusgreen=351:2
 cocoabeans=351:3
-browndye=351:3
 lapislazuli=351:4
-bluedye=351:4
-darkbluedye=351:4
-dkbluedye=351:4
 purpledye=351:5
-violetdye=351:5
 cyandye=351:6
-lightgreydye=351:7
 lightgraydye=351:7
-ltgreydye=351:7
-ltgraydye=351:7
-greydye=351:8
 graydye=351:8
-darkgreydye=351:8
-darkgraydye=351:8
-dkgreydye=351:8
-dkgraydye=351:8
 pinkdye=351:9
 limedye=351:10
-lightgreendye=351:10
-ltgreendye=351:10
 dandellionyellow=351:11
-yellowdye=351:11
 lightbluedye=351:12
-ltbluedye=351:12
 magentadye=351:13
 orangedye=351:14
 bonemeal=351:15
-whitedye=351:15
 bone=352
 sugar=353
 cake=354
 bed=355
 repeater=356
-diode=356
 cookie=357
 map=358
 shears=359
@@ -673,7 +529,7 @@ goldencarrot=396
 skeletonhead=397
 witherhead=397:1
 zombiehead=397:2
-stevehead=397:3
+playerhead=397:3
 creeperhead=397:4
 carrotonastick=398
 netherstar=399
@@ -691,7 +547,6 @@ prismarinecrystals=410
 rawrabbit=411
 cookedrabbit=412
 rabbitstew=413
-rabbitsoup=413
 rabbitsfood=414
 rabbithide=415
 armorstand=416
@@ -711,7 +566,6 @@ brownbanner=415:3
 bluebanner=415:4
 purplebanner=415:5
 cyanbanner=415:6
-silverbanner=415:7
 lightgraybanner=415:7
 graybanner=415:8
 pinkbanner=415:9
@@ -721,17 +575,11 @@ lightbluebanner=415:12
 magentabanner=415:13
 orangebanner=415:14
 whitebanner=415:15
-coniferdoor=427
-pinedoor=427
 sprucedoor=427
-darkdoor=427
 birchdoor=428
-whitedoor=428
 jungledoor=429
 acaciadoor=430
-bigoakdoor=431
 darkoakdoor=431
-roofedoakdoor=431
 goldrecord=2256
 greenrecord=2257
 blocksrecord=2258
@@ -744,6 +592,291 @@ stradrecord=2264
 wardrecord=2265
 11record=2266
 
+; ----------
+; Custom Names
+
+appleplanks=5:0
+coniferplanks=5:1
+pineplanks=5:1
+darkplanks=5:1
+lightplanks=5:2
+redplanks=5:3
+bigoakplanks=5:5
+roofedoakplanks=5:5
+applesapling=6:0
+conifersapling=6:1
+pinesapling=6:1
+whitesapling=6:2
+redsapling=6:3
+bigoaksapling=6:5
+roofedoaksapling=6:5
+adminium=7
+flowingwater=8
+swater=9
+stillwater=9
+stilllava=11
+slava=11
+tree=17
+applelog=17:0
+coniferlog=17:1
+pinelog=17:1
+darklog=17:1
+whitelog=17:2
+appleleaves=18:0
+coniferleaves=18:1
+pineleaves=18:1
+whiteleaves=18:2
+decorativesandstone=24:1
+ornamentsandstone=24:1
+pistonhead=34
+cloth=35
+ltbluewool=35:3
+lightgreenwool=35:5
+ltgreenwool=35:5
+greywool=35:7
+darkgraywool=35:7
+darkgreywool=35:7
+dkgraywool=35:7
+dkgreywool=35:7
+lightgreywool=35:8
+ltgraywool=35:8
+ltgreywool=35:8
+silverwool=35:8
+violetwool=35:10
+darkbluewool=35:11
+dkbluewool=35:11
+darkgreenwool=35:13
+dkgreenwool=35:13
+rose=38
+flower=38
+gold=41
+iron=42
+step=44
+brickwall=45
+bookcase=47
+mossy=48
+woodstairs=53
+redstonedust=55
+tilleddirt=60
+soil=60
+rail=66
+track=66
+tracks=66
+stairs=67
+signblocktop=68
+rockplate=70
+hellrock=87
+netherstone=87
+slowsand=88
+lightstone=89
+jacko=91
+ltbluestainedglass=95:3
+lightgreenstainedglass=95:5
+ltgreenstainedglass=95:5
+greystainedglass=95:7
+darkgraystainedglass=95:7
+darkgreystainedglass=95:7
+dkgraystainedglass=95:7
+dkgreystainedglass=95:7
+lightgreystainedglass=95:8
+ltgraystainedglass=95:8
+ltgreystainedglass=95:8
+silverstainedglass=95:8
+violetstainedglass=95:10
+darkbluestainedglass=95:11
+dkbluestainedglass=95:11
+darkgreenstainedglass=95:13
+dkgreenstainedglass=95:13
+stonebricks=98
+redstonelampoff=123
+redstonelampon=124
+appledoublewoodslab=125:0
+coniferwooddoubleslab=125:1
+pinewooddoubleslab=125:1
+darkwooddoubleslab=125:1
+whitewooddoubleslab=125:2
+bigoakwooddoubleslab=125:5
+roofedwooddoubleslab=125:5
+applewoodslab=126:0
+coniferwoodslab=126:1
+pinewoodslab=126:1
+darkwoodslab=126:1
+whitewoodslab=126:2
+roofedwoodslab=126:5
+bigoakwoodslab=126:5
+coniferwoodstairs=134
+pinewoodstairs=134
+whitewoodstairs=135
+humanhead=144:3
+stevehead=144:3
+ltbluestainedclay=159:3
+lightgreenstainedclay=159:5
+ltgreenstainedclay=159:5
+greystainedclay=159:7
+darkgraystainedclay=159:7
+darkgreystainedclay=159:7
+dkgraystainedclay=159:7
+dkgreystainedclay=159:7
+lightgreystainedclay=159:8
+ltgraystainedclay=159:8
+ltgreystainedclay=159:8
+silvertsainedclay=159:8
+violetstainedclay=159:10
+darkbluestainedclay=159:11
+dkbluestainedclay=159:11
+darkgreenstainedclay=159:13
+dkgreenstainedclay=159:13
+ltbluestainedglasspane=160:3
+lightgreenstainedglasspane=160:5
+ltgreenstainedglasspane=160:5
+greystainedglasspane=160:7
+darkgraystainedglasspane=160:7
+darkgreystainedglasspane=160:7
+dkgraystainedglasspane=160:7
+dkgreystainedglasspane=160:7
+lightgreystainedglasspane=160:8
+ltgraystainedglasspane=160:8
+ltgreystainedglasspane=160:8
+silverstainedglasspane=160:8
+violetstainedglasspane=160:10
+darkbluestainedglasspane=160:11
+dkbluestainedglasspane=160:11
+darkgreenstainedglasspane=160:13
+dkgreenstainedglasspane=160:13
+bigoakleaves=161:1
+roofedoakleaves=161:1
+bigoaklog=162:1
+roofedoaklog=162:1
+bigoakwoodstiars=164
+roofedoakwoodstairs=164
+ltbluecarpet=171:3
+lightgreencarpet=171:5
+ltgreencarpet=171:5
+greycarpet=171:7
+darkgraycarpet=171:7
+darkgreycarpet=171:7
+dkgraycarpet=171:7
+dkgreycarpet=171:7
+lightgreycarpet=171:8
+ltgraycarpet=171:8
+ltgreycarpet=171:8
+silvercarpet=171:8
+violetcarpet=171:10
+darkbluecarpet=171:11
+dkbluecarpet=171:11
+darkgreencarpet=171:13
+dkgreencarpet=171:13
+coniferfencegate=183
+pinefencegate=183
+darkfencegate=183
+whitefencegate=184
+bigoakfencegate=186
+roofedoakfencegate=186
+coniferfence=188
+pinefence=188
+darkfence=188
+whitefence=189
+bigoakfence=191
+roofedoakfence=191
+ironspade=256
+ironpick=257
+lighter=259
+redapple=260
+ironbar=265
+goldeningot=266
+goldbar=266
+goldenbar=266
+woodsword=268
+woodspade=269
+woodshovel=269
+woodenspade=269
+woodpickaxe=270
+woodenpick=270
+woodpick=270
+woodaxe=271
+stonespade=273
+stonepick=274
+diamondpick=278
+bowlwithsoup=282
+soupbowl=282
+soup=282
+goldsword=283
+goldshovel=284
+goldspade=284
+goldpickaxe=285
+goldenpick=285
+goldpick=285
+goldaxe=286
+woodhoe=290
+goldhoe=294
+goldhelmet=314
+goldchestplate=315
+goldpants=316
+goldboots=317
+meat=319
+pork=319
+cookedmeat=320
+cookedpork=320
+paintings=321
+goldapple=322
+enchantedgoldapple=322:1
+wooddoor=324
+reed=338
+slimeorb=341
+lightstonedust=348
+lightdust=348
+glowdust=348
+rawfish=349
+blackdye=351:0
+reddye=351:1
+greendye=351:2
+darkgreendye=351:2
+dkgreendye=351:2
+browndye=351:3
+bluedye=351:4
+darkbluedye=351:4
+dkbluedye=351:4
+violetdye=351:5
+ltgreydye=351:7
+ltgraydye=351:7
+lightgreydye=351:7
+silverdye=351:7
+greydye=351:8
+darkgreydye=351:8
+darkgraydye=351:8
+dkgreydye=351:8
+dkgraydye=351:8
+lightgreendye=351:10
+ltgreendye=351:10
+yellowdye=351:11
+ltbluedye=351:12
+whitedye=351:15
+diode=356
+stevehead=397:3
+rabbitsoup=413
+darkgreenbanner=415:2
+dkgreenbanner=415:2
+darkbluebanner=415:4
+dkbluebanner=415:4
+violetbanner=415:5
+lightgreybanner=415:7
+ltgraybanner=415:7
+ltgreybanner=415:7
+silverbanner=415:7
+greybanner=415:8
+darkgraybanner=415:8
+darkgreybanner=415:8
+dkgraybanner=415:8
+dkgreybanner=415:8
+lightgreenbanner=415:10
+ltgreenbanner=415:10
+ltbluebanner=415:12
+coniferdoor=427
+pinedoor=427
+darkdoor=427
+whitedoor=428
+bigoakdoor=431
+roofedoakdoor=431
 
 
 
-- 
cgit v1.2.3


From 63e9c9c6d9ddf7369dcc5335ec7c7cba417896f2 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Tue, 2 Sep 2014 21:36:59 +0200
Subject: Added missing recipes!

---
 MCServer/crafting.txt | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index d29344b64..b7218927e 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -40,8 +40,8 @@
 
 # Need to list each of the four log types, otherwise all logs would get converted into apple planks (^0)
 
-ApplePlanks, 4   = AppleLog, * 
-ConiferPlanks, 4 = ConiferLog, *
+OakPlanks, 4     = OakLog, * 
+SprucePlanks, 4  = SpruceLog, *
 BirchPlanks, 4   = BirchLog, *
 JunglePlanks, 4  = JungleLog, *
 AcaciaPlanks, 4  = AcaciaLog, *
@@ -67,6 +67,7 @@ DiamondBlock            = Diamond,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3
 LapisBlock              = LapisLazuli, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 EmeraldBlock            = Emerald,     1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 RedstoneBlock           = RedstoneDust,    1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
+CoalBlock               = Coal, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 QuartzBlock             = NetherQuartz, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
 NetherBrick             = netherbrickitem, 1:1, 1:2, 2:1, 2:2
 Glowstone               = GlowstoneDust, 1:1, 1:2, 2:1, 2:2
@@ -147,9 +148,6 @@ StoneBrickStairs, 4  = StoneBrick,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 RedSandstoneStairs, 4 = RedSandstone,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 RedSandstoneStairs, 4 = RedSandstone,  3:1, 2:2, 3:2, 1:3, 2:3, 3:3
 
-# Other
-Carpet             = Wool, 1:3, 2:3
-
 
 
 #******************************************************#
@@ -451,13 +449,30 @@ PinkWool      = Wool, * | PinkDye, *
 GrayWool      = Wool, * | GrayDye, *
 LightGrayWool = Wool, * | LightGrayDye, *
 CyanWool      = Wool, * | CyanDye, *
-VioletWool    = Wool, * | VioletDye, *
+PurpleWool    = Wool, * | PurpleDye, *
 BlueWool      = Wool, * | BlueDye, *
 BrownWool     = Wool, * | BrownDye, *
 GreenWool     = Wool, * | GreenDye, *
 RedWool       = Wool, * | RedDye, *
 BlackWool     = Wool, * | BlackDye, *
 
+WhiteCrapet, 3     = WhiteWool, 1:1, 2:1
+OrangeCarpet, 3    = OrangeWool, 1:1, 2:1
+MagentaCarpet, 3   = MagentaWool, 1:1, 2:1
+LightBlueCarpet, 3 = LightBlueWool, 1:1, 2:1
+YellowCarpet, 3    = YellowWool, 1:1, 2:1
+LimeCarpet, 3      = LimeWool, 1:1, 2:1
+PinkCarpet, 3      = PinkWool, 1:1, 2:1
+GrayCarpet, 3      = GrayWool, 1:1, 2:1
+LightGrayCarpet, 3 = LightGrayWool, 1:1, 2:1
+CyanCarpet, 3      = CyanWool, 1:1, 2:1
+PurpleCarpet, 3    = PurpleWool, 1:1, 2:1
+BlueCarpet, 3      = BlueWool, 1:1, 2:1
+BrownCarpet, 3     = BrownWool, 1:1, 2:1
+GreenCarpet, 3     = GreenWool, 1:1, 2:1
+RedCarpet, 3       = RedWool, 1:1, 2:2
+BlackCarpet, 3     = BlackWool, 1:1, 2:1
+
 #******************************************************#
 # Stained Glass:
 #
-- 
cgit v1.2.3


From 4823cbf73d21546e23c746461fd7ebf0ad7d9b3a Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Tue, 2 Sep 2014 21:54:47 +0200
Subject: Fixed typo!

---
 MCServer/crafting.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index b7218927e..64ad2adf9 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -456,7 +456,7 @@ GreenWool     = Wool, * | GreenDye, *
 RedWool       = Wool, * | RedDye, *
 BlackWool     = Wool, * | BlackDye, *
 
-WhiteCrapet, 3     = WhiteWool, 1:1, 2:1
+WhiteCarpet, 3     = WhiteWool, 1:1, 2:1
 OrangeCarpet, 3    = OrangeWool, 1:1, 2:1
 MagentaCarpet, 3   = MagentaWool, 1:1, 2:1
 LightBlueCarpet, 3 = LightBlueWool, 1:1, 2:1
-- 
cgit v1.2.3


From a9ed5baba35b012f577ca6c6cca970042fc4edf0 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 3 Sep 2014 17:01:23 +0200
Subject: Exported ForEachEntityInBox() to Lua API.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index ffd228d1a..718cb4e98 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2344,6 +2344,7 @@ end
 				ForEachBlockEntityInChunk = { Params = "ChunkX, ChunkZ, CallbackFunction, [CallbackData]", Return = "bool", Notes = "Calls the specified callback for each block entity in the chunk. Returns true if all block entities in the chunk have been processed (including when there are zero block entities), or false if the callback has aborted the enumeration by returning true. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cBlockEntity|BlockEntity}}, [CallbackData])</pre> The callback should return false or no value to continue with the next block entity, or true to abort the enumeration. Use {{tolua}}.cast() to cast the Callback's BlockEntity parameter to the correct {{cBlockEntity}} descendant." },
 				ForEachChestInChunk = { Params = "ChunkX, ChunkZ, CallbackFunction, [CallbackData]", Return = "bool", Notes = "Calls the specified callback for each chest in the chunk. Returns true if all chests in the chunk have been processed (including when there are zero chests), or false if the callback has aborted the enumeration by returning true. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cChestEntity|ChestEntity}}, [CallbackData])</pre> The callback should return false or no value to continue with the next chest, or true to abort the enumeration." },
 				ForEachEntity = { Params = "CallbackFunction, [CallbackData]", Return = "bool", Notes = "Calls the specified callback for each entity in the loaded world. Returns true if all the entities have been processed (including when there are zero entities), or false if the callback function has aborted the enumeration by returning true. The callback function has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cEntity|Entity}}, [CallbackData])</pre> The callback should return false or no value to continue with the next entity, or true to abort the enumeration." },
+				ForEachEntityInBox = { Params = "{{cBoundingBox|Box}}, CallbackFunction", Return = "bool", Notes = "Calls the specified callback for each entity in the specified bounding box. Returns true if all the entities have been processed (including when there are zero entities), or false if the callback function has aborted the enumeration by returning true. If any chunk within the bounding box is not valid, it is silently skipped without any notification. The callback function has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cEntity|Entity}})</pre> The callback should return false or no value to continue with the next entity, or true to abort the enumeration." },
 				ForEachEntityInChunk = { Params = "ChunkX, ChunkZ, CallbackFunction, [CallbackData]", Return = "bool", Notes = "Calls the specified callback for each entity in the specified chunk. Returns true if all the entities have been processed (including when there are zero entities), or false if the chunk is not loaded or the callback function has aborted the enumeration by returning true. The callback function has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cEntity|Entity}}, [CallbackData])</pre> The callback should return false or no value to continue with the next entity, or true to abort the enumeration." },
 				ForEachFurnaceInChunk = { Params = "ChunkX, ChunkZ, CallbackFunction, [CallbackData]", Return = "bool", Notes = "Calls the specified callback for each furnace in the chunk. Returns true if all furnaces in the chunk have been processed (including when there are zero furnaces), or false if the callback has aborted the enumeration by returning true. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cFurnaceEntity|FurnaceEntity}}, [CallbackData])</pre> The callback should return false or no value to continue with the next furnace, or true to abort the enumeration." },
 				ForEachPlayer = { Params = "CallbackFunction, [CallbackData]", Return = "bool", Notes = "Calls the specified callback for each player in the loaded world. Returns true if all the players have been processed (including when there are zero players), or false if the callback function has aborted the enumeration by returning true. The callback function has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cPlayer|Player}}, [CallbackData])</pre> The callback should return false or no value to continue with the next player, or true to abort the enumeration." },
-- 
cgit v1.2.3


From 5fa1a7fa223324a891c14c8b91544d859ee6fef4 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 3 Sep 2014 17:02:16 +0200
Subject: Debuggers: Added a test code for ForEachEntityInBox().

Currently untested, may not run, may crash.
---
 MCServer/Plugins/Debuggers/Debuggers.lua | 49 ++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index 179935c08..ca764c959 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -65,6 +65,8 @@ function Initialize(Plugin)
 	PM:BindCommand("/sb",      "debuggers", HandleSetBiome,        "- Sets the biome around you to the specified one");
 	PM:BindCommand("/wesel",   "debuggers", HandleWESel,           "- Expands the current WE selection by 1 block in X/Z");
 	PM:BindCommand("/rmitem",  "debuggers", HandleRMItem,          "- Remove the specified item from the inventory.");
+	PM:BindCommand("/pickups", "debuggers", HandlePickups,         "- Spawns random pickups around you");
+	PM:BindCommand("/poof",    "debuggers", HandlePoof,            "- Nudges pickups close to you away from you");
 
 	Plugin:AddWebTab("Debuggers",  HandleRequest_Debuggers)
 	Plugin:AddWebTab("StressTest", HandleRequest_StressTest)
@@ -1558,3 +1560,50 @@ end
 
 
 
+
+local PossibleItems =
+{
+	cItem(E_ITEM_DIAMOND),
+	cItem(E_ITEM_GOLD),
+	cItem(E_ITEM_IRON),
+	cItem(E_ITEM_DYE, E_META_DYE_BLUE),  -- Lapis lazuli
+	cItem(E_ITEM_COAL),
+}
+
+
+
+
+
+function HandlePickups(a_Split, a_Player)
+	local PlayerX = a_Player:GetPosX()
+	local PlayerY = a_Player:GetPosY()
+	local PlayerZ = a_Player:GetPosZ()
+	local World = a_Player:GetWorld()
+	local Range = 15
+	for x = 0, Range do for z = 0, Range do
+		local x = PlayerX + x - Range / 2
+		local z = PlayerZ + z - Range / 2
+		local Items = cItems()
+		Items:Add(PossibleItems[math.random(#PossibleItems)])
+		World:SpawnItemPickups(Items, x, PlayerY, z, 0)
+	end end  -- for z, for x
+end
+
+
+
+
+function HandlePoof(a_Split, a_Player)
+	local PlayerPos = a_Player:GetPos()
+	local Box = cBoundingBox(PlayerPos, a_Player:GetWidth() / 2, a_Player:GetHeight())
+	a_Player:GetWorld():ForEachEntityInBox(Box,
+		function (a_Entity)
+			local AddSpeed = PlayerPos - a_Entity:GetPosition()  -- Speed away from the player
+			a_Entity:AddSpeed(AddSpeed / AddSpeed:SqrLength())  -- The further away, the less speed to add
+		end
+	)
+	a_Player:SendMessage("Poof!")
+end
+
+
+
+
-- 
cgit v1.2.3


From 1b9edb0279b008cf549d75fa3135c166503bf9bc Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 3 Sep 2014 23:05:49 +0200
Subject: Debuggers: Reviewed and fixed the Pickups and Poof commands.

Now they're confirmed working.
---
 MCServer/Plugins/Debuggers/Debuggers.lua | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index ca764c959..0e7e647d5 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -1566,7 +1566,7 @@ local PossibleItems =
 	cItem(E_ITEM_DIAMOND),
 	cItem(E_ITEM_GOLD),
 	cItem(E_ITEM_IRON),
-	cItem(E_ITEM_DYE, E_META_DYE_BLUE),  -- Lapis lazuli
+	cItem(E_ITEM_DYE, 1, E_META_DYE_BLUE),  -- Lapis lazuli
 	cItem(E_ITEM_COAL),
 }
 
@@ -1579,29 +1579,36 @@ function HandlePickups(a_Split, a_Player)
 	local PlayerY = a_Player:GetPosY()
 	local PlayerZ = a_Player:GetPosZ()
 	local World = a_Player:GetWorld()
-	local Range = 15
+	local Range = 12
 	for x = 0, Range do for z = 0, Range do
-		local x = PlayerX + x - Range / 2
-		local z = PlayerZ + z - Range / 2
+		local px = PlayerX + x - Range / 2
+		local pz = PlayerZ + z - Range / 2
 		local Items = cItems()
 		Items:Add(PossibleItems[math.random(#PossibleItems)])
-		World:SpawnItemPickups(Items, x, PlayerY, z, 0)
+		World:SpawnItemPickups(Items, px, PlayerY, pz, 0)
 	end end  -- for z, for x
+	return true
 end
 
 
 
 
 function HandlePoof(a_Split, a_Player)
-	local PlayerPos = a_Player:GetPos()
-	local Box = cBoundingBox(PlayerPos, a_Player:GetWidth() / 2, a_Player:GetHeight())
+	local PlayerPos = Vector3d(a_Player:GetPosition())  -- Create a copy of the position
+	PlayerPos.y = PlayerPos.y - 1
+	local Box = cBoundingBox(PlayerPos, 4, 2)
+	local NumEntities = 0
 	a_Player:GetWorld():ForEachEntityInBox(Box,
 		function (a_Entity)
-			local AddSpeed = PlayerPos - a_Entity:GetPosition()  -- Speed away from the player
-			a_Entity:AddSpeed(AddSpeed / AddSpeed:SqrLength())  -- The further away, the less speed to add
+			if not(a_Entity:IsPlayer()) then
+				local AddSpeed = a_Entity:GetPosition() - PlayerPos  -- Speed away from the player
+				a_Entity:AddSpeed(AddSpeed * 32 / (AddSpeed:SqrLength() + 1))  -- The further away, the less speed to add
+				NumEntities = NumEntities + 1
+			end
 		end
 	)
-	a_Player:SendMessage("Poof!")
+	a_Player:SendMessage("Poof! (" .. NumEntities .. " entities)")
+	return true
 end
 
 
-- 
cgit v1.2.3


From f6e029253f6902a038328ee3c02e2e08647da305 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Sat, 6 Sep 2014 10:24:33 +0100
Subject: Removed outdated message sending methods.

Fixes #1381
---
 MCServer/Plugins/APIDump/Writing-a-MCServer-plugin.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Writing-a-MCServer-plugin.html b/MCServer/Plugins/APIDump/Writing-a-MCServer-plugin.html
index 35c880b00..dd124e119 100644
--- a/MCServer/Plugins/APIDump/Writing-a-MCServer-plugin.html
+++ b/MCServer/Plugins/APIDump/Writing-a-MCServer-plugin.html
@@ -202,7 +202,7 @@ function Explode(Split, Player)
 	if (#Split ~= 2) then
 		-- There was more or less than one argument (excluding the "/explode" bit)
 		-- Send the proper usage to the player and exit
-		SendMessage(Player, "Usage: /explode [playername]")
+		Player:SendMessage("Usage: /explode [playername]")
 		return true
 	end
 
@@ -213,7 +213,7 @@ function Explode(Split, Player)
 		if (Explodee:GetName() == Split[2]) then
 			-- Create an explosion at the same position as they are; see <a href="cWorld.html">API docs</a> for further details of this function
 			Player:GetWorld():DoExplosionAt(Explodee:GetPosX(), Explodee:GetPosY(), Explodee:GetPosZ(), false, esPlugin)
-			SendMessageSuccess(Player, Split[2] .. " was successfully exploded")
+			Player:SendMessageSuccess(Split[2] .. " was successfully exploded")
 			HasExploded = true;
 			return true -- Signalize to MCS that we do not need to call this callback for any more players
 		end
@@ -224,7 +224,7 @@ function Explode(Split, Player)
 	
 	if not(HasExploded) then
 		-- We have not broken out so far, therefore, the player must not exist, send failure
-		SendMessageFailure(Player, Split[2] .. " was not found")
+		Player:SendMessageFailure(Split[2] .. " was not found")
 	end
 	
 	return true
-- 
cgit v1.2.3


From a2452ff6fab9dcc282f9b1ad7f0f96c103e3f26f Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Sat, 6 Sep 2014 22:37:48 +0200
Subject: Re-ordered the items.ini and added a few new names

---
 MCServer/items.ini | 583 ++++++++++++++++++++++++++---------------------------
 1 file changed, 291 insertions(+), 292 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/items.ini b/MCServer/items.ini
index 67a3020ae..380c13e02 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -16,28 +16,46 @@ cobblestone=4
 cobble=4
 planks=5
 oakplanks=5:0
+appleplanks=5:0
 spruceplanks=5:1
+coniferplanks=5:1
+pineplanks=5:1
+darkplanks=5:1
 birchplanks=5:2
+lightplanks=5:2
 jungleplanks=5:3
+redplanks=5:3
 acaciaplanks=5:4
 darkoakplanks=5:5
-
-
-; Obsolete: do not use "wood", as its meaning is not clear - wiki uses log as wood, we use planks as wood.
-wood=5
-
+bigoakplanks=5:5
+roofedoakplanks=5:5
 sapling=6
 oaksapling=6:0
+applesapling=6:0
 sprucesapling=6:1
+conifersapling=6:1
+pinesapling=6:1
+darkplanks=6:1
 birchsapling=6:2
+whitesapling=6:2
 junglesapling=6:3
+redsapling=6:3
 acaciasapling=6:4
 darkoaksapling=6:5
+bigoaksapling=6:5
+roofedoaksapling=6:5
 bedrock=7
+adminium=7
 water=8
+flowingwater=8
 stationarywater=9
+stillwater=9
+swater=9
 lava=10
+flowinglava=10
 stationarylava=11
+stilllava=11
+slava=11
 sand=12
 redsand=12:1
 gravel=13
@@ -45,14 +63,25 @@ goldore=14
 ironore=15
 coalore=16
 log=17
+tree=17
 oaklog=17:0
+applelog=17:0
 sprucelog=17:1
+coniferlog=17:1
+pinelog=17:1
+darklog=17:1
 birchlog=17:2
+whitelog=17:2
 junglelog=17:3
 leaves=18
 oakleaves=18:0
+appleleaves=18:0
 spruceleaves=18:1
+coniferleaves=18:1
+pineleaves=18:1
+darkleaves=18:1
 birchleaves=18:2
+whiteleaves=18:2
 jungleleaves=18:3
 sponge=19
 wetsponge=19:1
@@ -63,6 +92,8 @@ dispenser=23
 sandstone=24
 normalsandstone=24:0
 chiseledsandstone=24:1
+decorativesandstone=24:1
+ornamentsandstone=24:1
 smoothsandstone=24:2
 noteblock=25
 bedblock=26
@@ -76,25 +107,47 @@ tallgrasstwo=31:2
 deadbush=32
 piston=33
 pistonextension=34
+pistonhead=34
 wool=35
+cloth=35
 whitewool=35:0
 orangewool=35:1
 magentawool=35:2
 lightbluewool=35:3
+ltbluewool=35:3
 yellowwool=35:4
 limewool=35:5
+ltbluewool=35:3
+lightgreenwool=35:5
+ltgreenwool=35:5
 pinkwool=35:6
 graywool=35:7
+greywool=35:7
+darkgraywool=35:7
+darkgreywool=35:7
+dkgraywool=35:7
+dkgreywool=35:7
 lightgraywool=35:8
+lightgreywool=35:8
+ltgraywool=35:8
+ltgreywool=35:8
+silverwool=35:8
 cyanwool=35:9
 purplewool=35:10
+violetwool=35:10
 bluewool=35:11
+darkbluewool=35:11
+dkbluewool=35:11
 brownwool=35:12
 greenwool=35:13
+darkgreenwool=35:13
+dkgreenwool=35:13
 redwool=35:14
 blackwool=35:15
 dandelion=37
 poppy=38
+rose=38
+flower=38
 blueorchid=38:1
 allium=38:2
 azurebluet=38:3
@@ -106,8 +159,11 @@ oxeyedaisy=38:8
 brownmushroom=39
 redmushroom=40
 goldblock=41
+gold=41
 ironblock=42
+iron=42
 doubleslab=43
+doublestep=43
 stonedoubleslab=43:0
 sandstonedoubleslab=43:1
 wooddoubleslab=43:2
@@ -117,6 +173,7 @@ stonebrickdoubleslab=43:5
 netherbrickdoubleslab=43:6
 quartzdoubleslab=43:7
 slab=44
+step=44
 stoneslab=44:0
 sandstoneslab=44:1
 woodslab=44:2
@@ -126,32 +183,45 @@ stonebrickslab=44:5
 netherbrickslab=44:6
 quartzslab=44:7
 brickblock=45
+brickwall=45
 tnt=46
 bookshelf=47
+bookcase=47
 mossycobblestone=48
+mossy=48
 obsidian=49
 torch=50
 fire=51
 mobspawner=52
 oakwoodstairs=53
+woodstairs=53
 chest=54
 redstonewire=55
+redstonedust=55
 diamondore=56
 diamondblock=57
 workbench=58
 crop=59
 crops=59
 farmland=60
+tilleddirt=60
+soil=60
 furnace=61
 litfurnace=62
 signblock=63
 wooddoorblock=64
 ladder=65
 rails=66
+rail=66
+track=66
+tracks=66
 cobblestonestairs=67
+stairs=67
 wallsign=68
+signblocktop=68
 lever=69
 stoneplate=70
+rockplate=70
 irondoorblock=71
 woodplate=72
 redstoneore=73
@@ -169,30 +239,53 @@ jukebox=84
 fence=85
 pumpkin=86
 netherrack=87
+hellrock=87
+netherstone=87
 soulsand=88
+slowsand=88
 glowstone=89
+lightstone=89
 portal=90
 jackolantern=91
+jacko=91
 cakeblock=92
 whitestainedglass=95
 orangestainedglass=95:1
 magentastainedglass=95:2
 lightbluestainedglass=95:3
+ltbluestainedglass=95:3
 yellowstainedglass=95:4
 limestainedglass=95:5
+lightgreenstainedglass=95:5
+ltgreenstainedglass=95:5
 pinkstainedglass=95:6
 graystainedglass=95:7
+greystainedglass=95:7
+darkgraystainedglass=95:7
+darkgreystainedglass=95:7
+dkgraystainedglass=95:7
+dkgreystainedglass=95:7
 lightgraystainedglass=95:8
+lightgreystainedglass=95:8
+ltgraystainedglass=95:8
+ltgreystainedglass=95:8
+silverstainedglass=95:8
 cyanstainedglass=95:9
 purplestainedglass=95:10
+violetstainedglass=95:10
 bluestainedglass=95:11
+darkbluestainedglass=95:11
+dkbluestainedglass=95:11
 brownstainedglass=95:12
 greenstainedglass=95:13
+darkgreenstainedglass=95:13
+dkgreenstainedglass=95:13
 redstainedglass=95:14
 blackstainedglass=95:15
 trapdoor=96
 silverfishblock=97
 stonebrick=98
+stonebricks=98
 mossystonebrick=98:1
 crackedstonebrick=98:2
 chiseledstonebrick=98:3
@@ -221,21 +314,37 @@ endportalframe=120
 endstone=121
 dragonegg=122
 redstonelamp=123
+redstonelampoff=123
 litredstonelamp=124
+redstonelampon=124
 woodendoubleslab=125
 oakwooddoubleslab=125:0
+appledoublewoodslab=125:0
 sprucewooddoubleslab=125:1
+coniferwooddoubleslab=125:1
+pinewooddoubleslab=125:1
+darkwooddoubleslab=125:1
 birchwooddoubleslab=125:2
+whitewooddoubleslab=125:2
 junglewooddoubleslab=125:3
 acaciawooddoubleslab=125:4
 darkoakwooddoubleslab=125:5
+bigoakwooddoubleslab=125:5
+roofedwooddoubleslab=125:5
 woodenslab=126
 oakwoodslab=126:0
+applewoodslab=126:0
 sprucewoodslab=126:1
+coniferwoodslab=126:1
+pinewoodslab=126:1
+darkwoodslab=126:1
 birchwoodslab=126:2
+whitewoodslab=126:2
 junglewoodslab=126:3
 acaciawoodslab=126:4
 darkoakwoodslab=126:5
+roofedwoodslab=126:5
+bigoakwoodslab=126:5
 cocoabeans=127
 sandstonestairs=128
 emeraldore=129
@@ -244,8 +353,11 @@ tripwirehook=131
 tripwire=132
 emeraldblock=133
 sprucewoodstairs=134
+coniferwoodstairs=134
+pinewoodstairs=134
 darkwoodstairs=134
 birchwoodstairs=135
+whitewoodstairs=135
 junglewoodstairs=136
 commandblock=137
 beacon=138
@@ -259,6 +371,8 @@ skeletonhead=144
 witherhead=144:1
 zombiehead=144:2
 playerhead=144:3
+humanhead=144:3
+stevehead=144:3
 creeperhead=144:4
 anvil=145
 trappedchest=146
@@ -280,42 +394,82 @@ whitestainedclay=159
 orangestainedclay=159:1
 magentastainedclay=159:2
 lightbluestainedclay=159:3
+ltbluestainedclay=159:3
 yellowstainedclay=159:4
 limestainedclay=159:5
+lightgreenstainedclay=159:5
+ltgreenstainedclay=159:5
 pinkstainedclay=159:6
 graystainedclay=159:7
+greystainedclay=159:7
+darkgraystainedclay=159:7
+darkgreystainedclay=159:7
+dkgraystainedclay=159:7
+dkgreystainedclay=159:7
 lightgraystainedclay=159:8
+lightgreystainedclay=159:8
+ltgraystainedclay=159:8
+ltgreystainedclay=159:8
+silvertsainedclay=159:8
 cyanstainedclay=159:9
 purplestainedclay=159:10
+violetstainedclay=159:10
 bluestainedclay=159:11
+darkbluestainedclay=159:11
+dkbluestainedclay=159:11
 brownstainedclay=159:12
 greenstainedclay=159:13
+darkgreenstainedclay=159:13
+dkgreenstainedclay=159:13
 redstainedclay=159:14
 blackstainedclay=159:15
 whitestainedglasspane=160
 orangestainedglasspane=160:1
 magentastainedglasspane=160:2
 lightbluestainedglasspane=160:3
+ltbluestainedglasspane=160:3
 yellowstainedglasspane=160:4
 limestainedglasspane=160:5
+lightgreenstainedglasspane=160:5
+ltgreenstainedglasspane=160:5
 pinkstainedglasspane=160:6
 graystainedglasspane=160:7
+greystainedglasspane=160:7
+darkgraystainedglasspane=160:7
+darkgreystainedglasspane=160:7
+dkgraystainedglasspane=160:7
+dkgreystainedglasspane=160:7
 lightgraystainedglasspane=160:8
+lightgreystainedglasspane=160:8
+ltgraystainedglasspane=160:8
+ltgreystainedglasspane=160:8
+silverstainedglasspane=160:8
 cyanstainedglasspane=160:9
 purplestainedglasspane=160:10
+violetstainedglasspane=160:10
 bluestainedglasspane=160:11
+darkbluestainedglasspane=160:11
+dkbluestainedglasspane=160:11
 brownstainedglasspane=160:12
 greenstainedglasspane=160:13
+darkgreenstainedglasspane=160:13
+dkgreenstainedglasspane=160:13
 redstainedglasspane=160:14
 blackstainedglasspane=160:15
 newleaves=161
 acacialeaves=161:0
 darkoakleaves=161:1
+bigoakleaves=161:1
+roofedoakleaves=161:1
 newlog=162
 acacialog=162:0
 darkoaklog=162:1
+bigoaklog=162:1
+roofedoaklog=162:1
 acaciawoodstairs=163
 darkoakwoodstairs=164
+bigoakwoodstiars=164
+roofedoakwoodstairs=164
 slimeblock=165
 irontrapdoor=167
 prismarine=168
@@ -328,16 +482,33 @@ whitecarpet=171:0
 orangecarpet=171:1
 magentacarpet=171:2
 lightbluecarpet=171:3
+ltbluecarpet=171:3
 yellowcarpet=171:4
 limecarpet=171:5
+lightgreencarpet=171:5
+ltgreencarpet=171:5
 pinkcarpet=171:6
 graycarpet=171:7
+greycarpet=171:7
+darkgraycarpet=171:7
+darkgreycarpet=171:7
+dkgraycarpet=171:7
+dkgreycarpet=171:7
 lightgraycarpet=171:8
+lightgreycarpet=171:8
+ltgraycarpet=171:8
+ltgreycarpet=171:8
+silvercarpet=171:8
 cyancarpet=171:9
 purplecarpet=171:10
+violetcarpet=171:10
 bluecarpet=171:11
+darkbluecarpet=171:11
+dkbluecarpet=171:11
 browncarpet=171:12
 greencarpet=171:13
+darkgreencarpet=171:13
+dkgreencarpet=171:13
 redcarpet=171:14
 blackcarpet=171:15
 hardenedclay=172
@@ -356,57 +527,100 @@ smoothredsandstone=179:2
 redsandstonestairs=180
 redsandstoneslab=182
 sprucefencegate=183
+coniferfencegate=183
+pinefencegate=183
+darkfencegate=183
 birchfencegate=184
+whitefencegate=184
 junglefencegate=185
 darkoakfencegate=186
+bigoakfencegate=186
+roofedoakfencegate=186
 acaciafencegate=187
 sprucefence=188
+coniferfence=188
+pinefence=188
+darkfence=188
 birchfence=189
+whitefence=189
 junglefence=190
 darkoakfence=191
+bigoakfence=191
+roofedoakfence=191
 acaciafence=192
 ironshovel=256
+ironspade=256
 ironpickaxe=257
+ironpick=257
 ironaxe=258
 flintandsteel=259
+lighter=259
 apple=260
+redapple=260
 bow=261
 arrow=262
 coal=263
 charcoal=263:1
 diamond=264
 ironingot=265
+ironbar=265
 goldingot=266
+goldeningot=266
+goldbar=266
+goldenbar=266
 ironsword=267
 woodensword=268
+woodsword=268
 woodenshovel=269
+woodspade=269
+woodshovel=269
+woodenspade=269
 woodenpickaxe=270
+woodpickaxe=270
+woodenpick=270
+woodpick=270
 woodenaxe=271
+woodaxe=271
 stonesword=272
 stoneshovel=273
+stonespade=273
 stonepickaxe=274
+stonepick=274
 stoneaxe=275
 diamondsword=276
 diamondshovel=277
 diamondspade=277
 diamondpickaxe=278
+diamondpick=278
 diamondaxe=279
 stick=280
 bowl=281
 mushroomstew=282
+bowlwithsoup=282
+soupbowl=282
+soup=282
 goldensword=283
+goldsword=283
 goldenshovel=284
 goldenspade=284
+goldshovel=284
+goldspade=284
 goldenpickaxe=285
+goldpickaxe=285
+goldenpick=285
+goldpick=285
 goldenaxe=286
+goldaxe=286
 string=287
 feather=288
 gunpowder=289
 woodenhoe=290
+woodhoe=290
 stonehoe=291
 ironhoe=292
 diamondhoe=293
 goldenhoe=294
+goldhoe=294
 seeds=295
 wheat=296
 bread=297
@@ -427,17 +641,32 @@ diamondchestplate=311
 diamondpants=312
 diamondboots=313
 goldenhelmet=314
+goldhelmet=314
 goldenchestplate=315
+goldchestplate=315
 goldenpants=316
+goldpants=316
 goldenboots=317
+goldboots=317
 flint=318
 porkchop=319
+meat=319
+pork=319
 cookedporkchop=320
+cookedmeat=320
+cookedpork=320
 painting=321
+paintings=321
 goldenapple=322
+goldapple=322
+notchapple=322:1
 enchantedgoldenapple=322:1
+enchantedgoldapple=322:1
 sign=323
+oakdoor=324
+appledoor=324
 woodendoor=324
+wooddoor=324
 bucket=325
 waterbucket=326
 lavabucket=327
@@ -452,9 +681,11 @@ milkbucket=335
 brick=336
 clay=337
 sugarcane=338
+reed=338
 paper=339
 book=340
 slimeball=341
+slimeorb=341
 storageminecart=342
 poweredminecart=343
 egg=344
@@ -462,30 +693,59 @@ compass=345
 fishingrod=346
 watch=347
 glowstonedust=348
+lightstonedust=348
+lightdust=348
+glowdust=348
 fish=349
+rawfish=349
 cookedfish=350
 dye=351
 inksac=351:0
+blackdye=351:0
 rosered=351:1
+reddye=351:1
 cactusgreen=351:2
+greendye=351:2
+darkgreendye=351:2
+dkgreendye=351:2
 cocoabeans=351:3
+browndye=351:3
 lapislazuli=351:4
+bluedye=351:4
+darkbluedye=351:4
+dkbluedye=351:4
 purpledye=351:5
+violetdye=351:5
 cyandye=351:6
 lightgraydye=351:7
+lightgreydye=351:7
+ltgraydye=351:7
+ltgreydye=351:7
+silverdye=351:7
 graydye=351:8
+greydye=351:8
+darkgreydye=351:8
+darkgraydye=351:8
+dkgreydye=351:8
+dkgraydye=351:8
 pinkdye=351:9
 limedye=351:10
-dandellionyellow=351:11
+lightgreendye=351:10
+ltgreendye=351:10
+dandellionyellow=351:11
+yellowdye=351:11
 lightbluedye=351:12
+ltbluedye=351:12
 magentadye=351:13
 orangedye=351:14
 bonemeal=351:15
+whitedye=351:15
 bone=352
 sugar=353
 cake=354
 bed=355
 repeater=356
+diode=356
 cookie=357
 map=358
 shears=359
@@ -530,6 +790,7 @@ skeletonhead=397
 witherhead=397:1
 zombiehead=397:2
 playerhead=397:3
+stevehead=397:3
 creeperhead=397:4
 carrotonastick=398
 netherstar=399
@@ -547,6 +808,7 @@ prismarinecrystals=410
 rawrabbit=411
 cookedrabbit=412
 rabbitstew=413
+rabbitsoup=413
 rabbitsfood=414
 rabbithide=415
 armorstand=416
@@ -562,24 +824,47 @@ banner=425
 blackbanner=415:0
 redbanner=415:1
 greenbanner=415:2
+darkgreenbanner=415:2
+dkgreenbanner=415:2
 brownbanner=415:3
 bluebanner=415:4
+darkbluebanner=415:4
+dkbluebanner=415:4
 purplebanner=415:5
+violetbanner=415:5
 cyanbanner=415:6
 lightgraybanner=415:7
+lightgreybanner=415:7
+ltgraybanner=415:7
+ltgreybanner=415:7
+silverbanner=415:7
 graybanner=415:8
+greybanner=415:8
+darkgraybanner=415:8
+darkgreybanner=415:8
+dkgraybanner=415:8
+dkgreybanner=415:8
 pinkbanner=415:9
 limebanner=415:10
+lightgreenbanner=415:10
+ltgreenbanner=415:10
 yellowbanner=415:11
 lightbluebanner=415:12
+ltbluebanner=415:12
 magentabanner=415:13
 orangebanner=415:14
 whitebanner=415:15
 sprucedoor=427
+coniferdoor=427
+pinedoor=427
+darkdoor=427
 birchdoor=428
+whitedoor=428
 jungledoor=429
 acaciadoor=430
 darkoakdoor=431
+bigoakdoor=431
+roofedoakdoor=431
 goldrecord=2256
 greenrecord=2257
 blocksrecord=2258
@@ -592,291 +877,5 @@ stradrecord=2264
 wardrecord=2265
 11record=2266
 
-; ----------
-; Custom Names
-
-appleplanks=5:0
-coniferplanks=5:1
-pineplanks=5:1
-darkplanks=5:1
-lightplanks=5:2
-redplanks=5:3
-bigoakplanks=5:5
-roofedoakplanks=5:5
-applesapling=6:0
-conifersapling=6:1
-pinesapling=6:1
-whitesapling=6:2
-redsapling=6:3
-bigoaksapling=6:5
-roofedoaksapling=6:5
-adminium=7
-flowingwater=8
-swater=9
-stillwater=9
-stilllava=11
-slava=11
-tree=17
-applelog=17:0
-coniferlog=17:1
-pinelog=17:1
-darklog=17:1
-whitelog=17:2
-appleleaves=18:0
-coniferleaves=18:1
-pineleaves=18:1
-whiteleaves=18:2
-decorativesandstone=24:1
-ornamentsandstone=24:1
-pistonhead=34
-cloth=35
-ltbluewool=35:3
-lightgreenwool=35:5
-ltgreenwool=35:5
-greywool=35:7
-darkgraywool=35:7
-darkgreywool=35:7
-dkgraywool=35:7
-dkgreywool=35:7
-lightgreywool=35:8
-ltgraywool=35:8
-ltgreywool=35:8
-silverwool=35:8
-violetwool=35:10
-darkbluewool=35:11
-dkbluewool=35:11
-darkgreenwool=35:13
-dkgreenwool=35:13
-rose=38
-flower=38
-gold=41
-iron=42
-step=44
-brickwall=45
-bookcase=47
-mossy=48
-woodstairs=53
-redstonedust=55
-tilleddirt=60
-soil=60
-rail=66
-track=66
-tracks=66
-stairs=67
-signblocktop=68
-rockplate=70
-hellrock=87
-netherstone=87
-slowsand=88
-lightstone=89
-jacko=91
-ltbluestainedglass=95:3
-lightgreenstainedglass=95:5
-ltgreenstainedglass=95:5
-greystainedglass=95:7
-darkgraystainedglass=95:7
-darkgreystainedglass=95:7
-dkgraystainedglass=95:7
-dkgreystainedglass=95:7
-lightgreystainedglass=95:8
-ltgraystainedglass=95:8
-ltgreystainedglass=95:8
-silverstainedglass=95:8
-violetstainedglass=95:10
-darkbluestainedglass=95:11
-dkbluestainedglass=95:11
-darkgreenstainedglass=95:13
-dkgreenstainedglass=95:13
-stonebricks=98
-redstonelampoff=123
-redstonelampon=124
-appledoublewoodslab=125:0
-coniferwooddoubleslab=125:1
-pinewooddoubleslab=125:1
-darkwooddoubleslab=125:1
-whitewooddoubleslab=125:2
-bigoakwooddoubleslab=125:5
-roofedwooddoubleslab=125:5
-applewoodslab=126:0
-coniferwoodslab=126:1
-pinewoodslab=126:1
-darkwoodslab=126:1
-whitewoodslab=126:2
-roofedwoodslab=126:5
-bigoakwoodslab=126:5
-coniferwoodstairs=134
-pinewoodstairs=134
-whitewoodstairs=135
-humanhead=144:3
-stevehead=144:3
-ltbluestainedclay=159:3
-lightgreenstainedclay=159:5
-ltgreenstainedclay=159:5
-greystainedclay=159:7
-darkgraystainedclay=159:7
-darkgreystainedclay=159:7
-dkgraystainedclay=159:7
-dkgreystainedclay=159:7
-lightgreystainedclay=159:8
-ltgraystainedclay=159:8
-ltgreystainedclay=159:8
-silvertsainedclay=159:8
-violetstainedclay=159:10
-darkbluestainedclay=159:11
-dkbluestainedclay=159:11
-darkgreenstainedclay=159:13
-dkgreenstainedclay=159:13
-ltbluestainedglasspane=160:3
-lightgreenstainedglasspane=160:5
-ltgreenstainedglasspane=160:5
-greystainedglasspane=160:7
-darkgraystainedglasspane=160:7
-darkgreystainedglasspane=160:7
-dkgraystainedglasspane=160:7
-dkgreystainedglasspane=160:7
-lightgreystainedglasspane=160:8
-ltgraystainedglasspane=160:8
-ltgreystainedglasspane=160:8
-silverstainedglasspane=160:8
-violetstainedglasspane=160:10
-darkbluestainedglasspane=160:11
-dkbluestainedglasspane=160:11
-darkgreenstainedglasspane=160:13
-dkgreenstainedglasspane=160:13
-bigoakleaves=161:1
-roofedoakleaves=161:1
-bigoaklog=162:1
-roofedoaklog=162:1
-bigoakwoodstiars=164
-roofedoakwoodstairs=164
-ltbluecarpet=171:3
-lightgreencarpet=171:5
-ltgreencarpet=171:5
-greycarpet=171:7
-darkgraycarpet=171:7
-darkgreycarpet=171:7
-dkgraycarpet=171:7
-dkgreycarpet=171:7
-lightgreycarpet=171:8
-ltgraycarpet=171:8
-ltgreycarpet=171:8
-silvercarpet=171:8
-violetcarpet=171:10
-darkbluecarpet=171:11
-dkbluecarpet=171:11
-darkgreencarpet=171:13
-dkgreencarpet=171:13
-coniferfencegate=183
-pinefencegate=183
-darkfencegate=183
-whitefencegate=184
-bigoakfencegate=186
-roofedoakfencegate=186
-coniferfence=188
-pinefence=188
-darkfence=188
-whitefence=189
-bigoakfence=191
-roofedoakfence=191
-ironspade=256
-ironpick=257
-lighter=259
-redapple=260
-ironbar=265
-goldeningot=266
-goldbar=266
-goldenbar=266
-woodsword=268
-woodspade=269
-woodshovel=269
-woodenspade=269
-woodpickaxe=270
-woodenpick=270
-woodpick=270
-woodaxe=271
-stonespade=273
-stonepick=274
-diamondpick=278
-bowlwithsoup=282
-soupbowl=282
-soup=282
-goldsword=283
-goldshovel=284
-goldspade=284
-goldpickaxe=285
-goldenpick=285
-goldpick=285
-goldaxe=286
-woodhoe=290
-goldhoe=294
-goldhelmet=314
-goldchestplate=315
-goldpants=316
-goldboots=317
-meat=319
-pork=319
-cookedmeat=320
-cookedpork=320
-paintings=321
-goldapple=322
-enchantedgoldapple=322:1
-wooddoor=324
-reed=338
-slimeorb=341
-lightstonedust=348
-lightdust=348
-glowdust=348
-rawfish=349
-blackdye=351:0
-reddye=351:1
-greendye=351:2
-darkgreendye=351:2
-dkgreendye=351:2
-browndye=351:3
-bluedye=351:4
-darkbluedye=351:4
-dkbluedye=351:4
-violetdye=351:5
-ltgreydye=351:7
-ltgraydye=351:7
-lightgreydye=351:7
-silverdye=351:7
-greydye=351:8
-darkgreydye=351:8
-darkgraydye=351:8
-dkgreydye=351:8
-dkgraydye=351:8
-lightgreendye=351:10
-ltgreendye=351:10
-yellowdye=351:11
-ltbluedye=351:12
-whitedye=351:15
-diode=356
-stevehead=397:3
-rabbitsoup=413
-darkgreenbanner=415:2
-dkgreenbanner=415:2
-darkbluebanner=415:4
-dkbluebanner=415:4
-violetbanner=415:5
-lightgreybanner=415:7
-ltgraybanner=415:7
-ltgreybanner=415:7
-silverbanner=415:7
-greybanner=415:8
-darkgraybanner=415:8
-darkgreybanner=415:8
-dkgraybanner=415:8
-dkgreybanner=415:8
-lightgreenbanner=415:10
-ltgreenbanner=415:10
-ltbluebanner=415:12
-coniferdoor=427
-pinedoor=427
-darkdoor=427
-whitedoor=428
-bigoakdoor=431
-roofedoakdoor=431
-
 
 
-- 
cgit v1.2.3


From 690867c89ec4d27a3d32329d06b3842790b1dc21 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 7 Sep 2014 09:09:10 +0200
Subject: Fixed submodules' downgrade from the previous PR merge.

---
 MCServer/Plugins/Core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
index 7cc99285a..bd23915df 160000
--- a/MCServer/Plugins/Core
+++ b/MCServer/Plugins/Core
@@ -1 +1 @@
-Subproject commit 7cc99285ae5117418f657c3b295ca71f2b75b4f4
+Subproject commit bd23915df763b182610c6163c5ff2d64a0756560
-- 
cgit v1.2.3


From c5cd75fae83a61920a9a5d50b94b09ae25d87430 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 7 Sep 2014 22:35:22 +0200
Subject: Exported cClientHandle:GetIPString() to Lua API.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 718cb4e98..c23120600 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -524,6 +524,7 @@ end
 			Functions =
 			{
 				GenerateOfflineUUID = { Params = "Username", Return = "string", Notes = "(STATIC) Generates an UUID based on the player name provided. This is used for the offline (non-auth) mode, when there's no UUID source. Each username generates a unique and constant UUID, so that when the player reconnects with the same name, their UUID is the same. Returns a 32-char UUID (no dashes)." },
+				GetIPString = { Params = "", Return = "string", Notes = "Returns the IP address of the connection, as a string. Only the address part is returned, without the port number." },
 				GetLocale = { Params = "", Return = "Locale", Notes = "Returns the locale string that the client sends as part of the protocol handshake. Can be used to provide localized strings." },
 				GetPing = { Params = "", Return = "number", Notes = "Returns the ping time, in ms" },
 				GetPlayer = { Params = "", Return = "{{cPlayer|cPlayer}}", Notes = "Returns the player object connected to this client. Note that this may be nil, for example if the player object is not yet spawned." },
-- 
cgit v1.2.3


From d8c381d8ccf6ca5f5603184e7eb45fabcf332673 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Wed, 10 Sep 2014 20:31:33 +0200
Subject: Fixed sign recipe

---
 MCServer/crafting.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 64ad2adf9..11de1e6d5 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -351,7 +351,7 @@ Clay, 4         = ClayBlock, *
 
 Painting            = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3   | Wool, 2:2
 ItemFrame           = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3   | Leather, 2:2
-Sign                = Planks, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2            | Stick, 2:3
+Sign, 3                = Planks, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2            | Stick, 2:3
 Ladder, 3           = Stick, 1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 3:3
 GlassPane, 16       = Glass,     1:1, 2:1, 3:1, 1:2, 2:2, 3:2
 IronBars, 16        = IronIngot, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
-- 
cgit v1.2.3


From 67d710429f6fe623a9e261c22351ffeaea15f139 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Wed, 10 Sep 2014 20:36:51 +0200
Subject: Fixed spacing

---
 MCServer/crafting.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 11de1e6d5..1236ab10e 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -351,7 +351,7 @@ Clay, 4         = ClayBlock, *
 
 Painting            = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3   | Wool, 2:2
 ItemFrame           = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3   | Leather, 2:2
-Sign, 3                = Planks, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2            | Stick, 2:3
+Sign, 3             = Planks, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2            | Stick, 2:3
 Ladder, 3           = Stick, 1:1, 3:1, 1:2, 2:2, 3:2, 1:3, 3:3
 GlassPane, 16       = Glass,     1:1, 2:1, 3:1, 1:2, 2:2, 3:2
 IronBars, 16        = IronIngot, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2
-- 
cgit v1.2.3


From ad1c61c3dd7b3a2650e7e2b4f615a422f6af5ef4 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Fri, 12 Sep 2014 18:07:51 +0200
Subject: Added slime block to slime balls recipe

---
 MCServer/crafting.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 1236ab10e..8e68d5cb5 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -348,6 +348,7 @@ Emerald, 9      = EmeraldBlock, *
 RedstoneDust, 9 = RedstoneBlock, *
 Coal, 9         = CoalBlock, *
 Clay, 4         = ClayBlock, *
+SlimeBall, 9    = SlimeBlock, *
 
 Painting            = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3   | Wool, 2:2
 ItemFrame           = Stick, 1:1, 1:2, 1:3, 2:1, 2:3, 3:1, 3:2, 3:3   | Leather, 2:2
-- 
cgit v1.2.3


From c0a069b260bf3a2a858a30f32311ad8877bac0d5 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 12 Sep 2014 20:59:47 +0200
Subject: APIDump: Improved command binding documentation.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index c23120600..fc1217474 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1885,13 +1885,13 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				},
 				BindCommand =
 				{
-					{ Params = "Command, Permission, Callback, HelpString", Return = "[bool]", Notes = "(STATIC) Binds an in-game command with the specified callback function, permission and help string. By common convention, providing an empty string for HelpString will hide the command from the /help display. Returns true if successful, logs to console and returns no value on error." },
-					{ Params = "Command, Permission, Callback, HelpString", Return = "[bool]", Notes = "Binds an in-game command with the specified callback function, permission and help string. By common convention, providing an empty string for HelpString will hide the command from the /help display. Returns true if successful, logs to console and returns no value on error." },
+					{ Params = "Command, Permission, Callback, HelpString", Return = "[bool]", Notes = "(STATIC) Binds an in-game command with the specified callback function, permission and help string. By common convention, providing an empty string for HelpString will hide the command from the /help display. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split, {{cPlayer|Player}})</pre> The Split parameter contains an array-table of the words that the player has sent, Player is the {{cPlayer}} object representing the player who sent the command. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server sends a warning to the player that the command is unknown (this is so that subcommands can be implemented)." },
+					{ Params = "Command, Permission, Callback, HelpString", Return = "[bool]", Notes = "Binds an in-game command with the specified callback function, permission and help string. By common convention, providing an empty string for HelpString will hide the command from the /help display. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split, {{cPlayer|Player}})</pre> The Split parameter contains an array-table of the words that the player has sent, Player is the {{cPlayer}} object representing the player who sent the command. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server sends a warning to the player that the command is unknown (this is so that subcommands can be implemented)." },
 				},
 				BindConsoleCommand =
 				{
-					{ Params = "Command, Callback, HelpString", Return = "[bool]", Notes = "(STATIC) Binds a console command with the specified callback function and help string. By common convention, providing an empty string for HelpString will hide the command from the \"help\" console command. Returns true if successful, logs to console and returns no value on error." },
-					{ Params = "Command, Callback, HelpString", Return = "[bool]", Notes = "Binds a console command with the specified callback function and help string. By common convention, providing an empty string for HelpString will hide the command from the \"help\" console command. Returns true if successful, logs to console and returns no value on error." },
+					{ Params = "Command, Callback, HelpString", Return = "[bool]", Notes = "(STATIC) Binds a console command with the specified callback function and help string. By common convention, providing an empty string for HelpString will hide the command from the \"help\" console command. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split)</pre> The Split parameter contains an array-table of the words that the admin has typed. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server issues a warning to the console that the command is unknown (this is so that subcommands can be implemented)." },
+					{ Params = "Command, Callback, HelpString", Return = "[bool]", Notes = "Binds a console command with the specified callback function and help string. By common convention, providing an empty string for HelpString will hide the command from the \"help\" console command. Returns true if successful, logs to console and returns no value on error. The callback uses the following signature: <pre class=\"prettyprint lang-lua\">function(Split)</pre> The Split parameter contains an array-table of the words that the admin has typed. If the callback returns true, the command is assumed to have executed successfully; in all other cases the server issues a warning to the console that the command is unknown (this is so that subcommands can be implemented)." },
 				},
 				CallPlugin = { Params = "PluginName, FunctionName, [FunctionArgs...]", Return = "[FunctionRets]", Notes = "(STATIC) Calls the specified function in the specified plugin, passing all the given arguments to it. If it succeeds, it returns all the values returned by that function. If it fails, returns no value at all. Note that only strings, numbers, bools, nils and classes can be used for parameters and return values; tables and functions cannot be copied across plugins." },
 				DisablePlugin = { Params = "PluginName", Return = "bool", Notes = "Disables a plugin specified by its name. Returns true if the plugin was disabled, false if it wasn't found or wasn't active." },
-- 
cgit v1.2.3


From ccaec8f424f4cb59ced6518d7fb1171667728f1c Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Wed, 17 Sep 2014 20:28:30 +0200
Subject: Fixed wrong url in the debuggers plugin

---
 MCServer/Plugins/Debuggers/Debuggers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index 0e7e647d5..66e06cb72 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -1502,7 +1502,7 @@ function OnPlayerJoined(a_Player)
 	-- Test composite chat chaining:
 	a_Player:SendMessage(cCompositeChat()
 		:AddTextPart("Hello, ")
-		:AddUrlPart(a_Player:GetName(), "www.mc-server.org", "u@2")
+		:AddUrlPart(a_Player:GetName(), "http://www.mc-server.org", "u@2")
 		:AddSuggestCommandPart(", and welcome.", "/help", "u")
 		:AddRunCommandPart(" SetDay", "/time set 0")
 	)
-- 
cgit v1.2.3


From 400ce1f9e0956d373e4326fd9eaa4a9558b4e9b3 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Thu, 18 Sep 2014 16:37:34 +0200
Subject: Added german language support

---
 MCServer/items.ini | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/items.ini b/MCServer/items.ini
index 380c13e02..df878cdf4 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -7,7 +7,6 @@ diorite=1:3
 polisheddiorite=1:4
 andesite=1:5
 polishedandesite=1:6
-stone=1
 grass=2
 dirt=3
 coarseddirt=3:1
@@ -410,7 +409,7 @@ lightgraystainedclay=159:8
 lightgreystainedclay=159:8
 ltgraystainedclay=159:8
 ltgreystainedclay=159:8
-silvertsainedclay=159:8
+silvertstainedclay=159:8
 cyanstainedclay=159:9
 purplestainedclay=159:10
 violetstainedclay=159:10
@@ -471,6 +470,7 @@ darkoakwoodstairs=164
 bigoakwoodstiars=164
 roofedoakwoodstairs=164
 slimeblock=165
+barrier=166
 irontrapdoor=167
 prismarine=168
 prismarinebricks=168:1
@@ -525,7 +525,8 @@ redsandstone=179
 chiseledredsandstone=179:1
 smoothredsandstone=179:2
 redsandstonestairs=180
-redsandstoneslab=182
+newstoneslab=182
+redsandstoneslab=182:0
 sprucefencegate=183
 coniferfencegate=183
 pinefencegate=183
@@ -698,7 +699,11 @@ lightdust=348
 glowdust=348
 fish=349
 rawfish=349
+rawsalmon=349:1
+clownfish=349:2
+pufferfish=349:3
 cookedfish=350
+cookedsalmon=350:1
 dye=351
 inksac=351:0
 blackdye=351:0
-- 
cgit v1.2.3


From b3de0e104fbb7654871926266984905026bdc587 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Thu, 18 Sep 2014 17:39:32 +0200
Subject: Added german language support, now really

---
 MCServer/lang/items_de.ini | 603 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 603 insertions(+)
 create mode 100644 MCServer/lang/items_de.ini

(limited to 'MCServer')

diff --git a/MCServer/lang/items_de.ini b/MCServer/lang/items_de.ini
new file mode 100644
index 000000000..3c2ab87d1
--- /dev/null
+++ b/MCServer/lang/items_de.ini
@@ -0,0 +1,603 @@
+[Items]
+luft=0
+stein=1
+granit=1:1
+poliertergranit=1:2
+diorit=1:3
+polierterdiorit=1:4
+andesit=1:5
+polierterandesit=1:6
+grasblock=2
+erde=3
+grobeerde=3:1
+podsol=3:2
+bruchstein=4
+holzbretter=5
+eichenholzbretter=5:0
+fichtenholzbretter=5:1
+birkenholzbretter=5:2
+tropenholzbretter=5:3
+akazienholzbretter=5:4
+schwarzeichenholzbretter=5:5
+setzling=6
+eichensetzling=6:0
+fichtensetzling=6:1
+birkensetzling=6:2
+tropensetzling=6:3
+akaziensetzling=6:4
+schwarzeichensetzling=6:5
+grundgestein=7
+wasser=8
+fliessendeswasser=8
+stehendeswasser=9
+stilleswasser=9
+swasser=9
+lava=10
+fliessendelava=10
+stehendelava=11
+stillelava=11
+slava=11
+sand=12
+rotersand=12:1
+kies=13
+golderz=14
+eisenerz=15
+kohleerz=16
+stamm=17
+eichenholz=17:0
+fichtenholz=17:1
+birkenholz=17:2
+tropenholz=17:3
+laub=18
+eichenlaub=18:0
+fichtenlaub=18:1
+birkenlaub=18:2
+tropenlaub=18:3
+schwamm=19
+nasserschwamm=19:1
+glas=20
+lapislazulierz=21
+lapislazuliblock=22
+werfer=23
+sandstein=24
+normalersandstein=24:0
+gemeisseltersandstein=24:1
+glattersandstein=24:2
+notenblock=25
+bettblock=26
+antriebsschiene=27
+sensorschiene=28
+klebrigerkolben=29
+spinnenweben=30
+gras=31
+gras=31:1
+farn=31:2
+toterbusch=32
+kolben=33
+kolbenkopf=34
+wolle=35
+weissewolle=35:0
+orangenewolle=35:1
+magentawolle=35:2
+hellblauewolle=35:3
+gelbewolle=35:4
+hellgruene=35:5
+rosawolle=35:6
+grauwool=35:7
+greywool=35:7
+grauewolle=35:7
+hellgrauewolle=35:8
+tuerkisewolle=35:9
+violettewolle=35:10
+blauewolle=35:11
+braunewolle=35:12
+gruenewolle=35:13
+rotewolle=35:14
+schwarzewolle=35:15
+loewenzahn=37
+blume=38
+mohn=38:0
+blaueorchidee=38:1
+sternlauch=38:2
+porzellansternchen=38:3
+rotetulpe=38:4
+orangenetulpe=38:5
+weissetulpe=38:6
+rosatulpe=38:7
+margerite=38:8
+braunerpilz=39
+roterpilz=40
+goldblock=41
+eisenblock=42
+doppelstufe=43
+doppelsteinstufe=43:0
+doppelsandsteinstufe=43:1
+doppelholzstufe=43:2
+doppelbruchsteinstufe=43:3
+doppelziegelstufe=43:4
+doppelsteinziegelstufe=43:5
+doppelnetherziegelstufe=43:6
+doppelquarzstufe=43:7
+stufe=44
+steinstufe=44:0
+sandsteinstufe=44:1
+holzstufe=44:2
+bruchsteinstufe=44:3
+ziegelstufe=44:4
+steinziegelstufe=44:5
+netherziegelstufe=44:6
+quarzstufe=44:7
+ziegelsteine=45
+tnt=46
+buecherregal=47
+bemoosterbruchstein=48
+obsidian=49
+fackel=50
+feuer=51
+monsterspawner=52
+eichenholztreppe=53
+kiste=54
+rotstonekabel=55
+diamanterz=56
+diamantblock=57
+werkbank=58
+ernte=59
+farmland=60
+ofen=61
+brennenderofen=62
+schildblock=63
+holztuerblock=64
+leiter=65
+schiene=66
+bruchsteintreppe=67
+wandschild=68
+schalter=69
+steindruckplatte=70
+eisentuerblock=71
+holzdruckplatte=72
+rotstoneerz=73
+leuchtendesrotstoneerz=74
+erloschenerotstonefackel=75
+rotstonefackel=76
+setinknopf=77
+schnee=78
+eis=79
+schneeblock=80
+kaktus=81
+ton=82
+zuckerrohrblock=83
+plattenspieler=84
+eichenholzzaun=85
+kuerbis=86
+netherstein=87
+selensand=88
+leuchtstein=89
+portal=90
+kürbislaterne=91
+kuchenlock=92
+weissesglas=95
+orangenesglas=95:1
+magentaglas=95:2
+hellblauesglas=95:3
+gelbesglas=95:4
+hellgruenesglas=95:5
+rosagerfaerbtglas=95:6
+grauesglas=95:7
+hellgrauesglas=95:8
+tuerkisesglas=95:9
+violettesglas=95:10
+blauesglas=95:11
+braunesglas=95:12
+gruenesglas=95:13
+rotesglas=95:14
+schwarzesglas=95:15
+falltuer=96
+silberfischblock=97
+steinziegel=98
+bemoostesteinziegel=98:1
+rissigesteinziegel=98:2
+gemeisseltesteinziegel=98:3
+braunerpilzblock=99
+roterpilzblock=100
+eisengitter=101
+glasscheibe=102
+melone=103
+kuerbispflanze=104
+melonenpflanze=105
+ranken=106
+eichenholzzauntor=107
+ziegeltreppe=108
+steinziegeltreppe=109
+myzel=110
+seerosenblatt=111
+netherziegel=112
+netherziegelzaun=113
+netherziegeltreppe=114
+netherwarzenblock=115
+zaubertisch=116
+braustandblock=117
+kesselblock=118
+endportal=119
+endportalrahmen=120
+endstein=121
+drachenei=122
+redstonelampe=123
+erlosscheneredstonelampe=124
+doppelholzstufe=125
+doppeleichenholzstufe=125:0
+doppelfichtenholzstufe=125:1
+doppelbirkenholzstufe=125:2
+doppeltropenholzstufe=125:3
+doppelakazienholzstufe=125:4
+doppelschwarzeichenstufe=125:5
+holzstufe=126
+eichenholzstufe=126:0
+fichtenholzstufe=126:1
+birkenholzstufe=126:2
+tropenholzstufe=126:3
+akazienholzstufe=126:4
+schwarzeichenholzstufe=126:5
+kakaobohnen=127
+sandsteintreppe=128
+smaragderz=129
+endertruhe=130
+haken=131
+stolperdraht=132
+smaragdblock=133
+fichtenholztreppe=134
+birkenholztreppe=135
+tropenholztreppe=136
+kommandoblock=137
+leuchtfeuer=138
+bruchsteinmauer=139
+bemoostebruchsteinmauer=139:1
+blumentopfblock=140
+karottenpflanze=141
+kartoffelpflanze=142
+knopf=143
+skelettschaedel=144
+witherskelettschaedel=144:1
+zombieschaedel=144:2
+schaedel=144:3
+creeperschaedel=144:4
+amboss=145
+redstonetruhe=146
+waegeplatteniedrigegewichte=147 # WTF, that names are so stupid...
+waegeplattehohegewichte=148
+inaktiverkomparator=149
+aktiverkomparator=150
+tageslichtsensor=151
+redstoneblock=152
+netherquarzerz=153
+trichter=154
+quarzblock=155
+gemeisselterquarzblock=155:1
+quarzsaeule=155:2
+quarztreppe=156
+aktivierungsschiene=157
+spender=158
+weissgerfaerbterton=159
+orangegerfaerbterton=159:1
+magentagerfaerbterton=159:2
+hellblaugerfaerbterton=159:3
+gelbgerfaerbterton=159:4
+hellgruengerfaerbterton=159:5
+rosagerfaerbterton=159:6
+graugerfaerbterton=159:7
+hellgraugefaerbterton=159:8
+tuerkisgerfaerbterton=159:9
+purplegerfaerbterton=159:10
+violettegerfaerbterton=159:10
+blaugerfaerbterton=159:11
+braungerfaerbterton=159:12
+gruengerfaerbterton=159:13
+rotgerfaerbterton=159:14
+schwarzgerfaerbterton=159:15
+weisseglasscheibe=160
+orangeneglasscheibe=160:1
+magentaglasscheibe=160:2
+hellblaueglasscheibe=160:3
+gelbeglasscheibe=160:4
+hellgrueneglasscheibe=160:5
+rosaglasscheibe=160:6
+graueglasscheibe=160:7
+hellgraueglasscheibe=160:8
+tuerkiseglasscheibe=160:9
+violetteglasscheibe=160:10
+blaueglasscheibe=160:11
+brauneglasscheibe=160:12
+grueneglasscheibe=160:13
+roteglasscheibe=160:14
+schwarzeglasscheibe=160:15
+neueslaub=161
+akazienlaub=161:0
+schwarzeichenlaub=161:1
+neuestaemme=162
+akazienholz=162:0
+schwarzeichenholz=162:1
+akazientreppe=163
+schwarzeichentreppe=164
+schleimblock=165
+bartriere=166
+eisenfalltür=167
+prismarin=168
+prismarinziegel=168:1
+dunklerprismarin=168:2
+seelaterne=169
+strohballen=170
+teppich=171
+weisserteppich=171:0
+orangenerteppich=171:1
+magentateppich=171:2
+hellblauerteppich=171:3
+gelberteppich=171:4
+hellgruenerteppich=171:5
+rosateppich=171:6
+grauerteppich=171:7
+hellgrauerteppich=171:8
+tuerkiserteppich=171:9
+violetterteppich=171:10
+blauerteppich=171:11
+braunerteppich=171:12
+gruenerteppich=171:13
+roterteppich=171:14
+schwarzerteppich=171:15
+gebrannterton=172
+kohleblock=173
+packeis=174
+doppelpflanze=175
+sonnenblume=175:0
+Flieder=175:1
+hohesgras=175:2
+grosserfarn=175:3
+rosenstrauch=175:4
+pfingstrose=175:5
+rotersandstein=179
+gemeisselterrotersandstein=179:1
+glatterrotersandstein=179:2
+rotesandsteintreppe=180
+neuesteinstufe=182
+rotesandsteinstufe=182:0
+fichtenzauntor=183
+birkenzauntor=184
+tropenzauntor=185
+schwarzeichenzauntor=186
+akazienzauntor=187
+fichtenzaun=188
+birkenzaun=189
+tropenzaun=190
+schwarzeichenzaun=191
+akazienzaun=192
+eisenschaufel=256
+eisenspitzhacke=257
+eisenaxt=258
+feuerzeug=259
+apfel=260
+bogen=261
+pfeil=262
+kohle=263
+holzkohle=263:1
+diamant=264
+eisenbarren=265
+goldbarren=266
+eisenschwert=267
+holzschwert=268
+holzschaufel=269
+holzspitzhacke=270
+holzaxt=271
+steinschwert=272
+steinschaufel=273
+steinspitzhacke=274
+steinaxt=275
+diamantschwert=276
+diamantschaufel=277
+diamantspitzhacke=278
+diamantaxt=279
+stock=280
+schuessel=281
+pilzsuppe=282
+goldschwert=283
+goldschaufel=284
+goldspitzhacke=285
+goldaxt=286
+faden=287
+feder=288
+schwarzpulver=289
+holzhacke=290
+steinhacke=291
+eisenhacke=292
+diamanthacke=293
+goldhacke=294
+samen=295
+weizen=296
+brot=297
+lederkappe=298
+lederjacke=299
+lederhose=300
+lederstiefel=301
+kettenhaube=302
+kettenhemd=303
+kettenhose=304
+kettenstiefel=305
+eisenhelm=306
+eisenbrustplatte=307
+eisenbeinschutz=308
+eisenstiefel=309
+diamanthelm=310
+diamantbrustplatte=311
+diamantbeinschutz=312
+diamantstiefel=313
+goldhelm=314
+goldharnisch=315
+goldbeinschutz=316
+goldstiefel=317
+goldboots=317
+feuerstein=318
+rohesschweinefleisch=319
+gebratenesschweinefleisch=320
+gemaelde=321
+goldenerapfel=322
+goldenerapfel=322:1
+schild=323
+eichenholztuer=324
+eimer=325
+wassereimer=326
+lavaeimer=327
+lore=328
+sattel=329
+eisentuer=330
+redstone=331
+schneeballl=332
+boot=333
+leder=334
+milcht=335
+ziegel=336
+ton=337
+zuckercane=338
+papier=339
+buch=340
+schleimball=341
+gueterlore=342
+angetriebenelore=343
+ei=344
+kompass=345
+angel=346
+uhr=347
+glowstonestaub=348
+fisch=349
+roherfisch=349
+roherlachs=349:1
+clownfisch=349:2
+kugelfisch=349:3
+gebratenerfisch=350
+gebratenerlachs=350:1
+farbe=351
+tintenbeutel=351:0
+rosenrot=351:1
+kaktusgruen=351:2
+kakaobohnen=351:3
+lapislazuli=351:4
+violetterfarbstoff=351:5
+tuerkiserfarbstoff=351:6
+hellgrauerfarbstoff=351:7
+grauerfarbstoff=351:8
+rosafarbstoff=351:9
+hellgruenerfarbstoff=351:10
+gelberfarbstoff=351:11
+hellblauerfarbstoff=351:12
+magentafarbstoff=351:13
+orangenerfarbstoff=351:14
+knochenmehl=351:15
+knochen=352
+zucker=353
+kuchen=354
+bett=355
+redstoneverstaerker=356
+keks=357
+karte=358
+schere=359
+melone=360
+kürbiskerne=361
+melonenkerne=362
+rohesrindfleisch=363
+steak=364
+roheshühnchen=365
+gebrateneshühnchen=366
+verrottetesfleisch=367
+enderperle=368
+lohenrute=369
+ghasttraene=370
+goldnugget=371
+netherwarze=372
+trank=373
+glasflasche=374
+spinnenauge=375
+fermentiertesspinnenauge=376
+lohenstaub=377
+magmacreme=378
+braustand=379
+kessel=380
+enderauge=381
+glitzerndemelone=382
+spawnei=383
+erfahrungsfläschchen=384
+feuerkugel=385
+buchundfeder=386
+beschriebenesbuch=387
+smaragd=388
+rahmen=389
+blumentopf=390
+karotte=391
+kartoffel=392
+ofenkartoffel=393
+giftigekartoffel=394
+leerekarte=395
+goldenekarotte=396
+skelettschaedel=397
+witherschaedel=397:1
+zombieschaedel=397:2
+kopf=397:3
+creeperschaedel=397:4
+karottenrute=398
+netherstern=399
+kuerbiskuchen=400
+feuerwerksrakete=401
+feuerwerksstern=402
+verzauberungsbuch=403
+redstonekomparator=404
+netherziegelitem=405
+netherquarz=406
+tntlore=407
+trichterlore=408
+prismarinscherbe=409
+prismarinkristalle=410
+roheskaninchen=411
+gebrateneskaninchen=412
+kaninchenragout=413
+hasenpfote=414
+kaninchenfell=415
+ruestungsstaender=416
+eisernepferderuestung=417
+goldenepferderuestung=418
+diamantenepferderuestung=419
+leine=420
+namensschild=421
+kommandoblocklore=422
+roheshammelfleisch=423
+gebrateneshammelfleisch=424
+banner=425
+schwarzesbanner=415:0
+rotesbanner=415:1
+gruenesbanner=415:2
+braunbanner=415:3
+blauesbanner=415:4
+violettesbanner=415:5
+tuerkisesbanner=415:6
+hellgrauesbanner=415:7
+grauesbanner=415:8
+rosabanner=415:9
+hellgruenesbanner=415:10
+gelbesbanner=415:11
+hellblauesbanner=415:12
+magentabanner=415:13
+orangenesbanner=415:14
+weissesbanner=415:15
+fichtenholztuer=427
+birkenholztuer=428
+tropentuer=429
+akazientuer=430
+schwarzeichentuer=431
+goldeneschallplatte=2256
+grueneschallplatte=2257
+blocksschallplatte=2258
+chirpschallplatte=2259
+farschallplatte=2260
+mallschallplatte=2261
+mellohischallplatte=2262
+stalschallplatte=2263
+stradschallplatte=2264
+wardschallplatte=2265
+11schallplatte=2266
+
+
+
-- 
cgit v1.2.3


From 0baca1f1d8e5e8f97e7aa81e319e343949879622 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Fri, 19 Sep 2014 14:36:02 +0200
Subject: Updated SPAWNING_ENTITY hook description.

---
 MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua b/MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua
index c4bff3916..e2bd1c940 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua
+++ b/MCServer/Plugins/APIDump/Hooks/OnSpawningEntity.lua
@@ -6,8 +6,9 @@ return
 		DefaultFnName = "OnSpawningEntity",  -- also used as pagename
 		Desc = [[
 			This hook is called before the server spawns an {{cEntity|entity}}. The plugin can either modify the
-			entity before it is spawned, or disable the spawning altogether. If the entity spawning is a
-			monster, the {{OnSpawningMonster|HOOK_SPAWNING_MONSTER}} hook is called before this hook.</p>
+			entity before it is spawned, or disable the spawning altogether. You can't disable the spawning if the
+			entity is a player. If the entity spawning is a monster, the {{OnSpawningMonster|HOOK_SPAWNING_MONSTER}}
+			hook is called before this hook.</p>
 			<p>
 			See also the {{OnSpawnedEntity|HOOK_SPAWNED_ENTITY}} hook for a similar hook called after the
 			entity is spawned.
-- 
cgit v1.2.3


From b2573aad50de4968bbc68824295eaed8cc566733 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 19 Sep 2014 22:30:32 +0200
Subject: Fixed typos in items.ini.

---
 MCServer/items.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/items.ini b/MCServer/items.ini
index df878cdf4..daf366654 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -1,5 +1,6 @@
 [Items]
 air=0
+stone=1
 rock=1
 granite=1:1
 polishedgranite=1:2
@@ -409,7 +410,7 @@ lightgraystainedclay=159:8
 lightgreystainedclay=159:8
 ltgraystainedclay=159:8
 ltgreystainedclay=159:8
-silvertstainedclay=159:8
+silverstainedclay=159:8
 cyanstainedclay=159:9
 purplestainedclay=159:10
 violetstainedclay=159:10
-- 
cgit v1.2.3


From a817243e3fc0115da3fc499ae108b4cdc9dd0a4e Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri, 26 Sep 2014 21:42:55 +0100
Subject: Updated Core

---
 MCServer/Plugins/Core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
index bd23915df..9de860603 160000
--- a/MCServer/Plugins/Core
+++ b/MCServer/Plugins/Core
@@ -1 +1 @@
-Subproject commit bd23915df763b182610c6163c5ff2d64a0756560
+Subproject commit 9de86060388b515642c55d58b44b4281285efc00
-- 
cgit v1.2.3


From 400a4d1083fa8ea29898a045ea1bb7815b3a4fcb Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Sat, 27 Sep 2014 15:33:35 +0100
Subject: Hopefully fix #1384

Can @madmaxoft comment?
---
 MCServer/Plugins/APIDump/Hooks/OnServerPing.lua | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 MCServer/Plugins/APIDump/Hooks/OnServerPing.lua

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
new file mode 100644
index 000000000..8a710e047
--- /dev/null
+++ b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
@@ -0,0 +1,24 @@
+ (cClientHandle & a_ClientHandle, AString & a_ServerDescription, int & a_OnlinePlayersCount, int & a_MaxPlayersCount, AString & a_Favicon);
+ 
+return
+{
+	HOOK_SERVER_PING =
+	{
+		CalledWhen = "Client pings the server from the server list.",
+		DefaultFnName = "OnServerPing",  -- also used as pagename
+		Desc = [[
+			A plugin may implement an OnServerPing() function and register it as a Hook to process pings from
+			clients in the server server list.
+		]],
+		Params = {
+			{ Name = "ClientHandle", Type = "{{cClientHandle}}", Notes = "The client handle that pinged the server" },
+			{ Name = "ServerDescription", Type = "string", Notes = "The server description" },
+			{ Name = "OnlinePlayersCount", Type = "number", Notes = "The number of players currently on the server" },
+			{ Name = "MaxPlayersCount", Type = "number", Notes = "The current player cap for the server" },
+			{ Name = "Favicon", Type = "string", Notes = "The base64 encoded favicon to be displayed in the server list for compatible clients" },
+		},
+		Returns = [[
+			The plugin may return a boolean of whether to respond to the client that pinged. 
+		]],
+	},  -- HOOK_SERVER_PING
+}
-- 
cgit v1.2.3


From 3ff7103440202694f36f4c5edd09f8c5d4abb5a5 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Sat, 27 Sep 2014 15:35:06 +0100
Subject: Remaining part of fix.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index e6ee4ca10..6a3c178ef 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1984,6 +1984,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				HOOK_PLAYER_USING_ITEM = { Notes = "Called when the player is about to right-click with a usable item in their hand." },
 				HOOK_POST_CRAFTING = { Notes = "Called after a valid recipe has been chosen for the current contents of the crafting grid. Plugins may modify the recipe." },
 				HOOK_PRE_CRAFTING = { Notes = "Called before a recipe is searched for the current contents of the crafting grid. Plugins may provide a recipe and cancel the built-in search." },
+				HOOK_SERVER_PING = { Notes = "Called when a alient pings the server from the server list." },
 				HOOK_SPAWNED_ENTITY = { Notes = "Called after an entity is spawned in a {{cWorld|world}}. The entity is already part of the world." },
 				HOOK_SPAWNED_MONSTER = { Notes = "Called after a mob is spawned in a {{cWorld|world}}. The mob is already part of the world." },
 				HOOK_SPAWNING_ENTITY = { Notes = "Called just before an entity is spawned in a {{cWorld|world}}." },
-- 
cgit v1.2.3


From 9dccbe7792cfdc6ffd56348aa9092004526b3794 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Sat, 27 Sep 2014 15:40:33 +0100
Subject: Fixed line left in.

---
 MCServer/Plugins/APIDump/Hooks/OnServerPing.lua | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
index 8a710e047..7cfbd06ac 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
+++ b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
@@ -1,5 +1,3 @@
- (cClientHandle & a_ClientHandle, AString & a_ServerDescription, int & a_OnlinePlayersCount, int & a_MaxPlayersCount, AString & a_Favicon);
- 
 return
 {
 	HOOK_SERVER_PING =
@@ -8,7 +6,8 @@ return
 		DefaultFnName = "OnServerPing",  -- also used as pagename
 		Desc = [[
 			A plugin may implement an OnServerPing() function and register it as a Hook to process pings from
-			clients in the server server list.
+			clients in the server server list. It can change the logged in players and player capacity, as well
+			as the server description and the favicon by editing the values passed in.
 		]],
 		Params = {
 			{ Name = "ClientHandle", Type = "{{cClientHandle}}", Notes = "The client handle that pinged the server" },
@@ -18,7 +17,7 @@ return
 			{ Name = "Favicon", Type = "string", Notes = "The base64 encoded favicon to be displayed in the server list for compatible clients" },
 		},
 		Returns = [[
-			The plugin may return a boolean of whether to respond to the client that pinged. 
+			The plugin may return a boolean.
 		]],
 	},  -- HOOK_SERVER_PING
 }
-- 
cgit v1.2.3


From 5245bb0eba6450339c5294038e34a242638c461b Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Sat, 27 Sep 2014 16:44:11 +0100
Subject: Typo fix.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 6a3c178ef..deaa28279 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2815,7 +2815,7 @@ end
 		Globals =
 		{
 			Desc = [[
-				These functions are available directly, without a class instance. Any plugin cal call them at any
+				These functions are available directly, without a class instance. Any plugin can call them at any
 				time.
 			]],
 			Functions =
-- 
cgit v1.2.3


From 990a467eb41c6fb1dc4a132bd6e990c97efaa2e6 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Sat, 27 Sep 2014 16:49:40 +0100
Subject: Fixed typo again.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index deaa28279..f903308d1 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1984,7 +1984,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				HOOK_PLAYER_USING_ITEM = { Notes = "Called when the player is about to right-click with a usable item in their hand." },
 				HOOK_POST_CRAFTING = { Notes = "Called after a valid recipe has been chosen for the current contents of the crafting grid. Plugins may modify the recipe." },
 				HOOK_PRE_CRAFTING = { Notes = "Called before a recipe is searched for the current contents of the crafting grid. Plugins may provide a recipe and cancel the built-in search." },
-				HOOK_SERVER_PING = { Notes = "Called when a alient pings the server from the server list." },
+				HOOK_SERVER_PING = { Notes = "Called when a client pings the server from the server list. Plugins may change the favicon, server description, players online and maximum players values." },
 				HOOK_SPAWNED_ENTITY = { Notes = "Called after an entity is spawned in a {{cWorld|world}}. The entity is already part of the world." },
 				HOOK_SPAWNED_MONSTER = { Notes = "Called after a mob is spawned in a {{cWorld|world}}. The mob is already part of the world." },
 				HOOK_SPAWNING_ENTITY = { Notes = "Called just before an entity is spawned in a {{cWorld|world}}." },
-- 
cgit v1.2.3


From 57e83f7d49485e254ab33ee348ce66c3981005a5 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Sat, 27 Sep 2014 21:27:48 +0100
Subject: Fixed return value descriptions.

---
 MCServer/Plugins/APIDump/Hooks/OnServerPing.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
index 7cfbd06ac..e4c8b054b 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
+++ b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
@@ -17,7 +17,9 @@ return
 			{ Name = "Favicon", Type = "string", Notes = "The base64 encoded favicon to be displayed in the server list for compatible clients" },
 		},
 		Returns = [[
-			The plugin may return a boolean.
+			The plugin returns <code>res, ServerDescription, OnlinePlayersCount, MaxPlayersCount, Favicon</code>.
+			res is a boolean which stops other plugins being notified of the ping if it's set to true, and the others
+			are the same as the arguments, and if emitted change the values transmitted to the client. 
 		]],
 	},  -- HOOK_SERVER_PING
 }
-- 
cgit v1.2.3


From e5873d4e890ab4c5cdff365790a368d99984944d Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Sat, 27 Sep 2014 21:28:59 +0100
Subject: Copy edit.

---
 MCServer/Plugins/APIDump/Hooks/OnServerPing.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
index e4c8b054b..2a6aaee27 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
+++ b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
@@ -7,7 +7,7 @@ return
 		Desc = [[
 			A plugin may implement an OnServerPing() function and register it as a Hook to process pings from
 			clients in the server server list. It can change the logged in players and player capacity, as well
-			as the server description and the favicon by editing the values passed in.
+			as the server description and the favicon, that are displayed to the client in the server list.
 		]],
 		Params = {
 			{ Name = "ClientHandle", Type = "{{cClientHandle}}", Notes = "The client handle that pinged the server" },
-- 
cgit v1.2.3


From 24275e058b9e98d43c21d6754b29defc1cba28f6 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Sat, 27 Sep 2014 21:35:08 +0100
Subject: changed description to be more readable.

---
 MCServer/Plugins/APIDump/Hooks/OnServerPing.lua | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
index 2a6aaee27..6dcaf3f17 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
+++ b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
@@ -17,9 +17,8 @@ return
 			{ Name = "Favicon", Type = "string", Notes = "The base64 encoded favicon to be displayed in the server list for compatible clients" },
 		},
 		Returns = [[
-			The plugin returns <code>res, ServerDescription, OnlinePlayersCount, MaxPlayersCount, Favicon</code>.
-			res is a boolean which stops other plugins being notified of the ping if it's set to true, and the others
-			are the same as the arguments, and if emitted change the values transmitted to the client. 
+			The plugin can return whether to continue processing of the hook with other plugins, the server description to
+			be displayed to the client, the currently online players, the player cap and the base64/png favicon data, in that order.
 		]],
 	},  -- HOOK_SERVER_PING
 }
-- 
cgit v1.2.3


From 4a4411d4d72efd13b38df813321565898d9da60f Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Sun, 28 Sep 2014 09:28:51 +0100
Subject: Add Code example.

---
 MCServer/Plugins/APIDump/Hooks/OnServerPing.lua | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
index 6dcaf3f17..6d2325fe6 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
+++ b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
@@ -20,5 +20,31 @@ return
 			The plugin can return whether to continue processing of the hook with other plugins, the server description to
 			be displayed to the client, the currently online players, the player cap and the base64/png favicon data, in that order.
 		]],
+		CodeExamples = {
+			{
+				Title = "Change information returned to the player",
+				Desc = "Tells the client that the server description is 'test', there are one more players online than there actually are, and that the player cap is zero. It also changes the favicon data.",
+				Code = [[
+function OnServerPing(ClientHandle, ServerDescription, OnlinePlayers, MaxPlayers, Favicon)
+	-- Change Server Description
+	ServerDescription = "Test"
+
+	-- Change online / max players
+	OnlinePlayers = OnlinePlayers + 1
+	MaxPlayers = 0
+
+	-- Change favicon
+	if (cFile:IsFile("my-favicon.png")) then
+		local FaviconData = cFile:ReadWholeFile("my-favicon.png")
+		if (FaviconData != "") then
+			Favicon = Base64Encode(FaviconData)
+		end
+	end
+
+	return false, ServerDescription, OnlinePlayers, MaxPlayers, Favicon
+end				
+				]],
+			},
+		},
 	},  -- HOOK_SERVER_PING
 }
-- 
cgit v1.2.3


From 27331da017625c748a104c72d72c8958003e1e90 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sun, 28 Sep 2014 11:17:36 +0200
Subject: Updated api documentation.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index e6ee4ca10..fbed7cc00 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2035,6 +2035,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				AddRank = { Params = "RankName, MsgPrefix, MsgSuffix, MsgNameColorCode", Return = "", Notes = "Adds a new rank of the specified name and with the specified message visuals. Logs an info message and does nothing if the rank already exists." },
 				GetAllGroups = { Params = "", Return = "array-table of groups' names", Notes = "Returns an array-table containing the names of all the groups that are known to the manager." },
 				GetAllPermissions = { Params = "", Return = "array-table of permissions", Notes = "Returns an array-table containing all the permissions that are known to the manager." },
+				GetAllPlayers = { Params = "", Return = "array-table of playernames", Notes = "Returns the short uuids of all defined players." },
 				GetAllRanks = { Params = "", Return = "array-table of ranks' names", Notes = "Returns an array-table containing the names of all the ranks that are known to the manager." },
 				GetDefaultRank = { Params = "", Return = "string", Notes = "Returns the name of the default rank. " },
 				GetGroupPermissions = { Params = "GroupName", Return = "array-table of permissions", Notes = "Returns an array-table containing the permissions that the specified group contains." },
@@ -2042,6 +2043,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				GetPlayerMsgVisuals = { Params = "PlayerUUID", Return = "MsgPrefix, MsgSuffix, MsgNameColorCode", Notes = "Returns the message visuals assigned to the player. If the player is not explicitly assigned a rank, the default rank's visuals are returned. If there is an error, no value is returned at all." },
 				GetPlayerPermissions = { Params = "PlayerUUID", Return = "array-table of permissions", Notes = "Returns the permissions that the specified player is assigned through their rank. Returns the default rank's permissions if the player has no explicit rank assigned to them. Returns an empty array on error." },
 				GetPlayerRankName = { Params = "PlayerUUID", Return = "RankName", Notes = "Returns the name of the rank that is assigned to the specified player. An empty string (NOT the default rank) is returned if the player has no rank assigned to them." },
+				GetPlayerName = { Params = "PlayerUUID", Return = "PlayerName", Notes = "Returns the last name that the specified player has. If the player isn't in the database, An empty string is returned if the player isn't in the database." },
 				GetRankGroups = { Params = "RankName", Return = "array-table of groups' names", Notes = "Returns an array-table of the names of all the groups that are assigned to the specified rank. Returns an empty table if there is no such rank." },
 				GetRankPermissions = { Params = "RankName", Return = "array-table of permissions", Notes = "Returns an array-table of all the permissions that are assigned to the specified rank through its groups. Returns an empty table if there is no such rank." },
 				GetRankVisuals = { Params = "RankName", Return = "MsgPrefix, MsgSuffix, MsgNameColorCode", Notes = "Returns the message visuals for the specified rank. Returns no value if the specified rank does not exist." },
-- 
cgit v1.2.3


From 63c53a8e23776cc3011fd0260857bd22274e2c62 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sun, 28 Sep 2014 15:16:11 +0200
Subject: cRankManager: Added ClearPlayerRanks()

---
 MCServer/Plugins/APIDump/APIDesc.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index fbed7cc00..2250092ba 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2033,6 +2033,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				AddGroupToRank = { Params = "GroupName, RankName", Return = "bool", Notes = "Adds the specified group to the specified rank. Returns true on success, false on failure - if the group name or the rank name is not found." },
 				AddPermissionToGroup = { Params = "Permission, GroupName", Return = "bool", Notes = "Adds the specified permission to the specified group. Returns true on success, false on failure - if the group name is not found." },
 				AddRank = { Params = "RankName, MsgPrefix, MsgSuffix, MsgNameColorCode", Return = "", Notes = "Adds a new rank of the specified name and with the specified message visuals. Logs an info message and does nothing if the rank already exists." },
+				ClearPlayerRanks = { Params = "", Return = "", Notes = "Removes all player ranks from the database. Note that this doesn't change the cPlayer instances for the already connected players, you need to update all the instances manually." },
 				GetAllGroups = { Params = "", Return = "array-table of groups' names", Notes = "Returns an array-table containing the names of all the groups that are known to the manager." },
 				GetAllPermissions = { Params = "", Return = "array-table of permissions", Notes = "Returns an array-table containing all the permissions that are known to the manager." },
 				GetAllPlayers = { Params = "", Return = "array-table of playernames", Notes = "Returns the short uuids of all defined players." },
-- 
cgit v1.2.3


From 3c6ce77934c83972a1ea9c6f9e7cf6af0e44d8c9 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 29 Sep 2014 20:39:09 +0200
Subject: Fixed a typo in the description.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 6c13597f4..eace16c96 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2045,7 +2045,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				GetPlayerMsgVisuals = { Params = "PlayerUUID", Return = "MsgPrefix, MsgSuffix, MsgNameColorCode", Notes = "Returns the message visuals assigned to the player. If the player is not explicitly assigned a rank, the default rank's visuals are returned. If there is an error, no value is returned at all." },
 				GetPlayerPermissions = { Params = "PlayerUUID", Return = "array-table of permissions", Notes = "Returns the permissions that the specified player is assigned through their rank. Returns the default rank's permissions if the player has no explicit rank assigned to them. Returns an empty array on error." },
 				GetPlayerRankName = { Params = "PlayerUUID", Return = "RankName", Notes = "Returns the name of the rank that is assigned to the specified player. An empty string (NOT the default rank) is returned if the player has no rank assigned to them." },
-				GetPlayerName = { Params = "PlayerUUID", Return = "PlayerName", Notes = "Returns the last name that the specified player has. If the player isn't in the database, An empty string is returned if the player isn't in the database." },
+				GetPlayerName = { Params = "PlayerUUID", Return = "PlayerName", Notes = "Returns the last name that the specified player has, for a player in the ranks database. An empty string is returned if the player isn't in the database." },
 				GetRankGroups = { Params = "RankName", Return = "array-table of groups' names", Notes = "Returns an array-table of the names of all the groups that are assigned to the specified rank. Returns an empty table if there is no such rank." },
 				GetRankPermissions = { Params = "RankName", Return = "array-table of permissions", Notes = "Returns an array-table of all the permissions that are assigned to the specified rank through its groups. Returns an empty table if there is no such rank." },
 				GetRankVisuals = { Params = "RankName", Return = "MsgPrefix, MsgSuffix, MsgNameColorCode", Notes = "Returns the message visuals for the specified rank. Returns no value if the specified rank does not exist." },
-- 
cgit v1.2.3


From 7a8ca26052f37d9e766f7f40ecff867aadfbbd2c Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 29 Sep 2014 21:46:38 +0200
Subject: Updated the Core.

---
 MCServer/Plugins/Core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
index 9de860603..4fc575c05 160000
--- a/MCServer/Plugins/Core
+++ b/MCServer/Plugins/Core
@@ -1 +1 @@
-Subproject commit 9de86060388b515642c55d58b44b4281285efc00
+Subproject commit 4fc575c0567a570618cea09caa47fb5bcde6d5b9
-- 
cgit v1.2.3


From 33dc66a4d23246b5794cf9ca5bd4287a72db4cec Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 29 Sep 2014 22:00:14 +0200
Subject: RankMgr: GetAllPlayers() returns players sorted by name.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index eace16c96..9bc6299d9 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2037,7 +2037,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				ClearPlayerRanks = { Params = "", Return = "", Notes = "Removes all player ranks from the database. Note that this doesn't change the cPlayer instances for the already connected players, you need to update all the instances manually." },
 				GetAllGroups = { Params = "", Return = "array-table of groups' names", Notes = "Returns an array-table containing the names of all the groups that are known to the manager." },
 				GetAllPermissions = { Params = "", Return = "array-table of permissions", Notes = "Returns an array-table containing all the permissions that are known to the manager." },
-				GetAllPlayers = { Params = "", Return = "array-table of playernames", Notes = "Returns the short uuids of all defined players." },
+				GetAllPlayers = { Params = "", Return = "array-table of uuids", Notes = "Returns the short uuids of all defined players, sorted by the players' names (case insensitive)." },
 				GetAllRanks = { Params = "", Return = "array-table of ranks' names", Notes = "Returns an array-table containing the names of all the ranks that are known to the manager." },
 				GetDefaultRank = { Params = "", Return = "string", Notes = "Returns the name of the default rank. " },
 				GetGroupPermissions = { Params = "GroupName", Return = "array-table of permissions", Notes = "Returns an array-table containing the permissions that the specified group contains." },
-- 
cgit v1.2.3


From cba871fd872cd49eb668e785e4525234d90089e3 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 29 Sep 2014 22:00:36 +0200
Subject: Updated Core.

---
 MCServer/Plugins/Core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
index 4fc575c05..0e4556798 160000
--- a/MCServer/Plugins/Core
+++ b/MCServer/Plugins/Core
@@ -1 +1 @@
-Subproject commit 4fc575c0567a570618cea09caa47fb5bcde6d5b9
+Subproject commit 0e455679821740a8d7c316340f4ed5d21e011172
-- 
cgit v1.2.3


From 46d3d4049364fc13a536396571bef2484d842315 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 29 Sep 2014 22:12:33 +0200
Subject: Updated Core.

---
 MCServer/Plugins/Core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
index 0e4556798..3a0e0597b 160000
--- a/MCServer/Plugins/Core
+++ b/MCServer/Plugins/Core
@@ -1 +1 @@
-Subproject commit 0e455679821740a8d7c316340f4ed5d21e011172
+Subproject commit 3a0e0597b7a24c44bf87ec90beb9be48d0b99709
-- 
cgit v1.2.3


From f2f0c26421e47ab815b25e7971e49a47f4ae1629 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 1 Oct 2014 12:14:51 +0200
Subject: APIDump: Added missing cClientHandle documentation.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 9bc6299d9..4865fb293 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -540,6 +540,9 @@ end
 				SetUsername = { Params = "Name", Return = "", Notes = "Sets the username" },
 				SetViewDistance = { Params = "ViewDistance", Return = "", Notes = "Sets the viewdistance (number of chunks loaded for the player in each direction)" },
 				SendBlockChange = { Params = "BlockX, BlockY, BlockZ, BlockType, BlockMeta", Return = "", Notes = "Sends a BlockChange packet to the client. This can be used to create fake blocks only for that player." },
+				SendEntityAnimation = { Params = "{{cEntity|Entity}}, AnimationNumber", Return = "", Notes = "Sends the specified animation of the specified entity to the client. The AnimationNumber is protocol-specific." },
+				SendSoundEffect = { Params = "SoundName, X, Y, Z, Volume, Pitch", Return = "", Notes = "Sends a sound effect request to the client. The sound is played at the specified coords, with the specified volume (a float, 1.0 is full volume, can be more) and pitch (0-255, 63 is 100%)" },
+				SendTimeUpdate = { Params = "WorldAge, TimeOfDay, DoDaylightCycle", Return = "", Notes = "Sends the specified time update to the client. WorldAge is the total age of the world, in ticks. TimeOfDay is the current day's time, in ticks (0 - 24000). DoDaylightCycle is a bool that specifies whether the client should automatically move the sun (true) or keep it in the same place (false)." },
 			},
 			Constants =
 			{
-- 
cgit v1.2.3


From a8f29097de5857f0b3530d365bb8f02aed5bac78 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 1 Oct 2014 12:24:09 +0200
Subject: APIDump: Documented missing cCompositeChat functions.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 4865fb293..2d6a8a73c 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -558,9 +558,9 @@ end
 				and commands suggested on click. The chat message can be sent by the regular chat-sending functions,
 				{{cPlayer}}:SendMessage(), {{cWorld}}:BroadcastChat() and {{cRoot}}:BroadcastChat().</p>
 				<p>
-				Note that most of the functions in this class are so-called modifiers - they modify the object and
-				then return the object itself, so that they can be chained one after another. See the Chaining
-				example below for details.</p>
+				Note that most of the functions in this class are so-called chaining modifiers - they modify the
+				object and then return the object itself, so that they can be chained one after another. See the
+				Chaining example below for details.</p>
 				<p>
 				Each part of the composite chat message takes a "Style" parameter, this is a string that describes
 				the formatting. It uses the following strings, concatenated together:
@@ -584,14 +584,16 @@ end
 					{ Params = "Text", Return = "", Notes = "Creates a chat message containing the specified text, parsed by the ParseText() function. This allows easy migration from old chat messages." },
 				},
 				AddRunCommandPart = { Params = "Text, Command, [Style]", Return = "self", Notes = "Adds a text which, when clicked, runs the specified command. Chaining." },
+				AddShowAchievementPart = { Params = "PlayerName, AchievementName, [Style]", Return = "", Notes = "Adds a text that represents the 'Achievement get' message." },
 				AddSuggestCommandPart = { Params = "Text, Command, [Style]", Return = "self", Notes = "Adds a text which, when clicked, puts the specified command into the player's chat input area. Chaining." },
 				AddTextPart = { Params = "Text, [Style]", Return = "self", Notes = "Adds a regular text. Chaining." },
 				AddUrlPart = { Params = "Text, Url, [Style]", Return = "self", Notes = "Adds a text which, when clicked, opens up a browser at the specified URL. Chaining." },
 				Clear = { Params = "", Return = "", Notes = "Removes all parts from this object" },
 				ExtractText = { Params = "", Return = "string", Notes = "Returns the text from the parts that comprises the human-readable data. Used for older protocols that don't support composite chat and for console-logging." },
+				GetAdditionalMessageTypeData = { Params = "", Return = "string", Notes = "Returns the AdditionalData associated with the message, such as the sender's name for mtPrivateMessage" },
 				GetMessageType = { Params = "", Return = "MessageType", Notes = "Returns the MessageType (mtXXX constant) that is associated with this message. When sent to a player, the message will be formatted according to this message type and the player's settings (adding \"[INFO]\" prefix etc.)" },
 				ParseText = { Params = "Text", Return = "self", Notes = "Adds text, while recognizing http and https URLs and old-style formatting codes (\"@2\"). Chaining." },
-				SetMessageType = { Params = "MessageType", Return = "self", Notes = "Sets the MessageType (mtXXX constant) that is associated with this message. When sent to a player, the message will be formatted according to this message type and the player's settings (adding \"[INFO]\" prefix etc.) Chaining." },
+				SetMessageType = { Params = "MessageType, AdditionalData", Return = "self", Notes = "Sets the MessageType (mtXXX constant) that is associated with this message. Also sets the additional data (string) associated with the message, which is specific for the message type - such as the sender's name for mtPrivateMessage. When sent to a player, the message will be formatted according to this message type and the player's settings (adding \"[INFO]\" prefix etc.). Chaining." },
 				UnderlineUrls = { Params = "", Return = "self", Notes = "Makes all URL parts contained in the message underlined. Doesn't affect parts added in the future. Chaining." },
 			},
 
-- 
cgit v1.2.3


From 196f09d4bcabd4dffb740d7d538e8c2ebfe67feb Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 1 Oct 2014 12:24:37 +0200
Subject: APIDump: Documented missing cIniFile function.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 2d6a8a73c..db6651707 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1048,6 +1048,7 @@ ValueName0=SomeOtherValue
 				GetValueSetB = { Params = "KeyName, ValueName, Default", Return = "bool", Notes = "Returns the value of the specified name under the specified key, as a bool. If the value doesn't exist, creates it with the specified default." },
 				GetValueSetF = { Params = "KeyName, ValueName, Default", Return = "number", Notes = "Returns the value of the specified name under the specified key, as a floating-point number. If the value doesn't exist, creates it with the specified default." },
 				GetValueSetI = { Params = "KeyName, ValueName, Default", Return = "number", Notes = "Returns the value of the specified name under the specified key, as an integer. If the value doesn't exist, creates it with the specified default." },
+				HasValue = { Params = "KeyName, ValueName", Return = "bool", Notes = "Returns true if the specified value is present." },
 				ReadFile = { Params = "FileName, [AllowExampleFallback]", Return = "bool", Notes = "Reads the values from the specified file. Previous in-memory contents are lost. If the file cannot be opened, and AllowExample is true, another file, \"filename.example.ini\", is loaded and then saved as \"filename.ini\". Returns true if successful, false if not." },
 				SetValue = 
 				{
-- 
cgit v1.2.3


From 901bed39895be35ceb66352f8120b8117f44fb4e Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 1 Oct 2014 12:44:28 +0200
Subject: Unified cRoot broadcast chat documentation.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index db6651707..b7f3e3e07 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2086,13 +2086,20 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 			]],
 			Functions =
 			{
-				BroadcastChat = { Params = "Message", Return = "", Notes = "Broadcasts a message to every player in the server. No formatting is done by the server." },
-				BroadcastChatFailure = { Params = "Message", Return = "", Notes = "Prepends Rose [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For a command that failed to run because of insufficient permissions, etc." },
-				BroadcastChatFatal = { Params = "Message", Return = "", Notes = "Prepends Red [FATAL] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For a plugin that crashed, or similar." },
-				BroadcastChatInfo = { Params = "Message", Return = "", Notes = "Prepends Yellow [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For informational messages, such as command usage." },
-				BroadcastChatSuccess = { Params = "Message", Return = "", Notes = "Prepends Green [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For success messages." },
-				BroadcastChatWarning = { Params = "Message", Return = "", Notes = "Prepends Rose [WARN] / colours entire text (depending on ShouldUseChatPrefixes()) and broadcasts message. For concerning events, such as plugin reload etc." },
-				CreateAndInitializeWorld = { Params = "WorldName", Return = "{{cWorld|cWorld}}", Notes = "Creates a new world and initializes it. If there is a world whith the same name it returns nil." },
+				BroadcastChat =
+				{
+					{ Params = "MessageText, MessageType", Return = "", Notes = "Broadcasts a message to all players, with its message type set to MessageType (default: mtCustom)." },
+					{ Params = "{{cCompositeChat|CompositeChat}}", Return = "", Notes = "Broadcasts a {{cCompositeChat|composite chat message} to all players." },
+				},
+				BroadcastChatDeath = { Params = "MessageText", Return = "", Notes = "Broadcasts the specified message to all players, with its message type set to mtDeath. Use for when a player has died." },
+				BroadcastChatFailure = { Params = "MessageText", Return = "", Notes = "Broadcasts the specified message to all players, with its message type set to mtFailure. Use for a command that failed to run because of insufficient permissions, etc." },
+				BroadcastChatFatal = { Params = "MessageText", Return = "", Notes = "Broadcasts the specified message to all players, with its message type set to mtFatal. Use for a plugin that crashed, or similar." },
+				BroadcastChatInfo = { Params = "MessageText", Return = "", Notes = "Broadcasts the specified message to all players, with its message type set to mtInfo. Use for informational messages, such as command usage." },
+				BroadcastChatJoin = { Params = "MessageText", Return = "", Notes = "Broadcasts the specified message to all players, with its message type set to mtJoin. Use for players joining the server." },
+				BroadcastChatLeave = { Params = "MessageText", Return = "", Notes = "Broadcasts the specified message to all players, with its message type set to mtLeave. Use for players leaving the server." },
+				BroadcastChatSuccess = { Params = "MessageText", Return = "", Notes = "Broadcasts the specified message to all players, with its message type set to mtSuccess. Use for success messages." },
+				BroadcastChatWarning = { Params = "MessageText", Return = "", Notes = "Broadcasts the specified message to all players, with its message type set to mtWarning. Use for concerning events, such as plugin reload etc." },
+				CreateAndInitializeWorld = { Params = "WorldName", Return = "{{cWorld|cWorld}}", Notes = "Creates a new world and initializes it. If there is a world whith the same name it returns nil.<br/><br/><b>NOTE</b>This function is currently unsafe, do not use!" },
 				FindAndDoWithPlayer = { Params = "PlayerName, CallbackFunction", Return = "", Notes = "Calls the given callback function for all players with names partially (or fully) matching the name string provided." },
 				ForEachPlayer = { Params = "CallbackFunction", Return = "", Notes = "Calls the given callback function for each player. The callback function has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cPlayer|cPlayer}})</pre>" },
 				ForEachWorld = { Params = "CallbackFunction", Return = "", Notes = "Calls the given callback function for each world. The callback function has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cWorld|cWorld}})</pre>" },
-- 
cgit v1.2.3


From ac0b3168a1dc4bb80499875375c458033423e35e Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 1 Oct 2014 17:29:28 +0200
Subject: APIDump: Added more of the missing documentation.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index b7f3e3e07..2f1c766cb 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -524,6 +524,7 @@ end
 			Functions =
 			{
 				GenerateOfflineUUID = { Params = "Username", Return = "string", Notes = "(STATIC) Generates an UUID based on the player name provided. This is used for the offline (non-auth) mode, when there's no UUID source. Each username generates a unique and constant UUID, so that when the player reconnects with the same name, their UUID is the same. Returns a 32-char UUID (no dashes)." },
+				GetClientBrand = { Params = "", Return = "string", Notes = "Returns the brand that the client has sent in their MC|Brand plugin message." },
 				GetIPString = { Params = "", Return = "string", Notes = "Returns the IP address of the connection, as a string. Only the address part is returned, without the port number." },
 				GetLocale = { Params = "", Return = "Locale", Notes = "Returns the locale string that the client sends as part of the protocol handshake. Can be used to provide localized strings." },
 				GetPing = { Params = "", Return = "number", Notes = "Returns the ping time, in ms" },
@@ -536,6 +537,7 @@ end
 				IsUUIDOnline = { Params = "UUID", Return = "bool", Notes = "(STATIC) Returns true if the UUID is generated by online auth, false if it is an offline-generated UUID. We use Version-3 UUIDs for offline UUIDs, online UUIDs are Version-4, thus we can tell them apart. Accepts both 32-char and 36-char UUIDs (with and without dashes). If the string given is not a valid UUID, returns false."},
 				Kick = { Params = "Reason", Return = "", Notes = "Kicks the user with the specified reason" },
 				SendPluginMessage = { Params = "Channel, Message", Return = "", Notes = "Sends the plugin message on the specified channel." },
+				SetClientBrand = { Params = "ClientBrand", Return = "", Notes = "Sets the value of the client's brand. Normally this value is received from the client by a MC|Brand plugin message, this function lets plugins overwrite the value." },
 				SetLocale = { Params = "Locale", Return = "", Notes = "Sets the locale that MCServer keeps on record. Initially the locale is initialized in protocol handshake, this function allows plugins to override the stored value (but only server-side and only until the user disconnects)." },
 				SetUsername = { Params = "Name", Return = "", Notes = "Sets the username" },
 				SetViewDistance = { Params = "ViewDistance", Return = "", Notes = "Sets the viewdistance (number of chunks loaded for the player in each direction)" },
@@ -589,6 +591,7 @@ end
 				AddTextPart = { Params = "Text, [Style]", Return = "self", Notes = "Adds a regular text. Chaining." },
 				AddUrlPart = { Params = "Text, Url, [Style]", Return = "self", Notes = "Adds a text which, when clicked, opens up a browser at the specified URL. Chaining." },
 				Clear = { Params = "", Return = "", Notes = "Removes all parts from this object" },
+				CreateJsonString = { Params = "[AddPrefixes]", Return = "string", Notes = "Returns the entire object serialized into JSON, as it would be sent to a client. AddPrefixes specifies whether the chat prefixes should be prepended to the message, true by default." },
 				ExtractText = { Params = "", Return = "string", Notes = "Returns the text from the parts that comprises the human-readable data. Used for older protocols that don't support composite chat and for console-logging." },
 				GetAdditionalMessageTypeData = { Params = "", Return = "string", Notes = "Returns the AdditionalData associated with the message, such as the sender's name for mtPrivateMessage" },
 				GetMessageType = { Params = "", Return = "MessageType", Notes = "Returns the MessageType (mtXXX constant) that is associated with this message. When sent to a player, the message will be formatted according to this message type and the player's settings (adding \"[INFO]\" prefix etc.)" },
@@ -1746,6 +1749,7 @@ a_Player:OpenWindow(Window);
 				GetItem = { Params = "", Return = "{{cItem|cItem}}", Notes = "Returns the item represented by this pickup" },
 				IsCollected = { Params = "", Return = "bool", Notes = "Returns true if this pickup has already been collected (is waiting to be destroyed)" },
 				IsPlayerCreated = { Params = "", Return = "bool", Notes = "Returns true if the pickup was created by a player" },
+				SetAge = { Params = "AgeTicks", Return = "", Notes = "Sets the pickup's age, in ticks." },
 			},
 			Inherits = "cEntity",
 		},  -- cPickup
@@ -1770,8 +1774,8 @@ a_Player:OpenWindow(Window);
 				ForceSetSpeed = { Params = "{{Vector3d|Direction}}", Notes = "Forces the player to move to the given direction." },
 				GetClientHandle = { Params = "", Return = "{{cClientHandle}}", Notes = "Returns the client handle representing the player's connection. May be nil (AI players)." },
 				GetColor = { Return = "string", Notes = "Returns the full color code to be used for this player's messages (based on their rank). Prefix player messages with this code." },
-				GetPlayerListName = { Return = "string", Notes = "Returns the name that is used in the playerlist." },
 				GetCurrentXp = { Params = "", Return = "number", Notes = "Returns the current amount of XP" },
+				GetCustomName = { Params = "", Return = "string", Notes = "Returns the custom name of this player. If the player hasn't a custom name, it will return an empty string." },
 				GetEffectiveGameMode = { Params = "", Return = "{{Globals#GameMode|GameMode}}", Notes = "(OBSOLETE) Returns the current resolved game mode of the player. If the player is set to inherit the world's gamemode, returns that instead. See also GetGameMode() and IsGameModeXXX() functions. Note that this function is the same as GetGameMode(), use that function instead." },
 				GetEquippedItem = { Params = "", Return = "{{cItem}}", Notes = "Returns the item that the player is currently holding; empty item if holding nothing." },
 				GetEyeHeight = { Return = "number", Notes = "Returns the height of the player's eyes, in absolute coords" },
@@ -1786,18 +1790,24 @@ a_Player:OpenWindow(Window);
 				GetGameMode = { Return = "{{Globals#GameMode|GameMode}}", Notes = "Returns the player's gamemode. The player may have their gamemode unassigned, in which case they inherit the gamemode from the current {{cWorld|world}}.<br /> <b>NOTE:</b> Instead of comparing the value returned by this function to the gmXXX constants, use the IsGameModeXXX() functions. These functions handle the gamemode inheritance automatically."},
 				GetIP = { Return = "string", Notes = "Returns the IP address of the player, if available. Returns an empty string if there's no IP to report."},
 				GetInventory = { Return = "{{cInventory|Inventory}}", Notes = "Returns the player's inventory"},
+				GetLastBedPos = { Params = "", Return = "{{Vector3i}}", Notes = "Returns the position of the last bed the player has slept in, or the world's spawn if no such position was recorded." },
 				GetMaxSpeed = { Params = "", Return = "number", Notes = "Returns the player's current maximum speed, relative to the game default speed. Takes into account the sprinting / flying status." },
 				GetName = { Return = "string", Notes = "Returns the player's name" },
 				GetNormalMaxSpeed = { Params = "", Return = "number", Notes = "Returns the player's maximum walking speed, relative to the game default speed. Defaults to 1, but plugins may modify it for faster or slower walking." },
+				GetPermissions = { Params = "", Return = "array-table of strings", Notes = "Returns the list of all permissions that the player has assigned to them through their rank." },
+				GetPlayerListName = { Return = "string", Notes = "Returns the name that is used in the playerlist." },
 				GetResolvedPermissions = { Return = "array-table of string", Notes = "Returns all the player's permissions, as a table. The permissions are stored in the array part of the table, beginning with index 1." },
 				GetSprintingMaxSpeed = { Params = "", Return = "number", Notes = "Returns the player's maximum sprinting speed, relative to the game default speed. Defaults to 1.3, but plugins may modify it for faster or slower sprinting." },
 				GetStance = { Return = "number", Notes = "Returns the player's stance (Y-pos of player's eyes)" },
+				GetTeam = { Params = "", Return = "{{cTeam}}", Notes = "Returns the team that the player belongs to, or nil if none." },
 				GetThrowSpeed = { Params = "SpeedCoeff", Return = "{{Vector3d}}", Notes = "Returns the speed vector for an object thrown with the specified speed coeff. Basically returns the normalized look vector multiplied by the coeff, with a slight random variation." },
 				GetThrowStartPos = { Params = "", Return = "{{Vector3d}}", Notes = "Returns the position where the projectiles should start when thrown by this player." },
+				GetUUID = { Params = "", Return = "string", Notes = "Returns the (short) UUID that the player is using. Could be empty string for players that don't have a Mojang account assigned to them (in the future, bots for example)." },
 				GetWindow = { Params = "", Return = "{{cWindow}}", Notes = "Returns the currently open UI window. If the player doesn't have any UI window open, returns the inventory window." },
 				GetXpLevel = { Params = "", Return = "number", Notes = "Returns the current XP level (based on current XP amount)." },
 				GetXpLifetimeTotal = { Params = "", Return = "number", Notes = "Returns the amount of XP that has been accumulated throughout the player's lifetime." },
 				GetXpPercentage = { Params = "", Return = "number", Notes = "Returns the percentage of the experience bar - the amount of XP towards the next XP level. Between 0 and 1." },
+				HasCustomName = { Params = "", Return = "bool", Notes = "Returns true if the player has a custom name." },
 				HasPermission = { Params = "PermissionString", Return = "bool", Notes = "Returns true if the player has the specified permission" },
 				Heal = { Params = "HitPoints", Return = "", Notes = "Heals the player by the specified amount of HPs. Only positive amounts are expected. Sends a health update to the client." },
 				IsEating = { Params = "", Return = "bool", Notes = "Returns true if the player is currently eating the item in their hand." },
@@ -1805,7 +1815,9 @@ a_Player:OpenWindow(Window);
 				IsFlying = { Return = "bool", Notes = "Returns true if the player is flying." },
 				IsGameModeAdventure = { Params = "", Return = "bool", Notes = "Returns true if the player is in the gmAdventure gamemode, or has their gamemode unset and the world is a gmAdventure world." },
 				IsGameModeCreative = { Params = "", Return = "bool", Notes = "Returns true if the player is in the gmCreative gamemode, or has their gamemode unset and the world is a gmCreative world." },
+				IsGameModeSpectator = { Params = "", Return = "bool", Notes = "Returns true if the player is in the gmSpectator gamemode, or has their gamemode unset and the world is a gmSpectator world." },
 				IsGameModeSurvival = { Params = "", Return = "bool", Notes = "Returns true if the player is in the gmSurvival gamemode, or has their gamemode unset and the world is a gmSurvival world." },
+				IsInBed = { Params = "", Return = "bool", Notes = "Returns true if the player is currently lying in a bed." },
 				IsOnGround = { Params = "", Return = "bool", Notes = "Returns true if the player is on ground (not falling, not jumping, not flying)" },
 				IsSatiated = { Params = "", Return = "bool", Notes = "Returns true if the player is satiated (cannot eat)." },
 				IsVisible = { Params = "", Return = "bool", Notes = "Returns true if the player is visible to other players" },
@@ -1813,6 +1825,7 @@ a_Player:OpenWindow(Window);
 				MoveTo = { Params = "{{Vector3d|NewPosition}}", Return = "Tries to move the player into the specified position." },
 				MoveToWorld = { Params = "WorldName", Return = "bool", Return = "Moves the player to the specified world. Returns true if successful." },
 				OpenWindow = { Params = "{{cWindow|Window}}", Return = "", Notes = "Opens the specified UI window for the player." },
+				PermissionMatches = { Params = "Permission, Template", Return = "bool", Notes = "(STATIC) Returns true if the specified permission matches the specified template. The template may contain wildcards." },
 				Respawn = { Params = "", Return = "", Notes = "Restores the health, extinguishes fire, makes visible and sends the Respawn packet." },
 				SendMessage = { Params = "Message", Return = "", Notes = "Sends the specified message to the player." },
 				SendMessageFailure = { Params = "Message", Return = "", Notes = "Prepends Rose [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. For a command that failed to run because of insufficient permissions, etc." },
@@ -1821,12 +1834,12 @@ a_Player:OpenWindow(Window);
 				SendMessagePrivateMsg = { Params = "Message, SenderName", Return = "", Notes = "Prepends Light Blue [MSG: *SenderName*] / prepends SenderName and colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. For private messaging." },
 				SendMessageSuccess = { Params = "Message", Return = "", Notes = "Prepends Green [INFO] / colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. Success notification." },
 				SendMessageWarning = { Params = "Message, Sender", Return = "", Notes = "Prepends Rose [WARN] / colours entire text (depending on ShouldUseChatPrefixes()) and sends message to player. Denotes that something concerning, such as plugin reload, is about to happen." },
-				HasCustomName = { Params = "", Return = "bool", Notes = "Returns true if the player has a custom name." },
-				GetCustomName = { Params = "", Return = "string", Notes = "Returns the custom name of this player. If the player hasn't a custom name, it will return an empty string." },
-				SetCustomName = { Params = "string", Return = "", Notes = "Sets the custom name of this player. If you want to disable the custom name, simply set an empty string. The custom name will be used in the tab-list, in the player nametag and in the tab-completion." },
+				SendRotation = { Params = "YawDegrees, PitchDegrees", Return = "", Notes = "Sends the specified rotation to the player, forcing them to look that way" },
+				SetBedPos = { Params = "{{Vector3i|Position}}", Return = "", Notes = "Sets the internal representation of the last bed position the player has slept in. The player will respawn at this position if they die." },
 				SetCanFly = { Params = "CanFly", Notes = "Sets if the player can fly or not." },
 				SetCrouch = { Params = "IsCrouched", Return = "", Notes = "Sets the crouch state, broadcasts the change to other players." },
 				SetCurrentExperience = { Params = "XPAmount", Return = "", Notes = "Sets the current amount of experience (and indirectly, the XP level)." },
+				SetCustomName = { Params = "string", Return = "", Notes = "Sets the custom name of this player. If you want to disable the custom name, simply set an empty string. The custom name will be used in the tab-list, in the player nametag and in the tab-completion." },
 				SetFlying = { Params = "IsFlying", Notes = "Sets if the player is flying or not." },
 				SetFlyingMaxSpeed = { Params = "FlyingMaxSpeed", Return = "", Notes = "Sets the flying maximum speed, relative to the game default speed. The default value is 1. Sends the updated speed to the client." },
 				SetFoodExhaustionLevel = { Params = "ExhaustionLevel", Return = "", Notes = "Sets the food exhaustion to the specified level." },
@@ -1840,7 +1853,11 @@ a_Player:OpenWindow(Window);
 				SetNormalMaxSpeed = { Params = "NormalMaxSpeed", Return = "", Notes = "Sets the normal (walking) maximum speed, relative to the game default speed. The default value is 1. Sends the updated speed to the client, if appropriate." },
 				SetSprint = { Params = "IsSprinting", Return = "", Notes = "Sets whether the player is sprinting or not." },
 				SetSprintingMaxSpeed = { Params = "SprintingMaxSpeed", Return = "", Notes = "Sets the sprinting maximum speed, relative to the game default speed. The default value is 1.3. Sends the updated speed to the client, if appropriate." },
+				SetTeam = { Params = "{{cTeam|Team}}", Return = "", Notes = "Moves the player to the specified team." },
 				SetVisible = { Params = "IsVisible", Return = "", Notes = "Sets the player visibility to other players" },
+				TossEquippedItem = { Params = "[Amount]", Return = "", Notes = "Tosses the item that the player has selected in their hotbar. Amount defaults to 1." },
+				TossHeldItem = { Params = "[Amount]", Return = "", Notes = "Tosses the item held by the cursor, then the player is in a UI window. Amount defaults to 1." },
+				TossPickup = { Params = "{{cItem|Item}}", Return = "", Notes = "Tosses a pickup newly created from the specified item." },
 				XpForLevel = { Params = "XPLevel", Return = "number", Notes = "(STATIC) Returns the total amount of XP needed for the specified XP level. Inverse of CalcLevelFromXp()." },
 			},
 			Constants =
@@ -2043,7 +2060,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				ClearPlayerRanks = { Params = "", Return = "", Notes = "Removes all player ranks from the database. Note that this doesn't change the cPlayer instances for the already connected players, you need to update all the instances manually." },
 				GetAllGroups = { Params = "", Return = "array-table of groups' names", Notes = "Returns an array-table containing the names of all the groups that are known to the manager." },
 				GetAllPermissions = { Params = "", Return = "array-table of permissions", Notes = "Returns an array-table containing all the permissions that are known to the manager." },
-				GetAllPlayers = { Params = "", Return = "array-table of uuids", Notes = "Returns the short uuids of all defined players, sorted by the players' names (case insensitive)." },
+				GetAllPlayerUUIDs = { Params = "", Return = "array-table of uuids", Notes = "Returns the short uuids of all players stored in the rank DB, sorted by the players' names (case insensitive)." },
 				GetAllRanks = { Params = "", Return = "array-table of ranks' names", Notes = "Returns an array-table containing the names of all the ranks that are known to the manager." },
 				GetDefaultRank = { Params = "", Return = "string", Notes = "Returns the name of the default rank. " },
 				GetGroupPermissions = { Params = "GroupName", Return = "array-table of permissions", Notes = "Returns an array-table containing the permissions that the specified group contains." },
-- 
cgit v1.2.3


From adab829d8fc24e0bc21737f5e125e19620b1f87c Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Wed, 1 Oct 2014 20:14:28 +0100
Subject: Fixed broken code.

---
 MCServer/Plugins/APIDump/Hooks/OnServerPing.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
index 6d2325fe6..db1707e47 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
+++ b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
@@ -34,9 +34,9 @@ function OnServerPing(ClientHandle, ServerDescription, OnlinePlayers, MaxPlayers
 	MaxPlayers = 0
 
 	-- Change favicon
-	if (cFile:IsFile("my-favicon.png")) then
+	if cFile:IsFile("my-favicon.png") then
 		local FaviconData = cFile:ReadWholeFile("my-favicon.png")
-		if (FaviconData != "") then
+		if FaviconData ~= "" and FaviconData ~= nil then
 			Favicon = Base64Encode(FaviconData)
 		end
 	end
-- 
cgit v1.2.3


From a765e43ee0db7be62a7d5c643a70cfec5a07d116 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 1 Oct 2014 22:29:38 +0200
Subject: APIDump: Fixed cEntity documentation.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 2f1c766cb..bf5003035 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -785,7 +785,9 @@ end</pre>
 				AddSpeedX = { Params = "AddX", Return = "", Notes = "Adds the specified amount of speed in the X axis direction." },
 				AddSpeedY = { Params = "AddY", Return = "", Notes = "Adds the specified amount of speed in the Y axis direction." },
 				AddSpeedZ = { Params = "AddZ", Return = "", Notes = "Adds the specified amount of speed in the Z axis direction." },
+				ArmorCoversAgainst = { Params = "{{cEntity|AttackerEntity}}, DamageType, RawDamage", Return = "number", Notes = "Returns the points out of a_RawDamage that the currently equipped armor would cover." },
 				Destroy = { Params = "", Return = "", Notes = "Schedules the entity to be destroyed" },
+				GetAirLevel = { Params = "", Return = "number", Notes = "Returns the air level (number of ticks of air left). Note, this function is only updated with mobs or players." },
 				GetArmorCoverAgainst = { Params = "AttackerEntity, DamageType, RawDamage", Return = "number", Notes = "Returns the number of hitpoints out of RawDamage that the currently equipped armor would cover. See {{TakeDamageInfo}} for more information on attack damage." },
 				GetChunkX = { Params = "", Return = "number", Notes = "Returns the X-coord of the chunk in which the entity is placed" },
 				GetChunkZ = { Params = "", Return = "number", Notes = "Returns the Z-coord of the chunk in which the entity is placed" },
@@ -801,6 +803,7 @@ end</pre>
 				GetHeadYaw = { Params = "", Return = "number", Notes = "Returns the pitch of the entity's head (FIXME: Rename to GetHeadPitch() )." },
 				GetHealth = { Params = "", Return = "number", Notes = "Returns the current health of the entity." },
 				GetHeight = { Params = "", Return = "number", Notes = "Returns the height (Y size) of the entity" },
+				GetInvulnerableTicks = { Params = "", Return = "number", Notes = "Returns the number of ticks that this entity will be invulnerable for. This is used for after-hit recovery - the entities are invulnerable for half a second after being hit." },
 				GetKnockbackAmountAgainst = { Params = "ReceiverEntity", Return = "number", Notes = "Returns the amount of knockback that the currently equipped items would cause when attacking the ReceiverEntity." },
 				GetLookVector = { Params = "", Return = "{{Vector3f}}", Notes = "Returns the vector that defines the direction in which the entity is looking" },
 				GetMass = { Params = "", Return = "number", Notes = "Returns the mass of the entity. Currently unused." },
@@ -818,23 +821,29 @@ end</pre>
 				GetSpeedX = { Params = "", Return = "number", Notes = "Returns the X-part of the speed vector" },
 				GetSpeedY = { Params = "", Return = "number", Notes = "Returns the Y-part of the speed vector" },
 				GetSpeedZ = { Params = "", Return = "number", Notes = "Returns the Z-part of the speed vector" },
+				GetTicksAlive = { Params = "", Return = "number", Notes = "Returns the number of ticks that this entity has been alive for." },
 				GetUniqueID = { Params = "", Return = "number", Notes = "Returns the ID that uniquely identifies the entity within the running server. Note that this ID is not persisted to the data files." },
 				GetWidth = { Params = "", Return = "number", Notes = "Returns the width (X and Z size) of the entity." },
 				GetWorld = { Params = "", Return = "{{cWorld}}", Notes = "Returns the world where the entity resides" },
 				GetYaw = { Params = "", Return = "number", Notes = "Returns the yaw (direction) of the entity. Measured in degrees, values range from -180 to +180. 0 means ZP, 90 means XM, -180 means ZM, -90 means XP." },
+				HandleSpeedFromAttachee = { Params = "ForwardAmount, SidewaysAmount", Return = "", Notes = "Updates the entity's speed based on the attachee exerting the specified force forward and sideways. Used for entities being driven by other entities attached to them - usually players driving minecarts and boats." },
 				Heal = { Params = "Hitpoints", Return = "", Notes = "Heals the specified number of hitpoints. Hitpoints is expected to be a positive number." },
 				IsA = { Params = "ClassName", Return = "bool", Notes = "Returns true if the entity class is a descendant of the specified class name, or the specified class itself" },
 				IsBoat = { Params = "", Return = "bool", Notes = "Returns true if the entity is a {{cBoat|boat}}." },
 				IsCrouched = { Params = "", Return = "bool", Notes = "Returns true if the entity is crouched. Always false for entities that don't support crouching." },
 				IsDestroyed = { Params = "", Return = "bool", Notes = "Returns true if the entity has been destroyed and is awaiting removal from the internal structures." },
+				IsEnderCrystal = { Params = "", Return = "bool", Notes = "Returns true if the entity is an ender crystal." },
 				IsExpOrb = { Params = "", Return = "bool", Notes = "Returns true if the entity represents an experience orb" },
 				IsFallingBlock = { Params = "", Return = "bool", Notes = "Returns true if the entity represents a {{cFallingBlock}} entity." },
+				IsFireproof = { Params = "", Return = "bool", Notes = "Returns true if the entity takes no damage from being on fire." },
 				IsFloater = { Params = "", Return = "bool", Notes = "Returns true if the entity represents a fishing rod floater" },
 				IsInvisible = { Params = "", Return = "bool", Notes = "Returns true if the entity is invisible" },
+				IsItemFrame = { Params = "", Return = "bool", Notes = "Returns true if the entity is an item frame." },
 				IsMinecart = { Params = "", Return = "bool", Notes = "Returns true if the entity represents a {{cMinecart|minecart}}" },
 				IsMob = { Params = "", Return = "bool", Notes = "Returns true if the entity represents any {{cMonster|mob}}." },
 				IsOnFire = { Params = "", Return = "bool", Notes = "Returns true if the entity is on fire" },
 				IsPainting = { Params = "", Return = "bool", Notes = "Returns if this entity is a painting." },
+				IsPawn = { Params = "", Return = "bool", Notes = "Returns true if the entity is a {{cPawn}} descendant." },
 				IsPickup = { Params = "", Return = "bool", Notes = "Returns true if the entity represents a {{cPickup|pickup}}." },
 				IsPlayer = { Params = "", Return = "bool", Notes = "Returns true if the entity represents a {{cPlayer|player}}" },
 				IsProjectile = { Params = "", Return = "bool", Notes = "Returns true if the entity is a {{cProjectileEntity}} descendant." },
@@ -844,12 +853,19 @@ end</pre>
 				IsSubmerged = { Params = "", Return = "bool", Notes = "Returns true if the mob or player is submerged in water (head is in a water block). Note, this function is only updated with mobs or players." },
 				IsSwimming = { Params = "", Return = "bool", Notes = "Returns true if the mob or player is swimming in water (feet are in a water block). Note, this function is only updated with mobs or players." },
 				IsTNT = { Params = "", Return = "bool", Notes = "Returns true if the entity represents a {{cTNTEntity|TNT entity}}" },
+				Killed = { Params = "{{cEntity|Victim}}", Return = "", Notes = "This entity has killed another entity (the Victim). For players, adds the scoreboard statistics about the kill." },
 				KilledBy = { Notes = "FIXME: Remove this from API" },
-				GetAirLevel = { Params = "", Return = "number", Notes = "Returns the air level (number of ticks of air left). Note, this function is only updated with mobs or players." },
+				MoveToWorld =
+				{
+					{ Params = "{{cWorld|World}}, [ShouldSendRespawn]", Return = "bool", Notes = "Removes the entity from this world and starts moving it to the specified world. Note that to avoid deadlocks, the move is asynchronous - the entity is moved into a queue and will be moved from that queue into the destination world at some (unpredictable) time in the future. ShouldSendRespawn is used only for players, it specifies whether the player should be sent a Repawn packet upon leaving the world (The client handles respawns only between different dimensions)." },
+					{ Params = "WorldName, [ShouldSendRespawn]", Return = "bool", Notes = "Removes the entity from this world and starts moving it to the specified world. Note that to avoid deadlocks, the move is asynchronous - the entity is moved into a queue and will be moved from that queue into the destination world at some (unpredictable) time in the future. ShouldSendRespawn is used only for players, it specifies whether the player should be sent a Repawn packet upon leaving the world (The client handles respawns only between different dimensions)." },
+				},
 				SetGravity = { Params = "Gravity", Return = "", Notes = "Sets the number that is used as the gravity for physics simulation. 1G (9.78) by default." },
 				SetHeadYaw = { Params = "HeadPitch", Return = "", Notes = "Sets the head pitch (FIXME: Rename to SetHeadPitch() )." },
 				SetHealth = { Params = "Hitpoints", Return = "", Notes = "Sets the entity's health to the specified amount of hitpoints. Doesn't broadcast any hurt animation. Doesn't kill the entity if health drops below zero. Use the TakeDamage() function instead for taking damage." },
 				SetHeight = { Params = "", Return = "", Notes = "FIXME: Remove this from API" },
+				SetInvulnerableTicks = { Params = "NumTicks", Return = "", Notes = "Sets the amount of ticks for which the entity will not receive any damage from other entities." },
+				SetIsFireproof = { Params = "IsFireproof", Return = "", Notes = "Sets whether the entity receives damage from being on fire." },
 				SetMass = { Params = "Mass", Return = "", Notes = "Sets the mass of the entity. Currently unused." },
 				SetMaxHealth = { Params = "MaxHitpoints", Return = "", Notes = "Sets the maximum hitpoints of the entity. If current health is above MaxHitpoints, it is capped to MaxHitpoints." },
 				SetPitch = { Params = "number", Return = "", Notes = "Sets the pitch (nose-down rotation) of the entity" },
@@ -864,7 +880,7 @@ end</pre>
 				SetPosZ = { Params = "number", Return = "", Notes = "Sets the Z-coord of the entity's pivot" },
 				SetRoll = { Params = "number", Return = "", Notes = "Sets the roll (sideways rotation) of the entity. Currently unused." },
 				SetRot = { Params = "{{Vector3f|Rotation}}", Return = "", Notes = "Sets the entire rotation vector (Yaw, Pitch, Roll)" },
-				SetYawFromSpeed = { Params = "", Return = "", Notes = "Sets the entity's yaw to match its current speed (entity looking forwards as it moves). (FIXME: Rename to SetYawFromSpeed)" },
+				SetYawFromSpeed = { Params = "", Return = "", Notes = "Sets the entity's yaw to match its current speed (entity looking forwards as it moves)." },
 				SetSpeed =
 				{
 					{ Params = "SpeedX, SpeedY, SpeedZ", Return = "", Notes = "Sets the current speed of the entity" },
@@ -890,18 +906,20 @@ end</pre>
 			Constants =
 			{
 				etBoat = { Notes = "The entity is a {{cBoat}}" },
+				etEnderCrystal = { Notes = "" },
 				etEntity = { Notes = "No further specialization available" },
 				etExpOrb = { Notes = "The entity is a {{cExpOrb}}" },
 				etFallingBlock = { Notes = "The entity is a {{cFallingBlock}}" },
 				etFloater = { Notes = "The entity is a fishing rod floater" },
+				etItemFrame = { Notes = "" },
+				etMinecart = { Notes = "The entity is a {{cMinecart}} descendant" },
 				etMob = { Notes = "The entity is a {{cMonster}} descendant" },
 				etMonster = { Notes = "The entity is a {{cMonster}} descendant" },
-				etMinecart = { Notes = "The entity is a {{cMinecart}} descendant" },
-				etPlayer = { Notes = "The entity is a {{cPlayer}}" },
+				etPainting = { Notes = "The entity is a {{cPainting}}" },
 				etPickup = { Notes = "The entity is a {{cPickup}}" },
+				etPlayer = { Notes = "The entity is a {{cPlayer}}" },
 				etProjectile = { Notes = "The entity is a {{cProjectileEntity}} descendant" },
 				etTNT = { Notes = "The entity is a {{cTNTEntity}}" },
-				etPainting = { Notes = "The entity is a {{cPainting}}" },
 			},
 			ConstantGroups =
 			{
-- 
cgit v1.2.3


From 7c731dbd8ac55c5e5660df0e1f745a76489b646c Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Wed, 1 Oct 2014 21:37:20 +0100
Subject: Added parentheses for clarity.

---
 MCServer/Plugins/APIDump/Hooks/OnServerPing.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
index db1707e47..76b6d1517 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
+++ b/MCServer/Plugins/APIDump/Hooks/OnServerPing.lua
@@ -36,7 +36,7 @@ function OnServerPing(ClientHandle, ServerDescription, OnlinePlayers, MaxPlayers
 	-- Change favicon
 	if cFile:IsFile("my-favicon.png") then
 		local FaviconData = cFile:ReadWholeFile("my-favicon.png")
-		if FaviconData ~= "" and FaviconData ~= nil then
+		if (FaviconData ~= "") and (FaviconData ~= nil) then
 			Favicon = Base64Encode(FaviconData)
 		end
 	end
-- 
cgit v1.2.3


From 017ba1c32a8f5f43dcf769692ad2ffea497aee5e Mon Sep 17 00:00:00 2001
From: WebFreak001 <janju007@web.de>
Date: Sun, 5 Oct 2014 11:08:10 +0200
Subject: Made WebAdmin design more modern

---
 MCServer/webadmin/files/style.css   | 496 +++++++++++++++++++-----------------
 MCServer/webadmin/template.lua      |  63 ++---
 MCServer/webadmin/template_orig.lua | 137 ++++++++++
 3 files changed, 431 insertions(+), 265 deletions(-)
 create mode 100644 MCServer/webadmin/template_orig.lua

(limited to 'MCServer')

diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css
index e7ffe3999..a1d9993de 100644
--- a/MCServer/webadmin/files/style.css
+++ b/MCServer/webadmin/files/style.css
@@ -1,326 +1,354 @@
-/* reset CSS */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
-	margin: 0;
+body, html
+{
+	font-family: "Open Sans";
 	padding: 0;
-	border: 0;
-	outline: 0;
-	font-size: 100%;
-	vertical-align: baseline;
-	background: transparent;
+	margin: 0;
+	font-weight: 400;
+	background-color: #fbe9e7;
+	color: rgba(0, 0, 0, 0.87);
+}
+
+.light { font-weight: 300; }
+.bold { font-weight: 600; }
+
+#wrapper
+{
+	background-color: #ff5722;
+	margin: 40px auto;
+	width: 99%;
+	max-width: 1200px;
+	box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-shadow: 0px 4px 5px rgba(0, 0, 0, 0.15);
+	color: rgba(0, 0, 0, 0.87);
+}
+
+.title
+{
+	font-size: 30pt;
+	padding: 10px 40px;
+	text-decoration: none;
+	color: white;
+	text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3);
+	display: block;
 }
-body {
-	line-height: 1;
+
+#sidebar
+{
+	float: left;
+	width: 20%;
 }
-ol, ul {
+
+.sideNav
+{
 	list-style: none;
-}
-blockquote, q {
-	quotes: none;
+	background-color: #fafafa;
+	margin: 20px 0;
+	padding: 5px 0;
+	width: 100%;
+	box-shadow: 1px 0px 10px rgba(0, 0, 0, 0.2);
 }
 
-/* remember to define focus styles! */
-:focus {
-	outline: 0;
+.sideNav li
+{
+	padding: 10px;
+	color: rgba(0, 0, 0, 0.54);
 }
 
-/* remove textarea resize at Safari */
-textarea { 
-	resize: none;
+.sideNav li.link
+{
+	padding-left: 30px;
 }
 
-/* remember to highlight inserts somehow! */
-ins {
+.sideNav li.link a
+{
 	text-decoration: none;
+	color: rgba(0, 0, 0, 0.87);
 }
-del {
-	text-decoration: line-through;
-}
-
-/* tables still need 'cellspacing="0"' in the markup */
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-
 
-/*
-	Origional from http://www.perspectived.com/
-	Modified by Ben Phelps
-	Made for FakeTruth - MCServer
-*/
-
-/* Basic  ---------------------------------------- */
-
-.clear { clear: both; }
-
-body {
-	background: white;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #646464;
-	text-align: center;
+#container
+{
+	margin: 0;
+	padding: 0;
+	overflow: hidden;
+	background-color: #f5f5f5;
 }
 
-#wrapper {
-	text-align: left;
-	width: 930px;
-	margin: 0 auto;
+#main
+{
+	float: right;
+	width: 80%;
+	padding: 0 15px 20px 15px;
+	box-sizing: border-box;
+	-moz-box-sizing: border-box;
 }
 
-/* Logo  ---------------------------------------- */
-
-h1 {
-	margin: 15px 0 10px 5px;
-	width: 180px;
-	height: 36px;
-	background: url(logo.png) no-repeat left top;
+.clear
+{
+	clear: both;
 }
 
-h1 a {
-	display: block;
-	width: 225px;
-	height: 28px;
+table
+{
+	width: 100%;
+	border-collapse: collapse;
 }
 
-h1 span { display: none; }
-
-a {
-	color: #646464;
+table td
+{
+	padding: 5px;
 }
 
-/* Container ---------------------------------------- */
-
-#containerHolder {
-	background: #eee;
+table th
+{
+	border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 	padding: 5px;
+	text-align: center;
 }
 
-
-#container {
-	background: #fff url(background.gif) repeat-y left top;
-	border: 1px solid #ddd;
-	width: 918px;
-
+table tr:nth-child(odd)
+{
+	background-color: rgba(0, 0, 0, 0.015);
 }
 
-#connectHolder {
-	background: #eee;
-	padding: 5px;
-	margin-bottom:8px;
+p
+{
+	margin: 8px 0;
+	padding: 8px 3px;
 }
 
-
-#connect {
-	border: 1px solid #ddd;
-	background-color: #fff;
-	padding:5px;
-	width: 908px;
+a
+{
+	text-decoration: none;
+	color: #0277bd;
+	-webkit-transition: color 0.1s linear;
+	-moz-transition: color 0.1s linear;
+	transition: color 0.1s linear;
 }
 
-.pics {  
-	height:  375px;
-	width:   600px;
-} 
-
-.pics img {  
-	padding: 5px;  
-	border:  1px solid #ddd;  
-	background-color: #eee;  
-	width:  600px; 
-	height: 375px;
-	margin-left: 15px;
+a:hover
+{
+	color: #01579b;
 }
 
-/* Login -------------------------------------- */
-
-#loginLogo {
-	margin: 0 auto;
-	margin-top:100px;
-	width: 180px;
-	height: 36px;
-	background-image: url(logo.png);
+.welcome-msg
+{
+	color: rgba(0, 0, 0, 0.54);
 }
 
-#loginHolder {
-	background: #eee;
-	padding: 5px;
-	width: 310px;
-	margin: 0 auto;
-	height: 90px;
-	margin-top:20px;
+.username
+{
+	text-transform: capitalize;
+	color: rgba(0, 0, 0, 0.87);
 }
 
-#login {
-	padding:10px;
-	width: 288px;
-	height: 68px;
-	border: 1px solid #ddd;
-	background:#fff;
-	text-align: left;
+a:hover
+{
+	color: black;
 }
 
-
-/* Sidebar ---------------------------------------- */
-
-#sidebar {
-	width: 179px;
-	float: left;
+input, select
+{
+	padding: 8px;
 }
 
-#sidebar .sideNav { width: 179px; }
+form
+{
+	padding: 4px;
+}
 
-#sidebar .sideNav li { border-bottom: 1px solid #ddd; width: 179px; }
+.info input[type="submit"], .info button, .info input[type="button"],
+.warn input[type="submit"], .warn button, .warn input[type="button"],
+.err input[type="submit"], .err button, .err input[type="button"]
+{
+	float: right;
+}
 
-#sidebar .sideNav li a {
+.err
+{
+	color: white;
 	display: block;
-	color: #646464;
-	background: #f6f6f6;
-	text-decoration: none;
-	height: 29px;
-	line-height: 29px;
-	padding: 0 19px;
-	width: 141px;
+	background-color: #e51c23 !important;
+	padding: 15px;
+	line-height: 30px;
+	min-height: 30px;
 }
 
-#sidebar .sideNav li a:hover { background: #fdfcf6; }
-
-#sidebar .sideNav li a.active, #sidebar .sideNav li a.active:hover {
-	background: #f0f7fa;
-	color: #c66653;
+.err:before
+{
+	content: "ERROR: ";
 }
 
-/* Breadcrumb ---------------------------------------- */
-
-h2 {
-	width: 718px;
-	float: right;
-	color: #646464;
-	font-size: 16px;
-	line-height: 16px;
-	font-weight: bold;
-	margin: 20px 0 0 0;
-	padding: 0 0 10px 0;
-	border-bottom: 1px solid #ddd;
+.warn
+{
+	color: white;
+	display: block;
+	background-color: #ff5722 !important;
+	padding: 15px;
+	line-height: 30px;
+	min-height: 30px;
 }
 
-h2 a {
-	color: #646464;
-	text-decoration: none;
+.warn:before
+{
+	content: "WARNING: ";
 }
 
-h2 a.active { color: #c66653; }
+.info
+{
+	color: white;
+	display: block;
+	background-color: #5677fc !important;
+	padding: 15px;
+	line-height: 30px;
+	min-height: 30px;
+}
 
-h2 a:hover { text-decoration: underline; }
+.info:before
+{
+	content: "INFORMATION: ";
+}
 
-/* Content ---------------------------------------- */
+#footer .fleft
+{
+	float: left;
+}
 
-#main {
-	width: 700px;
+#footer .fright
+{
 	float: right;
-	padding: 0 19px 0 0;
+	text-align: right;
 }
 
-#main p {
-
+#footer
+{
+	margin: 0;
 	padding: 10px;
+	font-size: 9pt;
+	color: rgba(255, 255, 255, 0.8);
+	box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.2) inset;
+}
 
+#footer a
+{
+	text-transform: none;
+	color: white;
 }
 
-h3 {
-	font-size: 14px;
-	line-height: 14px;
-	font-weight: bold;
-	color: #5494af;
-	padding: 0 0 0 10px;
-	margin: 20px 0 10px;
+input[type="submit"], button, input[type="button"]
+{
+	background-color: #ffc107;
+	padding: 8px 15px 8px 15px;
+	margin: 0 2px;
+	display: inline-block;
+	text-align: center;
+	color: black;
+	box-shadow: 0px 2px 3px rgba(0,0,0,0.2);
+	border: none;
+	outline: none;
+	cursor: pointer;
 }
 
-h4 {
-	padding: 0 0 0 10px;
-	margin: 20px 0 10px;
+input[type="submit"]:hover, button:hover, input[type="button"]:hover
+{
+	background-color: #ffca28;
 }
 
-#main ul {
-	padding: 0 0 0 10px;
-	list-style-type: circle;
-	list-style-position: inside;
+input[type="submit"]:active, button:active, input[type="button"]:active
+{
+	background-color: #ffd54f;
+	-webkit-transform: translateY(1px);
+	   -moz-transform: translateY(1px);
+			transform: translateY(1px);
 }
 
-#main table {
-	border-top: 1px solid #ddd;
-	width: 700px;
+hr
+{
+	border: none;
+	height: 1px;
+	background-color: rgba(0, 0, 0, 0.12);
 }
 
-#main table tr th {
-	text-align: left;
-	background: #f6f6f6;
-	padding: 0px 20px;
-	height: 20px;
-	line-height: 20px;
-	border-bottom: 1px solid #ddd;
+h4
+{
+	padding-bottom: 10px;
+	margin-bottom: 12px;
+	border-bottom: 1px solid rgba(0, 0, 0, 0.12);
 }
 
-#main table tr td {
-	background: #f6f6f6;
-	padding: 0px 20px;
-	height: 29px;
-	line-height: 29px;
-	border-bottom: 1px solid #ddd;
+
+/**** PAGE SPECIFIC CSS ****/
+
+/* remove the * for disabling: */
+
+.page-core-server-settings table td
+{
+	text-align: center;
+	width: 25%;
 }
 
-#main table tr.odd td {
-	background: #fbfbfb;
+.page-core-server-settings.no-param table td:nth-child(1) a,
+.page-core-server-settings.param-tab-general table td:nth-child(1) a
+{
+	font-weight: 600;
+	color: rgba(0, 0, 0, 0.87);
 }
 
-#main table tr:hover td { background: #fdfcf6; }
+.page-core-server-settings.param-tab-monsters table td:nth-child(2) a
+{
+	font-weight: 600;
+	color: rgba(0, 0, 0, 0.87);
+}
 
-#main table .action {
-	text-align: right;
-	padding: 0 20px 0 10px;
+.page-core-server-settings.param-tab-worlds table td:nth-child(3) a
+{
+	font-weight: 600;
+	color: rgba(0, 0, 0, 0.87);
 }
 
-#main table tr .action a { margin: 0 0 0 10px; text-decoration: none; color: #9b9b9b; }
-#main table tr:hover .action .edit { color: #c5a059; }
-#main table tr:hover .action .delete { color: #a02b2b; }
-#main table tr:hover .action .view { color: #55a34a; }
+.page-core-server-settings.param-tab-world table td:nth-child(4) a
+{
+	font-weight: 600;
+	color: rgba(0, 0, 0, 0.87);
+}
 
-#main table tr:hover .action a:hover { text-decoration: underline; }
+.page-core-permissions form table tr,
+.page-core-permissions form table td,
+.page-core-permissions form table th
+{
+	border: none;
+	background-color: transparent;
+}
 
-fieldset {
-	border: 1px solid #ddd;
-	padding: 19px;
-	margin: 0 0 20px 0;
-	background: #fbfbfb;
+.page-core-permissions form table tr:nth-child(1) th
+{
+	width: 35%;
 }
 
-form p { margin: 0 0 14px 0; float: left; width: 100%;  }
+.page-core-permissions form table tr:nth-child(1) td
+{
+	width: 65%;
+}
 
-label {
-	display: block;
+.page-core-permissions form table td input
+{
 	width: 100%;
-	margin: 0 0 7px 0;
-	line-height: 12px;
+	box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	margin: 0;
 }
 
-/* Footer ---------------------------------------- */
+#ChatDiv
+{
+	margin-bottom: 10px;
+}
 
-#footer {
-	margin: 10px 0 30px 0;
-	font-size: 11px;
-	line-height: 11px;
-	color: #9B9B9B;
-	padding: 0 0 0 5px;
+#ChatMessage
+{
+	width: 100%;
+	box-sizing: border-box;
+	-moz-box-sizing: border-box;
 }
 
-#footer a { color: #9B9B9B; }
 
-#footer a:hover { text-decoration: none; }
+/**/
\ No newline at end of file
diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua
index a7480f83e..84a50b055 100644
--- a/MCServer/webadmin/template.lua
+++ b/MCServer/webadmin/template.lua
@@ -70,25 +70,33 @@ function ShowPage(WebAdmin, TemplateRequest)
 		PageContent, SubTitle = GetDefaultPage()
 	end
 	
+	local reqParamsClass = ""
+	
+	for key,value in pairs(TemplateRequest.Request.Params) do
+		reqParamsClass = reqParamsClass .. " param-" .. string.lower(string.gsub(key, "[^a-zA-Z0-9]+", "-") .. "-" .. string.gsub(value, "[^a-zA-Z0-9]+", "-"))
+	end
+	
+	if (string.gsub(reqParamsClass, "%s", "") == "") then
+		reqParamsClass = " no-param"
+	end
+	
 	Output([[
 <!DOCTYPE html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="icon" href="/favicon.ico">
 <title>]] .. Title .. [[</title>
-<link rel="stylesheet" type="text/css" media="screen" href="/style.css">
+<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,600,300' rel='stylesheet' type='text/css'>
+<link rel="stylesheet" type="text/css" href="/style.css">
 </head>
-
 <body>
-	<div id="wrapper">
-		<!-- h1 tag stays for the logo, you can use the a tag for linking the index page -->
-		<h1>
-			<a href="]] .. BaseURL .. [["><span>MCServer</span></a>
-		</h1>
-		<div id="containerHolder">
-			<div id="container">
-				<div id="sidebar">
-					<ul class="sideNav">
+<div id="wrapper">
+	<div id="containerHolder">
+		<a href="./" class="title light">MCServer</a>
+		<div id="container">
+			<div id="sidebar">
+				<ul class="sideNav">
+					<li class='link'><a href=']] .. BaseURL .. [['>Home</a></li>
 	]])
 
 
@@ -100,7 +108,7 @@ function ShowPage(WebAdmin, TemplateRequest)
 			Output("<li>"..PluginWebTitle.."</li>\n");
 			
 			for webname,prettyname in pairs(TabNames) do
-				Output("<li><a href='" .. BaseURL .. PluginWebTitle .. "/" .. webname .. "'>" .. prettyname .. "</a></li>\n")
+				Output("<li class='link'><a href='" .. BaseURL .. PluginWebTitle .. "/" .. webname .. "'>" .. prettyname .. "</a></li>\n")
 			end
 		end
 	end
@@ -108,30 +116,23 @@ function ShowPage(WebAdmin, TemplateRequest)
 	
 	Output([[
 					</ul>
-					<!-- // .sideNav -->
-				</div>    
-				<!-- // #sidebar -->
-				<!-- h2 stays for breadcrumbs -->
-				<h2>Welcome ]] .. TemplateRequest.Request.Username .. [[</h2>
-				<div id="main">
-					<h3>]] .. SubTitle .. [[</h3>
-					]] .. PageContent .. [[
-				</div>
-				<!-- // #main -->
+			</div>
+			
+			<div id="main" class="page-]] .. string.lower(PluginPage.PluginName .. "-" .. string.gsub(PluginPage.TabName, "[^a-zA-Z0-9]+", "-")) .. reqParamsClass .. [[">
+				<h2 class="welcome-msg">Welcome <span class="username">]] .. TemplateRequest.Request.Username .. [[</span></h2>
 				
-				<div class="clear"></div>
+				<hr/>
 				
-			</div>
-			<!-- // #container -->
-		</div>	
-		<!-- // #containerHolder -->
-	    
-		<p id="footer">MCServer is using: ]] .. MemoryUsageKiB / 1024 .. [[ MiB of memory; Current chunk count: ]] .. NumChunks .. [[ </p>
+				<h3>]] .. SubTitle .. [[</h3>
+					]] .. PageContent .. [[</div>
+			<div class="clear"></div>
+		</div>
 	</div>
-	<!-- // #wrapper -->
+	<div id="footer"><div class="fleft">running MCServer using <span class="bold">]] .. MemoryUsageKiB / 1024 .. [[MB</span> of memory; <span class="bold">]] .. NumChunks .. [[</span> chunks</div><div class="fright">design by <a href="//www.github.com/WebFreak001">WebFreak001</a></div><div class="clear"></div></div>
+</div>
 </body>
 </html>
-	]])
+]])
 	
 	return table.concat(SiteContent)
 end
diff --git a/MCServer/webadmin/template_orig.lua b/MCServer/webadmin/template_orig.lua
new file mode 100644
index 000000000..a7480f83e
--- /dev/null
+++ b/MCServer/webadmin/template_orig.lua
@@ -0,0 +1,137 @@
+-- Use a table for fast concatenation of strings
+local SiteContent = {}
+function Output(String)
+	table.insert(SiteContent, String)
+end
+
+
+
+
+
+function GetTableSize(Table)
+	local Size = 0
+	for key,value in pairs(Table) do
+		Size = Size + 1
+	end
+	return Size
+end
+
+
+
+
+
+function GetDefaultPage()
+	local PM = cRoot:Get():GetPluginManager()
+
+	local SubTitle = "Current Game"
+	local Content = ""
+	
+	Content = Content .. "<h4>Server Name:</h4>"
+	Content = Content .. "<p>" .. cRoot:Get():GetServer():GetServerID() .. "</p>"
+	
+	Content = Content .. "<h4>Plugins:</h4><ul>"
+	local AllPlugins = PM:GetAllPlugins()
+	for key,value in pairs(AllPlugins) do
+		if( value ~= nil and value ~= false ) then
+			Content = Content ..  "<li>" .. key .. " V." .. value:GetVersion() .. "</li>"
+		end
+	end
+	
+	Content = Content .. "</ul>"
+	Content = Content .. "<h4>Players:</h4><ul>"
+	
+	local AddPlayerToTable = function( Player )
+		Content = Content .. "<li>" .. Player:GetName() .. "</li>"
+	end
+	cRoot:Get():ForEachPlayer( AddPlayerToTable )
+	
+	Content = Content .. "</ul><br>";
+
+	return Content, SubTitle
+end
+
+
+
+
+
+function ShowPage(WebAdmin, TemplateRequest)
+	SiteContent = {}
+	local BaseURL = WebAdmin:GetBaseURL(TemplateRequest.Request.Path)
+	local Title = "MCServer WebAdmin"
+	local MemoryUsageKiB = cRoot:GetPhysicalRAMUsage()
+	local NumChunks = cRoot:Get():GetTotalChunkCount()
+	local PluginPage = WebAdmin:GetPage(TemplateRequest.Request)
+	local PageContent = PluginPage.Content
+	local SubTitle = PluginPage.PluginName
+	if (PluginPage.TabName ~= "") then
+		SubTitle = PluginPage.PluginName .. " - " .. PluginPage.TabName
+	end
+	if (PageContent == "") then
+		PageContent, SubTitle = GetDefaultPage()
+	end
+	
+	Output([[
+<!DOCTYPE html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="icon" href="/favicon.ico">
+<title>]] .. Title .. [[</title>
+<link rel="stylesheet" type="text/css" media="screen" href="/style.css">
+</head>
+
+<body>
+	<div id="wrapper">
+		<!-- h1 tag stays for the logo, you can use the a tag for linking the index page -->
+		<h1>
+			<a href="]] .. BaseURL .. [["><span>MCServer</span></a>
+		</h1>
+		<div id="containerHolder">
+			<div id="container">
+				<div id="sidebar">
+					<ul class="sideNav">
+	]])
+
+
+	local AllPlugins = WebAdmin:GetPlugins()
+	for key,value in pairs(AllPlugins) do
+		local PluginWebTitle = value:GetWebTitle()
+		local TabNames = value:GetTabNames()
+		if (GetTableSize(TabNames) > 0) then
+			Output("<li>"..PluginWebTitle.."</li>\n");
+			
+			for webname,prettyname in pairs(TabNames) do
+				Output("<li><a href='" .. BaseURL .. PluginWebTitle .. "/" .. webname .. "'>" .. prettyname .. "</a></li>\n")
+			end
+		end
+	end
+
+	
+	Output([[
+					</ul>
+					<!-- // .sideNav -->
+				</div>    
+				<!-- // #sidebar -->
+				<!-- h2 stays for breadcrumbs -->
+				<h2>Welcome ]] .. TemplateRequest.Request.Username .. [[</h2>
+				<div id="main">
+					<h3>]] .. SubTitle .. [[</h3>
+					]] .. PageContent .. [[
+				</div>
+				<!-- // #main -->
+				
+				<div class="clear"></div>
+				
+			</div>
+			<!-- // #container -->
+		</div>	
+		<!-- // #containerHolder -->
+	    
+		<p id="footer">MCServer is using: ]] .. MemoryUsageKiB / 1024 .. [[ MiB of memory; Current chunk count: ]] .. NumChunks .. [[ </p>
+	</div>
+	<!-- // #wrapper -->
+</body>
+</html>
+	]])
+	
+	return table.concat(SiteContent)
+end
-- 
cgit v1.2.3


From 3baacce51e05ea4cc6d7352475b08a35ba8bc2a0 Mon Sep 17 00:00:00 2001
From: WebFreak001 <janju007@web.de>
Date: Sun, 5 Oct 2014 11:14:16 +0200
Subject: Added license

---
 MCServer/webadmin/files/style.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'MCServer')

diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css
index a1d9993de..3c8c8750f 100644
--- a/MCServer/webadmin/files/style.css
+++ b/MCServer/webadmin/files/style.css
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2014 WebFreak001
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 body, html
 {
 	font-family: "Open Sans";
-- 
cgit v1.2.3


From 828ded593cad10018dce226541bf782e6f2f545e Mon Sep 17 00:00:00 2001
From: WebFreak001 <janju007@web.de>
Date: Sun, 5 Oct 2014 11:24:54 +0200
Subject: Added newline

---
 MCServer/webadmin/files/style.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css
index 3c8c8750f..5860c00e1 100644
--- a/MCServer/webadmin/files/style.css
+++ b/MCServer/webadmin/files/style.css
@@ -366,5 +366,4 @@ h4
 	-moz-box-sizing: border-box;
 }
 
-
-/**/
\ No newline at end of file
+/**/
-- 
cgit v1.2.3


From cea0707ad5144e698fec6bf6a02174c7f1fd58cd Mon Sep 17 00:00:00 2001
From: WebFreak001 <janju007@web.de>
Date: Sun, 5 Oct 2014 11:35:29 +0200
Subject: Removed my license, added me to CONTRIBUTORS

---
 MCServer/webadmin/files/style.css | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css
index 5860c00e1..211f9f9a3 100644
--- a/MCServer/webadmin/files/style.css
+++ b/MCServer/webadmin/files/style.css
@@ -1,19 +1,3 @@
-/*
- * Copyright 2014 WebFreak001
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 body, html
 {
 	font-family: "Open Sans";
-- 
cgit v1.2.3


From 7aa81de2c67a3347720c9a5772832577b92a81d6 Mon Sep 17 00:00:00 2001
From: WebFreak001 <janju007@web.de>
Date: Sun, 5 Oct 2014 11:48:44 +0200
Subject: added font callback

---
 MCServer/webadmin/files/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/webadmin/files/style.css b/MCServer/webadmin/files/style.css
index 211f9f9a3..7f01b34b2 100644
--- a/MCServer/webadmin/files/style.css
+++ b/MCServer/webadmin/files/style.css
@@ -1,6 +1,6 @@
 body, html
 {
-	font-family: "Open Sans";
+	font-family: "Open Sans", Tahoma, sans-serif;
 	padding: 0;
 	margin: 0;
 	font-weight: 400;
-- 
cgit v1.2.3


From 02617a11cd6454c7a1d35bded1413828460cfdeb Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 5 Oct 2014 15:05:24 +0200
Subject: Updated Core.

---
 MCServer/Plugins/Core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core
index 3a0e0597b..f8c2531fb 160000
--- a/MCServer/Plugins/Core
+++ b/MCServer/Plugins/Core
@@ -1 +1 @@
-Subproject commit 3a0e0597b7a24c44bf87ec90beb9be48d0b99709
+Subproject commit f8c2531fbef9bfd0b6f024d4d3319384a70a0831
-- 
cgit v1.2.3


From a8aeceab9d6e5e5e36ef7bd58783b65aca4d8be7 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 5 Oct 2014 20:19:21 +0200
Subject: cClientHandle: Added protocol version knowledge.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'MCServer')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index bf5003035..6a151b5ef 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -529,6 +529,7 @@ end
 				GetLocale = { Params = "", Return = "Locale", Notes = "Returns the locale string that the client sends as part of the protocol handshake. Can be used to provide localized strings." },
 				GetPing = { Params = "", Return = "number", Notes = "Returns the ping time, in ms" },
 				GetPlayer = { Params = "", Return = "{{cPlayer|cPlayer}}", Notes = "Returns the player object connected to this client. Note that this may be nil, for example if the player object is not yet spawned." },
+				GetProtocolVersion = { Params = "", Return = "number", Notes = "Returns the protocol version number of the protocol that the client is talking. Returns zero if the protocol version is not (yet) known." },
 				GetUniqueID = { Params = "", Return = "number", Notes = "Returns the UniqueID of the client used to identify the client in the server" },
 				GetUUID = { Params = "", Return = "string", Notes = "Returns the authentication-based UUID of the client. This UUID should be used to identify the player when persisting any player-related data. Returns a 32-char UUID (no dashes)" },
 				GetUsername = { Params = "", Return = "string", Notes = "Returns the username that the client has provided" },
-- 
cgit v1.2.3


From de41e2a04cfae499e89f7edd96e160d854f6602c Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Wed, 8 Oct 2014 21:04:26 +0100
Subject: Removed ChunkWorx

---
 MCServer/Plugins/ChunkWorx/ChunkWorx.deproj   |   9 -
 MCServer/Plugins/ChunkWorx/chunkworx_main.lua | 128 ------------
 MCServer/Plugins/ChunkWorx/chunkworx_web.lua  | 274 --------------------------
 3 files changed, 411 deletions(-)
 delete mode 100644 MCServer/Plugins/ChunkWorx/ChunkWorx.deproj
 delete mode 100644 MCServer/Plugins/ChunkWorx/chunkworx_main.lua
 delete mode 100644 MCServer/Plugins/ChunkWorx/chunkworx_web.lua

(limited to 'MCServer')

diff --git a/MCServer/Plugins/ChunkWorx/ChunkWorx.deproj b/MCServer/Plugins/ChunkWorx/ChunkWorx.deproj
deleted file mode 100644
index 17420d1d7..000000000
--- a/MCServer/Plugins/ChunkWorx/ChunkWorx.deproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project>
-  <file>
-    <filename>chunkworx_main.lua</filename>
-  </file>
-  <file>
-    <filename>chunkworx_web.lua</filename>
-  </file>
-</project>
diff --git a/MCServer/Plugins/ChunkWorx/chunkworx_main.lua b/MCServer/Plugins/ChunkWorx/chunkworx_main.lua
deleted file mode 100644
index 88ecb3979..000000000
--- a/MCServer/Plugins/ChunkWorx/chunkworx_main.lua
+++ /dev/null
@@ -1,128 +0,0 @@
--- Global variables
-PLUGIN = {}	-- Reference to own plugin object
-GENERATION_STATE = 0
-OPERATION_CODE = 0	-- 0 = generation
-CX = 0
-CZ = 0
-CURRENT = 0
-TOTAL = 0
-
--- AREA Variables
-AreaStartX = -10
-AreaStartZ = -10
-AreaEndX = 10
-AreaEndZ = 10
-
--- RADIAL Variables
-RadialX = 0
-RadialZ = 0
-Radius = 10
-
--- WORLD
-WORK_WORLD = cRoot:Get():GetDefaultWorld():GetName()
-WW_instance = cRoot:Get():GetDefaultWorld()
-WORLDS = {}
-
-
-
-
-
-function Initialize(Plugin)
-	PLUGIN = Plugin
-	
-	PLUGIN:SetName("ChunkWorx")
-	PLUGIN:SetVersion(6)
-	
-	cPluginManager.AddHook(cPluginManager.HOOK_TICK, OnTick)
-	
-	Plugin:AddWebTab("(Re)Generation", HandleRequest_Generation)
-	
-	GENERATION_STATE = 0
-	WW_instance = cRoot:Get():GetWorld(WORK_WORLD)
-	if (WW_instance == nil) then
-		LOG("" .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion() .. ": NO WORLD found :(")
-	end
-	
-	-- Read the stored values:
-	local SettingsIni = cIniFile();
-	SettingsIni:ReadFile("ChunkWorx.ini");  -- ignore any read errors
-	AreaStartX = SettingsIni:GetValueSetI("Area data",   "StartX",  AreaStartX)
-	AreaStartZ = SettingsIni:GetValueSetI("Area data",   "StartZ",  AreaStartZ)
-	AreaEndX   = SettingsIni:GetValueSetI("Area data",   "EndX",    AreaEndX)
-	AreaEndZ   = SettingsIni:GetValueSetI("Area data",   "EndZ",    AreaEndZ)
-	RadialX    = SettingsIni:GetValueSetI("Radial data", "RadialX", RadialX)
-	RadialZ    = SettingsIni:GetValueSetI("Radial data", "RadialZ", RadialZ)
-	Radius     = SettingsIni:GetValueSetI("Radial data", "Radius",  Radius)
-	SettingsIni:WriteFile("ChunkWorx.ini");
-	
-	LOG("Initialized " .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion())
-	return true
-end
-
-
-
-
-
-function OnTick( DeltaTime )
-	if (GENERATION_STATE == 1 or GENERATION_STATE == 3) then
-		LOGINFO("" .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion() .. ": works STARTED!")
-		LOGINFO("" .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion() .. ": At world: " .. WORK_WORLD)
-		WW_instance = cRoot:Get():GetWorld(WORK_WORLD)
-		if (GENERATION_STATE == 1) then GENERATION_STATE = 2 end
-		if (GENERATION_STATE == 3) then GENERATION_STATE = 4 end
-		
-		-- Changing in case coordinates are flipped
-		local shifter = AreaEndX
-		if (AreaStartX > AreaEndX) then
-			AreaEndX = AreaStartX
-			AreaStartX = shifter
-		end
-		shifter = AreaEndZ
-		if (AreaStartZ > AreaEndZ) then
-			AreaEndZ = AreaStartZ
-			AreaStartZ = shifter
-		end
-		
-		CX = AreaStartX
-		CZ = AreaStartZ
-		CURRENT = 0
-		
-		if (WW_instance == nil) then
-			LOGERROR("" .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion() .. ": works ABORTED")
-			LOGERROR("" .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion() .. ": NO WORLD found :(")
-			GENERATION_STATE = 0
-		end
-	end
-	
-	
-	
-	if (GENERATION_STATE == 2 or GENERATION_STATE == 4) then
-		if (WW_instance:GetGeneratorQueueLength() < 200
-		and WW_instance:GetLightingQueueLength() < 200
-		and (WW_instance:GetStorageSaveQueueLength() + WW_instance:GetStorageLoadQueueLength()) < 80) then
-			local chunk_sum = (1+ AreaEndX - AreaStartX) * (1+ AreaEndZ - AreaStartZ)
-			TOTAL = chunk_sum
-			LOG("" .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion() .. ": PROCESSING 100 chunks, (" .. CURRENT .. "/" .. chunk_sum .. ")")
-			for C = 1, 100	do
-				if (GENERATION_STATE == 2) then WW_instance:GenerateChunk(CX, CZ) end
-				if (GENERATION_STATE == 4) then WW_instance:RegenerateChunk(CX, CZ) end
-				
-				CX = CX + 1
-				CURRENT = CURRENT + 1
-				if (CX > AreaEndX) then
-					CX = AreaStartX
-					CZ = CZ + 1
-					if (CZ > AreaEndZ) then
-						if (GENERATION_STATE == 2) then LOGINFO("" .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion() .. " - generation ENDED!") end
-						if (GENERATION_STATE == 4) then LOGINFO("" .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion() .. " - REgeneration ENDED!") end
-						
-						GENERATION_STATE = 0
-						break
-					end
-				end
-			end
-			WW_instance:QueueSaveAllChunks()
-			WW_instance:QueueUnloadUnusedChunks()
-		end
-	end
-end
\ No newline at end of file
diff --git a/MCServer/Plugins/ChunkWorx/chunkworx_web.lua b/MCServer/Plugins/ChunkWorx/chunkworx_web.lua
deleted file mode 100644
index 9aec38b12..000000000
--- a/MCServer/Plugins/ChunkWorx/chunkworx_web.lua
+++ /dev/null
@@ -1,274 +0,0 @@
-
--- chunkworx_web.lua
-
--- WebAdmin-related functions
-
-
-
-
-
-local function Buttons_Player( Name )
-	return "<form method='POST'><input type='hidden' name='PlayerName' value='"..Name.."'><input type='submit' name='PlayerExact' value='Exact'><input type='submit' name='Player3x3' value='3x3'></form>"
-end
-
-
-
-
-
-local function Button_World( Name )
-	return "<form method='POST'><input type='hidden' name='WorldName' value='"..Name.."'><input type='submit' name='SelectWorld' value='Select'></form>"
-end
-
-
-
-
-
-local function SaveSettings()
-	local SettingsIni = cIniFile()
-	SettingsIni:SetValueI("Area data",   "StartX",  AreaStartX)
-	SettingsIni:SetValueI("Area data",   "StartZ",  AreaStartZ)
-	SettingsIni:SetValueI("Area data",   "EndX",    AreaEndX)
-	SettingsIni:SetValueI("Area data",   "EndZ",    AreaEndZ)
-	SettingsIni:SetValueI("Radial data", "RadialX", RadialX)
-	SettingsIni:SetValueI("Radial data", "RadialZ", RadialZ)
-	SettingsIni:SetValueI("Radial data", "Radius",  Radius)
-	SettingsIni:WriteFile("ChunkWorx.ini")
-end
-
-
-
-
-
-function HandleRequest_Generation( Request )
-	local Content = ""
-	if (Request.PostParams["AGHRRRR"] ~= nil) then
-		GENERATION_STATE = 0
-		WW_instance:QueueSaveAllChunks()
-		WW_instance:QueueUnloadUnusedChunks()
-		LOGERROR("" .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion() .. ": works ABORTED by admin")
-	end
-	--Content = Content .. "<head><meta http-equiv=\"refresh\" content=\"2;\"></head>"
-					-- PROCESSING
-	--------------------------------------------------------------------------------------------------
-	local function ProcessingContent()
-		local _small_content = ""
-		_small_content = _small_content .. "<head><meta http-equiv=\"refresh\" content=\"2;\"></head>"
-		_small_content = _small_content .. "<h4>World for operations:</h4>"..WORK_WORLD
-		if (OPERATION_CODE == 0) then
-			_small_content = _small_content .. "<h4>Operation:</h4>Generation"
-		elseif (OPERATION_CODE == 1) then
-			_small_content = _small_content .. "<h4>Operation:</h4>Regeneration"
-		end
-		_small_content = _small_content .. "<h4>Area:   </h4>["..AreaStartX..":"..AreaStartZ.."]   ["..AreaEndX..":"..AreaEndZ.."]"
-		_small_content = _small_content .. "<h4>Progress:</h4>"..CURRENT.."/"..TOTAL
-		_small_content = _small_content .. "<br>"
-		_small_content = _small_content .. "<form method='POST'>"
-		_small_content = _small_content .. "<input type='submit' name='AGHRRRR' value='Stop'>"
-		_small_content = _small_content .. "</form>"
-		return _small_content
-	end
-	if (GENERATION_STATE == 2 or GENERATION_STATE == 4) then
-		Content = ProcessingContent()
-		return Content
-	end
-					-- SELECTING
-	--------------------------------------------------------------------------------------------------
-		if ( Request.PostParams["FormSetWorld"] ) then
-			WORK_WORLD = Request.PostParams["FormWorldName"]
-			WW_instance = cRoot:Get():GetWorld(WORK_WORLD)
-		end
-		
-		if( Request.PostParams["SelectWorld"] ~= nil
-		and Request.PostParams["WorldName"] ~= nil ) then		-- World is selected!
-			WORK_WORLD = Request.PostParams["WorldName"]
-			WW_instance = cRoot:Get():GetWorld(WORK_WORLD)
-		end
-		
-		if(Request.PostParams["OperationGenerate"] ~= nil) then
-			OPERATION_CODE = 0
-		end
-		if(Request.PostParams["OperationReGenerate"] ~= nil) then
-			OPERATION_CODE = 1
-		end
-		
-		if (GENERATION_STATE == 0) then
-			if( Request.PostParams["FormAreaStartX"] ~= nil
-			and Request.PostParams["FormAreaStartZ"] ~= nil
-			and Request.PostParams["FormAreaEndX"] ~= nil
-			and Request.PostParams["FormAreaEndZ"] ~= nil ) then	--(Re)Generation valid!
-				-- COMMON (Re)gen
-				if( Request.PostParams["StartArea"]) then
-					AreaStartX = tonumber(Request.PostParams["FormAreaStartX"])
-					AreaStartZ = tonumber(Request.PostParams["FormAreaStartZ"])
-					AreaEndX = tonumber(Request.PostParams["FormAreaEndX"])
-					AreaEndZ = tonumber(Request.PostParams["FormAreaEndZ"])
-					SaveSettings();
-					if (OPERATION_CODE == 0) then
-						GENERATION_STATE = 1
-					elseif (OPERATION_CODE == 1) then
-						GENERATION_STATE = 3
-					end
-					Content = ProcessingContent()
-					return Content
-				end
-			end
-			if( Request.PostParams["FormRadialX"] ~= nil
-			and Request.PostParams["FormRadialZ"] ~= nil
-			and Request.PostParams["FormRadius"] ~= nil ) then	--(Re)Generation valid!
-				-- COMMON (Re)gen
-				if( Request.PostParams["StartRadial"]) then
-					RadialX = tonumber(Request.PostParams["FormRadialX"]) or 0
-					RadialZ = tonumber(Request.PostParams["FormRadialZ"]) or 0
-					Radius =  tonumber(Request.PostParams["FormRadius"])  or 10
-					AreaStartX = RadialX - Radius
-					AreaStartZ = RadialZ - Radius
-					AreaEndX = RadialX + Radius
-					AreaEndZ = RadialZ + Radius
-					SaveSettings()
-					if (OPERATION_CODE == 0) then
-						GENERATION_STATE = 1
-					elseif (OPERATION_CODE == 1) then
-						GENERATION_STATE = 3
-					end
-					Content = ProcessingContent()
-					return Content
-				end
-			end
-			-- POINT REGEN!
-			if( Request.PostParams["FormPointX"] ~= nil
-			and Request.PostParams["FormPointZ"] ~= nil ) then	--ReGeneration valid!
-				-- EXACT
-				if ( Request.PostParams["PointExact"] ~= nil) then
-					AreaStartX = tonumber(Request.PostParams["FormPointX"])
-					AreaStartZ = tonumber(Request.PostParams["FormPointZ"])
-					AreaEndX = AreaStartX
-					AreaEndZ = AreaStartZ
-					GENERATION_STATE = 3
-					Content = ProcessingContent()
-					return Content
-				end
-				-- 3x3
-				if ( Request.PostParams["Point3x3"] ~= nil) then
-					AreaStartX = tonumber(Request.PostParams["FormPointX"]) - 1
-					AreaStartZ = tonumber(Request.PostParams["FormPointZ"]) - 1
-					AreaEndX = AreaStartX + 2
-					AreaEndZ = AreaStartZ + 2
-					GENERATION_STATE = 3
-					Content = ProcessingContent()
-					return Content
-				end
-			end
-			
-			local GetAreaByPlayer = function(Player)
-				-- Player is valid only within this function, it cannot be stord and used later!
-				AreaStartX = Player:GetChunkX()
-				AreaStartZ = Player:GetChunkZ()
-			end
-			-- PLAYERS REGEN!
-			if( Request.PostParams["PlayerExact"] ~= nil
-			and Request.PostParams["PlayerName"] ~= nil ) then		-- Making BOOM! I meant, regenereate...
-				cRoot:Get():GetWorld(WORK_WORLD):DoWithPlayer(Request.PostParams["PlayerName"],GetAreaByPlayer)
-				AreaEndX = AreaStartX
-				AreaEndZ = AreaStartZ
-				GENERATION_STATE = 3
-				Content = ProcessingContent()
-				return Content
-			end
-			if( Request.PostParams["Player3x3"] ~= nil
-			and Request.PostParams["PlayerName"] ~= nil ) then		-- Making BOOM! I meant, regenereate...
-				cRoot:Get():GetWorld(WORK_WORLD):DoWithPlayer(Request.PostParams["PlayerName"],GetAreaByPlayer)
-				AreaStartX = AreaStartX - 1
-				AreaStartZ = AreaStartZ - 1
-				AreaEndX = AreaStartX + 2
-				AreaEndZ = AreaStartZ + 2
-				GENERATION_STATE = 3
-				Content = ProcessingContent()
-				return Content
-			end
-		end
-		
-		--Content = Content .. "<h4>World for operations: " .. WORK_WORLD .. "</h4>"
-		--Content = Content .. "<form method='POST'>"
-		--Content = Content .. "<input type='text' name='FormWorldName' value='Input world name here'><input type='submit' name='FormSetWorld' value='Set world'>"
-		--Content = Content .. "</form>"
-		
-		-- SELECTING WORK_WORLD
-		Content = Content .. "<h4>World for operations: " .. WORK_WORLD .. "</h4>"
-		Content = Content .. "<table>"
-		local WorldNum = 0
-		local AddWorldToTable = function(World)
-			WorldNum = WorldNum + 1
-			Content = Content .. "<tr>"
-			Content = Content .. "<td style='width: 10px;'>" .. WorldNum .. ".</td>"
-			Content = Content .. "<td>" .. World:GetName() .. "</td>"
-			Content = Content .. "<td>" .. Button_World(World:GetName()) .. "</td>"
-			Content = Content .. "</tr>"
-		end
-		cRoot:Get():ForEachWorld(AddWorldToTable)
-		if( WorldNum == 0 ) then
-			Content = Content .. "<tr><td>No worlds! O_O</td></tr>"
-		end
-		Content = Content .. "</table>"
-		Content = Content .. "<br>"
-		
-		-- SELECTING OPERATION
-		if (OPERATION_CODE == 0) then
-			Content = Content .. "<h4>Operation: Generation</h4>"
-		elseif (OPERATION_CODE == 1) then
-			Content = Content .. "<h4>Operation: Regeneration</h4>"
-		end
-		Content = Content .. "<form method='POST'>"
-		Content = Content .. "<input type='submit' name='OperationGenerate' value='Generation'>"
-		Content = Content .. "<input type='submit' name='OperationReGenerate' value='Regeneration'>"
-		Content = Content .. "</form>"
-		
-		-- SELECTING AREA
-		Content = Content .. "<h4>Area:   </h4>Start X, Start Z;    End X, End Z"
-		Content = Content .. "<form method='POST'>"
-		Content = Content .. "<input type='text' name='FormAreaStartX' value='" .. AreaStartX .. "'><input type='text' name='FormAreaStartZ' value='" .. AreaStartZ .. "'>"
-		Content = Content .. "<input type='text' name='FormAreaEndX' value='" .. AreaEndX .. "'><input type='text' name='FormAreaEndZ' value='" .. AreaEndZ .. "'>"
-		Content = Content .. "<input type='submit' name='StartArea' value='Start'>"
-		Content = Content .. "</form>"
-		
-		-- SELECTING RADIAL
-		Content = Content .. "<h4>Radial:   </h4>Center X, Center Z, Radius"
-		Content = Content .. "<form method='POST'>"
-		Content = Content .. "<input type='text' name='FormRadialX' value='" .. RadialX .. "'><input type='text' name='FormRadialZ' value='" .. RadialZ .. "'><input type='text' name='FormRadius' value='" .. Radius .. "'>"
-		Content = Content .. "<input type='submit' name='StartRadial' value='Start'>"
-		Content = Content .. "</form>"
-		Content = Content .. "<br>"
-		Content = Content .. "<br>"
-		Content = Content .. "<br>"
-		
-		-- SELECTING POINT
-		Content = Content .. "<h4>Point regeneration:</h4> X, Z"
-		Content = Content .. "<form method='POST'>"
-		Content = Content .. "<input type='text' name='FormPointX' value='0'><input type='text' name='FormPointZ' value='0'>"
-		Content = Content .. "<input type='submit' name='PointExact' value='Exact'>"
-		Content = Content .. "<input type='submit' name='Point3x3' value='3x3'>"
-		Content = Content .. "</form>"
-		
-		-- SELECTING PLAYERS
-		Content = Content .. "<h4>Player-based regeneration:</h4>"
-		Content = Content .. "<table>"
-		local PlayerNum = 0
-		local AddPlayerToTable = function( Player )
-			PlayerNum = PlayerNum + 1
-			Content = Content .. "<tr>"
-			Content = Content .. "<td style='width: 10px;'>" .. PlayerNum .. ".</td>"
-			Content = Content .. "<td>" .. Player:GetName() .. "</td>"
-			Content = Content .. "<td>" .. Buttons_Player(Player:GetName()) .. "</td>"
-			Content = Content .. "</tr>"
-		end
-		if (cRoot:Get():GetWorld(WORK_WORLD) == nil) then
-			Content = Content .. "<tr><td>Incorrect world selection</td></tr>"
-		else
-			cRoot:Get():GetWorld(WORK_WORLD):ForEachPlayer( AddPlayerToTable )
-			if( PlayerNum == 0 ) then
-				Content = Content .. "<tr><td>No connected players</td></tr>"
-			end
-		end
-		Content = Content .. "</table>"
-		Content = Content .. "<br>"
-	return Content
-end
\ No newline at end of file
-- 
cgit v1.2.3


From ce11888851f7531d23db8aa10045b4babb9def88 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Wed, 8 Oct 2014 21:05:24 +0100
Subject: Added chunkWorx.

---
 MCServer/Plugins/ChunkWorx | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 MCServer/Plugins/ChunkWorx

(limited to 'MCServer')

diff --git a/MCServer/Plugins/ChunkWorx b/MCServer/Plugins/ChunkWorx
new file mode 160000
index 000000000..894c7e320
--- /dev/null
+++ b/MCServer/Plugins/ChunkWorx
@@ -0,0 +1 @@
+Subproject commit 894c7e32049e9d2a1e736f7d721aaacd1ae29e53
-- 
cgit v1.2.3


From 8f625867f72ea5865616a14c628a21d494bac27e Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Wed, 8 Oct 2014 21:07:55 +0100
Subject: Removed ChatLog.

---
 MCServer/Plugins/ChatLog/plugin.lua | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 MCServer/Plugins/ChatLog/plugin.lua

(limited to 'MCServer')

diff --git a/MCServer/Plugins/ChatLog/plugin.lua b/MCServer/Plugins/ChatLog/plugin.lua
deleted file mode 100644
index adbf986e0..000000000
--- a/MCServer/Plugins/ChatLog/plugin.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-
--- plugin.lua
-
--- Implements the main entrypoint for the plugin, as well as all the handling needed
-
--- ChatLog plugin logs all chat messages into the server log
-
-
-
-
-
-function Initialize(Plugin)
-	Plugin:SetName("ChatLog")
-	Plugin:SetVersion(3)
-
-	cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChat)
-
-	LOG("Initialized " .. Plugin:GetName() .. " v." .. Plugin:GetVersion())
-	return true
-end
-
-
-
-
-
-function OnChat(Player, Message)
-	-- Lets get loggin'
-	LOGINFO("[" .. Player:GetName() .. "]: " .. StripColorCodes(Message));
-
-	return false
-end
\ No newline at end of file
-- 
cgit v1.2.3


From 3b68949cc92d1b059516c4467faa7d648d802f50 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Wed, 8 Oct 2014 21:08:21 +0100
Subject: Added ChatLog

---
 MCServer/Plugins/ChatLog | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 MCServer/Plugins/ChatLog

(limited to 'MCServer')

diff --git a/MCServer/Plugins/ChatLog b/MCServer/Plugins/ChatLog
new file mode 160000
index 000000000..983d23ca3
--- /dev/null
+++ b/MCServer/Plugins/ChatLog
@@ -0,0 +1 @@
+Subproject commit 983d23ca37baa89f7e4dc11d71502d9c059f6376
-- 
cgit v1.2.3


From ccbd5ba6a2cf75cfa3a11e74464fc5943468127f Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Wed, 8 Oct 2014 21:11:09 +0100
Subject: Added Handy.

---
 MCServer/Plugins/Handy                     |   1 +
 MCServer/Plugins/Handy/handy.lua           |  28 ----
 MCServer/Plugins/Handy/handy_functions.lua | 216 -----------------------------
 3 files changed, 1 insertion(+), 244 deletions(-)
 create mode 160000 MCServer/Plugins/Handy
 delete mode 100644 MCServer/Plugins/Handy/handy.lua
 delete mode 100644 MCServer/Plugins/Handy/handy_functions.lua

(limited to 'MCServer')

diff --git a/MCServer/Plugins/Handy b/MCServer/Plugins/Handy
new file mode 160000
index 000000000..e64a04be3
--- /dev/null
+++ b/MCServer/Plugins/Handy
@@ -0,0 +1 @@
+Subproject commit e64a04be39ac7790abcb09de3d4c7d8fc2a2a1e2
diff --git a/MCServer/Plugins/Handy/handy.lua b/MCServer/Plugins/Handy/handy.lua
deleted file mode 100644
index e4e9d3f5f..000000000
--- a/MCServer/Plugins/Handy/handy.lua
+++ /dev/null
@@ -1,28 +0,0 @@
--- Global variables
-PLUGIN = {}	-- Reference to own plugin object
-CHEST_WIDTH = 9
-HANDY_VERSION = 2
---[[
-
-Handy is a plugin for other plugins. It contain no commands, no hooks, but functions to ease plugins developers' life.
-
-API:
-
-
-TODO:
-1. GetChestSlot wrapper, so it will detect double chest neighbour chest and will be able to access it.
-]]
-
-function Initialize(Plugin)
-	PLUGIN = Plugin
-	PLUGIN:SetName("Handy")
-	PLUGIN:SetVersion(HANDY_VERSION)
-	
-	PluginManager = cRoot:Get():GetPluginManager()
-	LOG("Initialized " .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion())
-	return true
-end
-
-function OnDisable()
-	LOG(PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion() .. " is shutting down...")
-end
\ No newline at end of file
diff --git a/MCServer/Plugins/Handy/handy_functions.lua b/MCServer/Plugins/Handy/handy_functions.lua
deleted file mode 100644
index af43f663a..000000000
--- a/MCServer/Plugins/Handy/handy_functions.lua
+++ /dev/null
@@ -1,216 +0,0 @@
---[[
-General stuff
-]]
--- Returns Handy plugin version number
-function GetHandyVersion()
-	return HANDY_VERSION
-end
--- Checks if handy is in proper version
-function CheckForRequiredVersion( inVersion )
-	if( inVersion > HANDY_VERSION ) then		return false	end
-	return true
-end
---[[
-MCS-specific _functions and nasty hacks :D
-]]
-function GetChestHeightCheat( inChest )
-	local chestGrid = inChest:GetContents()
-	LOGINFO( "This function serves no purpose now! You should consider chest:GetContents():GetHeight() now!" )
-	LOGINFO( "Also, you might find Handy's new 'IsChestDouble()' useful for your case" )
-	return chestGrid:GetHeight()
-end
-function IsChestDouble( inChest )
-	local chestHeight = inChest:GetContents():GetHeight()
-	if( chestHeight == 3 ) then
-		return false
-	end
-	return true
-end
--- Those two checks how many items of given inItemID chest and player have, and how much they could fit inside them
-function ReadChestForItem( inChest, inItemID )
-	return ReadGridForItems( inChest:GetContents(), inItemID )
-end
-function ReadPlayerForItem( inPlayer, inItemID )
-	local inventoryFound, inventoryFree = ReadGridForItems( inPlayer:GetInventory():GetInventoryGrid(), inItemID )
-	local hotbarFound, hotbarFree = ReadGridForItems( inPlayer:GetInventory():GetHotbarGrid(), inItemID )
-	local itemsFound = inventoryFound + hotbarFound
-	local freeSpace = inventoryFree + hotbarFree
-	return itemsFound, freeSpace
-end
--- Following functions are for chest-related operations
--- BEWARE! Those assume you did checked if chest has items/space in it!
-function ReadGridForItems( inGrid, inItemID )
-	local itemsFound = 0
-	local freeSpace = 0
-	local slotsCount = inGrid:GetNumSlots()
-	local testerItem = cItem( inItemID )
-	local maxStackSize = testerItem:GetMaxStackSize()
-	for index = 0, (slotsCount - 1) do
-		slotItem = inGrid:GetSlot( index )
-		if( slotItem:IsEmpty() ) then
-			freeSpace = freeSpace + maxStackSize
-		else
-			if( slotItem:IsStackableWith( testerItem ) ) then
-				itemsFound = itemsFound + slotItem.m_ItemCount
-				freeSpace = maxStackSize - slotItem.m_ItemCount
-			end
-		end
-	end
-	return itemsFound, freeSpace
-end
-
-function TakeItemsFromGrid( inGrid, inItem )
-	local slotsCount = inGrid:GetNumSlots()
-	local removedItem = cItem( inItem )
-	for index = 0, (slotsCount - 1) do
-		slotItem = inGrid:GetSlot( index )
-		if( slotItem:IsSameType( removedItem ) ) then
-			if( slotItem.m_ItemCount <= removedItem.m_ItemCount ) then
-				removedItem.m_ItemCount = removedItem.m_ItemCount - slotItem.m_ItemCount
-				inGrid:EmptySlot( index )
-			else
-				removedItem.m_ItemCount = slotItem.m_ItemCount - removedItem.m_ItemCount
-				inGrid:SetSlot( index, removedItem )
-				removedItem.m_ItemCount = 0
-			end
-			if( removedItem.m_ItemCount <= 0 ) then		break	end
-		end
-	end
-	return removedItem.m_ItemCount
-end
---------------
-function TakeItemsFromChest( inChest, inItemID, inAmount )	-- MIGHT BE UNSAFE! CHECK FOR ITEMS FIRST!!
-	local chestGrid = inChest:GetContents()
-	local removedItem = cItem( inItemID, inAmount )
-	TakeItemsFromGrid( chestGrid, removedItem )
-end
-function PutItemsToChest( inChest, inItemID, inAmount )
-	local chestGrid = inChest:GetContents()
-	local addedItem = cItem( inItemID, inAmount )
-	chestGrid:AddItem( addedItem )
-end
--- Similar to chest-related.
-function TakeItemsFromPlayer( inPlayer, inItemID, inAmount )	-- MIGHT BE UNSAFE! CHECK FIRST!
-	local removedItem = cItem( inItemID, inAmount )
-	local inventoryGrid = inPlayer:GetInventory():GetInventoryGrid()
-	local hotbarGrid = inPlayer:GetInventory():GetHotbarGrid()
-	local itemsLeft = TakeItemsFromGrid( inventoryGrid, removedItem )
-	if( itemsLeft > 0 ) then
-		removedItem = cItem( inItemID, itemsLeft )
-		TakeItemsFromGrid( hotbarGrid, removedItem )
-	end
-end
-function GiveItemsToPlayer( inPlayer, inItemID, inAmount )
-	local addedItem = cItem( inItemID, inAmount )
-	local inventoryGrid = inPlayer:GetInventory():GetInventoryGrid()
-	local hotbarGrid = inPlayer:GetInventory():GetHotbarGrid()
-	local itemsAdded = inventoryGrid:AddItem( addedItem )
-	if( itemsAdded < inAmount ) then
-		addedItem.m_ItemCount = addedItem.m_ItemCount - itemsAdded
-		hotbarGrid:AddItem( addedItem )
-	end
-end
--- This function returns item max stack for a given itemID. It uses vanilla max stack size, and uses several non-common items notations;
--- Those are:
--- oneonerecord( because aparently 11record wasn't the best idea in lua scripting application )
--- carrotonastick( because it wasn't added to items.txt yet )
--- waitrecord( for same reason )
--- Feel free to ignore the difference, or to add those to items.txt
-function GetItemMaxStack( inItemID )
-	local testerItem = cItem( inItemID )
-	LOGINFO( "This function serves no real purpose now, maybe consider using cItem:GetMaxStackSize()?" )
-	return testerItem:GetMaxStackSize()
-end
-function ItemIsArmor( inItemID, inCheckForHorseArmor )
-	inCheckForHorseArmor = inCheckForHorseArmor or false
-	if( inItemID == E_ITEM_LEATHER_CAP )		then	return true		end
-	if( inItemID == E_ITEM_LEATHER_TUNIC )		then	return true		end
-	if( inItemID == E_ITEM_LEATHER_PANTS )		then	return true		end
-	if( inItemID == E_ITEM_LEATHER_BOOTS )		then	return true		end
-	
-	if( inItemID == E_ITEM_CHAIN_HELMET )		then	return true		end
-	if( inItemID == E_ITEM_CHAIN_CHESTPLATE )	then	return true		end
-	if( inItemID == E_ITEM_CHAIN_LEGGINGS )		then	return true		end
-	if( inItemID == E_ITEM_CHAIN_BOOTS )		then	return true		end
-	
-	if( inItemID == E_ITEM_IRON_HELMET )		then	return true		end
-	if( inItemID == E_ITEM_IRON_CHESTPLATE )	then	return true		end
-	if( inItemID == E_ITEM_IRON_LEGGINGS )		then	return true		end
-	if( inItemID == E_ITEM_IRON_BOOTS )			then	return true		end
-	
-	if( inItemID == E_ITEM_DIAMOND_HELMET )		then	return true		end
-	if( inItemID == E_ITEM_DIAMOND_CHESTPLATE )	then	return true		end
-	if( inItemID == E_ITEM_DIAMOND_LEGGINGS )	then	return true		end
-	if( inItemID == E_ITEM_DIAMOND_BOOTS )		then	return true		end
-	
-	if( inItemID == E_ITEM_GOLD_HELMET )		then	return true		end
-	if( inItemID == E_ITEM_GOLD_CHESTPLATE )	then	return true		end
-	if( inItemID == E_ITEM_GOLD_LEGGINGS )		then	return true		end
-	if( inItemID == E_ITEM_GOLD_BOOTS )			then	return true		end
-	
-	if( inCheckForHorseArmor ) then
-		if( inItemID == E_ITEM_IRON_HORSE_ARMOR )		then	return true		end
-		if( inItemID == E_ITEM_GOLD_HORSE_ARMOR )		then	return true		end
-		if( inItemID == E_ITEM_DIAMOND_HORSE_ARMOR )	then	return true		end
-	end
-	return false
-end
--- Returns full-length playername for a short name( usefull for parsing commands )
-function GetExactPlayername( inPlayerName )
-	local _result = inPlayerName
-	local function SetProcessingPlayername( inPlayer )
-		_result = inPlayer:GetName()
-	end
-	cRoot:Get():FindAndDoWithPlayer( inPlayerName, SetProcessingPlayername )
-	return _result
-end
-function GetPlayerByName( inPlayerName )
-	local _player
-	local PlayerSetter = function( Player )
-		_player = Player
-	end
-	cRoot:Get():FindAndDoWithPlayer( inPlayerName, PlayerSetter )
-	return _player
-end
---[[
-Not-so-usual math _functions
-]]
--- Rounds floating point number. Because lua guys think this function doesn't deserve to be presented in lua's math
-function round( inX )
-  if( inX%2 ~= 0.5 ) then
-    return math.floor( inX + 0.5 )
-  end
-  return inX - 0.5
-end
---[[
-Functions I use for filework and stringswork
-]]
-function PluralString( inValue, inSingularString, inPluralString )
-	local _value_string = tostring( inValue )
-	if( _value_string[#_value_string] == "1" ) then
-		return inSingularString
-	end
-	return inPluralString
-end
-function PluralItemName( inItemID, inAmount )	-- BEWARE! TEMPORAL SOLUTION THERE! :D
-	local _value_string = tostring( inValue )
-	local _name = ""
-	if( _value_string[#_value_string] == "1" ) then
-		-- singular names
-		_name = ItemTypeToString( inItemID )
-	else
-		-- plural names
-		_name = ItemTypeToString( inItemID ).."s"
-	end
-	return _name
-end
--- for filewriting purposes. 0 = false, 1 = true
-function StringToBool( inValue )
-	if( inValue == "1" ) then return true end
-	return false
-end
--- same, but reversal
-function BoolToString( inValue )
-	if( inValue == true ) then return 1 end
-	return 0
-end
-- 
cgit v1.2.3


From 27e69f32c6e72ada6741f0b866c1afbc7ba00bc0 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Wed, 8 Oct 2014 21:13:10 +0100
Subject: Removed MagicCarpet

---
 MCServer/Plugins/MagicCarpet/objects.lua | 97 --------------------------------
 MCServer/Plugins/MagicCarpet/plugin.lua  | 81 --------------------------
 2 files changed, 178 deletions(-)
 delete mode 100644 MCServer/Plugins/MagicCarpet/objects.lua
 delete mode 100644 MCServer/Plugins/MagicCarpet/plugin.lua

(limited to 'MCServer')

diff --git a/MCServer/Plugins/MagicCarpet/objects.lua b/MCServer/Plugins/MagicCarpet/objects.lua
deleted file mode 100644
index 8d81623a5..000000000
--- a/MCServer/Plugins/MagicCarpet/objects.lua
+++ /dev/null
@@ -1,97 +0,0 @@
--- Location object
-cLocation = {}
-function cLocation:new( x, y, z )
-	local object = { x = x, y = y, z = z }
-	setmetatable(object, { __index = cLocation })
-	return object
-end
-
--- Offsets
-cFibers = { }
-function cFibers:new()
-	local object = {
-						cLocation:new( 2, -1, 2 ),
-						cLocation:new( 2, -1, 1 ),
-						cLocation:new( 2, -1, 0 ),
-						cLocation:new( 2, -1, -1 ),
-						cLocation:new( 2, -1, -2 ),
-						cLocation:new( 1, -1, 2 ),
-						cLocation:new( 1, -1, 1 ),
-						cLocation:new( 1, -1, 0 ),
-						cLocation:new( 1, -1, -1 ),
-						cLocation:new( 1, -1, -2 ),
-						cLocation:new( 0, -1, 2 ),
-						cLocation:new( 0, -1, 1 ),
-						cLocation:new( 0, -1, 0 ),
-						cLocation:new( 0, -1, -1 ),
-						cLocation:new( 0, -1, -2 ),
-						cLocation:new( -1, -1, 2 ),
-						cLocation:new( -1, -1, 1 ),
-						cLocation:new( -1, -1, 0 ),
-						cLocation:new( -1, -1, -1 ),
-						cLocation:new( -1, -1, -2 ),
-						cLocation:new( -2, -1, 2 ),
-						cLocation:new( -2, -1, 1 ),
-						cLocation:new( -2, -1, 0 ),
-						cLocation:new( -2, -1, -1 ),
-						cLocation:new( -2, -1, -2 ),
-						imadeit = false,
-					}
-	setmetatable(object, { __index = cFibers })
-	return object;
-end
-
--- Carpet object
-cCarpet = {}
-function cCarpet:new()
-	local object = {	Location = cLocation:new(0,0,0),
-						Fibers = cFibers:new(),
-					}
-	setmetatable(object, { __index = cCarpet })
-	return object
-end
-
-function cCarpet:remove()
-	local World = cRoot:Get():GetDefaultWorld()
-	for i, fib in ipairs( self.Fibers ) do
-		local x = self.Location.x + fib.x
-		local y = self.Location.y + fib.y
-		local z = self.Location.z + fib.z
-		local BlockID = World:GetBlock( x, y, z )
-		if( fib.imadeit == true and BlockID == E_BLOCK_GLASS ) then
-			World:SetBlock( x, y, z, 0, 0 )
-			fib.imadeit = false
-		end
-	end
-end
-
-function cCarpet:draw()
-	local World = cRoot:Get():GetDefaultWorld()
-	for i, fib in ipairs( self.Fibers ) do
-		local x = self.Location.x + fib.x
-		local y = self.Location.y + fib.y
-		local z = self.Location.z + fib.z
-		local BlockID = World:GetBlock( x, y, z )
-		if( BlockID == 0  ) then
-			fib.imadeit = true
-			World:SetBlock( x, y, z, E_BLOCK_GLASS, 0 )
-		else
-			fib.imadeit = false
-		end
-	end
-end
-
-function cCarpet:moveTo( NewPos )
-	local x = math.floor( NewPos.x )
-	local y = math.floor( NewPos.y )
-	local z = math.floor( NewPos.z )
-	if( self.Location.x ~= x or self.Location.y ~= y or self.Location.z ~= z ) then
-		self:remove()
-		self.Location = cLocation:new( x, y, z )
-		self:draw()
-	end
-end
-
-function cCarpet:getY()
-	return self.Location.y
-end
\ No newline at end of file
diff --git a/MCServer/Plugins/MagicCarpet/plugin.lua b/MCServer/Plugins/MagicCarpet/plugin.lua
deleted file mode 100644
index 417ea0e02..000000000
--- a/MCServer/Plugins/MagicCarpet/plugin.lua
+++ /dev/null
@@ -1,81 +0,0 @@
-local Carpets = {}
-local PLUGIN
-
-function Initialize( Plugin )
-	Plugin:SetName( "MagicCarpet" )
-	Plugin:SetVersion( 2 )
-
-	cPluginManager.AddHook(cPluginManager.HOOK_PLAYER_MOVING, OnPlayerMoving)
-	cPluginManager.AddHook(cPluginManager.HOOK_PLAYER_DESTROYED, OnDisconnect)
-	
-	local PluginManager = cPluginManager:Get()
-	PluginManager:BindCommand("/mc", "magiccarpet", HandleCarpetCommand, " - Spawns a magical carpet");
-	
-	PLUGIN = Plugin
-	
-	LOG( "Initialised " .. Plugin:GetName() .. " v." .. Plugin:GetVersion() )
-	return true
-end
-
-
-
-
-
-function OnDisable()
-	LOG( PLUGIN:GetName() .. " v." .. PLUGIN:GetVersion() .. " is shutting down..." )
-	for i, Carpet in pairs( Carpets ) do
-		Carpet:remove()
-	end
-end
-
-
-
-
-
-function HandleCarpetCommand( Split, Player )
-	Carpet = Carpets[ Player ]
-	
-	if( Carpet == nil ) then
-		Carpets[ Player ] = cCarpet:new()
-		Player:SendMessageSuccess("You're on a magic carpet!")
-		Player:SendMessageInfo("Look straight down to descend. Jump to ascend.")
-	else
-		Carpet:remove()
-		Carpets[ Player ] = nil
-		Player:SendMessageSuccess("The carpet vanished!")
-	end
-
-	return true
-end
-
-
-
-
-
-function OnDisconnect( Reason, Player )
-	local Carpet = Carpets[ Player ]
-	if( Carpet ~= nil )	 then
-		Carpet:remove()
-	end
-	Carpets[ Player ] = nil
-end
-
-
-
-
-
-function OnPlayerMoving(Player)
-	local Carpet = Carpets[ Player ]
-	if( Carpet == nil ) then
-		return
-	end
-
-	if( Player:GetPitch() == 90 ) then
-		Carpet:moveTo( cLocation:new( Player:GetPosX(), Player:GetPosY() - 1, Player:GetPosZ() ) )
-	else
-		if( Player:GetPosY() < Carpet:getY() ) then
-			Player:TeleportToCoords(Player:GetPosX(), Carpet:getY() + 0.2, Player:GetPosZ())
-		end
-		Carpet:moveTo( cLocation:new( Player:GetPosX(), Player:GetPosY(), Player:GetPosZ() ) )
-	end
-end
-- 
cgit v1.2.3


From fa00cbeda3729c072e3594b137ee00b298d5f120 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <bearbin@gmail.com>
Date: Wed, 8 Oct 2014 21:13:38 +0100
Subject: Added MagicCarpet

---
 MCServer/Plugins/MagicCarpet | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 MCServer/Plugins/MagicCarpet

(limited to 'MCServer')

diff --git a/MCServer/Plugins/MagicCarpet b/MCServer/Plugins/MagicCarpet
new file mode 160000
index 000000000..493f2dfa6
--- /dev/null
+++ b/MCServer/Plugins/MagicCarpet
@@ -0,0 +1 @@
+Subproject commit 493f2dfa6d39f134e37c4c614cf8d6ffd10c825f
-- 
cgit v1.2.3


From d3f31b5046ebd2dacfcbeb96f900e12d2bddcad9 Mon Sep 17 00:00:00 2001
From: win32re <win32re@users.noreply.github.com>
Date: Sat, 11 Oct 2014 17:40:33 +0200
Subject: Update template.html

---
 MCServer/webadmin/template.html | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/webadmin/template.html b/MCServer/webadmin/template.html
index 822f73857..50eaa486b 100644
--- a/MCServer/webadmin/template.html
+++ b/MCServer/webadmin/template.html
@@ -51,7 +51,7 @@
 	    table {
 	        border-top: 1px solid #ddd;
 	        width: 700px;
-		    }
+            }
 	    
 	    table tr th {
 	    	text-align: left;
@@ -71,17 +71,23 @@
 	    	border: 1px solid #ddd;
 	    	border-radius: 3px;
 	    }
-	    	#main table tr.odd td {
+	    
+            #main table tr.odd td {
 	    	background: #fbfbfb;
 	    }
 	    
-	    table tr:hover td { background: #fdfcf6; }
+	    table tr:hover td {
+	    	background: #fdfcf6;
+	    }
+	    
 	    table .action {
 	    	text-align: right;
 	    	padding: 0 20px 0 10px;
 	    }
 	    
-	    table tr .action a { color: #9b9b9b; }
+	    table tr .action a {
+	    	color: #9b9b9b;
+	    }
 	    
 	    #cssmenu{ height:10px; display:table; padding:0; margin: 0 auto;  border:1px #707070 solid; border-radius:5px; } 
 	    #cssmenu > ul {list-style:inside none; padding:0; margin:0;} 
-- 
cgit v1.2.3