diff options
Diffstat (limited to 'MCServer')
| -rw-r--r-- | MCServer/crafting.txt | 6 | ||||
| -rw-r--r-- | MCServer/webadmin/login_template.html | 12 | ||||
| -rw-r--r-- | MCServer/webadmin/template.lua | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt index 46ac3332e..243e52fdb 100644 --- a/MCServer/crafting.txt +++ b/MCServer/crafting.txt @@ -76,8 +76,8 @@ 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 +PillarQuartzBlock, 2 = QuartzBlock, 1:1, 1:2 +ChiseledQuartzBlock = QuartzSlab, 1:1, 1:2 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 @@ -475,7 +475,7 @@ 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 +RedCarpet, 3 = RedWool, 1:1, 2:1 BlackCarpet, 3 = BlackWool, 1:1, 2:1 WhiteCarpet, 3 = WhiteWool, 1:1, 2:1 diff --git a/MCServer/webadmin/login_template.html b/MCServer/webadmin/login_template.html index 26b260bd3..fb6f21b52 100644 --- a/MCServer/webadmin/login_template.html +++ b/MCServer/webadmin/login_template.html @@ -1,7 +1,7 @@ <!-- Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ --> <html> <head> - <title>MCServer WebAdmin - Login</title> + <title>Cuberite WebAdmin - Login</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link href="login.css" rel="stylesheet" type="text/css"> <link rel="icon" href="favicon.ico"> @@ -10,7 +10,7 @@ <div class="contention"> <div class="row1"> <div class="wrapper"> - <img src="logo_login.png" alt="MCServer Logo" class="logo"> + <img src="logo_login.png" alt="Cuberite Logo" class="logo"> </div> </div> <div id="panel"> @@ -51,17 +51,17 @@ <div class="upper"> <div class="wrapper"> <ul class="menu bottom_links"> - <li><a href="http://www.mc-server.org" target="_blank">MCServer</a></li> + <li><a href="http://cuberite.org" target="_blank">Cuberite</a></li> <li><a href="http://forum.mc-server.org" target="_blank">Forums</a></li> <li><a href="http://builds.cuberite.org" target="_blank">Buildserver</a></li> - <li><a href="http://mc-server.xoft.cz/LuaAPI" target="_blank">API Documentation</a></li> - <li><a href="http://book.mc-server.org/" target="_blank">User's Manual</a></li> + <li><a href="http://api-docs.cuberite.org" target="_blank">API Documentation</a></li> + <li><a href="http://book.cuberite.org/" target="_blank">User's Manual</a></li> </ul> </div> </div> <div class="lower"> <div class="wrapper"> - <span id="copyright">Copyright © <a href="http://www.mc-server.org" target="_blank">MCServer Team</a> 2014.</span> + <span id="copyright">Copyright © <a href="http://www.cuberite.org" target="_blank">Cuberite Team</a>.</span> </div> </div> </div> diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua index f210a2ce8..5b3ecf152 100644 --- a/MCServer/webadmin/template.lua +++ b/MCServer/webadmin/template.lua @@ -56,7 +56,7 @@ end function ShowPage(WebAdmin, TemplateRequest) SiteContent = {} local BaseURL = WebAdmin:GetBaseURL(TemplateRequest.Request.Path) - local Title = "MCServer WebAdmin" + local Title = "Cuberite WebAdmin" local NumPlayers = cRoot:Get():GetServer():GetNumPlayers() local MemoryUsageKiB = cRoot:GetPhysicalRAMUsage() local NumChunks = cRoot:Get():GetTotalChunkCount() @@ -177,17 +177,17 @@ function ShowPage(WebAdmin, TemplateRequest) <div class="upper"> <div class="wrapper"> <ul class="menu bottom_links"> - <li><a href="http://www.mc-server.org" target="_blank">MCServer</a></li> + <li><a href="http://cuberite.org" target="_blank">Cuberite</a></li> <li><a href="http://forum.mc-server.org" target="_blank">Forums</a></li> <li><a href="http://builds.cuberite.org" target="_blank">Buildserver</a></li> - <li><a href="http://mc-server.xoft.cz/LuaAPI" target="_blank">API Documentation</a></li> - <li><a href="http://book.mc-server.org/" target="_blank">User's Manual</a></li> + <li><a href="http://api-docs.cuberite.org" target="_blank">API Documentation</a></li> + <li><a href="http://book.cuberite.org/" target="_blank">User's Manual</a></li> </ul> </div> </div> <div class="lower"> <div class="wrapper"> - <span id="copyright">Copyright © <a href="http://www.mc-server.org" target="_blank">MCServer Team</a> 2014.</span> + <span id="copyright">Copyright © <a href="http://www.cuberite.org" target="_blank">Cuberite Team</a>.</span> </div> </div> </div> |