From a5f8b9ebf8c18df11f4857970b6bbc15c39f52a4 Mon Sep 17 00:00:00 2001 From: Ben Wallis Date: Thu, 15 Sep 2022 10:04:46 +0100 Subject: [PATCH] Resolved changelog conflict --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f2bb979d8..f203773ebe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,14 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added a setting to influence the gap between music track plays. - Added a Craft All button. - Server: Vacuum database on startup -- SeaChapel, greek/latin inspired dungeon for ocean biome coasts +- SeaChapel, greek/latin inspired dungeon for ocean biome coasts - Entity view distance setting added (shown in graphics and network tabs). This setting controls the distance at which entities are synced to the client and which entities are displayed in. This is clamped to be no more than the current overall view distance setting. - 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). 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 - 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 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. -- FXAA now behaves correctly at non-1.0x internal resolutions - Pets no longer aggro on pet owners after being healed ## [0.13.0] - 2022-07-23