1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-11 12:50:41 +01:00

Merge branch 'NALC2' into NALC

This commit is contained in:
sys4-fr 2017-10-28 18:26:19 +02:00
commit eb97efc8d6
4 changed files with 12 additions and 7 deletions

4
.dir-locals.el Executable file
View File

@ -0,0 +1,4 @@
((nil . ((indent-tabs-mode . t)
(tab-width . 3)))
(lua-mode . (
(eval . (highlight-regexp "^ *")))))

View File

@ -315,7 +315,9 @@ for n,data in ipairs(guide_infos) do
elseif typ == "x" then
x = math.max(x, content)
elseif typ == "text" then
local tab = minetest.splittext(content, guide_size.fx)
local wrap_func = minetest.wrap_text
if not wrap_func then wrap_func = minetest.splittext end
local tab = wrap_func(content, guide_size.fx)
local l = guide_size.cx
for _,str in ipairs(tab) do
form = form.."label["..guide_size.cx ..","..guide_size.cy+y..";"..str.."]"

View File

@ -386,7 +386,9 @@ minetest.register_node("nether:apple", {
p_hunger = 30
end
hbhunger.hunger[user:get_player_name()] = p_hunger
hbhunger.set_hunger(user)
local save_hunger = hbhunger.save_hunger
if not save_hunger then save_hunger = hbhunger.set_hunger end
save_hunger(user)
local amount = math.random(4, 6)
inv:add_item("main", {name="nether:blood_extracted", count=math.floor(amount/3)})

5
worlds/minetestforfun/world.mt Executable file → Normal file
View File

@ -126,7 +126,6 @@ load_mod_pipeworks = true
load_mod_factions = true
load_mod_invtweak = true
load_mod_screwdriver = true
load_mod_carts = true
load_mod_sponge = true
@ -140,7 +139,6 @@ load_mod_more_chests = true
load_mod_connected_chests = true
load_mod_chesttools = true
load_mod_farming = true
load_mod_food = true
load_mod_food_basic = true
load_mod_fishing = true
@ -217,7 +215,6 @@ load_mod_building_blocks = true
load_mod_inbox = true
load_mod_money = true
load_mod_minercantile = true
load_mod_beds = true
load_mod_builtin_item = true
load_mod_email = true
load_mod_report = true
@ -249,7 +246,6 @@ load_mod_playereffects = true
load_mod_meshnode = false
load_mod_experience = false
load_mod_bonemeal = true
load_mod_tnt = true
load_mod_playeranim = true
load_mod_lightning = true
@ -267,3 +263,4 @@ load_mod_cotton = true
load_mod_camera = true
load_mod_claycrafter = true
load_mod_snowdrift = true
player_backend = files