Commit graph

9839 commits

Author SHA1 Message Date
cora
eeecc52ff8 Fix crash when trying to place meshhand 2022-11-16 12:23:39 -06:00
cora
661424ad23 Merge pull request 'better water visuals' (#2960) from better_visuals_water into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2960
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-11-16 16:14:38 +00:00
FossFanatic
9b392fcefc Upload files to 'mods/ITEMS/mcl_cocoas/models' 2022-11-16 13:44:35 +00:00
FossFanatic
d091d634bb Delete 'mods/ITEMS/mcl_cocoas/models/emptyfile' 2022-11-16 13:44:23 +00:00
FossFanatic
16746f962f Upload files to 'mods/ITEMS/mcl_cocoas/models' 2022-11-16 13:44:15 +00:00
FossFanatic
00c596c126 Add 'mods/ITEMS/mcl_cocoas/models/emptyfile' 2022-11-16 13:43:40 +00:00
FossFanatic
993d7b6873 Delete 'mods/ITEMS/mcl_cocoas/models' 2022-11-16 13:43:23 +00:00
FossFanatic
ceff91e2c3 Add 'mods/ITEMS/mcl_cocoas/models/' 2022-11-16 13:43:11 +00:00
FossFanatic
6bfcd9b1ea Delete 'mods/ITEMS/mcl_cocoas/models/emptyfile' 2022-11-16 13:42:49 +00:00
FossFanatic
6b826b45e1 Add 'mods/ITEMS/mcl_cocoas/models/emptyfile' 2022-11-16 13:42:36 +00:00
FossFanatic
3de1f9e4d6 Delete 'mods/ITEMS/mcl_cocoas/mcl_cocoas_cocoa_stage_2.obj' 2022-11-16 13:39:41 +00:00
FossFanatic
348434adf1 Delete 'mods/ITEMS/mcl_cocoas/mcl_cocoas_cocoa_stage_1.obj' 2022-11-16 13:39:36 +00:00
FossFanatic
6946573e65 Delete 'mods/ITEMS/mcl_cocoas/mcl_cocoas_cocoa_stage_0.obj' 2022-11-16 13:39:32 +00:00
FossFanatic
862d6a9e3e Upload files to 'mods/ITEMS/mcl_cocoas' 2022-11-16 13:39:19 +00:00
FossFanatic
78d45d23c2 change the code 2022-11-16 13:38:44 +00:00
FossFanatic
b11d65cc82 Update cocoa textures 2022-11-16 13:35:01 +00:00
FossFanatic
f4f57a9fe6 Delete 'mods/ITEMS/mcl_cocoas/textures/mcl_cocoas_cocoa_top_stage_2.png' 2022-11-16 13:33:42 +00:00
TheOnlyJoeEnderman
9e73c2cd46 Remove spaces on line 70 (71)
Actually delete the spaces this time.
2022-11-16 08:00:35 +00:00
TheOnlyJoeEnderman
50e6dd94b2 Code cleaning
Remove outdated comment. Fix spaces on lines 40, 67, 70.
2022-11-16 07:58:07 +00:00
epCode
7ed8370eb0 localize var/fix weather not changing brightness while underwater. 2022-11-15 22:36:06 +00:00
epCode
3f8f6f8e44 deeper-darker image 2022-11-15 22:36:05 +00:00
epCode
a5eb1d240e add deeper = darker 2022-11-15 22:36:05 +00:00
epCode
ce724ee926 make sky color change when submerged 2022-11-15 22:36:05 +00:00
PrairieWind
e0419f3568 Merge pull request 'Turn villagers to zombie villagers when killed by zombies half the time' (#2962) from villagers_to_zs into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2962
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
2022-11-15 22:30:41 +00:00
cora
f66a241188 turn villagers to z villagers not normal zs 2022-11-15 22:20:04 +00:00
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