1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-05 10:00:26 +01:00
Commit Graph

132 Commits

Author SHA1 Message Date
LeMagnesium
4de7f3e484 Let's do a step forward
- Commits :
	b0871dfe0f (Not really because the reverts were done in my last commit)
	c1043f0120
	35a13c8faf
	6679190d44
	eae0c1bc2e
	ef566a5fe1
	85bd085ab8
	254ec74625
	99feb28ec3
	d6b270e197
	b4a95f223f
	69d4d5dcad
	d7a5dcbb29
	48dd18d49a
	8c2391d5ac
  Are done again. (Ok, no all of them only those concerning default and reverted mods)

TODO: Still missing the three next commits

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-12-10 17:04:10 +01:00
LeMagnesium
2155ecc638 OK, ROLLBACK!
- All the modifications done before 7845fd5f1f are reverted
- Merged commits from http://github.com/minetest/minetest_game from 10 days ago to today. (concerning default mod)

TODO: Merge the other mods which have been reverted.
      Add all the commits of Ombridride after the 7845fd5f1f one.

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-12-10 16:49:14 +01:00
Ombridride
8c2391d5ac Update mobs mod
- add chicken/chicken_black models
- add DM_strangewhite/DM_cobblestone models
- add rat/rat_brown models
- add the support for multiple textures/models in
rat.lua/sandmonster.lua/spider.lua/stonemonster.lua/treemonster.lua
- add the honey_block texture
2014-12-09 14:22:26 +01:00
Ombridride
48dd18d49a Update the mess monster for multiple textures 2014-12-09 14:10:51 +01:00
Ombridride
d7a5dcbb29 update the lava_flan for multiple textures 2014-12-09 14:09:56 +01:00
Ombridride
69d4d5dcad Update the DM for multiple textures 2014-12-09 14:09:14 +01:00
Ombridride
b4a95f223f Update dirt monster for multiple textures 2014-12-09 14:07:44 +01:00
Ombridride
d6b270e197 Update cow for multiple textures 2014-12-09 14:06:19 +01:00
Ombridride
99feb28ec3 MAJ chicken for multiple textures 2014-12-09 14:04:56 +01:00
Ombridride
254ec74625 MAJ bee.lua from "mobs" mod
(add honey block)
2014-12-09 14:01:36 +01:00
Ombridride
85bd085ab8 Add multiple textures for mobs 2014-12-09 13:56:43 +01:00
Ombridride
ef566a5fe1 Update README.txt 2014-12-09 13:48:17 +01:00
Ombridride
eae0c1bc2e Update README.txt 2014-12-09 13:47:27 +01:00
Ombridride
6679190d44 Warthog now spawn on dirt 2014-12-09 13:45:47 +01:00
Ombridride
cf78e6713a Delete a temporary file 2014-12-08 19:22:51 +01:00
Ombridride
c9b6800821 bugfix de "mobs:meat" 2014-12-08 19:21:04 +01:00
Ombridride
340f034305 Correct a small mistake in map tools
For the 3D super_apple tweak
2014-12-08 19:19:00 +01:00
Ombridride
e5fd6e0192 Add 3D super_apple
in the mod « maptools », like in the mod « riesenpilz »
2014-12-08 19:12:56 +01:00
Ombridride
57cd06f3e1 Merge server with github 2014-12-08 02:11:35 +01:00
Ombridride
e76a36a9ac merge server with github 2014-12-08 02:11:04 +01:00
LeMagnesium
3c10469c03 Copying code of cactus' check in sprint
- Sprint mod now check if the player is near a cactus. If yes, it hurts
  him. However, the duration between two checking is about 0.1 seconds.
2014-12-07 18:01:17 +01:00
LeMagnesium
c1f5523d9e Implementation of megabuild priv in markers mod
- The players owning the precious megabuilder privilege will now be able
  to create, manage, and own an infinite amount of areas by using the
  boundary manager and the markers
