1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-09-16 17:50:23 +02:00
Commit Graph

167 Commits

Author SHA1 Message Date
LeMagnesium
12501fb1cd Merged most of default
- Merged README, crafting, functions, furnace, init, mapgen, nodes, tools and trees
2015-06-14 11:46:12 +02:00
LeMagnesium
9aa6b9cd98 Merged init and legacy of default (with textures) 2015-06-14 11:46:11 +02:00
LeMagnesium
308c5b0582 Removed xray's legacy from Carbone 2015-06-14 11:46:11 +02:00
LeMagnesium
e1ebbe9b1e Finished merge of nodes.lua from Minetest Game 2015-06-14 11:46:11 +02:00
LeMagnesium
b3852113b7 Began reorganizing minetestforfun_game (nodes.lua) 2015-06-14 11:46:11 +02:00
LeMagnesium
2913bcb93d Removed all whitespaces (using new script) 2015-06-10 19:12:48 +02:00
Ombridride
ecdad27e27 Unification of default Shovels and Axes materials 2015-06-02 23:01:42 +02:00
Ombridride
8970de6604 Re-organize the code of tools.lua
Wood > Steel > Bronze > Gold > Mese > Nyan > Diamond
2015-06-02 22:44:58 +02:00
Ombridride
8683193e3c rights 755 + new textures for swords/axe/shovel in wood/stone/steel 2015-05-31 11:56:13 +02:00
LeMagnesium
a2c8d5345f Moved recipes for desert_sand and sand to crafting.lua in default 2015-05-27 18:51:23 +02:00
Ombridride
bd37f19662 Change rights in the repository (755) 2015-05-26 23:37:16 +02:00
LeMagnesium
7fadb09c08 Added back craft recipe to get sand from gravel 2015-05-26 21:21:02 +02:00
LeMagnesium
5da1412b29 Used static source for quicksands
- Used `default_sand.png`, a static picture, as tile image for `default:sand_source`
 - Turned alpha of quicksands to 255 (maximum)
 - Turned post_effect_color to nearly black
2015-05-24 15:56:03 +02:00
Obani
bb25fc622f Simplified sand_source texture 2015-05-24 15:49:47 +02:00
Obani
fe24cb3634 Added textures for liquid sand 2015-05-24 15:23:59 +02:00
LeMagnesium
927263ee3c Added quicksands
- Added suffocating quicksands' sources and buckets
 - Referenced needed textures to #43
2015-05-24 13:45:23 +02:00
LeMagnesium
baa7b8875b Updated minetestforfun_game
- Added default:meselamps
 - Added shelf:vessel
 - Merged cactus/papyrus override possibility
2015-05-01 14:38:17 +02:00
LeMagnesium
d5ee3eabcc Removed inhibiting code in sand place callbacks
- Removed inhibiting code in sand-type nodes' place callback to avoid
   blocking all callbacks to be executed, and the engine to send logs
2015-04-22 14:21:08 +02:00
LeMagnesium
3927b86f41 Added river water
- Added river water (alias in mapgen.lua and registrations in nodes.lua)
- Reorganized aliases in mapgen.lua as they are in minetest_game to make further
  merges simplier
