53 files changed, 11 insertions, 3 deletions

diff --git a/Plugins/ChatLog/plugin.lua b/MCServer/Plugins/ChatLog/plugin.lua
index e18a8e642..e18a8e642 100644
--- a/Plugins/ChatLog/plugin.lua
+++ b/MCServer/Plugins/ChatLog/plugin.lua
diff --git a/Plugins/Core/ban.lua b/MCServer/Plugins/Core/ban.lua
index a6a662c3c..a6a662c3c 100644
--- a/Plugins/Core/ban.lua
+++ b/MCServer/Plugins/Core/ban.lua
diff --git a/Plugins/Core/coords.lua b/MCServer/Plugins/Core/coords.lua
index 07cda1a92..07cda1a92 100644
--- a/Plugins/Core/coords.lua
+++ b/MCServer/Plugins/Core/coords.lua
diff --git a/Plugins/Core/gamemode.lua b/MCServer/Plugins/Core/gamemode.lua
index 1e73b46fd..1e73b46fd 100644
--- a/Plugins/Core/gamemode.lua
+++ b/MCServer/Plugins/Core/gamemode.lua
diff --git a/Plugins/Core/gotoworld.lua b/MCServer/Plugins/Core/gotoworld.lua
index d5113b667..d5113b667 100644
--- a/Plugins/Core/gotoworld.lua
+++ b/MCServer/Plugins/Core/gotoworld.lua
diff --git a/Plugins/Core/help.lua b/MCServer/Plugins/Core/help.lua
index 02ef25ebd..02ef25ebd 100644
--- a/Plugins/Core/help.lua
+++ b/MCServer/Plugins/Core/help.lua
diff --git a/Plugins/Core/item.lua b/MCServer/Plugins/Core/item.lua
index 942fa8ce6..942fa8ce6 100644
--- a/Plugins/Core/item.lua
+++ b/MCServer/Plugins/Core/item.lua
diff --git a/Plugins/Core/kick.lua b/MCServer/Plugins/Core/kick.lua
index ff4f8a705..ff4f8a705 100644
--- a/Plugins/Core/kick.lua
+++ b/MCServer/Plugins/Core/kick.lua
diff --git a/Plugins/Core/main.lua b/MCServer/Plugins/Core/main.lua
index 220dd940e..fead7638b 100644
--- a/Plugins/Core/main.lua
+++ b/MCServer/Plugins/Core/main.lua
@@ -140,6 +140,7 @@ function Initialize( Plugin )
 	WebPlugin:AddTab( "Whitelist", HandleRequest_WhiteList )

 	WebPlugin:AddTab( "Permissions", HandleRequest_Permissions )

 	WebPlugin:AddTab( "Manage Plugins", HandleRequest_ManagePlugins )

+	WebPlugin:AddTab( "Ini Editor", HandleRequest_IniEditor )

 	

 	LOG( "Initialized " .. Plugin:GetName() .. " v." .. Plugin:GetVersion() )

 	return true