2014-12-06 10:54:27 +01:00
LeMagnesium
279983e0b0 A little step backward! 2014-12-06 10:15:42 +01:00
LeMagnesium
174ef642f8 Modifications on moretrees
- Modifications about palm trees' leaves to be non-walkable. All the
  leaves are now walkable except them (aka moretrees:palm_leaves)
2014-12-05 19:03:30 +01:00
Ombridride
734dff15ba Add a breathless sound for sprint mod
And delete a temporary file
2014-12-05 13:02:35 +01:00
LeMagnesium
2850a4c243 Modifications for sprint and moretrees
- Moretrees' leaves aren't walkable anymore
- Adding the snore sound in default
- Adding snore sound's play when stamina has run out (on both e and w
  sprint)
- I don't know why mud mods/snow/config.txt has been modified
2014-12-04 17:59:35 +01:00
LeMagnesium
8df06a0019 Modifications on hunger
- Given hunger changed for mushroom's essence
- Hunger disabled for mushroom:poison
2014-12-03 19:50:17 +01:00
Le_Docteur
93ce800e60 Added plantlife_modpack/mushroom potions. 2014-12-03 17:55:12 +01:00
Le_Docteur
e08936158a Added mobs:cheese 2014-12-03 08:11:33 +01:00
Le_Docteur
af3b07ead3 Support Ferns. Update Farming Redo and Mobs Redo 2014-12-03 00:50:25 +01:00
Ombridride
d29d5ce0c3 Delete the /money command and
Others funtionnalities of this command...
(because it's useless, we use physical coins !)
2014-11-29 23:56:11 +01:00
LeMagnesium
613d2c9b02 Final textures update
- Changed both the shaved sheep and the sheep's texture
- Chichen's texture added

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-11-29 22:06:14 +01:00
LeMagnesium
8cc99d05a8 Adding mapfix mod
- Adding the mapfix mod to repair shadow-ed areas on a map (eg. after using worldedit).

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-11-29 21:30:06 +01:00
LeMagnesium
eeb0f0be09 New tewtures for sheep and cow
- New texture for mobs:cow
- New texture for mobs:sheep

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-11-29 21:07:04 +01:00
LeMagnesium
736d4e6951 Adding again mesecons
- It's an easier way to update it than to copy the files over the old ones..

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-11-29 20:24:59 +01:00
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
fe926d914b Updating textures
(I've got a backu-up if some of them aren't good)

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-11-29 19:41:01 +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
Le_Docteur
caab72be87 Show coloredwood planks in the crafting guide. 2014-11-26 14:04:08 +01:00
LeMagnesium
ccccd48a63 Using static_spawnpoint in minetest.conf
- When return back from the nether, the player is teleported either to 5,
  35, -7 (something like that), or to the defined value of
  static_spawnpoint key in minetest.conf.
2014-11-24 22:52:28 +01:00
LeMagnesium
cc2661f622 Commenting useless (unused) craft recipes
- Craft recipes using undeclared group:wood_slab commented.
2014-11-23 17:40:03 +01:00
Ombridride
792278400b bugfix DM damage
tweak the fleshy not the damage=  variable !
2014-11-22 01:47:41 +01:00
Ombridride
f2bd222432 Remove mese_monster / add DM in the nether
tweak the spawn frequency of the mese_monster
2014-11-22 01:29:53 +01:00
LeMagnesium
472c77cc46 The "nether" was missing
Now I won't ever forget that the itemstring for the nether's dirt is
nether:NETHERrack...
2014-11-22 01:25:02 +01:00
LeMagnesium
1f537e4b7e Nether nodes can't be destroyed by Dungeon Masters
- Adding a check for the nodes hit by a dungeon master's fireball. If the
  node is under y=-19600, is not nether:rack, and is part of the nether
  mod, it won't be destroyed.
2014-11-22 01:01:26 +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
LeMagnesium
87b1cd745f Removing snow falls in the nether
- Placing a limitation at y = - 19600 for the snow falls, under they won't
  happend.
- Changing reload intervals for beginners' chests 1 and 2 (now 1h and
  40min)
2014-11-16 21:00:43 +01:00