Merge after rebase and resolving conflict
M mods/wool/init.lua
This commit is contained in:
parent
592ed84831
commit
dad270a296
|
@ -1,3 +1,8 @@
|
||||||
|
-- wool/init.lua
|
||||||
|
|
||||||
|
-- Load support for MT game translation.
|
||||||
|
local S = minetest.get_translator()
|
||||||
|
|
||||||
local dyes = dye.dyes
|
local dyes = dye.dyes
|
||||||
|
|
||||||
for i = 1, #dyes do
|
for i = 1, #dyes do
|
||||||
|
|
Loading…
Reference in New Issue