Merge remote-tracking branch 'origin/master'

1 files changed, 7 insertions, 4 deletions

diff --git a/src/script/lua_api/luaapi.h b/src/script/lua_api/luaapi.h
index 592046965..d03c14117 100644
--- a/src/script/lua_api/luaapi.h
+++ b/src/script/lua_api/luaapi.h
@@ -45,9 +45,6 @@ private:
 	// get_server_status()
 	static int l_get_server_status(lua_State *L);
 
-	// register_biome_groups({frequencies})
-	static int l_register_biome_groups(lua_State *L);
-
 	// register_biome({lots of stuff})
 	static int l_register_biome(lua_State *L);
 
@@ -85,7 +82,7 @@ private:
 	static int l_ban_player(lua_State *L);
 
 	// unban_player_or_ip()
-	static int l_unban_player_of_ip(lua_State *L);
+	static int l_unban_player_or_ip(lua_State *L);
 
 	// show_formspec(playername,formname,formspec)
 	static int l_show_formspec(lua_State *L);
@@ -130,9 +127,15 @@ private:
 	// rollback_revert_actions_by(actor, seconds) -> bool, log messages
 	static int l_rollback_revert_actions_by(lua_State *L);
 
+	// register_ore(oredesc)
 	static int l_register_ore(lua_State *L);
+	
+	// register_decoration(deco)
+	static int l_register_decoration(lua_State *L);
 
 	static struct EnumString es_OreType[];
+	static struct EnumString es_DecorationType[];
+
 };