diff options
author | mathiascode <mathiascode@users.noreply.github.com> | 2016-12-19 17:08:19 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2016-12-19 17:08:19 +0100 |
commit | efc7fed05b4800289cc644fbdeff18fe6cdd2a96 (patch) | |
tree | 237ef6d66aa2a8073c5d4200dde81f73a7727f6c /Server | |
parent | Reverted temporary redirect to LuaAPI docs (#3487) (diff) | |
download | cuberite-efc7fed05b4800289cc644fbdeff18fe6cdd2a96.tar cuberite-efc7fed05b4800289cc644fbdeff18fe6cdd2a96.tar.gz cuberite-efc7fed05b4800289cc644fbdeff18fe6cdd2a96.tar.bz2 cuberite-efc7fed05b4800289cc644fbdeff18fe6cdd2a96.tar.lz cuberite-efc7fed05b4800289cc644fbdeff18fe6cdd2a96.tar.xz cuberite-efc7fed05b4800289cc644fbdeff18fe6cdd2a96.tar.zst cuberite-efc7fed05b4800289cc644fbdeff18fe6cdd2a96.zip |
Diffstat (limited to '')
-rw-r--r-- | Server/Plugins/APIDump/APIDesc.lua | 2 | ||||
-rw-r--r-- | Server/Plugins/APIDump/Classes/Geometry.lua | 2 | ||||
-rw-r--r-- | Server/Plugins/APIDump/InfoFile.html | 2 | ||||
-rw-r--r-- | Server/Plugins/APIDump/SettingUpDecoda.html | 2 | ||||
-rw-r--r-- | Server/Plugins/APIDump/SettingUpZeroBrane.html | 2 | ||||
-rw-r--r-- | Server/Plugins/APIDump/UsingChunkStays.html | 2 | ||||
-rw-r--r-- | Server/Plugins/APIDump/WebWorldThreads.html | 2 | ||||
-rw-r--r-- | Server/Plugins/APIDump/Writing-a-Cuberite-plugin.html | 2 | ||||
-rw-r--r-- | Server/Plugins/APIDump/main_APIDump.lua | 8 | ||||
-rw-r--r-- | Server/README.txt | 12 | ||||
-rw-r--r-- | Server/webadmin/login_template.html | 6 | ||||
-rw-r--r-- | Server/webadmin/template.lua | 4 |
12 files changed, 24 insertions, 22 deletions
diff --git a/Server/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua index 2ed3b861f..3fc21b6a3 100644 --- a/Server/Plugins/APIDump/APIDesc.lua +++ b/Server/Plugins/APIDump/APIDesc.lua @@ -3687,7 +3687,7 @@ end <tr><td>@X</td><td>color X (X is 0 - 9 or a - f, same as dye meta</td></tr> </table> The following picture, taken from MineCraft Wiki, illustrates the color codes:</p> - <img src="http://hydra-media.cursecdn.com/minecraft.gamepedia.com/4/4c/Colors.png?version=34a0f56789a95326e1f7d82047b12232" /> + <img src="https://hydra-media.cursecdn.com/minecraft.gamepedia.com/4/4c/Colors.png?version=34a0f56789a95326e1f7d82047b12232" /> ]], Functions = { diff --git a/Server/Plugins/APIDump/Classes/Geometry.lua b/Server/Plugins/APIDump/Classes/Geometry.lua index fa0fe995a..2f37a9c25 100644 --- a/Server/Plugins/APIDump/Classes/Geometry.lua +++ b/Server/Plugins/APIDump/Classes/Geometry.lua @@ -1236,7 +1236,7 @@ end Type = "Vector3d", }, }, - Notes = "Returns a new Vector3d that is a {{http://en.wikipedia.org/wiki/Cross_product|cross product}} of this vector and the specified vector.", + Notes = "Returns a new Vector3d that is a {{https://en.wikipedia.org/wiki/Cross_product|cross product}} of this vector and the specified vector.", }, Dot = { diff --git a/Server/Plugins/APIDump/InfoFile.html b/Server/Plugins/APIDump/InfoFile.html index 6f70e5b54..e293931f2 100644 --- a/Server/Plugins/APIDump/InfoFile.html +++ b/Server/Plugins/APIDump/InfoFile.html @@ -2,7 +2,7 @@ <html> <head> <title>Cuberite - Info.lua file</title> - <link rel="canonical" href="http://api-docs.cuberite.org/"> + <link rel="canonical" href="https://api.cuberite.org/InfoFile.html"> <link rel="stylesheet" type="text/css" href="main.css" /> <link rel="stylesheet" type="text/css" href="prettify.css" /> <script src="prettify.js"></script> diff --git a/Server/Plugins/APIDump/SettingUpDecoda.html b/Server/Plugins/APIDump/SettingUpDecoda.html index d9b91ed3a..15df27816 100644 --- a/Server/Plugins/APIDump/SettingUpDecoda.html +++ b/Server/Plugins/APIDump/SettingUpDecoda.html @@ -3,7 +3,7 @@ <html> <head> <title>Cuberite - Setting up Decoda</title> - <link rel="canonical" href="http://api-docs.cuberite.org/"> + <link rel="canonical" href="https://api.cuberite.org/SettingUpDecoda.html"> <link rel="stylesheet" type="text/css" href="main.css" /> <link rel="stylesheet" type="text/css" href="prettify.css" /> <script src="prettify.js"></script> diff --git a/Server/Plugins/APIDump/SettingUpZeroBrane.html b/Server/Plugins/APIDump/SettingUpZeroBrane.html index 3038c4795..b2a820ee3 100644 --- a/Server/Plugins/APIDump/SettingUpZeroBrane.html +++ b/Server/Plugins/APIDump/SettingUpZeroBrane.html @@ -3,7 +3,7 @@ <html> <head> <title>Cuberite - Setting up ZeroBrane Studio</title> - <link rel="canonical" href="http://api-docs.cuberite.org/"> + <link rel="canonical" href="https://api.cuberite.org/SettingUpZeroBrane.html"> <link rel="stylesheet" type="text/css" href="main.css" /> <link rel="stylesheet" type="text/css" href="prettify.css" /> <script src="prettify.js"></script> diff --git a/Server/Plugins/APIDump/UsingChunkStays.html b/Server/Plugins/APIDump/UsingChunkStays.html index 1fada61eb..b8cc1bf5f 100644 --- a/Server/Plugins/APIDump/UsingChunkStays.html +++ b/Server/Plugins/APIDump/UsingChunkStays.html @@ -2,7 +2,7 @@ <html> <head> <title>Cuberite - Using ChunkStays</title> - <link rel="canonical" href="http://api-docs.cuberite.org/"> + <link rel="canonical" href="https://api.cuberite.org/UsingChunkStays.html"> <link rel="stylesheet" type="text/css" href="main.css" /> <link rel="stylesheet" type="text/css" href="prettify.css" /> <script src="prettify.js"></script> diff --git a/Server/Plugins/APIDump/WebWorldThreads.html b/Server/Plugins/APIDump/WebWorldThreads.html index e48df9845..c35aa0337 100644 --- a/Server/Plugins/APIDump/WebWorldThreads.html +++ b/Server/Plugins/APIDump/WebWorldThreads.html @@ -2,7 +2,7 @@ <html> <head> <title>Cuberite - Webserver vs World threads</title> - <link rel="canonical" href="http://api-docs.cuberite.org/"> + <link rel="canonical" href="https://api.cuberite.org/WebWorldThreads.html"> <link rel="stylesheet" type="text/css" href="main.css" /> <link rel="stylesheet" type="text/css" href="prettify.css" /> <script src="prettify.js"></script> diff --git a/Server/Plugins/APIDump/Writing-a-Cuberite-plugin.html b/Server/Plugins/APIDump/Writing-a-Cuberite-plugin.html index cb0637f22..eaf56deed 100644 --- a/Server/Plugins/APIDump/Writing-a-Cuberite-plugin.html +++ b/Server/Plugins/APIDump/Writing-a-Cuberite-plugin.html @@ -3,7 +3,7 @@ <html> <head> <title>Cuberite Plugin Tutorial</title> - <link rel="canonical" href="http://api-docs.cuberite.org/"> + <link rel="canonical" href="https://api.cuberite.org/Writing-a-Cuberite-plugin.html"> <link rel="stylesheet" type="text/css" href="main.css" /> <link rel="stylesheet" type="text/css" href="prettify.css" /> <script src="prettify.js"></script> diff --git a/Server/Plugins/APIDump/main_APIDump.lua b/Server/Plugins/APIDump/main_APIDump.lua index bbd2fa19e..624aed93b 100644 --- a/Server/Plugins/APIDump/main_APIDump.lua +++ b/Server/Plugins/APIDump/main_APIDump.lua @@ -271,7 +271,7 @@ local function WriteHtmlHook(a_Hook, a_HookNav) f:write([[<!DOCTYPE html><html> <head> <title>Cuberite API - ]], HookName, [[ Hook</title> - <link rel="canonical" href="http://api-docs.cuberite.org/"> + <link rel="canonical" href="https://api.cuberite.org/]], HookName, [[.html"> <link rel="stylesheet" type="text/css" href="main.css" /> <link rel="stylesheet" type="text/css" href="prettify.css" /> <script src="prettify.js"></script> @@ -965,6 +965,7 @@ local function WriteHtmlClass(a_ClassAPI, a_ClassMenu, a_API) cf:write([[<!DOCTYPE html><html> <head> <title>Cuberite API - ]], a_ClassAPI.Name, [[ Class</title> + <link rel="canonical" href="https://api.cuberite.org/]], a_ClassAPI.Name, [[.html"> <link rel="stylesheet" type="text/css" href="main.css" /> <link rel="stylesheet" type="text/css" href="prettify.css" /> <script src="prettify.js"></script> @@ -1442,6 +1443,7 @@ local function DumpAPIHtml(a_API, a_Descs) <html> <head> <title>Cuberite API - Index</title> + <link rel="canonical" href="https://api.cuberite.org/"> <link rel="stylesheet" type="text/css" href="main.css" /> </head> <body> @@ -1641,7 +1643,7 @@ local function DumpLuaCheck(a_API) file:write([[ -- This file is the config file for the tool named Luacheck --- Documentation: http://luacheck.readthedocs.io/en/stable/index.html +-- Documentation: https://luacheck.readthedocs.io/en/stable/index.html -- Ignore unused function and loop arguments unused_args = false @@ -1891,7 +1893,7 @@ end local function CheckNewUndocumentedSymbols() -- Download the official API stats on undocumented stuff: -- (We need a blocking downloader, which is impossible with the current cNetwork API) - assert(os.execute("wget -q -O official_undocumented.lua https://apidocs.cuberite.org/_undocumented.lua")) + assert(os.execute("wget -q -O official_undocumented.lua https://api.cuberite.org/_undocumented.lua")) local OfficialStats = cFile:ReadWholeFile("official_undocumented.lua") if (OfficialStats == "") then return true, "Cannot load official stats" diff --git a/Server/README.txt b/Server/README.txt index 62f6c29b8..88d60fae8 100644 --- a/Server/README.txt +++ b/Server/README.txt @@ -1,16 +1,16 @@ ---------------------------------------------------------------------------------- - Welcome to your new Cuberite server, compatible with Minecraft 1.8 and 1.9! ---------------------------------------------------------------------------------- +-------------------------------------------------------------------------------- + Welcome to your new Cuberite server, compatible with Minecraft 1.8 - 1.10! +-------------------------------------------------------------------------------- - To get started with your server, read the user's manual at https://book.cuberite.org/ - - Subscribe to the Newsletter for update news and important information - at https://newsletter.cuberite.org/subscribe.htm + - Subscribe to the Newsletter for update news and important information at + https://cuberite.org/news/#subscribe - For information about adding plugins to your server, visit https://cuberite.org/plugins/ - For additional support, visit https://cuberite.org/support/ ---------------------------------------------------------------------------------- +-------------------------------------------------------------------------------- diff --git a/Server/webadmin/login_template.html b/Server/webadmin/login_template.html index 20393d828..75c2f8e7e 100644 --- a/Server/webadmin/login_template.html +++ b/Server/webadmin/login_template.html @@ -51,17 +51,17 @@ <div class="upper"> <div class="wrapper"> <ul class="menu bottom_links"> - <li><a href="http://cuberite.org/" target="_blank">Cuberite</a></li> + <li><a href="https://cuberite.org/" target="_blank">Cuberite</a></li> <li><a href="https://forum.cuberite.org/" target="_blank">Forums</a></li> <li><a href="https://builds.cuberite.org/" target="_blank">Buildserver</a></li> - <li><a href="http://api-docs.cuberite.org/" target="_blank">API Documentation</a></li> + <li><a href="https://api.cuberite.org/" target="_blank">API Documentation</a></li> <li><a href="https://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://cuberite.org/" target="_blank">Cuberite Team</a>.</span> + <span id="copyright">Copyright © <a href="https://cuberite.org/" target="_blank">Cuberite Team</a>.</span> </div> </div> </div> diff --git a/Server/webadmin/template.lua b/Server/webadmin/template.lua index 168f87993..ac7fb9d72 100644 --- a/Server/webadmin/template.lua +++ b/Server/webadmin/template.lua @@ -197,10 +197,10 @@ function ShowPage(WebAdmin, TemplateRequest) <div class="upper"> <div class="wrapper"> <ul class="menu bottom_links"> - <li><a href="http://cuberite.org/" target="_blank">Cuberite</a></li> + <li><a href="https://cuberite.org/" target="_blank">Cuberite</a></li> <li><a href="https://forum.cuberite.org/" target="_blank">Forums</a></li> <li><a href="https://builds.cuberite.org/" target="_blank">Buildserver</a></li> - <li><a href="http://api-docs.cuberite.org/" target="_blank">API Documentation</a></li> + <li><a href="https://api.cuberite.org/" target="_blank">API Documentation</a></li> <li><a href="https://book.cuberite.org/" target="_blank">User's Manual</a></li> </ul> </div> |