diff options
author | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
---|---|---|
committer | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
commit | 8928f78ee6305e29ed8d3b9395fcb6564c984fdf (patch) | |
tree | cd250c2b98d7131158e3744efe238780cec73fec /ontime_clocks/common.lua | |
parent | eccdad46ef2b38cd061aab7ae6bcb252a67c2218 (diff) | |
parent | a3e0d36a68247cac40349d9089fe3c71546d75e8 (diff) | |
download | display_modpack-master.tar.gz display_modpack-master.tar.bz2 display_modpack-master.zip |
Resolved conflicts by reordering of files
Diffstat (limited to 'ontime_clocks/common.lua')
-rw-r--r-- | ontime_clocks/common.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ontime_clocks/common.lua b/ontime_clocks/common.lua index 39462d3..cced299 100644 --- a/ontime_clocks/common.lua +++ b/ontime_clocks/common.lua @@ -19,7 +19,7 @@ --]] -- Entity for time display -display_lib.register_display_entity("ontime_clocks:display") +display_api.register_display_entity("ontime_clocks:display") function ontime_clocks.get_h24() return math.floor(minetest.get_timeofday()*24)%24 |