- Updated news.txt
2015-04-19 11:21:58 +02:00
LeMagnesium
27118401bc Removed default:ice as ore
- Removed default:ice chuncks generated (legacy from carbone)
2015-04-16 19:18:59 +02:00
LeMagnesium
c4ff82dae4 Solved on_use bug with strange on_item_eat behavior
- Removed the sound on_item_eat call so that hunger's function will be called
2015-04-08 22:06:27 +02:00
55d75b175b Added new default:ladder_obsidian and changed lavatemple:ladder
Added new default:ladder_obsidian
Changed lavatemple:ladder  walkable=true, drawtype=nodebox, added new texture inv and changed texture
2015-04-07 00:40:35 +02:00
LeMagnesium
0b7251fdce Added all cherry things from Jordach's BFD
- Added cherry trees' biomes
- Added cherry wooden plank stairs
- Added cherry nodes : sapling, log, wood, etc
- Added cherry trees' generation system
- Added cherry items' crafts
2015-03-30 20:54:58 +02:00
LeMagnesium
5b071b9018 Fixed fix fixing infotools
- Corrected typo in registered_items' table's name
2015-03-28 17:45:52 +01:00
LeMagnesium
7de6860654 Checked one more field before indexing it in infotools 2015-03-25 23:42:26 +01:00
LeMagnesium
4643e2cb52 Updated minetestforfun_game, final 5th part
- Updated textures
2015-03-03 22:17:50 +01:00
Ombridride
5734e2a2e2 Fix mossycobble 2015-03-03 21:50:36 +01:00
Ombridride
d4117fcfc8 Remove dupe aliases (fixes #438)
from mt_game
2015-03-03 21:22:42 +01:00
Ombridride
0e05ac226a Fix typo in survival form spec & create legacy file
(from MT_game)
2015-03-03 20:06:59 +01:00
Ombridride
ef982471fa MFF_game - Update texture 02 2015-03-03 19:53:32 +01:00
Ombridride
f514d7058f MFF_game texture update
(From MT_game)
2015-03-03 19:52:12 +01:00
Ombridride
31f8354649 Update MFF_game "README" again 2015-03-03 19:45:50 +01:00
Ombridride
8f5dd6e2e6 update MFF_game "README.txt" 2015-03-03 19:44:20 +01:00
539113c778 fix infotool crash when unknow node 2015-03-03 19:31:30 +01:00
Ombridride
30ac1e2c6c Add mossy cobble uncraft
mossycobble => stone
2015-03-03 19:28:47 +01:00
Ombridride
f572fedea9 Mossycobble fixes in node.lua 2015-03-03 19:15:57 +01:00
LeMagnesium
c0926d33cc Merge remote-tracking branch 'origin/master'
Conflicts:
	minetestforfun_game/minetest.conf
2015-03-03 19:01:23 +01:00
LeMagnesium
969080ab81 Fixed typos and changed sinking speed's value 2015-03-03 18:58:33 +01:00
Ombridride
7ed90a8651 Merge minetest_game - Update node.lua 2015-03-03 18:31:52 +01:00
LeMagnesium
d9c182cf9d Changed all the LIGHT_MAX calls to default.LIGHT_MAX
- Avoided crash by using the real variable instead of its old name
2015-03-03 18:22:38 +01:00
LeMagnesium
3ae94073c4 Updated minetestforfun_game, part 3
- Merged :
	Removed weird constants in default
	Add tree growing functions to game_api.txt
2015-03-03 16:04:42 +01:00
LeMagnesium
c4c6e9fe44 Updated minetestforfun_game, part 2
- Merged :
	Add crafting grid result arrow to creative inventory
	Simple biomes for mgv5/mgv7. Uses get_mapgen_params
2015-03-03 15:51:09 +01:00
LeMagnesium
afa51785fb Updated minetestforfun_game, part 1
- Merged :
	Change furnace fire icons
	Add Obsidian / Obsidian brick stairs & slabs
2015-03-03 15:43:04 +01:00
639584ec06 callback for torches in water 2015-03-03 00:19:08 +01:00
LeMagnesium
908082e9ba Re-increased amount of sticks given for a default:wood
- Avoided conflict between building_blocks:sticks and default:wood by changing
  the default:wood's recipe and output
2015-02-26 09:18:19 +01:00
LeMagnesium
ecb9d17a33 Decreased the number of sticks given from group:wood
- In the craft inventory, putting, from now, an item from the group:wood won't give you 9 sticks anymore but 4. In fact, 4 sticks give you a wooden plank item, part of
  the group:wood, and this wooden plank gives you back 9 sticks, which could be used to craft again some wooden planks, etc...
2015-02-25 21:17:23 +01:00
Gael-de-Sailly
92d20a7e61 Turn glass into glasslike_framed_optional drawtype 2015-02-22 18:17:27 +01:00
Gael-de-Sailly
8adbc1031c Store any book in bookshelves, not only default:book 2015-02-09 14:19:30 +01:00
LeMagnesium
fffef558bb Added return statement in bookshelf's callbacks 2015-02-08 22:30:54 +01:00
Ataron
09977a198b New Moon texture 2015-02-07 16:53:21 +01:00
LeMagnesium
60602f60c0 Merge branch 'sand' of http://github.com/Gael-de-Sailly/minetest-minetestforfun-server into Gael-sand 2015-01-30 18:24:49 +01:00
Gael-de-Sailly
09ef071c81 Fixed sand replacing non-buildable-to nodes on place 2015-01-30 14:32:51 +01:00
Ombridride
a149bc8c08 encore des petits ajustements... 2015-01-29 00:20:09 +01:00
LeMagnesium
618adecf2b Fixed global vas errors and updated beginners_chest with license 2015-01-25 22:34:03 +01:00
LeMagnesium
70d7d0fee7 Updated moreores mod : NOT RUNNING YET 2015-01-24 19:28:26 +01:00
Ombridride
e3b992264d small fix - unification 2015-01-23 19:57:44 +01:00
Ombridride
71607ba18b Smalls fixs on unification pickaxe 2015-01-21 22:54:51 +01:00
Ombridride
202d50632c unification Pickaxe 2015-01-21 22:38:36 +01:00
LeMagnesium
24bbb848e7 Made superapples harder to craft
- Changed craft recipe for default:superapple, now using :
	"default:apple","default:mese","default:mese"
2015-01-20 21:32:21 +01:00
Ombridride
bb42a3be06 Add acid to the “acid” group
(From Carbone)
2015-01-01 12:41:01 +01:00
Ombridride
bb3165a013 Sword unification in "moreore mod"
silver + mithril
2014-12-23 22:19:29 +01:00
Ombridride
5071301b77 Sword unification in our subgame 2014-12-23 22:14:34 +01:00
Le_Docteur
2d30ca67bb Both furnaces moved to 'default/furnace.lua' with updated formspecs to keep Carbone's semi-transparent background. 2014-12-17 17:29:04 +01:00
Le_Docteur
f618237c98 Moved global variables into the "default" list/class. 2014-12-17 09:20:37 +01:00
Ombridride
204f66b311 Small tweak about Mese ore generation 2014-12-15 03:26:54 +01:00
Ombridride
825917ebd4 Tweak diamond ore generation
- Trouvable à partir de -256 en petite quantité
- Trouvable à partir de -512 en quantité décente
- Trouvable à partir de -1024 en grande quantité « parfois »
- Chunk énorme de diamants réduit de moitié
2014-12-15 03:24:35 +01:00
Ombridride
a806d9b55b Tweak growing chance of cactus and papyrus
- 1 tick / minute
- 25% chance of growth / tick
2014-12-15 03:07:32 +01:00
LeMagnesium
a921fb4b97 Merge... some random commits 2014-12-15 00:04:45 +01:00
LeMagnesium
7126d2af7f Merge "Set param2 to 1 if player places leaves" 2014-12-14 23:53:42 +01:00
LeMagnesium
4ad72bfdd4 Merge Give 4 obsidianbrick for 4 obsidian (but 2) 2014-12-14 23:28:29 +01:00
LeMagnesium
1eb510dfd3 Merge "Add pinetree by sfan5" 2014-12-14 23:13:59 +01:00
LeMagnesium
29b65dafc0 Merge "Add 3D signs" 2014-12-14 23:02:24 +01:00
LeMagnesium
386816df66 Merge "Add obsidianbrick" and farming's soil's texture 2014-12-14 22:57:29 +01:00
LeMagnesium
201bde2152 Merge pine and dye's visibility fix 2014-12-14 22:41:55 +01:00
LeMagnesium
57b2df5054 Merge various fire's bug fixs and doors textures 2014-12-14 22:33:57 +01:00
LeMagnesium
db0aa37152 Merge "Rewrite furnace" 2014-12-14 22:05:45 +01:00
Ombridride
d47d4dddb0 Tweak the breathless sound
commit 6d6b3e0f07
2014-12-14 21:49:11 +01:00
Ombridride
22059a77c4 Texture tweaks
(water)
commit 4a551eb143
2014-12-14 21:46:52 +01:00
Ombridride
1692b7bb94 Tweak the texture of jungleleaves
commit 91d40bdb02
2014-12-14 21:45:19 +01:00
Ombridride
5366cb9c62 Make jungle leaves use allfaces_optional drawtype
commit a0e09da761
2014-12-14 21:43:59 +01:00
Ombridride
7f110b4dc2 Tweak again some post effect colours
commit 7e798df2fa
2014-12-14 21:42:48 +01:00
Ombridride
887473124e Merge server to github 2014-12-11 18:53:00 +01:00
LeMagnesium
af23cdfb4c Removing bug line : gravel's sound
MUST BE DEBUGGED
2014-12-10 23:46:17 +01:00
LeMagnesium
8b3abd1b43 Rollback again, something is crashing the server.. 2014-12-10 23:31:28 +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
LeMagnesium
beb7e8e900 Grass textures fixed 2014-12-09 19:49:39 +01:00
LeMagnesium
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
LeMagnesium
e80df61377 Reverting bad update reversion
- Putting back the asked textures instead of current ones
2014-12-09 19:04:50 +01:00
Ombridride
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
Ombridride
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
LeMagnesium
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
Ombridride
7845fd5f1f Add a Sun and Moon default texture 2014-12-08 20:20:29 +01:00
Ombridride
6d6b3e0f07 tweak the breathless sound
(-10 decibel)
2014-12-08 19:55:09 +01:00
Ombridride
11ebb56017 Remove indev ore generations
(Minetest_game / Carbone)
2014-12-08 19:43:33 +01:00
Ombridride
4a551eb143 Texture tweaks
(Carbone)
2014-12-08 19:42:14 +01:00
Ombridride
91d40bdb02 tweak the texture of jungleleaves
(Carbone)
2014-12-08 19:39:09 +01:00
Ombridride
a0e09da761 Make jungle leaves use allfaces_optional drawtype 2014-12-08 19:37:39 +01:00
Ombridride
7e798df2fa Tweak again some post effect colours
(Carbone)
2014-12-08 19:35:48 +01:00
Ombridride
7c142fb42d Tweak some post effect colours
(Carbone)
2014-12-08 19:33:25 +01:00