Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
9,664 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

9664 Commits (f06d5a1ee324f3416f83c8ca24d044b56e944415)

Author SHA1 Message Date
cora 80fb648447 Turn villagers to zombies half the time when killed by zombies 2022-11-15 22:20:04 +00:00
PrairieWind 4255143087 Merge pull request 'Add colors.txt file to tools/' (#2953) from add_colors_txt into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2953
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-11-15 22:16:52 +00:00
RankoSaotome 51d4f075b2 Add credits to colors.txt file 2022-11-15 22:12:27 +00:00
RankoSaotome a607444e60 Add colors.txt for minetestmapper 2022-11-15 22:12:27 +00:00
PrairieWind ebd38fd44e Merge pull request 'Fix crash when new player rightclicks a bed' (#2958) from fix_bed_meta_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2958
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-11-15 22:08:42 +00:00
cora dbef60c558 Fix crash when new player rightclicks a bed 2022-11-15 22:02:37 +00:00
PrairieWind 4e9190bbcf Merge pull request 'Fix crash when rightclicking parrot' (#2965) from fix_parrot_rightclick_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2965
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-11-15 21:50:17 +00:00
cora 033b051689 Fix crash when rightclicking parrot 2022-11-15 21:16:48 +01:00
cora 589bf75e6a Merge pull request 'Fix creative mode inventory search crash' (#2956) from fix_creative_inv_search into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2956
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-11-15 14:53:15 +00:00
erlehmann 94960b64d4 Fix creative mode inventory search crash 
Before this patch it was possible for any user to to crash Minetest in
creative mode. This was possible because queries in the search field
were interpreted as search patterns for string.find().

A search for a single square bracket would reliably crash the server.
Also, a search for 6000 times the string “a?” would hang the server.

The solution to both bugs is to not interpret the query as a pattern.
 2022-11-15 04:41:01 +01:00
anarquimico 507f14c317 Modified function and ABM 2022-11-15 00:01:28 -03:00
cora 12a31ee5ba Merge pull request 'Add ocean temple' (#2907) from ocean_temple into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2907
 2022-11-15 00:35:27 +00:00
cora 63225c20e5 change schematics for gold and sponges instead of chests 2022-11-15 01:28:51 +01:00
PrairieWind 54d4a97a27 Add Ocean Temple Loot 2022-11-15 01:28:51 +01:00
cora 61b5783e73 Make temple rarer 2022-11-15 01:28:51 +01:00
cora 04cb919f2b structure-spawning: make water spawns possible 2022-11-15 01:28:51 +01:00
cora 4ceecffc8b Add ocean temple 2022-11-15 01:28:51 +01:00
cora 3c287d84d2 Merge pull request 'Fix a couple issues in mcl_structures' (#2940) from fix_struct_construct_nodes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2940
 2022-11-15 00:27:35 +00:00
cora 00541cbfb8 Fix end spike wrong vector.add usage 2022-11-15 01:26:06 +01:00
cora 36a6a353a3 Fix local construct_nodes 2022-11-15 01:26:06 +01:00
cora 8fa0371c63 Merge pull request 'Fix undeclared global variable in mcl_playerplus' (#2950) from playerplus into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2950
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-15 00:22:38 +00:00
Johannes Fritz 3d6ff573e7 Fix undeclared global variable in mcl_playerplus 2022-11-14 12:40:45 -06:00
cora b7f766e7cc Merge pull request 'Who doesn't love hopper minecarts?' (#2941) from feature/hopper_minecarts into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2941
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-14 03:25:47 +00:00
cora 489ef43458 Don't transfer whole stacks 2022-11-14 04:07:41 +01:00
ancientmarinerdev e6d778b214 Remove WIP flag for hopper minecart 2022-11-14 04:07:41 +01:00
ancientmarinerdev 70a7fb9387 Hoppers now take from hopper minecarts 2022-11-14 04:07:41 +01:00
ancientmarinerdev a2732b655f Code cleanup 2022-11-14 04:07:41 +01:00
ancientmarinerdev 9065170b1c Clean up hopper minecart 2022-11-14 04:07:41 +01:00
ancientmarinerdev ce457eb351 Who doesn't love hopper minecarts? 2022-11-14 04:07:41 +01:00
cora c21527d207 Merge pull request 'add mycelium townaura particles' (#2946) from mycelium_aura_particle into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2946
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-14 01:48:08 +00:00
epCode c288b6ab93 make townaura more preformant 2022-11-14 02:38:02 +01:00
epCode 28f952309e add mycelium townaura particles 2022-11-14 02:38:02 +01:00
cora 55375a7476 Merge pull request 'fix all chests size with selectionbox/collisionbox' (#2944) from fix_chests into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2944
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-13 22:20:30 +00:00
epCode 080182ab15 Fix ender and shulker nodeboxes 2022-11-13 22:18:00 +00:00
epCode 6c6e21b63e fix chests 2022-11-13 22:18:00 +00:00
cora b36b2058ab Merge pull request 'Pot nether roots and fungi' (#2945) from 3raven/MineClone2-pot:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2945
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-13 22:00:01 +00:00
3raven d01aa36d09 Pot nether roots and fungi 
Pot nether roots and fungi
 2022-11-13 17:44:21 +00:00
cora daa455c41b Merge pull request 'Integrate hoppers with composter' (#2917) from anarquimico/MineClone2:hoppers_w_composter into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2917
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-12 12:28:50 +00:00
cora b625fba4f2 Merge branch 'master' into hoppers_w_composter 2022-11-12 12:27:49 +00:00
anarquimico 3ef8838a11 Fixed indentation. 2022-11-12 06:28:36 -03:00
cora 99b26f5e3f Merge pull request 'Villagers will now claim more than red beds. Villagers don't steal players beds.' (#2924) from feature/villagers_pt5 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2924
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-12 01:43:55 +00:00
ancientmarinerdev 59808c5190 Fix race condition where many villagers are fighting for same job 2022-11-12 02:35:00 +01:00
ancientmarinerdev 3000a378f3 Villagers can claim any bed. Player can steal villager bed. Villager won't take player bed 2022-11-12 02:35:00 +01:00
ancientmarinerdev 3e1a475442 Logging improvements 2022-11-12 02:35:00 +01:00
ancientmarinerdev e5c639c779 Logging improvements 2022-11-12 02:35:00 +01:00
ancientmarinerdev ff0fea8978 Add default logger to make logging easier 2022-11-12 02:35:00 +01:00
ancientmarinerdev 814ad39c09 Villagers can now claim any type of bed. 2022-11-12 02:35:00 +01:00
cora 1dfc71c76c Merge pull request 'mcl_playerplus fixes' (#2906) from playerplus into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2906
Reviewed-by: epCode <epcode@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-11 17:58:55 +00:00
Johannes Fritz 8ff4a94889 mcl_playerplus: Fix bows 2022-11-11 17:53:13 +00:00
Johannes Fritz c66e184373 mcl_playerplus fixes 2022-11-11 17:53:13 +00:00