Commit Graph

849 Commits (cc32e37b82240c2cf9d81c0d49fc8cff7f338528)

Author SHA1 Message Date
Tim cc32e37b82 merge upstream commit: Gitignore: Update to ignore additional ide/editors 2016-07-16 13:46:33 +02:00
paramat 0533203710 merge upstream commit: Default: Add stone / desert stone / sandstone / obsidian blocks 2016-07-16 13:45:32 +02:00
paramat 4ee09a274b merge upstream commit: Stairs: Stair recipe returns 8 stairs not 6
Make it consistent with the slab recipe which conserves volume
2016-07-16 13:43:22 +02:00
tchncs 2e67cbc1b9 add horses to submodules 2016-07-15 22:58:03 +02:00
tchncs 892ab3faaa default: get darkage modpath to ensure basalt is available 2016-07-15 22:33:11 +02:00
tchncs 1e7ea09713 default: flowing lava can cool down to basalt 2016-07-15 19:06:35 +02:00
tchncs 3a42666e46 update submodule farming, worldedit 2016-07-13 18:00:33 +02:00
tchncs 18ea8f6e7d update submodule illuna 2016-06-29 09:59:24 +02:00
tchncs e31d456de1 update submodule illuna 2016-06-29 09:51:41 +02:00
tchncs c882e33618 update submodule caverealms 2016-06-23 19:45:50 +02:00
tchncs 92c0bcfa59 update submodule mobs_redo, farming, boats, worldedit 2016-06-23 19:14:14 +02:00
tchncs a3ecc88a45 add cottages to submodules 2016-06-23 19:08:01 +02:00
tchncs 81bf163a59 Flowers: add mushroom group to mushrooms 2016-06-22 22:49:19 +02:00
Xunto b64202fbe9 cherry-pick from github.com/minetest/minetest_game> Default: Fix character model uv-mapping 2016-06-22 15:44:37 +02:00
Yutao Yuan 2de51ee96f cherry-pick from github.com/minetest/minetest_game> Flowers: Fix misaligned waterlily texture 2016-06-22 15:43:33 +02:00
Auke Kok a033f68bdc cherry-pick from github.com/minetest/minetest_game> Doors: Clean up nodedef usage 2016-06-22 15:42:39 +02:00
Auke Kok 77cdaacaac cherry-pick from github.com/minetest/minetest_game> Default: Make brick and plank nodes rotatable 2016-06-22 15:41:25 +02:00
Auke Kok 4c3b8376ab cherry-pick from github.com/minetest/minetest_game> Stairs: Add mossy cobble slab and stair 2016-06-22 15:39:40 +02:00
paramat eff782c61f cherry-pick from github.com/minetest/minetest_game> Mapgen: Add biome fields for riverbed node and depth 2016-06-22 15:38:31 +02:00
tchncs 0fe3efbfd1 revert: Farming: allow LBM's for other mods as well. 2016-06-22 15:37:41 +02:00
Auke Kok 451e18751f cherry-pick from github.com/minetest/minetest_game> Farming: allow LBM's for other mods as well. 2016-06-22 15:34:29 +02:00
paramat 97f0ff6c44 cherry-pick from github.com/minetest/minetest_game> Fire: Ignite tnt, gunpowder, permanent flame above coalblock 2016-06-22 15:33:49 +02:00
Auke Kok b4b24687a3 cherry-pick from github.com/minetest/minetest_game> Doors: Pass pointed_thing to on_rightclick() callback 2016-06-22 15:32:40 +02:00
paramat 37d3fe0cb1 cherry-pick from github.com/minetest/minetest_game> Default: Bookshelf has 2 openings instead of 4 2016-06-22 15:31:23 +02:00
Auke Kok 71a593ad88 cherry-pick from github.com/minetest/minetest_game> Fire: move fire node removal out of ABM. 2016-06-22 15:29:27 +02:00
tchncs 1f19159689 update submodule bags 2016-06-15 20:48:38 +02:00
tchncs ca1e88ed3d update submodule ctravelnet 2016-06-15 19:38:15 +02:00
tchncs d9449fcd56 update submodule mobs_animal 2016-06-14 13:17:51 +02:00
tchncs b4e6b5ba3c update submodule hudbars, mobs_monster, mobs_redo 2016-06-14 13:07:44 +02:00
tchncs ba5d33dc2e add forked bags mod to submodules 2016-06-10 21:01:19 +02:00
tchncs b9e4c394fd remove old bags mod 2016-06-10 20:59:41 +02:00
tchncs b87d427ac2 update submodule illuna, mobs_redo 2016-06-10 20:27:02 +02:00
tchncs 7375b9a8fa add ctravelnet to submodules 2016-06-10 09:38:08 +02:00
tchncs 3f8d39113f update submodule wardrobe 2016-06-09 12:39:50 +02:00
tchncs f9861a86bb add wardrobe to submodules 2016-06-09 12:30:06 +02:00
tchncs 72e72d0bd3 update submodule illuna 2016-06-08 20:02:26 +02:00
tchncs 72f68f9de0 update submdoule illuna 2016-06-08 19:54:34 +02:00
tchncs 10d1f448b2 update submodule darkage, mobs_redo 2016-06-08 13:18:50 +02:00
tchncs f9b87f3300 update submdoule illuna and mobs_redo 2016-06-05 19:04:44 +02:00
tchncs 633be8f94e update submodule wine, darkage 2016-06-04 22:48:50 +02:00
tchncs 30e1476c5d replace default crafting_guide in initial stuff 2016-06-01 18:44:10 +02:00
tchncs e6ab3a5977 update submodule xdecor 2016-05-31 19:12:39 +02:00
tchncs 40a736cc14 update submodule caverealms 2016-05-31 18:17:11 +02:00
tchncs 87551af24b add caverealms to submodules 2016-05-31 18:12:02 +02:00
tchncs d2f63e50c5 change pick_diamond speed and make it group 3 again 2016-05-31 18:02:13 +02:00
tchncs 6f9cf1e999 update submodules 2016-05-31 10:49:50 +02:00
tchncs 30241f62ad update submodules 2016-05-31 09:57:11 +02:00
tchncs 5bb740cac3 update submodules 2016-05-28 22:58:57 +02:00
Auke Kok 0da14dbb56 cherry-pick from github.com/minetest/minetest_game> Default: Convert saplings to use node timers
Each sapling is given a single node timer that is between
2 and 4 days of game play time (40-80 minutes). If you walk out
of the zone, and come back later, the tree will always grow
to full if the timer has elapsed.

Because trees.lua is all functions, it needs to be parsed before
nodes.lua, since that references some of its functions. Hence,
change the order of parsing here. Otherwise saplings would not
grow to full.
2016-05-28 08:58:23 +02:00
paramat b80af1bc95 cherry-pick from github.com/minetest/minetest_game> Vessels: Improve code style 2016-05-28 08:57:47 +02:00