Fix merge conflict in changelog

This commit is contained in:
Lwmte 2023-02-18 22:59:52 +02:00
parent 4077b45e0f
commit 572e43b84c

View file

@ -7,7 +7,6 @@ Version 1.0.7
* Fix TR3 Shiva not taking explosive damage (should still block it with the sword).
* Fix TR3 Puna boss not blocking projectiles (grenade, rocket, harpoon, bolt) with the shield.
* Fix TR3 Puna boss and TR5 Roman statue taking fire when shot by explosive ammo.
* Fix entity taking damage when it's drawed by default (not invisible like shiva or sword/spear guardian) but still not triggered.
* Fix valve switch unable to untrigger objects.
* Fix valve and wall hole switches (OCB 5 and 6) not working as a timed switches.
* Fix silent crash if hair object or skin joints are missing.