1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-28 03:30:36 +01:00
Commit Graph

239 Commits

Author SHA1 Message Date
LeMagnesium
d6d311581c Merge branch 'master' of http://github.com/Ombridride/minetest-minetestforfun-server 2014-12-25 23:27:36 +01:00
Ombridride
bf14c9b165 Add kittens and improve the sounds code/name 2014-12-25 23:20:28 +01:00
unknown
ca3755ea64 Right texture for unbreakable diamond block 2014-12-25 23:02:30 +01:00
Ombridride
84295212df Re-add texture for 3D-superapple 2014-12-25 22:34:07 +01:00
LeMagnesium
931c706f04 Adding random_messages mod with simple messages
- Random messages mod by @arsdragonfly (http://github.com/arsdragonfly)
  has been added to the server mods.
2014-12-25 20:13:11 +01:00
Ombridride
5b6c7f8d2d Update Moretrees
But keep our changes
2014-12-25 18:55:50 +01:00
Ombridride
3fce25aeab Update the mobs mod
- Update to the 0.8 release of TenPlus1 mobs redo mod
- Merge the TenPlus1 mobs redo mod changes
- Add 2/3 new sounds for each monsters (from the Cyberpangolin mobs
sounds)
- Small up of the lava_flan mob health
2014-12-25 18:34:34 +01:00
Ombridride
c81fc9903e Sword unification for "nether" mod
netherrack + blue netherrack + Switonic
2014-12-23 22:30:26 +01:00
Ombridride
bb3165a013 Sword unification in "moreore mod"
silver + mithril
2014-12-23 22:19:29 +01:00
Ombridride
ea59709133 Throwing unification 2014-12-23 22:08:04 +01:00
LeMagnesium
c3be3dd058 Funny death messages when a player dies in acid
- Funny messages added when a player dies in default:acid_source and
  default:acid_flowing (thanks to Calinou for having added acid group to
  acid nodes).
2014-12-23 18:16:12 +01:00
Ombridride
f4ba3a2262 Repus correctement du mod u_skins
(Petit soucis sur le commit précédent car fait avec un nouvel outil que
je ne maitrise pas encore… :p)
2014-12-22 21:05:19 +01:00
Ombridride
a3b6f66c47 Ajout du skin "santa_01" en WTFPL fait par JAPP (que l'on remercie) 2014-12-22 18:44:59 +01:00
LeMagnesium
06515d42ed Fixing anti-explosion system for excluded nodes
- Changed the name of the variable in the parse system to SIMPLY MAKE IT
  ABLE TO WORK FINE!
2014-12-19 21:41:28 +01:00
Le_Docteur
9e03189586 Fixed the Soil abm. 2014-12-18 23:42:51 +01:00
LeMagnesium
b185b9a61f Oooops
- Missing modification on dungeon masters, I was exluding node only if I
  had to includ them... Things are correct now.
2014-12-18 20:13:33 +01:00
LeMagnesium
5314a1d30b Down the water, tweak the u-boots, exclude nodes
- Dungeon masters cannot destroy nodes in excluded table neither nodes of
  group unbreakable, neither nether's nodes.
- Tweak of a global variable in seawrecks (aka. choosen_ingot)
- Highlandpools create real lakes now, and not water flower over the
  floor.
2014-12-18 20:09:07 +01:00
Ombridride
c5d752a3be tweak the description
Because before « leaves » and « jungle leaves » has the same name
« leaves », and players was unable to recognize which is exactly the
right « leaves » …
2014-12-17 23:30:53 +01:00
Le_Docteur
c786d5e0e9 Removed temporay files. 2014-12-17 17:40:48 +01:00
LeMagnesium
db0e531877 Merge branch 'nether_update_without_conflicts' 2014-12-16 22:40:02 +01:00
LeMagnesium
577bcbf470 Applying our own changes
- Nether apple giving 9 of hunger
- Come back in real world at static_spawnpoint or MFF's spawnpoint
2014-12-16 22:36:07 +01:00
LeMagnesium
c6c301ec54 Adding new version 2014-12-16 21:43:27 +01:00
Ombridride
8ff2a55b74 Small fix about "christmas_craft" mod 2014-12-15 23:51:58 +01:00
Ombridride
d503126f05 Update plantlike
With the latest commit of VanessaE
2014-12-15 22:29:30 +01:00
Ombridride
28bd40307b fix texture of christmas_craft mod 2014-12-15 21:46:20 +01:00
Ombridride
636019e28a Don't use the "Default" but the "Moretrees" mod
Because « Moretrees » override the default jungle leaves/sapling/tree
2014-12-15 21:01:34 +01:00
Ombridride
57d84955fd bug fix and delete the stick override
and add in group:stick a craft_recipce
2014-12-15 19:36:40 +01:00
Ombridride
c265993fa8 solution de secours pour christmas_craft
(A améliorer plus tard)
2014-12-15 19:05:19 +01:00
Ombridride
105fc254b5 Leaves of christmas_craft now with
walkable = false
2014-12-15 18:53:35 +01:00
Ombridride
d74a358a2c Update "christmas_craft" mod
For add support to jungle_leaves (snowed)
2014-12-15 18:32:11 +01:00
Ombridride
c0edb397e5 Tweak Moreores ores generation
Now the mithril is more harder to find, and smalls tweaks about other
ores
2014-12-15 03:16:22 +01:00
Ombridride
cdbe82a9e9 Add a new fishing mod and ...
- Remove the old fishing mod
- Update aliases
- tweak settings and hunger of the new fishing mod
2014-12-15 01:53:06 +01:00
Ombridride
e588717ca0 Add "future_ban" mod
Useful if the xban2 method doesn’t work
2014-12-15 01:23:00 +01:00
Ombridride
5579c455f5 petit oubli 2014-12-15 01:07:32 +01:00
Ombridride
6beb2cdf1b Double les drops des épaves de bateau
mod searecks
2014-12-15 01:00:22 +01:00
Ombridride
e6ea287709 MAJ plantlife_modpack
(garde les modifs antérieur sur les « mushrooms » et sur les bugfixs
liés au mod « areas »)
2014-12-15 00:41:13 +01:00
Ombridride
5163bf9551 MAJ mobs(redo) mod
Added switch to disable mobs in protected areas
2014-12-15 00:17:31 +01:00
LeMagnesium
91a018e7c7 Remove nether mod for update
THIS IS NOT A STABLE VERSION AT ALL!
This commit is just supposed to remove nether mod to avoid conflicts when
the branch will be merged, after updates. It's also a check point from
where I can rebase my updates if they break the repository.
2014-12-15 00:13:14 +01:00
Ombridride
8386263856 update riesenpilz 02 2014-12-14 23:56:05 +01:00
Ombridride
863a9bb1cb Update riesenpilz
And add a new dependency : vector_extras
2014-12-14 23:56:05 +01:00
LeMagnesium
87f013bf28 Merge TenPlus1's screwdriver and new minetest.conf.example 2014-12-14 23:46:05 +01:00
LeMagnesium
adc99333fb Partially-merge Don't dry out soil if unloaded blocks are nearby 2014-12-14 23:41:07 +01:00
LeMagnesium
1f419342a7 Merge Only allow rotating nodes that could be dug 2014-12-14 23:26:23 +01:00
LeMagnesium
9677e75c97 Merge "Cleanup" in screwdriver mod 2014-12-14 23:22:28 +01:00
Ombridride
3cb7091f23 fait charger le mod après les autres
pour que la dirt_with_grass soit bien override…
2014-12-14 23:15:31 +01:00
LeMagnesium
97ef8aa781 Merge branch 'master' of http://github.com/Ombridride/minetest-minetestforfun-server 2014-12-14 22:58:43 +01:00
LeMagnesium
386816df66 Merge "Add obsidianbrick" and farming's soil's texture 2014-12-14 22:57:29 +01:00
Ombridride
dcc9228469 problème de dossier...
résolu !
2014-12-14 22:44:50 +01:00
Ombridride
24529f4c4d Add a christmas mod
ALL snow biome + christmas craft !
2014-12-14 22:37:06 +01:00
LeMagnesium
4fc007a008 Rebalance of wool:* crafts
- All the wool nodes give farming:cotton 9 from now.
2014-12-13 23:51:46 +01:00
LeMagnesium
99e767bc06 Enable sugar alias
- The alias between bushes:sugar and farming:sugar is enable to replace
  current bushes:sugar by farming's one
2014-12-13 16:19:03 +01:00
Le_Docteur
d2e86c8d45 removed bushes:sugar (bushes_classic). 2014-12-13 14:06:13 +01:00
LeMagnesium
ecd48cfb1f Modifications on wool:white's recipe
- You need, from now on, 9 farming:strings to craft a wool:white. Before,
  you needed 4 strings, and the wool:white gave you 9 strings, which is a
  problem. The solution is : 9 to craft the wool, which gives 9.
2014-12-12 20:54:56 +01:00
LeMagnesium
06ff688a3e Adding security on esprint 2014-12-11 19:18:34 +01:00
Ombridride
e816fb5f42 Merge server to github 02 2014-12-11 18:53:24 +01:00
Ombridride
887473124e Merge server to github 2014-12-11 18:53:00 +01:00
Le_Docteur
eb5ddbe8f3 Update mod mobs to multiple textures. 2014-12-10 17:42:25 +01:00
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