1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-10-01 17:00:31 +02:00
server-nalc/worlds/minetestforfun
LeMagnesium 50802588f0 Merge of 'solarmana_add'
Conflicts:
	mods/WorldEdit/worldedit/init.lua
	mods/WorldEdit/worldedit/manipulations.lua
	mods/WorldEdit/worldedit_commands/init.lua
	mods/WorldEdit/worldedit_commands/safe.lua
	mods/compassgps/README.md
	mods/mobs/api.lua
	mods/mobs/chicken.lua
	mods/mobs/cow.lua

This branch was completly f*cked up, we couldn't find a way to update it without throwing piles of merge conflicts, even with patches.
Runes are defaultly disabled. The README.md file will be updated, as well as many files in the repository
2015-05-22 20:09:39 +02:00
..
forbidden_names.txt Added wonderfuly rude forbidden nicknames to the blacklist 2015-04-18 13:01:21 +02:00
moretrees_settings.txt Add some elements of the "worlds" directory 2015-02-15 22:19:03 +01:00
news.txt Update news.txt 2015-05-22 17:37:11 +02:00
random_messages Merged missing parts of mobs' api, updated news 2015-04-21 12:32:35 +02:00
world.mt Merge of 'solarmana_add' 2015-05-22 20:09:39 +02:00