From f62a0e137e9cb0f128c82823b0586e914c1e8e65 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Sat, 13 Dec 2014 12:59:23 +0100 Subject: Fixed the width sometimes going over the div size --- MCServer/Plugins/APIDump/main_APIDump.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'MCServer') diff --git a/MCServer/Plugins/APIDump/main_APIDump.lua b/MCServer/Plugins/APIDump/main_APIDump.lua index a25bab9cf..01f3970fb 100644 --- a/MCServer/Plugins/APIDump/main_APIDump.lua +++ b/MCServer/Plugins/APIDump/main_APIDump.lua @@ -252,7 +252,7 @@ local function WriteHtmlHook(a_Hook, a_HookNav)

]], a_Hook.Name, [[

-
+
Index:
Articles
Classes
@@ -262,7 +262,7 @@ local function WriteHtmlHook(a_Hook, a_HookNav) ]]); f:write(a_HookNav); f:write([[ -

+

]]); f:write(LinkifyString(a_Hook.Desc, HookName)); f:write("

\n

Callback function

\n

The default name for the callback function is "); @@ -829,7 +829,7 @@ local function WriteHtmlClass(a_ClassAPI, a_ClassMenu)

]], a_ClassAPI.Name, [[

-
+
Index:
Articles
Classes
@@ -839,7 +839,7 @@ local function WriteHtmlClass(a_ClassAPI, a_ClassMenu) ]]); cf:write(a_ClassMenu); cf:write([[ -

Contents

+

Contents

    ]]); -- cgit v1.2.3 From 4f2931dd39f6606bd40d240cc70df8f1b0d002ce Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Sat, 13 Dec 2014 15:33:51 +0100 Subject: Reverted main_APIDump.lua changes --- MCServer/Plugins/APIDump/main_APIDump.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'MCServer') diff --git a/MCServer/Plugins/APIDump/main_APIDump.lua b/MCServer/Plugins/APIDump/main_APIDump.lua index 01f3970fb..a25bab9cf 100644 --- a/MCServer/Plugins/APIDump/main_APIDump.lua +++ b/MCServer/Plugins/APIDump/main_APIDump.lua @@ -252,7 +252,7 @@ local function WriteHtmlHook(a_Hook, a_HookNav)

    ]], a_Hook.Name, [[

    -
    +
    Index:
    Articles
    Classes
    @@ -262,7 +262,7 @@ local function WriteHtmlHook(a_Hook, a_HookNav) ]]); f:write(a_HookNav); f:write([[ -

    +

    ]]); f:write(LinkifyString(a_Hook.Desc, HookName)); f:write("

    \n

    Callback function

    \n

    The default name for the callback function is "); @@ -829,7 +829,7 @@ local function WriteHtmlClass(a_ClassAPI, a_ClassMenu)

    ]], a_ClassAPI.Name, [[

    -
    +
    Index:
    Articles
    Classes
    @@ -839,7 +839,7 @@ local function WriteHtmlClass(a_ClassAPI, a_ClassMenu) ]]); cf:write(a_ClassMenu); cf:write([[ -

    Contents

    +

    Contents

      ]]); -- cgit v1.2.3 From 3fb10f064c6b51336a0dfae75c212f6b0c63b049 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Sat, 13 Dec 2014 15:34:46 +0100 Subject: Made comment in example code smaller It caused the whole page to extend beyond the max width --- MCServer/Plugins/APIDump/APIDesc.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'MCServer') diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua index 72dcce5e4..ba3763724 100644 --- a/MCServer/Plugins/APIDump/APIDesc.lua +++ b/MCServer/Plugins/APIDump/APIDesc.lua @@ -2564,7 +2564,9 @@ World:ForEachEntity( if not(a_Entity:IsMob()) then return; end - local Monster = tolua.cast(a_Entity, "cMonster"); -- Get the cMonster out of cEntity, now that we know the entity represents one. + + -- Get the cMonster out of cEntity, now that we know the entity represents one. + local Monster = tolua.cast(a_Entity, "cMonster"); if (Monster:GetMobType() == mtSpider) then Monster:TeleportToCoords(Monster:GetPosX(), Monster:GetPosY() + 100, Monster:GetPosZ()); end -- cgit v1.2.3 From 5005c01f4c72d5e9f4e0e1232496ab774d07f62c Mon Sep 17 00:00:00 2001 From: Masy98 Date: Sun, 14 Dec 2014 16:01:06 +0100 Subject: Fixed fence/-gates and door recipes and added baked potato recipe --- MCServer/crafting.txt | 6 +++--- MCServer/furnace.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'MCServer') diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt index 4d28b1f52..a24fdee0c 100644 --- a/MCServer/crafting.txt +++ b/MCServer/crafting.txt @@ -277,12 +277,12 @@ ActivatorRail, 6 = IronIngot, 1:1, 1:2, 1:3, 3:1, 3:2, 3:3 | Stick, 2:1, 2:3 | R #******************************************************# # Mechanisms # -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 +WoodenDoor, 3 = OakPlanks, 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 @@ -358,21 +358,21 @@ 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, 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 +Fence, 3 = OakPlanks, 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 | 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 +FenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | OakPlanks, 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, * diff --git a/MCServer/furnace.txt b/MCServer/furnace.txt index 7179b5299..fb8d63677 100644 --- a/MCServer/furnace.txt +++ b/MCServer/furnace.txt @@ -49,6 +49,7 @@ NetherQuartzOre = NetherQuartz Sand = Glass Pork = CookedPork RawBeef = Steak +Potato = BakedPotato RawChicken = CookedChicken Clay = Brick ClayBlock = HardenedClay -- cgit v1.2.3 From aff32ba27b44248f978b5c002a9f607dcbb17d5c Mon Sep 17 00:00:00 2001 From: Mattes D Date: Tue, 16 Dec 2014 12:52:34 +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 39d980e3a..6e9d612b9 160000 --- a/MCServer/Plugins/Core +++ b/MCServer/Plugins/Core @@ -1 +1 @@ -Subproject commit 39d980e3a3447ac23f61c7d65426b33ee6c0718d +Subproject commit 6e9d612b9eb548d888d2bf986488aad762a99be0 -- cgit v1.2.3