Rebase to 15.4.1

[FoseFx]

Changes

• rebase to 15.4.1

Checklist

• [x] My change builds
• [x] I tested my change
• [x] I use the "bttv_" prefix for all resources I propose
• [x] When adding a string I also added it to the bttv.Res.strings Enum and res/values/strings.xml (in mod) and res/values/public.xml (in disass)
• [x] If my change is significant enough, I added it to the CHANGELOG.md under master
• [x] I'll add myself and everyone else who contributed to this change to the contributors list using all-contributors
• [x] I license my changes according to the MIT License.