From 80e1eb37ddfcbd224fe1d3491201ba8db3e1114f Mon Sep 17 00:00:00 2001 From: Mattes D Date: Fri, 1 Jan 2016 21:05:09 +0100 Subject: Renamed leftover strings to Cuberite / Server, as needed. Also upgraded the user setting file for MSVC to 2013. --- Server/Plugins/Debuggers/Debuggers.lua | 2 +- Server/Plugins/HookNotify/HookNotify.lua | 2 +- Server/Plugins/NetworkTest/NetworkTest.lua | 4 ++-- Server/Plugins/TestLuaRocks/TestLuaRocks.lua | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Server/Plugins') diff --git a/Server/Plugins/Debuggers/Debuggers.lua b/Server/Plugins/Debuggers/Debuggers.lua index 85e2c50ae..5b7f26fe6 100644 --- a/Server/Plugins/Debuggers/Debuggers.lua +++ b/Server/Plugins/Debuggers/Debuggers.lua @@ -1459,7 +1459,7 @@ function HandleCompo(a_Split, a_Player) -- Send one composite message to self: local msg = cCompositeChat() msg:AddTextPart("Hello! ", "b@e") -- bold yellow - msg:AddUrlPart("MCServer", "http://mc-server.org") + msg:AddUrlPart("Cuberite", "http://cuberite.org") msg:AddTextPart(" rules! ") msg:AddRunCommandPart("Set morning", "/time set 0") a_Player:SendMessage(msg) diff --git a/Server/Plugins/HookNotify/HookNotify.lua b/Server/Plugins/HookNotify/HookNotify.lua index 411dbebbd..33b1a80a8 100644 --- a/Server/Plugins/HookNotify/HookNotify.lua +++ b/Server/Plugins/HookNotify/HookNotify.lua @@ -5,7 +5,7 @@ Implements the entire plugin NOTE: This plugin is not meant for production servers. It is used mainly by developers to verify that things -are working properly when implementing MCServer features. Do not enable this plugin on production servers! +are working properly when implementing Cuberite features. Do not enable this plugin on production servers! This plugin logs a notification for each hook that is being called by the server. The TICK and WORLD_TICK hooks are disabled because they produce too much output. diff --git a/Server/Plugins/NetworkTest/NetworkTest.lua b/Server/Plugins/NetworkTest/NetworkTest.lua index d6849ead6..1bb35d0c6 100644 --- a/Server/Plugins/NetworkTest/NetworkTest.lua +++ b/Server/Plugins/NetworkTest/NetworkTest.lua @@ -107,7 +107,7 @@ local g_Services = -- Send a welcome message to newly accepted connections: OnAccepted = function (a_Link) - a_Link:Send("Hello, " .. a_Link:GetRemoteIP() .. ", welcome to the echo server @ MCServer-Lua\r\n") + a_Link:Send("Hello, " .. a_Link:GetRemoteIP() .. ", welcome to the echo server @ Cuberite-Lua\r\n") end, -- OnAccepted() -- There was an error listening on the port: @@ -140,7 +140,7 @@ local g_Services = -- Send a welcome message and the fortune to newly accepted connections: OnAccepted = function (a_Link) - a_Link:Send("Hello, " .. a_Link:GetRemoteIP() .. ", welcome to the fortune server @ MCServer-Lua\r\n\r\nYour fortune:\r\n") + a_Link:Send("Hello, " .. a_Link:GetRemoteIP() .. ", welcome to the fortune server @ Cuberite-Lua\r\n\r\nYour fortune:\r\n") a_Link:Send(g_Fortunes[math.random(#g_Fortunes)] .. "\r\n") end, -- OnAccepted() diff --git a/Server/Plugins/TestLuaRocks/TestLuaRocks.lua b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua index 4a7cd4e1e..0e4ccb7d5 100644 --- a/Server/Plugins/TestLuaRocks/TestLuaRocks.lua +++ b/Server/Plugins/TestLuaRocks/TestLuaRocks.lua @@ -1,7 +1,7 @@ -- TestLuaRocks.lua --- This is a mockup plugin that does a quick test of LuaRocks capability in MCServer +-- This is a mockup plugin that does a quick test of LuaRocks capability in Cuberite -- "Success" is when the plugin loads, downloads the forum webpage and displays the headers and length and then displays both libs as loaded. -- "Failure" usually manifests as one of the "require" lines failing, although you have the luarock installed. -- cgit v1.2.3 From 14e7213f586886f119e6bd758b13f22802624eb2 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Fri, 1 Jan 2016 21:40:18 +0100 Subject: Updated plugins with the rename to Cuberite. --- Server/Plugins/ChatLog | 2 +- Server/Plugins/Core | 2 +- Server/Plugins/ProtectionAreas | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Server/Plugins') diff --git a/Server/Plugins/ChatLog b/Server/Plugins/ChatLog index 983d23ca3..cc04da381 160000 --- a/Server/Plugins/ChatLog +++ b/Server/Plugins/ChatLog @@ -1 +1 @@ -Subproject commit 983d23ca37baa89f7e4dc11d71502d9c059f6376 +Subproject commit cc04da381b9aa683ee3bbd7013f9d3fd909db039 diff --git a/Server/Plugins/Core b/Server/Plugins/Core index 0838838a1..5df413231 160000 --- a/Server/Plugins/Core +++ b/Server/Plugins/Core @@ -1 +1 @@ -Subproject commit 0838838a18f49251d62e9b0760215fda6ec319cc +Subproject commit 5df413231a918070adc15dfe36630ffba06e15dd diff --git a/Server/Plugins/ProtectionAreas b/Server/Plugins/ProtectionAreas index ac6ad2152..d73f95a50 160000 --- a/Server/Plugins/ProtectionAreas +++ b/Server/Plugins/ProtectionAreas @@ -1 +1 @@ -Subproject commit ac6ad215295257a9098869d6ec935cbbb900a046 +Subproject commit d73f95a5000f939a94c372173480282f0fe1e52b -- cgit v1.2.3