Resolved merge conflicts with master

2022-01-23 16:01:44 -07:00
parent 55d1c2c446 ba65b471b3
commit 7cb200ab04
31 changed files with 1525 additions and 291 deletions
--- a/modpol_minetest/modules/priv_to_org.lua
+++ b/modpol_minetest/modules/priv_to_org.lua
@ -20,7 +20,7 @@ priv_to_org.config = {
 function priv_to_org:initiate(result) 
   local player_privs = minetest.get_player_privs(self.initiator)
   -- construct table for display
-   local player_privs_table = {"View..."}
+   local player_privs_table = {}
   for k,v in pairs(player_privs) do
      if player_privs[k] then
         table.insert(player_privs_table,k)