1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-12-14 14:28:29 +01:00

Finished maptool's update's rebase

This commit is contained in:
LeMagnesium
2015-01-24 19:13:58 +01:00
parent f70d47ccaf
commit 6dc3e7d3ad
5 changed files with 58 additions and 3 deletions

View File

@@ -26,4 +26,8 @@ local function setting(settingtype, name, default)
end
-- Show Map Tools stuff in creative inventory (1 or 0):
<<<<<<< HEAD
setting("integer", "hide_from_creative_inventory", 0)
=======
setting("integer", "hide_from_creative_inventory", 1)
>>>>>>> Maptool's update