Merge after rebase and resolving conflict

M mods/wool/init.lua
2019-05-28 02:00:27 +02:00 · 2019-05-28 02:00:27 +02:00 · aa868b1586
parent 73d0d21897
commit aa868b1586
1 changed files with 5 additions and 0 deletions
--- a/mods/wool/init.lua
+++ b/mods/wool/init.lua
@ -1,3 +1,8 @@
+-- wool/init.lua
+
+-- Load support for MT game translation.
+local S = minetest.get_translator()
+
 local dyes = dye.dyes

 for i = 1, #dyes do