cora
5778c2d27a
Merge pull request 'Fix items obtained from villager trades:' ( #2264 ) from Fix_items_obtained_from_villagers into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2264
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-05-30 21:21:54 +00:00
MysticTempest
31106a2031
Fix items obtained from villager trades:
...
This PR stops the load_enchantments function from being
called for all items in the villager trades.
Fixing non-enchanted items from villagers being unable to stack
with their regular counterparts.
As they now, no longer have any description metadata.
While also ensuring that enchanted items still have their
tooltips, and work.
2022-05-30 15:11:22 -05:00
cora
ad1b7510aa
Merge pull request 'Update old mobs_mc_ horse armor textures' ( #2262 ) from legacy_horse_armor_texture into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2262
2022-05-30 10:54:12 +00:00
cora
dc21b02d04
update old mobs_mc_ horse armor textures
2022-05-30 10:49:38 +00:00
Elias Fleckenstein
a86fc935aa
mcl_maps: add callback to load_map function ( #2261 )
...
Fixes maps in itemframes not loading after restart (#2255 )
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2261
Co-authored-by: Elias Fleckenstein <eliasfleckenstein@web.de>
Co-committed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
2022-05-30 01:32:20 +00:00
cora
50c802df98
Merge pull request 'Make new jobsite tables diggable.' ( #2260 ) from fix_undiggable_jobsites into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2260
Reviewed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-05-29 20:12:57 +00:00
cora
a44347f641
make cart.table, fletch.table and loom diggable
2022-05-29 22:07:47 +02:00
cora
a85bf22695
Merge pull request 'Spawn witch and black cat on witchhut generation' ( #2246 ) from spawn_witches into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2246
2022-05-29 00:35:37 +00:00
cora
e4a4648b25
fix size of black cat texture
2022-05-29 02:34:02 +02:00
cora
6b9cb0062d
save home coords in cat entity as well
2022-05-29 02:34:02 +02:00
cora
2337e72a23
simplify spawn logic
2022-05-29 02:34:02 +02:00
cora
da6563a5b3
Spawn witch and black cat on witchhut generation
2022-05-29 02:34:02 +02:00
cora
41ebaf12a5
Merge pull request 'fix indoor weather + multiplayer issue' ( #2250 ) from weather_fixes into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2250
2022-05-29 00:32:16 +00:00
cora
a179a1cb62
fix indoor weather + multiplayer issue
2022-05-29 02:24:12 +02:00
cora
663e6dfe9e
Merge pull request 'Add Parrot perching' ( #2232 ) from parrot_perching_2 into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2232
2022-05-29 00:22:52 +00:00
cora
7bc63d2882
fix mcl_mobs api_changes
2022-05-28 00:06:29 +02:00
cora
c0a9cb7020
don't hurt perched parrot on punch
2022-05-28 00:05:04 +02:00
cora
e90e17e533
clean up perch code, smoother behavior
2022-05-28 00:05:04 +02:00
cora
3d13000599
tweak detaching behavior
2022-05-28 00:05:04 +02:00
cora
86bc398a79
don't do flying animation while perching,fix anims
2022-05-28 00:05:04 +02:00
cora
14ec1aa014
add basic parrot perching
2022-05-28 00:05:04 +02:00
cora
c1114211fc
Merge pull request 'Fix crash on non existent xp-hud due to gamemode' ( #2249 ) from fix-gamemode-xp into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2249
2022-05-27 18:15:48 +00:00
cora
ae2860d017
Show/Hide XP-hud immediately after gamemode switch
2022-05-27 19:56:47 +02:00
cora
1127231ca9
Fix crash on non existent xp-hud due to gamemode
2022-05-27 15:06:25 +02:00
cora
ff6af32ddf
Merge pull request 'mobs-redo mobitems breakup' ( #2247 ) from mobs-redo-mobitem-breakup into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2247
2022-05-27 00:54:01 +00:00
cora
4dba637ed8
readd lost horse armor inv images - confusing names
2022-05-27 02:44:39 +02:00
Elias Fleckenstein
e7898352d8
Remove mobs_mc_gameconfig
2022-05-27 02:44:39 +02:00
cora
d887a97310
Merge pull request 'Add entity cramming' ( #2226 ) from entity_cramming into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2226
Reviewed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
2022-05-26 12:21:46 +00:00
cora
47fa43825c
count only mobs for cramming
2022-05-26 14:20:19 +02:00
cora
af7dc0fb8f
change "constant" declaration to match mcl_mobs
2022-05-26 14:16:38 +02:00
cora
87f50d6423
entity cramming: clean up check logic
2022-05-26 14:16:38 +02:00
cora
fb4f21cba0
entity cramming: spare the children
2022-05-26 14:16:38 +02:00
cora
85b599edba
entity cramming: check less often
2022-05-26 14:16:38 +02:00
cora
b4cbc528a3
mcl_mobs: add entity_cramming
2022-05-26 14:16:38 +02:00
Elias Fleckenstein
96dcfb8a62
Merge pull request 'Strip trailing whitespace from files' ( #2240 ) from EliasFleckenstein03/MineClone2:fmt into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2240
2022-05-26 05:36:32 +00:00
Elias Fleckenstein
f6a40ffb78
Run tools/strip_trailing_whitespace.sh
2022-05-26 07:29:28 +02:00
Elias Fleckenstein
6a054556cc
Add tool to strip trailing whitespace
2022-05-26 07:28:05 +02:00
cora
8210fba65b
Merge pull request 'Mobs Redo Part 1' ( #2245 ) from mobs-redo-basic-cleanup into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2245
2022-05-25 21:19:07 +00:00
Elias Fleckenstein
dd1f8cb59c
Remove enderman gameconfig
2022-05-25 23:13:33 +02:00
Elias Fleckenstein
ff33794487
Rename mobs global to mcl_mobs
2022-05-25 23:13:33 +02:00
Elias Fleckenstein
e0f70b54ec
Remove _cmi_is_mob
2022-05-25 23:13:33 +02:00
Elias Fleckenstein
4054f05a4c
Remove support for invisibility mod
2022-05-25 23:13:33 +02:00
Elias Fleckenstein
f6be8bac5a
Remove checks for MCL2 mods
2022-05-25 23:13:33 +02:00
Elias Fleckenstein
8db9e76529
Remove unused version field
2022-05-25 23:13:33 +02:00
Elias Fleckenstein
6ae722a6ee
Remove use_cmi
2022-05-25 23:13:33 +02:00
Elias Fleckenstein
fc3992ceb6
Remove mobs.is_creative
2022-05-25 23:13:33 +02:00
cora
d3afccad64
Merge pull request 'Fix warnings in mcl_bells and mcl_beds' ( #2243 ) from EliasFleckenstein03/MineClone2:warn into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2243
2022-05-25 17:54:28 +00:00
Elias Fleckenstein
569288b782
Fix warnings in mcl_bells and mcl_beds
2022-05-25 19:37:36 +02:00
cora
950a0607f1
Merge pull request 'Add /gamemode command for per player gamemode' ( #2235 ) from creative_gamemode_2 into master
...
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2235
Reviewed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
2022-05-25 14:43:06 +00:00
cora
d863a6298b
fix/simplifiy things from review
2022-05-25 16:36:04 +02:00