diff --git a/Plugins/Core/motd.lua b/MCServer/Plugins/Core/motd.lua
index 49cdcecad..49cdcecad 100644
--- a/Plugins/Core/motd.lua
+++ b/MCServer/Plugins/Core/motd.lua
diff --git a/Plugins/Core/onblockdig.lua b/MCServer/Plugins/Core/onblockdig.lua
index 65e48576c..65e48576c 100644
--- a/Plugins/Core/onblockdig.lua
+++ b/MCServer/Plugins/Core/onblockdig.lua
diff --git a/Plugins/Core/onblockplace.lua b/MCServer/Plugins/Core/onblockplace.lua
index 9032f8207..9032f8207 100644
--- a/Plugins/Core/onblockplace.lua
+++ b/MCServer/Plugins/Core/onblockplace.lua
diff --git a/Plugins/Core/oncraftingnorecipe.lua b/MCServer/Plugins/Core/oncraftingnorecipe.lua
index 2006e410f..2006e410f 100644
--- a/Plugins/Core/oncraftingnorecipe.lua
+++ b/MCServer/Plugins/Core/oncraftingnorecipe.lua
diff --git a/Plugins/Core/onkilled.lua b/MCServer/Plugins/Core/onkilled.lua
index a8a92f667..a8a92f667 100644
--- a/Plugins/Core/onkilled.lua
+++ b/MCServer/Plugins/Core/onkilled.lua
diff --git a/Plugins/Core/onlogin.lua b/MCServer/Plugins/Core/onlogin.lua
index a706f8024..a706f8024 100644
--- a/Plugins/Core/onlogin.lua
+++ b/MCServer/Plugins/Core/onlogin.lua
diff --git a/Plugins/Core/onplayerjoin.lua b/MCServer/Plugins/Core/onplayerjoin.lua
index e8263f608..e8263f608 100644
--- a/Plugins/Core/onplayerjoin.lua
+++ b/MCServer/Plugins/Core/onplayerjoin.lua
diff --git a/Plugins/Core/playerlist.lua b/MCServer/Plugins/Core/playerlist.lua
index f06dfed85..f06dfed85 100644
--- a/Plugins/Core/playerlist.lua
+++ b/MCServer/Plugins/Core/playerlist.lua
diff --git a/Plugins/Core/pluginlist.lua b/MCServer/Plugins/Core/pluginlist.lua
index 7b007f7db..7b007f7db 100644
--- a/Plugins/Core/pluginlist.lua
+++ b/MCServer/Plugins/Core/pluginlist.lua
diff --git a/Plugins/Core/regeneratechunk.lua b/MCServer/Plugins/Core/regeneratechunk.lua
index b4b2874fc..b4b2874fc 100644
--- a/Plugins/Core/regeneratechunk.lua
+++ b/MCServer/Plugins/Core/regeneratechunk.lua
diff --git a/Plugins/Core/reload.lua b/MCServer/Plugins/Core/reload.lua
index e2b338ba1..e2b338ba1 100644
--- a/Plugins/Core/reload.lua
+++ b/MCServer/Plugins/Core/reload.lua
diff --git a/Plugins/Core/spawn.lua b/MCServer/Plugins/Core/spawn.lua
index 73034d9cf..73034d9cf 100644
--- a/Plugins/Core/spawn.lua
+++ b/MCServer/Plugins/Core/spawn.lua
diff --git a/Plugins/Core/stop.lua b/MCServer/Plugins/Core/stop.lua
index 0a06fc7d3..0a06fc7d3 100644
--- a/Plugins/Core/stop.lua
+++ b/MCServer/Plugins/Core/stop.lua
diff --git a/Plugins/Core/teleport.lua b/MCServer/Plugins/Core/teleport.lua
index 90eb3529a..90eb3529a 100644
--- a/Plugins/Core/teleport.lua
+++ b/MCServer/Plugins/Core/teleport.lua
diff --git a/Plugins/Core/time.lua b/MCServer/Plugins/Core/time.lua
index 425d69e6a..425d69e6a 100644
--- a/Plugins/Core/time.lua
+++ b/MCServer/Plugins/Core/time.lua
diff --git a/Plugins/Core/top.lua b/MCServer/Plugins/Core/top.lua
index 0f7a8f95f..0f7a8f95f 100644
--- a/Plugins/Core/top.lua
+++ b/MCServer/Plugins/Core/top.lua
diff --git a/Plugins/Core/unban.lua b/MCServer/Plugins/Core/unban.lua
index 9defbe323..9defbe323 100644
--- a/Plugins/Core/unban.lua
+++ b/MCServer/Plugins/Core/unban.lua
diff --git a/Plugins/Core/viewdistance.lua b/MCServer/Plugins/Core/viewdistance.lua
index 43d2a7de8..43d2a7de8 100644
--- a/Plugins/Core/viewdistance.lua
+++ b/MCServer/Plugins/Core/viewdistance.lua
diff --git a/Plugins/Core/web_manageplugins.lua b/MCServer/Plugins/Core/web_manageplugins.lua
index 3030efc7a..3030efc7a 100644
--- a/Plugins/Core/web_manageplugins.lua
+++ b/MCServer/Plugins/Core/web_manageplugins.lua
diff --git a/Plugins/Core/web_permissions.lua b/MCServer/Plugins/Core/web_permissions.lua
index 4fce502e1..4fce502e1 100644
--- a/Plugins/Core/web_permissions.lua
+++ b/MCServer/Plugins/Core/web_permissions.lua
diff --git a/Plugins/Core/web_playerlist.lua b/MCServer/Plugins/Core/web_playerlist.lua
index b7e48cc3f..b7e48cc3f 100644
--- a/Plugins/Core/web_playerlist.lua
+++ b/MCServer/Plugins/Core/web_playerlist.lua
diff --git a/Plugins/Core/web_whitelist.lua b/MCServer/Plugins/Core/web_whitelist.lua
index 2c9ddb953..2c9ddb953 100644
--- a/Plugins/Core/web_whitelist.lua
+++ b/MCServer/Plugins/Core/web_whitelist.lua
diff --git a/Plugins/MagicCarpet/objects.lua b/MCServer/Plugins/MagicCarpet/objects.lua
index 30528cc42..30528cc42 100644
--- a/Plugins/MagicCarpet/objects.lua
+++ b/MCServer/Plugins/MagicCarpet/objects.lua
diff --git a/Plugins/MagicCarpet/plugin.lua b/MCServer/Plugins/MagicCarpet/plugin.lua
index 22604c9d9..22604c9d9 100644
--- a/Plugins/MagicCarpet/plugin.lua
+++ b/MCServer/Plugins/MagicCarpet/plugin.lua
diff --git a/Plugins/SquirrelChatLog.nut b/MCServer/Plugins/SquirrelChatLog.nut
index 4ef0fd595..4ef0fd595 100644
--- a/Plugins/SquirrelChatLog.nut
+++ b/MCServer/Plugins/SquirrelChatLog.nut
diff --git a/Plugins/sTick/main.lua b/MCServer/Plugins/sTick/main.lua
index 16ac7167f..16ac7167f 100644
--- a/Plugins/sTick/main.lua
+++ b/MCServer/Plugins/sTick/main.lua
diff --git a/Plugins/sTick/onblockplace.lua b/MCServer/Plugins/sTick/onblockplace.lua
index 0216b580e..0216b580e 100644
--- a/Plugins/sTick/onblockplace.lua
+++ b/MCServer/Plugins/sTick/onblockplace.lua
diff --git a/banned.example.ini b/MCServer/banned.example.ini
index efe5f51b6..efe5f51b6 100644
--- a/banned.example.ini
+++ b/MCServer/banned.example.ini
diff --git a/crafting.txt b/MCServer/crafting.txt
index abadeeaa3..abadeeaa3 100644
--- a/crafting.txt
+++ b/MCServer/crafting.txt
diff --git a/furnace.txt b/MCServer/furnace.txt
index c8e3cd0c7..c8e3cd0c7 100644
--- a/furnace.txt
+++ b/MCServer/furnace.txt
diff --git a/groups.example.ini b/MCServer/groups.example.ini
index 7f061204b..7f061204b 100644
--- a/groups.example.ini
+++ b/MCServer/groups.example.ini
diff --git a/groups.ini b/MCServer/groups.ini
index 7f061204b..7f061204b 100644
--- a/groups.ini
+++ b/MCServer/groups.ini
diff --git a/items.ini b/MCServer/items.ini
index 5b9012521..5b9012521 100644
--- a/items.ini
+++ b/MCServer/items.ini
diff --git a/monsters.ini b/MCServer/monsters.ini
index 6634c5bef..6634c5bef 100644
--- a/monsters.ini
+++ b/MCServer/monsters.ini
diff --git a/settings.example.ini b/MCServer/settings.example.ini
index bfb16c7e6..bfb16c7e6 100644
--- a/settings.example.ini
+++ b/MCServer/settings.example.ini
diff --git a/settings.ini b/MCServer/settings.ini
index b21997f32..ab1519021 100644
--- a/settings.ini
+++ b/MCServer/settings.ini
@@ -8,10 +8,13 @@ Description=MCServer - Slightly more custom!
 DefaultWorld=world

 

 [Plugins]

