# Conflicts:
#	extras/conf/SRB2-22.cfg
#	src/p_ceilng.c

# Conflicts:
#	src/p_user.c

Fix metal recordings not being saved in srb2home

See merge request !1601

Raise the maximum value of file upload speed drastically

See merge request !1665

Fix `KeyUp` hook being called when the console is open

See merge request !1664

Perfstats averaging and refactor

See merge request !1643

Raise addon limit

See merge request !1465

Timestamp function for Lua

See merge request !1647

Clean up bouncy fof code + fix bugs (closes #291)

Closes #291

See merge request !1461

Fix visplanes getting allocated twice (backport from srb2kart)

See merge request !1636

Remove that line again

See merge request !1645

fix MFE_TOUCHWATER (and MFE_TOUCHLAVA) not applying while standing on sloped water or lava (resolves #365, #201)

Closes #201 and #365

See merge request !1654

Add toggle for linedef action 401 to not change the ceiling texture.

Closes #567

See merge request !1663

A few damage type fixes

Closes #392

See merge request !1660

Small menu edits

Closes #614 and #87

See merge request STJr/SRB2!1658

Fix Large Spike Balls not dealing spike damage

See merge request !1661

The Single Most Important Typo Fix of All-Time

See merge request !1662

Fix #214 (Crushstacean + Fireball Player Removal)

Closes #214

See merge request !1629

Give userdata that needed names some names.

See merge request !1639

Pause the console refresh while startup wads are loading. (Competing with !1347) (Resolves #412)

Closes #412

See merge request STJr/SRB2!1357

merge master into next again

See merge request !1659

Remove mixed code and declarations warning

See merge request !1618