1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-14 06:20:32 +01:00
Commit Graph

57 Commits

Author SHA1 Message Date
LeMagnesium
83acee73fd Removing mesecons
- For some merge failure reasons, I've chosen to remove it and add it again.

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-11-29 20:23:23 +01:00
LeMagnesium
304080ff1d Merge branch 'master' of http://github.com/Ombridride/minetest-minetestforfun-server
Conflicts:
	mods/mesecons/mesecons/internal.lua
	mods/mesecons/mesecons/services.lua
	mods/mesecons/mesecons/util.lua
	mods/mesecons/mesecons_gates/init.lua
	mods/mesecons/mesecons_luacontroller/init.lua
	mods/mesecons/mesecons_movestones/init.lua
	mods/mesecons/mesecons_mvps/init.lua
	mods/mesecons/mesecons_pistons/init.lua
2014-11-29 18:56:39 +01:00
LeMagnesium
3cd50ee817 Update of Mesecon mod (http://github.com/Jeija/minetest-mod-mesecons)
Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-11-29 18:53:06 +01:00
Ombridride
b86fd8cfa9 merge server with github 2014-11-29 15:40:55 +01:00
Ombridride
af9a953cf3 Update meecons mod (with full modpack) 2014-11-16 22:24:33 +01:00
Ombridride
2e895a7790 Merge server with github repository
Pas mal de changement n’ont pas été pushé sur le github du serveur,
voici l’occasion de faire une bonne synchronisation :)
2014-11-16 22:23:16 +01:00
Ombridride
232b274c55 initial commit
subgame + mods
2014-10-28 18:01:32 +01:00