[ci-skip] update CHANGELOG.md

Crazy-Crew · Aug 23, 2024 · a140c0d · a140c0d
1 parent efff2c8
commit a140c0d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,7 @@
 ### Changes:
-- Bumped to 1.21.1.
-- Bumped nbt-api.
 - Cleaned up a bit of the internals.
 - Optimized a few little bits of the plugin including some questionable ItemMeta calls.
 - Removed reliance on nbt-api.
 
 ### Fixed:
-- Fixed a few issues with broken bits of code that were commented.
-- Fixed issue with the location for boom not being correct.
-- Fixed the lore in blacksmith for the cost.
-
-### Removed:
-- NoCheatPlus support as it's not hosted anywhere.
+- Fixed a few issues with broken bits of code that were commented.
diff --git a/paper/run/config/paper-world-defaults.yml b/paper/run/config/paper-world-defaults.yml
@@ -103,6 +103,7 @@ entities:
       skeletons: false
       zombies: false
     nerf-pigmen-from-nether-portals: false
+    only-merge-items-horizontally: false
     parrots-are-unaffected-by-player-movement: false
     phantoms-do-not-spawn-on-creative-players: true
     phantoms-only-attack-insomniacs: true

diff --git a/paper/run/server.properties b/paper/run/server.properties
@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Sat Aug 10 15:31:33 EDT 2024
+#Fri Aug 23 00:25:51 EDT 2024
 accepts-transfers=false
 allow-flight=false
 allow-nether=false