1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-06-28 14:16:06 +02:00
Commit Graph

2201 Commits

Author SHA1 Message Date
7f110b4dc2 Tweak again some post effect colours
commit 7e798df2fa
2014-12-14 21:42:48 +01:00
4fc007a008 Rebalance of wool:* crafts
- All the wool nodes give farming:cotton 9 from now.
2014-12-13 23:51:46 +01:00
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
bf37db8dcd Merge branch 'mgl512-sugar' 2014-12-13 16:15:00 +01:00
d2e86c8d45 removed bushes:sugar (bushes_classic). 2014-12-13 14:06:13 +01:00
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
06ff688a3e Adding security on esprint 2014-12-11 19:18:34 +01:00
e816fb5f42 Merge server to github 02 2014-12-11 18:53:24 +01:00
887473124e Merge server to github 2014-12-11 18:53:00 +01:00
a7dc6bdff7 Merge pull request #5 from LeMagnesium/new_readme
New readme.md
2014-12-11 18:11:55 +01:00
65a58b764c I don't know how to create new line with MDown.. 2014-12-11 17:21:09 +01:00
8e5c0fb05a Merge branch 'new_readme' of http://github.com/LeMagnesium/minetest-minetestforfun-server into new_readme
Conflicts:
	README.md
2014-12-11 17:20:25 +01:00
5202194b48 New Readme.md
- Contributors added to the readme.md

Everyone who have already contibuted to the repository is (I hope) listed
with his exact role.
2014-12-11 17:16:16 +01:00
e6ca4ad3c8 New Readme.md
- Contributors added to the readme.md

Everyone who have already contibuted to the repository is (I hope) listed
with his exact role.
2014-12-11 17:12:07 +01:00
164bb2afe8 Merge branch 'mgl512-devel' 2014-12-11 16:48:41 +01:00
24bf4e51d7 Merge branch 'devel' of http://github.com/mgl512/minetest-minetestforfun-server into mgl512-devel 2014-12-11 16:43:18 +01:00
af23cdfb4c Removing bug line : gravel's sound
MUST BE DEBUGGED
2014-12-10 23:46:17 +01:00
8b3abd1b43 Rollback again, something is crashing the server.. 2014-12-10 23:31:28 +01:00
eb5ddbe8f3 Update mod mobs to multiple textures. 2014-12-10 17:42:25 +01:00
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
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
beb7e8e900 Grass textures fixed 2014-12-09 19:49:39 +01:00
b0794d51d2 Acid is not renewable anymore
- default:acid_source isn't registered as a renewable liquid anymore
2014-12-09 19:11:31 +01:00
e80df61377 Reverting bad update reversion
- Putting back the asked textures instead of current ones
2014-12-09 19:04:50 +01:00
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
48dd18d49a Update the mess monster for multiple textures 2014-12-09 14:10:51 +01:00
d7a5dcbb29 update the lava_flan for multiple textures 2014-12-09 14:09:56 +01:00
69d4d5dcad Update the DM for multiple textures 2014-12-09 14:09:14 +01:00
b4a95f223f Update dirt monster for multiple textures 2014-12-09 14:07:44 +01:00
d6b270e197 Update cow for multiple textures 2014-12-09 14:06:19 +01:00
99feb28ec3 MAJ chicken for multiple textures 2014-12-09 14:04:56 +01:00
254ec74625 MAJ bee.lua from "mobs" mod
(add honey block)
2014-12-09 14:01:36 +01:00
85bd085ab8 Add multiple textures for mobs 2014-12-09 13:56:43 +01:00
ef566a5fe1 Update README.txt 2014-12-09 13:48:17 +01:00
eae0c1bc2e Update README.txt 2014-12-09 13:47:27 +01:00
6679190d44 Warthog now spawn on dirt 2014-12-09 13:45:47 +01:00
35a13c8faf forgot the default/fire update/merge
simplement un changement de fonctions utilisé
2014-12-09 13:38:01 +01:00
c1043f0120 merge the functions.lua update
functions.lua :
- abm des cactus et papyrus modifiées (la pousse est plus lente)
- abm des papyrus modifiée (ne pousse que sur la dirt/dirt with grass)

(Le reste c’est des prises de Carbone)
2014-12-09 13:32:48 +01:00
b0871dfe0f Reverse bad update from minetest_game
- game.conf (MAJ OK)
- default/boat/ (MAJ OK)
- craftitems.lua (MAJ OK)
- furnace.lua (not tweaked because it’s a total rewrite from
minetest_game)
- init.lua (petites modifs et remise du son/texte à la connexion de
nouveaux joueurs)
- player.lua (reprise des modifs de carbone sur l’animation du
personnage)
- tools.lua (on remet l’ancien)
- default/doors (MAJ OK, crafts modifiés)
- default/dye (MAJ OK)
- default/fire (MAJ OK)
- default/stairs (MAJ OK)

Mg, c’est à faire :
- default/textures/ (j’ai fait une bêtise, faut remettre les textures
grass/grass_side du minetest_game, et le water/water animated de
carbone)
2014-12-09 13:17:31 +01:00
b8a1cac0cb Update minetestforfun_game with minetest_game
- I hope there is no problem. I see a lot of new stuff in the vanilla
  game. I keep a backup on another computer to restore the state of the
  repository if there is a problem.
2014-12-08 22:44:21 +01:00
7845fd5f1f Add a Sun and Moon default texture 2014-12-08 20:20:29 +01:00
6d6b3e0f07 tweak the breathless sound
(-10 decibel)
2014-12-08 19:55:09 +01:00
11ebb56017 Remove indev ore generations
(Minetest_game / Carbone)
2014-12-08 19:43:33 +01:00
4a551eb143 Texture tweaks
(Carbone)
2014-12-08 19:42:14 +01:00
91d40bdb02 tweak the texture of jungleleaves
(Carbone)
2014-12-08 19:39:09 +01:00
a0e09da761 Make jungle leaves use allfaces_optional drawtype 2014-12-08 19:37:39 +01:00
7e798df2fa Tweak again some post effect colours
(Carbone)
2014-12-08 19:35:48 +01:00
7c142fb42d Tweak some post effect colours
(Carbone)
2014-12-08 19:33:25 +01:00
e1fb647ea6 Update README.md 2014-12-08 19:28:24 +01:00
b049880a68 Update README.md 2014-12-08 19:27:44 +01:00