Resolved changelog conflict

This commit is contained in:
Ben Wallis 2022-09-15 10:04:46 +01:00
parent cafdcad8ce
commit a5f8b9ebf8

View File

@ -21,7 +21,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- View distance settings that are lowered by the server limit (or other factors) now display an - View distance settings that are lowered by the server limit (or other factors) now display an
extra ghost slider cursor when set above the limit (instead of snapping back to the limit). extra ghost slider cursor when set above the limit (instead of snapping back to the limit).
Limits on the view distance by the server no longer affect the settings saved on the client. Limits on the view distance by the server no longer affect the settings saved on the client.
- HQX upscaling shader for people playing on low internal resolutions
### Changed ### Changed
- Use fluent for translations - Use fluent for translations
@ -50,7 +49,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
first joining a server and when changing the view distance (previously this required moving to a first joining a server and when changing the view distance (previously this required moving to a
new chunk for the initial setting or subsequent change to apply). new chunk for the initial setting or subsequent change to apply).
- Moderators and admins are no longer blocked from logging in when there are too many players. - Moderators and admins are no longer blocked from logging in when there are too many players.
- FXAA now behaves correctly at non-1.0x internal resolutions
- Pets no longer aggro on pet owners after being healed - Pets no longer aggro on pet owners after being healed
## [0.13.0] - 2022-07-23 ## [0.13.0] - 2022-07-23