Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mergeconflict

Browse source
This commit is contained in:
tchncs 2018-11-29 12:38:43 +01:00
commit 03cde3f325
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mods/areas

@ -1 +1 @@
Subproject commit 7cb8787bebdad6b1077f7046eddeacc9da0d2136
Subproject commit 5d0314158a4e1a436a28292df004fdc8466c0150

1
mods/random_messages/init.lua
View file

@ -60,6 +60,7 @@ function random_messages.read_messages()
mc(base, "# Illuna-Notes: ")..mc(highlight, "Illuna is powered by donations! ")..mc(base,"You can help us paying the bills at ")..mc(url,"https://illuna.rocks/donate")..mc(base,". Each tiny donation helps a bunch! And as a ")..mc(highlight, "*thank you*")..mc(base, " you'll get some Donorcoins for your donation. <3"),
mc(base, "# Illuna-Notes: Confused about the new, final spawnpoint? You can always go back to the old one with the ")..mc(highlight, "/spawn2")..mc(base," command")..mc(base, "."),
mc(base, "# Illuna-Notes: If you use ")..mc(highlight, "Pipeworks")..mc(base, ", please try to make as short pipes as possible using")..mc(highlight, " teleportation tubes")..mc(base, "."),
mc(base, "On your way to the travelcenter? Why not give the")..mc(highlight, " postoffice")..mc(base, "a visit too? it's just nearby and awaiting your beautiful/personal mailbox!"),
}
end

2
mods/xdecor

@ -1 +1 @@
Subproject commit 64939142fe7d68d69b3ac7489fc59349d36b132f
Subproject commit 2472b65e9275dda7ee26ac868443e74e9774951e