1
0
Fork 0
Commit Graph

9091 Commits (01791cf5503abad345b9766acad7afdf5ad7a7ce)

Author SHA1 Message Date
FaceDeer 9c1cc9e141 Merge pull request 'Merge master into my fork' (#2) from MineClone2/MineClone2:master into master
Reviewed-on: https://git.minetest.land/FaceDeer/MineClone2/pulls/2
2022-09-02 01:05:45 +00:00
cora b552548b4e Merge pull request 'Add setting for bookshelf inventories' (#2613) from bookshelf_inv_setting into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2613
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2022-09-01 21:00:32 +00:00
cora 1ddc1abb97 Add setting for bookshelf inventories 2022-09-01 12:10:12 +02:00
cora eed52b69a2 Merge pull request 'Fixed Bookshelf Close Gui Issue' (#2611) from fix_bookshelf_issue into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2611
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-09-01 09:47:59 +00:00
PrairieWind 574267446e Merge branch 'master' into fix_bookshelf_issue 2022-08-31 22:37:46 +00:00
PrairieWind 3aae2b6d96 Fixed Bookshelf close gui issue 2022-08-31 13:51:38 -06:00
PrairieWind 2bfca18377 Merge pull request 'fix translation and update french translation -master' (#2588) from 3raven/MineClone2-french:master into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2588
Reviewed-by: cora <cora@noreply.git.minetest.land>
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2022-08-31 18:49:32 +00:00
3raven 5329e70df9 Merge branch 'master' into master 2022-08-31 17:04:43 +00:00
cora 7c686c8b79 Merge pull request 'Added Formspec to Bookshelf' (#2603) from bookshelf_inventory into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2603
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-31 10:02:57 +00:00
PrairieWind 2eab947d84 Added container group to Bookshelf 2022-08-30 17:41:52 -06:00
PrairieWind 8bcf80422d Added Formspec to Bookshelf 2022-08-30 21:36:27 +00:00
cora 6b7b2c74ed Merge pull request 'Fix Chest on top floor of Pillager Outpost' (#2608) from fix_outpost_chest into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2608
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-30 21:05:58 +00:00
PrairieWind 0c6cbc9e99 Chest on top floor of Pillager Outpost now works. 2022-08-30 23:04:43 +02:00
cora 9b2306151a Merge pull request 'Add golem summoning for villagers' (#2606) from villagers_spawn_golem into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2606
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2022-08-30 21:02:57 +00:00
cora 93cccaa264 Allow spawning on water 2022-08-30 22:58:55 +02:00
cora b067111e71 Add golem summoning for villagers 2022-08-30 22:01:18 +02:00
cora 34c7246e4a Merge pull request 'Mob group spawning fixes' (#2605) from spawning_fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2605
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2022-08-30 19:58:47 +00:00
cora 77e11713d3 Remove superfluous bed check for villagers 2022-08-30 21:52:47 +02:00
cora 2f0ca063e9 Make monsters less likely to spawn in groups 2022-08-30 21:52:47 +02:00
cora 0aa4e0a395 Don't spawn creeper in groups 2022-08-30 21:52:47 +02:00
cora 3993cddfc6 Check for conditions on each group spawn 2022-08-30 21:52:47 +02:00
cora 961c9bd3c9 Merge pull request 'Make zombie babies have big heads' (#2596) from zombies into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2596
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-08-30 19:22:19 +00:00
Johannes Fritz d7253e8b3b Remove saved visual_size 2022-08-30 07:47:29 -05:00
Johannes Fritz 9d08f8662d Make zombie babies have big heads 2022-08-30 07:47:29 -05:00
FaceDeer be36022249 Merge pull request 'Update from master' (#1) from MineClone2/MineClone2:master into master
Reviewed-on: https://git.minetest.land/FaceDeer/MineClone2/pulls/1
2022-08-29 07:16:32 +00:00
FaceDeer e1bf4081dd since registered_generators was a table, not an array, table.sort was having no effect and so priority was being ignored. Generators were being run in an arbitrary order.
I discovered this when I attempted to register an lvm in a mod that was intended to run after "main", to modify clay that the main mapgen lvm adds to the world. It wasn't finding any clay because priority was being ignored and it was running before "main" was.
2022-08-28 22:11:02 -06:00
cora 1f2b70cb85 Merge pull request 'Fix crash when using flint and steel on creeper' (#2598) from fix_flint_and_creeper into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2598
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-08-28 19:12:21 +00:00
cora 683ace0748 Fix crash when using flint and steel on creeper 2022-08-28 21:10:48 +02:00
cora 7ac2c30622 Merge pull request 'Fix crash with itementity and unloaded nodes' (#2600) from fix_item_crash into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2600
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-08-28 19:10:08 +00:00
cora 2b2ba47aed Fix crash with itementity and unloaded nodes 2022-08-28 21:08:17 +02:00
cora 7a6a84b2a2 Merge pull request 'Fix a couple of warnings in grindstone' (#2601) from fix_grindstone_warnings into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2601
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-08-28 19:07:17 +00:00
cora c158be848d Grindstone: Fix indentation 2022-08-28 15:06:06 +02:00
cora 5520f81404 Fix grindston warnings 2022-08-28 15:02:02 +02:00
cora d75fdec8f0 Merge pull request 'Fix ender particle spam with particlespammers' (#2593) from fix_enderparticles into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2593
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-08-26 20:02:52 +00:00
cora 94f07c2b3d Fix ender particle spam with particlespammers 2022-08-26 21:53:27 +02:00
cora a93bf3bf53 Merge pull request 'Make items not drop into blocks on playerdeath' (#2592) from fix_death_drop into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2592
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-08-26 19:31:13 +00:00
cora 0a45486304 Make items not drop into blocks on playerdeath 2022-08-26 02:32:16 +02:00
cora 0385dd7cab Merge pull request 'Fix enchanted tools not being properly upgraded' (#2586) from fix_netherite_upgrade into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2586
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-08-25 09:51:06 +00:00
cora 05979ed690 Fix enchanted tools not being properly upgraded 2022-08-25 11:31:08 +02:00
cora 35f064511d Merge pull request 'Fix tropical fish crash (#2583)' (#2587) from fix_tropical_fish_textures into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2587
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-08-24 09:01:04 +00:00
3raven 1a405b291a Mise à jour de 'mods/MAPGEN/mcl_villages/locale/mcl_villages.fr.tr' 2022-08-24 05:39:45 +00:00
3raven 0d23a89713 Mise à jour de 'mods/MAPGEN/mcl_villages/locale/template.txt' 2022-08-24 05:39:11 +00:00
3raven 561396f4e6 Mise à jour de 'mods/MAPGEN/mcl_villages/init.lua' 2022-08-24 05:38:30 +00:00
3raven 5621250c07 Mise à jour de 'mods/ITEMS/mcl_cauldrons/locale/mcl_chaudrons.fr.tr' 2022-08-24 05:28:22 +00:00
3raven d93a4cc457 Mise à jour de 'mods/ITEMS/mcl_crimson/init.lua' 2022-08-24 05:26:09 +00:00
3raven ef02c82767 Mise à jour de 'mods/ITEMS/mcl_blackstone/init.lua' 2022-08-24 05:19:54 +00:00
3raven b02daff1c9 Mise à jour de 'mods/ITEMS/mcl_mangrove/init.lua' 2022-08-24 05:02:18 +00:00
3raven bb5aea08ef Mise à jour de 'mods/MAPGEN/mcl_villages/locale/mcl_villages.ru.tr' 2022-08-24 04:57:18 +00:00
3raven d6d70757a3 Mise à jour de 'mods/MAPGEN/mcl_villages/locale/mcl_villages.fr.tr' 2022-08-24 04:56:58 +00:00
3raven ec91be347a Mise à jour de 'mods/MAPGEN/mcl_villages/locale/template.txt' 2022-08-24 04:56:32 +00:00