-NewPlugin=Core

 ;NewPlugin=Protect

 ;NewPlugin=MagicCarpet

 ;NewPlugin=ChatLog

+;NewPlugin=BlockInfo

+NewPlugin=CuboidPlus

+NewPlugin=Core

+NewPlugin=ChunkWorx

 

 [HelpPlugin]

 ShowPluginNames=1

@@ -30,4 +33,5 @@ Types=Spider,Chicken,Cow,Pig,Sheep,Squid,Enderman,Zombiepigman,Cavespider,Creepe
 [Authentication]

 Server=session.minecraft.net

 Address=/game/checkserver.jsp?user=%USERNAME%&serverId=%SERVERID%

-Authenticate=0
\ No newline at end of file
+Authenticate=0

+

diff --git a/terrain.ini b/MCServer/terrain.ini
index a917223f9..a917223f9 100644
--- a/terrain.ini
+++ b/MCServer/terrain.ini
diff --git a/users.example.ini b/MCServer/users.example.ini
index fae7030f1..fae7030f1 100644
--- a/users.example.ini
+++ b/MCServer/users.example.ini
diff --git a/users.ini b/MCServer/users.ini
index 21a52760f..21a52760f 100644
--- a/users.ini
+++ b/MCServer/users.ini
diff --git a/webadmin.example.ini b/MCServer/webadmin.example.ini
index 6ecbf7513..6ecbf7513 100644
--- a/webadmin.example.ini
+++ b/MCServer/webadmin.example.ini
diff --git a/webadmin.ini b/MCServer/webadmin.ini
index 6ecbf7513..7384f0bde 100644
--- a/webadmin.ini
+++ b/MCServer/webadmin.ini
@@ -1,6 +1,6 @@
 [WebAdmin]

 Enabled=1

-Port=8080

+Port=8081

 

 [User:admin]

 Password=admin
\ No newline at end of file
diff --git a/webadmin/template.html b/MCServer/webadmin/template.html
index a607c3f53..a607c3f53 100644
--- a/webadmin/template.html
+++ b/MCServer/webadmin/template.html
diff --git a/whitelist.example.ini b/MCServer/whitelist.example.ini
index eb884dcda..eb884dcda 100644
--- a/whitelist.example.ini
+++ b/MCServer/whitelist.example.ini
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index a2137e87f..9082c8de2 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -64,6 +64,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib Psapi.lib"

+				OutputFile="$(ProjectDir)\..\MCServer\$(ProjectName).exe"

 				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				SubSystem="1"

@@ -139,6 +140,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib Psapi.lib"

+				OutputFile="$(ProjectDir)\..\MCServer\$(ProjectName).exe"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

@@ -216,6 +218,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2_32.lib Psapi.lib"

+				OutputFile="$(ProjectDir)\..\MCServer\$(ProjectName).exe"

 				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"