Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@681c013 Bundle spark (#11093) PaperMC/Paper@5fee9c6 Move configuration option to a system property PaperMC/Paper@aa3b356 Improve server startup logging (#11110) PaperMC/Paper@9aea240 Properly lookup plugin classes when looked up by spark PaperMC/Paper@7e91a2c Update the bundled spark version
2025-12-22 00:09:25 +00:00 · 2024-07-21 07:11:14 +08:00
parent d4f0ad7103
commit a4ed88543a
125 changed files with 156 additions and 155 deletions
--- a/patches/server/0003-Hide-irrelevant-compilation-warnings.patch
+++ b/patches/server/0003-Hide-irrelevant-compilation-warnings.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/build.gradle.kts b/build.gradle.kts
-index a302242681e477aa8f0d243e3a0ecf9f31c27c0a..fcc026e9b5ebf892d86f8395f3571b0a7c5b8311 100644
+index 22e840a7ec04b7ec5d3886dda023c05b6f0b55c7..6129fd5f7615ae0c9b98f86441ce76d9807bffb0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -67,6 +67,15 @@ paperweight {
+@@ -71,6 +71,15 @@ paperweight {
     craftBukkitPackageVersion.set("v1_21_R1") // also needs to be updated in MappingEnvironment
 }
 
--- a/patches/server/0004-Enable-preview-features-for-development-runs.patch
+++ b/patches/server/0004-Enable-preview-features-for-development-runs.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0ca56b8c082e17ace3425ee151b096f961448799..ee6002acca215015d00ea0bfc2b720ea0087145e 100644
+index 6129fd5f7615ae0c9b98f86441ce76d9807bffb0..4175bee3238ba53d85cab942d31d38e90599330d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -181,6 +181,7 @@ fun TaskContainer.registerRunTask(
+@@ -185,6 +185,7 @@ fun TaskContainer.registerRunTask(
     val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
     minHeapSize = "${memoryGb}G"
     maxHeapSize = "${memoryGb}G"
--- a/patches/server/0005-Gale-branding-changes.patch
+++ b/patches/server/0005-Gale-branding-changes.patch
@@ -221,10 +221,10 @@ index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898
 -<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 +<https://www.gnu.org/philosophy/why-not-lgpl.html>.
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 525a2087472f6fba3552efb8eaf6f485f158802c..b6b99aff8940d62bf63cebf260faf7f923c0baed 100644
+index 4175bee3238ba53d85cab942d31d38e90599330d..014ad39c084f37c274d8a6847814404dfb7c97c9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -89,14 +89,14 @@ tasks.jar {
+@@ -93,14 +93,14 @@ tasks.jar {
         val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
         attributes(
             "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -244,7 +244,7 @@ index 525a2087472f6fba3552efb8eaf6f485f158802c..b6b99aff8940d62bf63cebf260faf7f9
             "Build-Number" to (build ?: ""),
             "Build-Time" to Instant.now().toString(),
             "Git-Branch" to gitBranch, // Paper
-@@ -233,3 +233,22 @@ tasks.registerRunTask("runReobfPaperclip") {
+@@ -237,3 +237,22 @@ tasks.registerRunTask("runReobfPaperclip") {
     classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createReobfPaperclipJar").flatMap { it.outputZip })
     mainClass.set(null as String?)
 }
--- a/patches/server/0008-Gale-configuration.patch
+++ b/patches/server/0008-Gale-configuration.patch
@@ -189,7 +189,7 @@ index 8f23276796037d048eb114952891a01a40971b3e..ac9ceb54b894119cb30a22d37e035e2c
     }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 57e84cf2219d28c37e4c042371afddf585334954..eadc4709ae518023dfcf1661c95e921ef3ae44b2 100644
+index 9325d6f95165a7cee00d7de736af723681cc16b4..590f9f43377b88e6c94eeccbb53c08a6067930cf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -3,9 +3,6 @@ package net.minecraft.server;
@@ -274,7 +274,7 @@ index 33e3815a0c979609d4c7ab83ad91e87ac07a556d..67d4a82f371a4772128cc2218fd0a18c
     }
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 7d82cc6b847124cf4225428ba310309544928148..ac703c9ef504779dffbd8d7e676dbb51fb94dd29 100644
+index dd56c8e041116ef3602a9f89c998c8208ab89b51..86c615518e315dd4425d17df163e88a150a4ef7c 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -226,6 +226,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -285,9 +285,9 @@ index 7d82cc6b847124cf4225428ba310309544928148..ac703c9ef504779dffbd8d7e676dbb51
 +        galeConfigurations.initializeGlobalConfiguration(this.registryAccess());
 +        galeConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
 +        // Gale end - Gale configuration
+         this.server.spark.enableEarlyIfRequested(); // Paper - spark
         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
         if (this.convertOldUsers()) {
-             this.getProfileCache().save(false); // Paper
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
 index 2766ec28f028c0bd672009928bf64c1a6e5d07d6..3bdca1658cec40df0c31aa66e5102f2e9ba5de13 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -356,10 +356,10 @@ index e2a0487089eb5a7bdc1433e4c75f69d8e9f9d5f9..90fc52bb3c8c48e055965f2f822c6199
         this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3a91faeb6957e4e783b1de3e1145e7d1d164a857..497f75de077018588fe837a1a73a1c6a804e502d 100644
+index c8b82bc41f2042bb4b067f06265a3a22e51f7629..a01e30045b02526db835f2e763d987146eec4c35 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1068,6 +1068,7 @@ public final class CraftServer implements Server {
+@@ -1070,6 +1070,7 @@ public final class CraftServer implements Server {
 
         org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
         this.console.paperConfigurations.reloadConfigs(this.console);
@@ -367,7 +367,7 @@ index 3a91faeb6957e4e783b1de3e1145e7d1d164a857..497f75de077018588fe837a1a73a1c6a
         for (ServerLevel world : this.console.getAllLevels()) {
             // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
             world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -2987,6 +2988,14 @@ public final class CraftServer implements Server {
+@@ -2991,6 +2992,14 @@ public final class CraftServer implements Server {
             return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
         }
 
--- a/patches/server/0010-Gale-commands.patch
+++ b/patches/server/0010-Gale-commands.patch
@@ -13,7 +13,7 @@ As part of: Paper (https://github.com/PaperMC/Paper)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 87ec971241047314e7d505fb6b35be4a456727de..f5510ec3ecdb51ca33b4e91ffd164d62b4f7c5dd 100644
+index 86c615518e315dd4425d17df163e88a150a4ef7c..8306edb6fb28e90ba4b432a07131e063daa70507 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -57,6 +57,7 @@ import net.minecraft.world.level.GameRules;
@@ -24,14 +24,14 @@ index 87ec971241047314e7d505fb6b35be4a456727de..f5510ec3ecdb51ca33b4e91ffd164d62
 import org.slf4j.Logger;
 
 // CraftBukkit start
-@@ -239,6 +240,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -240,6 +241,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); // Paper - start watchdog thread
         thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
         io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
 +        GaleCommands.registerCommands(this); // Gale - Gale commands - register commands
+         this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
- 
 diff --git a/src/main/java/org/galemc/gale/command/GaleCommand.java b/src/main/java/org/galemc/gale/command/GaleCommand.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..87d3aed35341dfa9358af064dd54d7de95078269
--- a/patches/server/0011-Include-time-in-startup-logs.patch
+++ b/patches/server/0011-Include-time-in-startup-logs.patch
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martijn Muijsers <martijnmuijsers@live.nl>
-Date: Sat, 4 Feb 2023 10:58:12 +0100
-Subject: [PATCH] Include time in startup logs
-
-License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-Gale - https://galemc.org
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 6e1f92b45504cef0c4dcbbebf3df339ef4cad0a1..f4106b117c2b82a25616b590e7b0853f05864ea1 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -2,6 +2,7 @@ package org.bukkit.craftbukkit;
- 
- import java.io.File;
- import java.io.IOException;
-+import java.text.DateFormat;
- import java.text.SimpleDateFormat;
- import java.util.Arrays;
- import java.util.Calendar;
-@@ -25,6 +26,26 @@ public class Main {
-     }
-     // Paper end - Reset loggers after shutdown
- 
-+    // Gale start - include time in startup logs
-+    private static final DateFormat startupDateFormat = new SimpleDateFormat("HH:mm:ss");
-+
-+    private static void printlnStartupToSystemOut(String type, String line) {
-+        System.out.println("[" + startupDateFormat.format(new Date()) + " " + type + "]: " + line);
-+    }
-+
-+    public static void printlnStartupInfoToSystemOut(String line) {
-+        printlnStartupToSystemOut("INFO", line);
-+    }
-+
-+    public static void printlnStartupWarningToSystemOut(String line) {
-+        printlnStartupToSystemOut("WARN", line);
-+    }
-+
-+    public static void printlnStartupErrorToSystemOut(String line) {
-+        printlnStartupToSystemOut("ERROR", line);
-+    }
-+    // Gale end - include time in startup logs
-+
-     public static void main(String[] args) {
-         // Paper start
-         final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected");
-@@ -288,13 +309,13 @@ public class Main {
-                     String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")";
-                     String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")";
- 
-                    System.out.println("System Info: " + javaInfo + " " + osInfo);
-+                    printlnStartupInfoToSystemOut("System Info: " + javaInfo + " " + osInfo); // Gale - include time in startup logs
-                 } else {
-                    System.out.println("Unable to read system info");
-+                    printlnStartupInfoToSystemOut("Unable to read system info"); // Gale - include time in startup logs
-                 }
-                 // Paper end - Log Java and OS versioning to help with debugging plugin issues
- 
-                System.out.println("Loading libraries, please wait...");
-+                printlnStartupInfoToSystemOut("Loading libraries, please wait..."); // Gale - include time in startup logs
-                 net.minecraft.server.Main.main(options);
-             } catch (Throwable t) {
-                 t.printStackTrace();
--- a/patches/server/0011-Remove-vanilla-profiler.patch
+++ b/patches/server/0011-Remove-vanilla-profiler.patch
@@ -164,7 +164,7 @@ index e9775b4506909bee65a74964f0d5391a0513de1d..1c4dd8acdcd571aceffe4b78599ca2c7
     }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed2119735d 100644
+index 590f9f43377b88e6c94eeccbb53c08a6067930cf..29f34d369e7d5930f0e1ea146fa811893a0f8b85 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -103,18 +103,9 @@ import net.minecraft.util.datafix.DataFixers;
@@ -215,7 +215,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
         this.random = RandomSource.create();
         this.port = -1;
         this.levels = Maps.newLinkedHashMap();
-@@ -1032,9 +1008,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1034,9 +1010,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         org.spigotmc.WatchdogThread.doStop(); // Paper
         // Paper end
         // CraftBukkit end
@@ -225,7 +225,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
 
         MinecraftServer.LOGGER.info("Stopping server");
         Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
-@@ -1288,16 +1261,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1292,16 +1265,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
                 boolean flag = i == 0L;
 
@@ -242,7 +242,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
                 this.tickServer(flag ? () -> {
                     return false;
                 } : this::haveTime);
-@@ -1308,7 +1274,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1312,7 +1278,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                     throw new RuntimeException("Chunk system crash propagated to tick()", crash);
                 }
                 // Paper end - rewrite chunk system
@@ -250,7 +250,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
                 this.mayHaveDelayedTasks = true;
                 this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
                 this.startMeasuringTaskExecutionTime();
-@@ -1318,9 +1283,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1322,9 +1287,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                     this.tickRateManager.endTickWork();
                 }
 
@@ -260,7 +260,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
                 this.isReady = true;
                 JvmProfiler.INSTANCE.onServerTick(this.smoothedTickTimeMillis);
             }
-@@ -1530,7 +1493,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1534,7 +1497,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
 
     public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
@@ -268,7 +268,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
         super.doRunTask(ticktask);
     }
 
-@@ -1603,7 +1565,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1608,7 +1570,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         if (playerSaveInterval < 0) {
             playerSaveInterval = autosavePeriod;
         }
@@ -276,7 +276,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
         final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
         try {
             this.isSaving = true;
-@@ -1618,7 +1579,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1623,7 +1584,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         } finally {
             this.isSaving = false;
         }
@@ -284,23 +284,23 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
         // Paper end - Incremental chunk and player saving
         // Paper start - move executeAll() into full server tick timing
         try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
-@@ -1630,7 +1590,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
+@@ -1636,7 +1596,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
+         this.server.spark.tickEnd(((double)(endTime - lastTick) / 1000000D)); // Paper - spark
         // Paper end - Server Tick Events
 -        this.profiler.push("tallying");
         long j = Util.getNanos() - i;
         int k = this.tickCount % 100;
 
-@@ -1644,7 +1603,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1650,7 +1609,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         this.tickTimes60s.add(this.tickCount, j);
         // Paper end - Add tick times API and /mspt command
         this.logTickMethodTime(i);
 -        this.profiler.pop();
         org.spigotmc.WatchdogThread.tick(); // Spigot
-         co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTimingFullServerTick(); // Paper // Gale - final timings calls
+         co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
     }
-@@ -1735,11 +1693,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1741,11 +1699,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         });
         // Paper end - Folia scheduler API
         io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
@@ -312,7 +312,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
         //Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; moved down
 
         // CraftBukkit start
-@@ -1781,21 +1737,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1787,21 +1743,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
             worldserver.updateLagCompensationTick(); // Paper - lag compensation
 
@@ -334,7 +334,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
             try {
                 worldserver.timings.doTick.startTiming(); // Spigot
                 worldserver.tick(shouldKeepTicking);
-@@ -1807,17 +1754,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1813,17 +1760,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                 throw new ReportedException(crashreport);
             }
 
@@ -352,7 +352,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
         MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper
         this.playerList.tick();
         MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper
-@@ -1825,15 +1768,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1831,15 +1774,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             GameTestTicker.SINGLETON.tick();
         }
 
@@ -368,7 +368,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
         iterator = this.playerList.getPlayers().iterator();
 
         while (iterator.hasNext()) {
-@@ -1843,7 +1783,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1849,7 +1789,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             entityplayer.connection.resumeFlushing();
         }
 
@@ -376,7 +376,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
     }
 
     private void synchronizeTime(ServerLevel world) {
-@@ -1851,7 +1790,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1857,7 +1796,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
 
     public void forceTimeSynchronization() {
@@ -384,7 +384,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
         Iterator iterator = this.getAllLevels().iterator();
 
         while (iterator.hasNext()) {
-@@ -1859,8 +1797,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1865,8 +1803,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
             this.synchronizeTime(worldserver);
         }
@@ -393,7 +393,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
     }
 
     public boolean isLevelEnabled(Level world) {
-@@ -2572,7 +2508,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2578,7 +2514,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
 
     public ProfilerFiller getProfiler() {
@@ -402,7 +402,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
     }
 
     public abstract boolean isSingleplayerOwner(GameProfile profile);
-@@ -2817,53 +2753,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2823,53 +2759,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
     // CraftBukkit end
 
@@ -456,7 +456,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
     public Path getWorldPath(LevelResource worldSavePath) {
         return this.storageSource.getLevelPath(worldSavePath);
     }
-@@ -2913,25 +2802,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2919,25 +2808,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return this.isSaving;
     }
 
@@ -482,7 +482,7 @@ index b157214ca20be2ddd234744e5e2a8064977b1227..b26625c0acce99a31810fdce2d9548ed
     public int getMaxChainedNeighborUpdates() {
         return 1000000;
     }
-@@ -3030,56 +2900,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -3036,56 +2906,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         }
     }
 
@@ -603,10 +603,10 @@ index 9cd4f7c6910727c849ac7f5d675dc6105c4bbba2..f9f893a286147c9a8e49f78891381227
 
     }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 53ab4dcd715b24d0e058cc4af1a3b780fc305df4..cfd23ef2d67d360d16a3e9ae8759441e4aa95145 100644
+index 8306edb6fb28e90ba4b432a07131e063daa70507..8538024c6345e79d08643e2d68ca146542b7860a 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -889,12 +889,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -891,12 +891,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         return this.settings.getProperties().serverResourcePackInfo;
     }
 
--- a/patches/server/0012-Include-server.properties-in-timings.patch
+++ b/patches/server/0012-Include-server.properties-in-timings.patch
@@ -1,249 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martijn Muijsers <martijnmuijsers@live.nl>
-Date: Sat, 24 Dec 2022 17:56:41 +0100
-Subject: [PATCH] Include server.properties in timings
-
-License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-Gale - https://galemc.org
-
-diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 29796a404e210f7864f4b33b3367e02531bca2a0..73e503d0590964ac7f9ea15ac7ee7783f0801b2e 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
-+++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -35,6 +35,7 @@ import org.bukkit.Material;
- import org.bukkit.configuration.ConfigurationSection;
- import org.bukkit.configuration.MemorySection;
- import org.bukkit.entity.EntityType;
-+import org.galemc.gale.configuration.timingsexport.VanillaServerPropertiesTimingsExport;
- import org.json.simple.JSONObject;
- import org.json.simple.JSONValue;
- import oshi.SystemInfo;
-@@ -238,6 +239,7 @@ public class TimingsExport extends Thread {
-         // Information on the users Config
- 
-         parent.put("config", createObject(
-+            pair("server.properties", VanillaServerPropertiesTimingsExport.get()), // Gale - include server.properties in timings
-             pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
-             pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
-             // Gale start - Gale configuration - include in timings
-diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index d6431376184e5650b370cbab204e28bc31f4dac6..bfe9be2e329c2ea2c8c44458e88d22bc75520ed4 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-@@ -67,6 +67,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-     public final Difficulty difficulty;
-     public final GameType gamemode;
-     public final String levelName;
-+    public final String levelSeed; // Gale - include server.properties in timings
-     public final int serverPort;
-     @Nullable
-     public final Boolean announcePlayerAchievements;
-@@ -100,13 +101,14 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-     public final boolean hideOnlinePlayers;
-     public final int entityBroadcastRangePercentage;
-     public final String textFilteringConfig;
-+    public final String resourcePackPrompt; // Gale - include server.properties in timings
-     public final Optional<MinecraftServer.ServerResourcePackInfo> serverResourcePackInfo;
-     public final DataPackConfig initialDataPackConfiguration;
-     public final Settings<DedicatedServerProperties>.MutableValue<Integer> playerIdleTimeout;
-     public final Settings<DedicatedServerProperties>.MutableValue<Boolean> whiteList;
-     public final boolean enforceSecureProfile;
-     public final boolean logIPs;
-    private final DedicatedServerProperties.WorldDimensionData worldDimensionData;
-+    public final DedicatedServerProperties.WorldDimensionData worldDimensionData; // Gale - include server.properties in timings - private -> public
-     public final WorldOptions worldOptions;
-     public boolean acceptsTransfers;
- 
-@@ -161,6 +163,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-         this.logIPs = this.get("log-ips", true);
-         this.acceptsTransfers = this.get("accepts-transfers", false);
-         String s = this.get("level-seed", "");
-+        this.levelSeed = s; // Gale - include server.properties in timings
-         boolean flag = this.get("generate-structures", true);
-         long i = WorldOptions.parseSeed(s).orElse(WorldOptions.randomSeed());
- 
-@@ -170,7 +173,10 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
-         }, new JsonObject()), (String) this.get("level-type", (s1) -> {
-             return s1.toLowerCase(Locale.ROOT);
-         }, WorldPresets.NORMAL.location().toString()));
-        this.serverResourcePackInfo = DedicatedServerProperties.getServerPackInfo(this.get("resource-pack-id", ""), this.get("resource-pack", ""), this.get("resource-pack-sha1", ""), this.getLegacyString("resource-pack-hash"), this.get("require-resource-pack", false), this.get("resource-pack-prompt", ""));
-+        // Gale start - include server.properties in timings
-+        this.resourcePackPrompt = this.get("resource-pack-prompt", "");
-+        this.serverResourcePackInfo = DedicatedServerProperties.getServerPackInfo(this.get("resource-pack-id", ""), this.get("resource-pack", ""), this.get("resource-pack-sha1", ""), this.getLegacyString("resource-pack-hash"), this.get("require-resource-pack", false), this.resourcePackPrompt);
-+        // Gale end - include server.properties in timings
-         this.initialDataPackConfiguration = DedicatedServerProperties.getDatapackConfig(this.get("initial-enabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getEnabled())), this.get("initial-disabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getDisabled())));
-         // Paper start - Configurable rcon ip
-         final String rconIp = this.getStringRaw("rcon.ip");
-diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 8f8fd98f96cd390ba43033521982a13044df91cf..dbb0f523608a9208e8c656898b18ce1b9505a1e0 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -27,4 +27,33 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
- 
-     }
- 
-+    public Misc misc;
-+    public class Misc extends ConfigurationPart {
-+
-+        public IncludeInTimingsReport includeInTimingsReport;
-+        public class IncludeInTimingsReport extends ConfigurationPart {
-+            
-+            // Gale start - include server.properties in timings
-+            public ServerProperties serverProperties;
-+            public class ServerProperties extends ConfigurationPart {
-+                public boolean dataPacks = true;
-+                public boolean enableRcon = false;
-+                public boolean generatorSettings = true;
-+                public boolean levelName = false;
-+                public boolean motd = false;
-+                public boolean queryPort = false;
-+                public boolean rconPort = false;
-+                public boolean resourcePackPrompt = false;
-+                @Setting("resource-pack-and-resource-pack-sha1")
-+                public boolean resourcePackAndResourcePackSha1 = false;
-+                public boolean serverIp = false;
-+                public boolean serverPort = false;
-+                public boolean textFilteringConfig = false;
-+            }
-+            // Gale end - include server.properties in timings
-+
-+        }
-+
-+    }
-+
- }
-diff --git a/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java b/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..139d946346594d2a59a8b2930c4eae794c880dbc
--- /dev/null
-+++ b/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java
-@@ -0,0 +1,129 @@
-+// Gale - include server.properties in timings
-+
-+package org.galemc.gale.configuration.timingsexport;
-+
-+import co.aikar.timings.TimingsExport;
-+import net.minecraft.server.MinecraftServer;
-+import net.minecraft.server.dedicated.DedicatedServer;
-+import org.galemc.gale.configuration.GaleGlobalConfiguration;
-+import org.jetbrains.annotations.NotNull;
-+import org.json.simple.JSONObject;
-+
-+import java.util.Optional;
-+
-+/**
-+ * Exports the vanilla server.properties to a JSON object, to be included in a timings report.
-+ *
-+ * @see TimingsExport
-+ *
-+ * @author Martijn Muijsers under GPL-3.0
-+ */
-+public final class VanillaServerPropertiesTimingsExport {
-+
-+    private VanillaServerPropertiesTimingsExport() {}
-+
-+    @SuppressWarnings("unchecked")
-+    public static @NotNull JSONObject get() {
-+
-+        var json = new JSONObject();
-+        var properties = ((DedicatedServer) MinecraftServer.getServer()).getProperties();
-+        var includeConfig = GaleGlobalConfiguration.get().misc.includeInTimingsReport.serverProperties;
-+
-+        json.put("allow-flight", String.valueOf(properties.allowFlight));
-+        json.put("allow-nether", String.valueOf(properties.allowNether));
-+        json.put("broadcast-console-to-ops", String.valueOf(properties.broadcastConsoleToOps));
-+        json.put("broadcast-rcon-to-ops", String.valueOf(properties.broadcastRconToOps));
-+        json.put("debug", String.valueOf(properties.debug));
-+        json.put("difficulty", String.valueOf(properties.difficulty));
-+        json.put("enable-command-block", String.valueOf(properties.enableCommandBlock));
-+        json.put("enable-jmx-monitoring", String.valueOf(properties.enableJmxMonitoring));
-+        json.put("enable-query", String.valueOf(properties.enableQuery));
-+        if (includeConfig.enableRcon) {
-+            json.put("enable-rcon", String.valueOf(properties.enableRcon));
-+        }
-+        json.put("enable-status", String.valueOf(properties.enableStatus));
-+        json.put("enforce-secure-profile", String.valueOf(properties.enforceSecureProfile));
-+        json.put("enforce-whitelist", String.valueOf(properties.enforceWhitelist));
-+        json.put("entity-broadcast-range-percentage", String.valueOf(properties.entityBroadcastRangePercentage));
-+        json.put("force-gamemode", String.valueOf(properties.forceGameMode));
-+        json.put("function-permission-level", String.valueOf(properties.functionPermissionLevel));
-+        json.put("gamemode", String.valueOf(properties.gamemode));
-+        Optional.ofNullable(properties.worldOptions).ifPresent(worldOptions -> json.put("generate-structures", String.valueOf(worldOptions.generateStructures())));
-+        if (includeConfig.generatorSettings) {
-+            Optional.ofNullable(properties.worldDimensionData).ifPresent(worldDimensionData -> json.put("generator-settings", String.valueOf(worldDimensionData.generatorSettings())));
-+        }
-+        json.put("hardcore", String.valueOf(properties.hardcore));
-+        json.put("hide-online-players", String.valueOf(properties.hideOnlinePlayers));
-+        if (includeConfig.dataPacks) {
-+            Optional.ofNullable(properties.initialDataPackConfiguration).ifPresent(initialDataPackConfiguration -> {
-+                json.put("initial-enabled-packs", String.valueOf(initialDataPackConfiguration.getEnabled()));
-+                json.put("initial-disabled-packs", String.valueOf(initialDataPackConfiguration.getDisabled()));
-+            });
-+        }
-+        if (includeConfig.levelName) {
-+            json.put("level-name", String.valueOf(properties.levelName));
-+        }
-+        // Note: level-seed is never included to prevent it being leaked
-+//        if (includeConfig.levelSeed) {
-+//            json.put("level-seed", String.valueOf(properties.levelSeed));
-+//        }
-+        Optional.ofNullable(properties.worldDimensionData).ifPresent(worldDimensionData -> json.put("level-type", String.valueOf(worldDimensionData.levelType())));
-+        json.put("log-ips", String.valueOf(properties.logIPs));
-+        json.put("max-chained-neighbor-updates", String.valueOf(properties.maxChainedNeighborUpdates));
-+        json.put("max-players", String.valueOf(properties.maxPlayers));
-+        json.put("max-tick-time", String.valueOf(properties.maxTickTime));
-+        json.put("max-world-size", String.valueOf(properties.maxWorldSize));
-+        if (includeConfig.motd) {
-+            json.put("motd", String.valueOf(properties.motd));
-+        }
-+        json.put("network-compression-threshold", String.valueOf(properties.networkCompressionThreshold));
-+        json.put("online-mode", String.valueOf(properties.onlineMode));
-+        json.put("op-permission-level", String.valueOf(properties.opPermissionLevel));
-+        Optional.ofNullable(properties.playerIdleTimeout).ifPresent(playerIdleTimeout -> json.put("player-idle-timeout", String.valueOf(playerIdleTimeout.get())));
-+        json.put("prevent-proxy-connections", String.valueOf(properties.preventProxyConnections));
-+        json.put("pvp", String.valueOf(properties.pvp));
-+        if (includeConfig.queryPort) {
-+            json.put("query-port", String.valueOf(properties.queryPort));
-+        }
-+        json.put("rate-limit", String.valueOf(properties.rateLimitPacketsPerSecond));
-+        // Note: rcon-password is never included to prevent it being leaked
-+//        if (includeConfig.rconPassword) {
-+//            json.put("rcon-password", String.valueOf(properties.rconPassword));
-+//        }
-+        if (includeConfig.rconPort) {
-+            json.put("rcon-port", String.valueOf(properties.queryPort));
-+        }
-+        properties.serverResourcePackInfo.ifPresent(serverResourcePackInfo -> {
-+            json.put("require-resource-pack", String.valueOf(serverResourcePackInfo.isRequired()));
-+            if (includeConfig.resourcePackAndResourcePackSha1) {
-+                json.put("resource-pack", String.valueOf(serverResourcePackInfo.url()));
-+                json.put("resource-pack-sha1", String.valueOf(serverResourcePackInfo.hash()));
-+            }
-+        });
-+        if (includeConfig.resourcePackPrompt) {
-+            json.put("resource-pack-prompt", String.valueOf(properties.resourcePackPrompt));
-+        }
-+        if (includeConfig.serverIp) {
-+            json.put("server-ip", String.valueOf(properties.serverIp));
-+        }
-+        if (includeConfig.serverPort) {
-+            json.put("server-port", String.valueOf(properties.serverPort));
-+        }
-+        json.put("simulation-distance", String.valueOf(properties.simulationDistance));
-+        json.put("spawn-animals", String.valueOf(properties.spawnAnimals));
-+        json.put("spawn-monsters", String.valueOf(properties.spawnMonsters));
-+        json.put("spawn-npcs", String.valueOf(properties.spawnNpcs));
-+        json.put("spawn-protection", String.valueOf(properties.spawnProtection));
-+        json.put("sync-chunk-writes", String.valueOf(properties.syncChunkWrites));
-+        if (includeConfig.textFilteringConfig) {
-+            json.put("text-filtering-config", String.valueOf(properties.textFilteringConfig));
-+        }
-+        json.put("use-native-transport", String.valueOf(properties.useNativeTransport));
-+        json.put("view-distance", String.valueOf(properties.viewDistance));
-+        Optional.ofNullable(properties.whiteList).ifPresent(whiteList -> json.put("white-list", String.valueOf(whiteList.get())));
-+
-+        return json;
-+
-+    }
-+
-+}
--- a/patches/server/0012-Use-platform-math-functions.patch
+++ b/patches/server/0012-Use-platform-math-functions.patch
--- a/patches/server/0013-Faster-floating-point-positive-modulo.patch
+++ b/patches/server/0013-Faster-floating-point-positive-modulo.patch
--- a/patches/server/0013-Include-hardware-specs-in-timings.patch
+++ b/patches/server/0013-Include-hardware-specs-in-timings.patch
@@ -1,127 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martijn Muijsers <martijnmuijsers@live.nl>
-Date: Sat, 24 Dec 2022 20:28:31 +0100
-Subject: [PATCH] Include hardware specs in timings
-
-License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-Gale - https://galemc.org
-
-diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 758cb80e64520ff085c4ef5ca8b2ed77d4bc0162..f749516e5d3c22e808638f3a7672aab837571b1a 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
-+++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -35,6 +35,7 @@ import org.bukkit.Material;
- import org.bukkit.configuration.ConfigurationSection;
- import org.bukkit.configuration.MemorySection;
- import org.bukkit.entity.EntityType;
-+import org.galemc.gale.configuration.GaleGlobalConfiguration;
- import org.galemc.gale.configuration.timingsexport.VanillaServerPropertiesTimingsExport;
- import org.json.simple.JSONObject;
- import org.json.simple.JSONValue;
-@@ -51,6 +52,8 @@ import java.lang.management.RuntimeMXBean;
- import java.net.HttpURLConnection;
- import java.net.InetAddress;
- import java.net.URL;
-+import java.util.Arrays;
-+import java.util.LinkedHashMap;
- import java.util.List;
- import java.util.Map;
- import java.util.Set;
-@@ -135,6 +138,59 @@ public class TimingsExport extends Thread {
- 
-         HardwareAbstractionLayer hardwareInfo = new SystemInfo().getHardware();
- 
-+        // Gale start - include hardware specs in timings
-+        var processor = hardwareInfo.getProcessor();
-+        var processorIdentifier = processor.getProcessorIdentifier();
-+        var memory = hardwareInfo.getMemory();
-+
-+        Map<String, Object> hardwareSpecsMap = new LinkedHashMap<>();
-+        if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.cpu) {
-+            hardwareSpecsMap.put("cpu", createObject(
-+                pair("logicalprocessorcount", processor.getLogicalProcessorCount()),
-+                pair("physicalprocessorcount", processor.getPhysicalProcessorCount()),
-+                pair("physicalpackagecount", processor.getPhysicalPackageCount()),
-+                pair("contextswitches", processor.getContextSwitches()),
-+                pair("interrupts", processor.getInterrupts()),
-+                pair("maxfreq", processor.getMaxFreq()),
-+                pair("currentfreq", Arrays.toString(processor.getCurrentFreq())),
-+                pair("identifier", createObject(
-+                    pair("vendor", String.valueOf(processorIdentifier.getVendor()).trim()),
-+                    pair("name", String.valueOf(processorIdentifier.getName()).trim()),
-+                    pair("family", String.valueOf(processorIdentifier.getFamily()).trim()),
-+                    pair("model", String.valueOf(processorIdentifier.getModel()).trim()),
-+                    pair("vendor", String.valueOf(processorIdentifier.getVendor()).trim()),
-+                    pair("cpu64bit", processorIdentifier.isCpu64bit()),
-+                    pair("vendorfreq", processorIdentifier.getVendorFreq()),
-+                    pair("microarchitecture", String.valueOf(processorIdentifier.getMicroarchitecture()).trim())
-+                ))
-+            ));
-+        }
-+        if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.disks) {
-+            hardwareSpecsMap.put("diskstores", toArrayMapper(hardwareInfo.getDiskStores(), disk -> createObject(
-+                pair("name", String.valueOf(disk.getName()).trim()),
-+                pair("model", String.valueOf(disk.getModel()).trim()),
-+                pair("serial", String.valueOf(disk.getSerial()).trim()),
-+                pair("size", disk.getSize())
-+            )));
-+        }
-+        if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.gpus) {
-+            hardwareSpecsMap.put("gpus", toArrayMapper(hardwareInfo.getGraphicsCards(), gpu -> createObject(
-+                pair("name", String.valueOf(gpu.getName()).trim()),
-+                pair("deviceid", String.valueOf(gpu.getDeviceId()).trim()),
-+                pair("vendor", String.valueOf(gpu.getVendor()).trim()),
-+                pair("versioninfo", String.valueOf(gpu.getVersionInfo()).trim()),
-+                pair("vram", gpu.getVRam())
-+            )));
-+        }
-+        if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.memory) {
-+            hardwareSpecsMap.put("memory", createObject(
-+                pair("total", memory.getTotal()),
-+                pair("available", memory.getAvailable()),
-+                pair("pagesize", memory.getPageSize())
-+            ));
-+        }
-+        // Gale end - include hardware specs in timings
-+
-         parent.put("system", createObject(
-                 pair("timingcost", getCost()),
-                 pair("loadavg", osInfo.getSystemLoadAverage()),
-@@ -152,6 +208,7 @@ public class TimingsExport extends Thread {
-                 )),
-                 pair("cpu", runtime.availableProcessors()),
-                 pair("cpuname", hardwareInfo.getProcessor().getProcessorIdentifier().getName().trim()),
-+                pair("hardwarespecs", hardwareSpecsMap), // Gale - include hardware specs in timings
-                 pair("runtime", runtimeBean.getUptime()),
-                 pair("flags", StringUtils.join(runtimeBean.getInputArguments(), " ")),
-                 pair("gc", toObjectMapper(ManagementFactory.getGarbageCollectorMXBeans(), input -> pair(input.getName(), toArray(input.getCollectionCount(), input.getCollectionTime()))))
-diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index dbb0f523608a9208e8c656898b18ce1b9505a1e0..2a3cd1baab364126d10a42c8ab59f3da8ca9bdfb 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -32,7 +32,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
- 
-         public IncludeInTimingsReport includeInTimingsReport;
-         public class IncludeInTimingsReport extends ConfigurationPart {
-            
-+
-             // Gale start - include server.properties in timings
-             public ServerProperties serverProperties;
-             public class ServerProperties extends ConfigurationPart {
-@@ -52,6 +52,16 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
-             }
-             // Gale end - include server.properties in timings
- 
-+            // Gale start - include hardware specs in timings
-+            public HardwareSpecs hardwareSpecs;
-+            public class HardwareSpecs extends ConfigurationPart {
-+                public boolean cpu = true;
-+                public boolean disks = true;
-+                public boolean gpus = true;
-+                public boolean memory = true;
-+            }
-+            // Gale end - include hardware specs in timings
-+
-         }
- 
-     }
--- a/patches/server/0014-Simpler-ShapelessRecipe-comparison-for-vanilla.patch
+++ b/patches/server/0014-Simpler-ShapelessRecipe-comparison-for-vanilla.patch
@@ -37,7 +37,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
-index 5740296b55827f11c0029e89a86eaab1a24f560c..23344dcb49e8bfd6338e1e9d204861b28ea1da11 100644
+index 213ee4aa988dd4c2a5a7be99b1d13f67338e5209..a51f21995b66e08b33e8645297c25e1f979d0e73 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
@@ -25,8 +25,15 @@ public class ShapelessRecipe extends io.papermc.paper.inventory.recipe.RecipeBoo
--- a/patches/server/0014-Use-timin.gs-by-default.patch
+++ b/patches/server/0014-Use-timin.gs-by-default.patch
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martijn Muijsers <martijnmuijsers@live.nl>
-Date: Thu, 1 Dec 2022 17:26:18 +0100
-Subject: [PATCH] Use timin.gs by default
-
-License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-Gale - https://galemc.org
-
-This patch is based on the following patch:
-"Optimize default values for configs"
-By: etil2jz <81570777+etil2jz@users.noreply.github.com>
-As part of: Mirai (https://github.com/etil2jz/Mirai)
-Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-
-diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 379452394679c466a09441d4c12882d0d00d9ef3..b021721efaab5242b7d174a9c859fe06a5ca6054 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -98,7 +98,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public class Timings extends ConfigurationPart {
-         public boolean enabled = false;
-         public boolean verbose = true;
-        public String url = "https://timings.aikar.co/";
-+        public String url = "https://timin.gs/"; // Gale - use timin.gs by default
-         public boolean serverNamePrivacy = false;
-         public List<String> hiddenConfigEntries = List.of(
-             "database",
--- a/patches/server/0015-Recommend-disabling-timings-on-startup.patch
+++ b/patches/server/0015-Recommend-disabling-timings-on-startup.patch
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martijn Muijsers <martijnmuijsers@live.nl>
-Date: Wed, 23 Nov 2022 16:02:19 +0100
-Subject: [PATCH] Recommend disabling timings on startup
-
-License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-Gale - https://galemc.org
-
-This patch is based on the following patch:
-"Disable Paper timings by default"
-By: Paul Sauve <paul@technove.co>
-As part of: Airplane (https://github.com/TECHNOVE/Airplane)
-Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-
-* Airplane copyright *
-
-Airplane
-Copyright (C) 2020 Technove LLC
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index b021721efaab5242b7d174a9c859fe06a5ca6054..65c7a798ae69602f586038ecb2c9ab4f7b968fce 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -97,6 +97,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-     @Deprecated(forRemoval = true)
-     public class Timings extends ConfigurationPart {
-         public boolean enabled = false;
-+        public boolean warnIfEnabled = true; // Gale - recommend disabling timings on startup
-         public boolean verbose = true;
-         public String url = "https://timin.gs/"; // Gale - use timin.gs by default
-         public boolean serverNamePrivacy = false;
-@@ -110,6 +111,13 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-         @PostProcess
-         private void postProcess() {
-+            // Gale start - recommend disabling timings on startup
-+            if (enabled && warnIfEnabled) {
-+                net.minecraft.server.MinecraftServer.LOGGER.warn("To improve performance, we recommend setting timings.enabled to false in paper-global.yml");
-+                net.minecraft.server.MinecraftServer.LOGGER.warn("(If you do this, timings will not start on server startup, but you can still start timings later by using /timings on)");
-+                net.minecraft.server.MinecraftServer.LOGGER.warn("If you would like to disable this message, set timings.warn-if-enabled to false in paper-global.yml.");
-+            }
-+            // Gale end - recommend disabling timings on startup
-             MinecraftTimings.processConfig(this);
-         }
-     }
--- a/patches/server/0015-Reduce-projectile-chunk-loading.patch
+++ b/patches/server/0015-Reduce-projectile-chunk-loading.patch
--- a/patches/server/0016-Make-timings-calls-final.patch
+++ b/patches/server/0016-Make-timings-calls-final.patch
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martijn Muijsers <martijnmuijsers@live.nl>
-Date: Sat, 24 Dec 2022 13:24:18 +0100
-Subject: [PATCH] Make timings calls final
-
-License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-Gale - https://galemc.org
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b53c92cf6b172222689674de8554709757b36a84..b157214ca20be2ddd234744e5e2a8064977b1227 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1577,7 +1577,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     }
- 
-     public void tickServer(BooleanSupplier shouldKeepTicking) {
-        co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper
-+        co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTimingFullServerTick(); // Paper // Gale - final timings calls
-         long i = Util.getNanos();
- 
-         // Paper start - move oversleep into full server tick
-@@ -1646,7 +1646,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         this.logTickMethodTime(i);
-         this.profiler.pop();
-         org.spigotmc.WatchdogThread.tick(); // Spigot
-        co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
-+        co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTimingFullServerTick(); // Paper // Gale - final timings calls
-     }
- 
-     private void logTickMethodTime(long tickStartTime) {
--- a/patches/server/0016-Predict-Halloween.patch
+++ b/patches/server/0016-Predict-Halloween.patch
--- a/patches/server/0017-Reduce-enderman-teleport-chunk-lookups.patch
+++ b/patches/server/0017-Reduce-enderman-teleport-chunk-lookups.patch
--- a/patches/server/0018-Reduce-acquire-POI-for-stuck-entities.patch
+++ b/patches/server/0018-Reduce-acquire-POI-for-stuck-entities.patch
--- a/patches/server/0019-Remove-iterators-from-Inventory-contains.patch
+++ b/patches/server/0019-Remove-iterators-from-Inventory-contains.patch
--- a/patches/server/0020-Check-targeting-range-before-getting-visibility.patch
+++ b/patches/server/0020-Check-targeting-range-before-getting-visibility.patch
--- a/patches/server/0021-Print-stack-trace-for-plugins-not-shutting-down-task.patch
+++ b/patches/server/0021-Print-stack-trace-for-plugins-not-shutting-down-task.patch
@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 497f75de077018588fe837a1a73a1c6a804e502d..6e10402e52d6301121fd70074ad074c3ebbce916 100644
+index a01e30045b02526db835f2e763d987146eec4c35..eb1604ce8845c14eeb90641a074381b277ef918f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1160,6 +1160,13 @@ public final class CraftServer implements Server {
+@@ -1164,6 +1164,13 @@ public final class CraftServer implements Server {
                 plugin.getPluginMeta().getDisplayName(),
                 "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
             ));
--- a/patches/server/0022-Improve-fluid-direction-caching.patch
+++ b/patches/server/0022-Improve-fluid-direction-caching.patch
--- a/patches/server/0023-Cache-on-climbable-check.patch
+++ b/patches/server/0023-Cache-on-climbable-check.patch
--- a/patches/server/0024-Make-EntityCollisionContext-a-live-representation.patch
+++ b/patches/server/0024-Make-EntityCollisionContext-a-live-representation.patch
--- a/patches/server/0025-Improve-container-checking-with-a-bitset.patch
+++ b/patches/server/0025-Improve-container-checking-with-a-bitset.patch
--- a/patches/server/0026-Better-checking-for-useless-move-packets.patch
+++ b/patches/server/0026-Better-checking-for-useless-move-packets.patch
--- a/patches/server/0027-Inline-level-height.patch
+++ b/patches/server/0027-Inline-level-height.patch
@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 950d8d94ce2ae521b50b6aa523a92fe2be99a250..e82f6b86e70410b43335c0f6bf9fd9e85a9bb9a2 100644
+index abebc41e69a41cbf940ffd10dae4815202b525dc..a48b1639ffa83ae2d1e614d32a339f08366da57c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -685,6 +685,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
--- a/patches/server/0028-Remove-streams-and-iterators-from-range-check.patch
+++ b/patches/server/0028-Remove-streams-and-iterators-from-range-check.patch
@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 9a271a13c67ff2affb128a58f2b718f83dbf801c..7946ad36d6a5e90b7bceefc43662b8caa01bc666 100644
+index bfb5a1ffec9a01b86f65a577bbd4d2927f9718b0..caa295231c7d4573dca04eefcceedd2d067cc903 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1275,8 +1275,30 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
--- a/patches/server/0029-Block-goal-does-not-load-chunks.patch
+++ b/patches/server/0029-Block-goal-does-not-load-chunks.patch
--- a/patches/server/0030-Reduce-entity-allocations.patch
+++ b/patches/server/0030-Reduce-entity-allocations.patch
@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a9c6ac88e8388401b525e32c6474568f93046aca..4b48cac0c8861dfaad16d5ecfa3e73c9b5db0bb7 100644
+index e4751a821d73bcf6dad22abb6fc5ab394953029f..a0ed1ffbf07edeb4d7f08316855376488b99940b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -446,6 +446,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/patches/server/0031-Remove-lambda-from-ticking-guard.patch
+++ b/patches/server/0031-Remove-lambda-from-ticking-guard.patch
--- a/patches/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch
+++ b/patches/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch
@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 54d484e7e89e3a43259fce06c6071c6bde77f56a..b533741f289235dc2b5d38f9d715ce35bf68464e 100644
+index a0ed1ffbf07edeb4d7f08316855376488b99940b..dfc1f3b3097430f1553b0a0b03d7be3863d14c11 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4434,16 +4434,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/patches/server/0033-SIMD-support.patch
+++ b/patches/server/0033-SIMD-support.patch
@@ -13,10 +13,10 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/build.gradle.kts b/build.gradle.kts
-index b6b99aff8940d62bf63cebf260faf7f923c0baed..eae5b87677ac577ceafc6371647e92178627116f 100644
+index 014ad39c084f37c274d8a6847814404dfb7c97c9..c25f76e726d614d183062c213ab83bd3404b6b15 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -73,6 +73,7 @@ tasks.withType<JavaCompile> {
+@@ -77,6 +77,7 @@ tasks.withType<JavaCompile> {
     compilerArgs.add("-Xlint:-module")
     compilerArgs.add("-Xlint:-removal")
     compilerArgs.add("-Xlint:-dep-ann")
@@ -24,7 +24,7 @@ index b6b99aff8940d62bf63cebf260faf7f923c0baed..eae5b87677ac577ceafc6371647e9217
 }
 // Gale end - hide irrelevant compilation warnings
 
-@@ -182,6 +183,7 @@ fun TaskContainer.registerRunTask(
+@@ -186,6 +187,7 @@ fun TaskContainer.registerRunTask(
     minHeapSize = "${memoryGb}G"
     maxHeapSize = "${memoryGb}G"
     jvmArgs("--enable-preview") // Gale - enable preview features for development runs
@@ -84,7 +84,7 @@ index 66477f772ffb9271cf647dfb7567d75c3d5145fb..13a51c939b8bd17584a4742178231506
 
         }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index e510366a69f44ea1772f5bbd1cf799d335b7b0da..91105ac1d3cbc8c0169540996edebd5e6e72bc82 100644
+index 8538024c6345e79d08643e2d68ca146542b7860a..94e86acd4bc9c2be7c07fbd17364ba7bf9edb094 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -20,6 +20,8 @@ import java.util.Locale;
@@ -104,7 +104,7 @@ index e510366a69f44ea1772f5bbd1cf799d335b7b0da..91105ac1d3cbc8c0169540996edebd5e
 import org.slf4j.Logger;
 
 // CraftBukkit start
-@@ -244,6 +247,13 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -246,6 +249,13 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
 
@@ -119,7 +119,7 @@ index e510366a69f44ea1772f5bbd1cf799d335b7b0da..91105ac1d3cbc8c0169540996edebd5e
         this.setFlightAllowed(dedicatedserverproperties.allowFlight);
         this.setMotd(dedicatedserverproperties.motd);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 2a3cd1baab364126d10a42c8ab59f3da8ca9bdfb..5ade5d2ff3a68cf9e0240fc86e4b63432cb899c0 100644
+index 8f8fd98f96cd390ba43033521982a13044df91cf..d46f952e5e425eb90f8c435276bfc4542e85f6a7 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -25,6 +25,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -136,4 +136,4 @@ index 2a3cd1baab364126d10a42c8ab59f3da8ca9bdfb..5ade5d2ff3a68cf9e0240fc86e4b6343
 +
     }
 
-     public Misc misc;
+ }
--- a/patches/server/0034-Make-book-writing-configurable.patch
+++ b/patches/server/0034-Make-book-writing-configurable.patch
@@ -68,10 +68,10 @@ index 0a808c5d242b2d9bea82d9d219227fbaf5741bf4..7d66126c1f5957c109a2426d53f5d007
     }
 }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 5ade5d2ff3a68cf9e0240fc86e4b63432cb899c0..346fdf6f8a76539fa9ca46015ee122417e4a8102 100644
+index d46f952e5e425eb90f8c435276bfc4542e85f6a7..d180ea6099d8fed3cf19f0f32bbfced7df57c9d7 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -35,6 +35,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -35,4 +35,10 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
 
     }
 
@@ -81,7 +81,4 @@ index 5ade5d2ff3a68cf9e0240fc86e4b63432cb899c0..346fdf6f8a76539fa9ca46015ee12241
 +        public boolean enableBookWriting = true; // Gale - Pufferfish - make book writing configurable
 +
 +    }
-+
-     public Misc misc;
-     public class Misc extends ConfigurationPart {
- 
+ }
--- a/patches/server/0035-Optimize-entity-coordinate-key.patch
+++ b/patches/server/0035-Optimize-entity-coordinate-key.patch
--- a/patches/server/0036-Reduce-in-wall-checks.patch
+++ b/patches/server/0036-Reduce-in-wall-checks.patch
--- a/patches/server/0037-Make-chat-order-verification-configurable.patch
+++ b/patches/server/0037-Make-chat-order-verification-configurable.patch
@@ -34,15 +34,17 @@ index 300929a406905f5ff1ede664d5b99fb0938d4d2e..e5625557d2cd70b19b9db5fd418c243b
                         throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.OUT_OF_ORDER_CHAT, org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
                     } else {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 346fdf6f8a76539fa9ca46015ee122417e4a8102..7c781eabbb6df5df9f9f2cbdeef4e116ca30b645 100644
+index d180ea6099d8fed3cf19f0f32bbfced7df57c9d7..8075e5c17f469f1bf5b7758a1334943d6ed8383f 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -45,6 +45,8 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
-     public Misc misc;
-     public class Misc extends ConfigurationPart {
+@@ -41,4 +41,10 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+         public boolean enableBookWriting = true; // Gale - Pufferfish - make book writing configurable
 
-+        public boolean verifyChatOrder = true; // Gale - Pufferfish - make chat order verification configurable
+     }
 +
-         public IncludeInTimingsReport includeInTimingsReport;
-         public class IncludeInTimingsReport extends ConfigurationPart {
- 
+    public Misc misc;
+    public class Misc extends ConfigurationPart {
+
+        public boolean verifyChatOrder = true; // Gale - Pufferfish - make chat order verification configurable
+    }
+ }
--- a/patches/server/0038-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
+++ b/patches/server/0038-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
--- a/patches/server/0039-Make-saving-fireworks-configurable.patch
+++ b/patches/server/0039-Make-saving-fireworks-configurable.patch
--- a/patches/server/0040-Reduce-hopper-item-checks.patch
+++ b/patches/server/0040-Reduce-hopper-item-checks.patch
--- a/patches/server/0041-Reduce-villager-item-re-pickup.patch
+++ b/patches/server/0041-Reduce-villager-item-re-pickup.patch
--- a/patches/server/0042-Variable-entity-wake-up-duration.patch
+++ b/patches/server/0042-Variable-entity-wake-up-duration.patch
--- a/patches/server/0043-Do-not-process-chat-commands-before-player-has-joine.patch
+++ b/patches/server/0043-Do-not-process-chat-commands-before-player-has-joine.patch
--- a/patches/server/0044-Do-not-log-invalid-statistics.patch
+++ b/patches/server/0044-Do-not-log-invalid-statistics.patch
@@ -44,26 +44,18 @@ index fb7342f7a5008a283c3400c6313c637de8210dfa..a45353b8a6dd85c74d3e195f89f75f25
                             }
                         }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 7c781eabbb6df5df9f9f2cbdeef4e116ca30b645..168e1ae2e3cd1c4f5a2c10670d79aa2a41b95635 100644
+index 8075e5c17f469f1bf5b7758a1334943d6ed8383f..56aa01dfbfc0817b71315322ed3f676bd62ad825 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -48,6 +48,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -47,4 +47,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+ 
         public boolean verifyChatOrder = true; // Gale - Pufferfish - make chat order verification configurable
- 
-         public IncludeInTimingsReport includeInTimingsReport;
-+
-         public class IncludeInTimingsReport extends ConfigurationPart {
- 
-             // Gale start - include server.properties in timings
-@@ -83,4 +84,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
- 
     }
- 
+
 +    public LogToConsole logToConsole;
 +    public class LogToConsole extends ConfigurationPart {
 +
 +        public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
 +
 +    }
-+
 }
--- a/patches/server/0045-Do-not-log-empty-message-warnings.patch
+++ b/patches/server/0045-Do-not-log-empty-message-warnings.patch
@@ -28,10 +28,10 @@ index 4ff3dbb9c1bcac000e4ed293cbc1a48aa1738e8f..f9647ce528d23743f687249ecaa6b51c
             final String conversationInput = s;
             this.server.processQueue.add(new Runnable() {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 168e1ae2e3cd1c4f5a2c10670d79aa2a41b95635..2a42c6616e4702bb0a6dfbf4540e8c9c29c11373 100644
+index 56aa01dfbfc0817b71315322ed3f676bd62ad825..8ef64ac15626633ecdba555b39a20da11d917b65 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -89,6 +89,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -53,5 +53,10 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
 
         public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
 
@@ -41,5 +41,4 @@ index 168e1ae2e3cd1c4f5a2c10670d79aa2a41b95635..2a42c6616e4702bb0a6dfbf4540e8c9c
 +        }
 +
     }
- 
 }
--- a/patches/server/0046-Do-not-log-ignored-advancements.patch
+++ b/patches/server/0046-Do-not-log-ignored-advancements.patch
@@ -58,10 +58,10 @@ index 9fabf9322acd663c4452b562494e74aa42eb19da..749dbb091af02c2e5922de14fc2743b7
                 this.startProgress(advancementholder, advancementprogress);
                 this.progressChanged.add(advancementholder);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 2a42c6616e4702bb0a6dfbf4540e8c9c29c11373..9c8c283aa88165d862c649b22fd86e61ec8e84d7 100644
+index 8ef64ac15626633ecdba555b39a20da11d917b65..0ffbe284abfc8ef8f9ed21c8539c497cad685380 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -88,6 +88,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -52,6 +52,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
     public class LogToConsole extends ConfigurationPart {
 
         public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
--- a/patches/server/0047-Do-not-log-setBlock-in-far-chunks.patch
+++ b/patches/server/0047-Do-not-log-setBlock-in-far-chunks.patch
@@ -49,10 +49,10 @@ index 5a8a33638ceb1d980ffc3e6dd86e7eb11dfd9375..4ec094e06e7707a052f3647871f7d141
             Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + String.valueOf(pos) + ", status: " + String.valueOf(this.generatingStep.targetStatus()) + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
                 hasSetFarWarned = true;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 9c8c283aa88165d862c649b22fd86e61ec8e84d7..281d01126f623d0541b1676bf79bf1dd3020d250 100644
+index 0ffbe284abfc8ef8f9ed21c8539c497cad685380..0844babd79d3743abe240e68a50e082f58e2f01c 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -89,6 +89,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -53,6 +53,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
 
         public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
         public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
--- a/patches/server/0048-Do-not-log-unrecognized-recipes.patch
+++ b/patches/server/0048-Do-not-log-unrecognized-recipes.patch
@@ -58,10 +58,10 @@ index 8a2584deccbf19de8a18fcfcb9c65318b60afe57..457d774dbfd441abfb108e0a11e675fa
                     handler.accept((RecipeHolder) optional.get());
                 }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 281d01126f623d0541b1676bf79bf1dd3020d250..c6908d6cf03a514690508ae216d3a6347ded0b61 100644
+index 0844babd79d3743abe240e68a50e082f58e2f01c..360c48ce9f64e7bbfadd56ce4fa2b78c4787734d 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -90,6 +90,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -54,6 +54,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
         public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
         public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
         public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
--- a/patches/server/0049-Do-not-log-legacy-Material-initialization.patch
+++ b/patches/server/0049-Do-not-log-legacy-Material-initialization.patch
@@ -58,10 +58,10 @@ index dc591702d1ad41209bb80e8d05f4ca11f20816f2..38a5b11d52ffcd1e3f7ffe8d617e7d3f
             new Exception().printStackTrace();
         }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index c6908d6cf03a514690508ae216d3a6347ded0b61..5af30bdac9e9315b53d31309956486ca3f0622b5 100644
+index 360c48ce9f64e7bbfadd56ce4fa2b78c4787734d..3ad96a516ef51858b91e2c95fd4e923522a93246 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -91,6 +91,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -55,6 +55,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
         public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
         public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
         public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
--- a/patches/server/0050-Do-not-log-plugin-library-loads.patch
+++ b/patches/server/0050-Do-not-log-plugin-library-loads.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 5af30bdac9e9315b53d31309956486ca3f0622b5..83fcaa347be906cf42ba853754ac6bda2b39d8f9 100644
+index 3ad96a516ef51858b91e2c95fd4e923522a93246..dfe4ea3fbdcd36e10a10041d006454a7e6f9e68a 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -4,6 +4,8 @@ package org.galemc.gale.configuration;
@@ -49,7 +49,7 @@ index 5af30bdac9e9315b53d31309956486ca3f0622b5..83fcaa347be906cf42ba853754ac6bda
 import org.spongepowered.configurate.objectmapping.meta.Setting;
 
 @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
-@@ -98,6 +100,24 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -62,5 +64,23 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
             public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
         }
 
@@ -72,5 +72,4 @@ index 5af30bdac9e9315b53d31309956486ca3f0622b5..83fcaa347be906cf42ba853754ac6bda
 +        // Gale end - Purpur - do not log plugin library loads
 +
     }
- 
 }
--- a/patches/server/0051-Do-not-log-expired-message-warnings.patch
+++ b/patches/server/0051-Do-not-log-expired-message-warnings.patch
@@ -20,10 +20,10 @@ index e5625557d2cd70b19b9db5fd418c243b639188e8..67ab06ccd421f991035360bd037616c9
 
                             SignedMessageChain.this.nextLink = signedMessageLink.advance();
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 83fcaa347be906cf42ba853754ac6bda2b39d8f9..ca6d3712f4552534585b46e921738ec9416095ab 100644
+index dfe4ea3fbdcd36e10a10041d006454a7e6f9e68a..3fd497761dfb5e10ae7a3fd83bee8013c3869117 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -98,6 +98,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -62,6 +62,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
         public Chat chat;
         public class Chat extends ConfigurationPart {
             public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
--- a/patches/server/0052-Do-not-log-Not-Secure-marker.patch
+++ b/patches/server/0052-Do-not-log-Not-Secure-marker.patch
@@ -50,10 +50,10 @@ index 0277371164e242b1d2fa6e5a1304af40ea845d0c..d4de82ad3791f87b6f3ddc1b0ee3efd4
         boolean flag1 = false;
 
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index ca6d3712f4552534585b46e921738ec9416095ab..0f5471291c482bd2b8ecc588da74a408563b7312 100644
+index 3fd497761dfb5e10ae7a3fd83bee8013c3869117..413c41e8c2fead4de859535007641094a64e97dd 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -99,6 +99,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -63,6 +63,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
         public class Chat extends ConfigurationPart {
             public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
             public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings
--- a/patches/server/0053-Do-not-log-disconnections-with-null-id.patch
+++ b/patches/server/0053-Do-not-log-disconnections-with-null-id.patch
@@ -44,10 +44,10 @@ index b0f7a378f19b9837c060c891002cd5db756cdae1..22865e638a50397d194fb39b883f7375
             this.connection.send(new ClientboundLoginDisconnectPacket(reason));
             this.connection.disconnect(reason);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 0f5471291c482bd2b8ecc588da74a408563b7312..d95141f43ebbad984db96416623957bd47f3ac1b 100644
+index 413c41e8c2fead4de859535007641094a64e97dd..a1b98b0f92618764304de484c373ce5e106f34f0 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -94,6 +94,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -58,6 +58,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
         public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
         public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
         public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization
--- a/patches/server/0054-Do-not-log-run-as-root-warning.patch
+++ b/patches/server/0054-Do-not-log-run-as-root-warning.patch
@@ -41,7 +41,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 91105ac1d3cbc8c0169540996edebd5e6e72bc82..73430880f231d41b6e2eb3694b4d462863555d1e 100644
+index 94e86acd4bc9c2be7c07fbd17364ba7bf9edb094..8cbad64897ea764a10f044cabb8f77ffbcb3a7a0 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -201,7 +201,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
--- a/patches/server/0055-Do-not-log-offline-mode-warning.patch
+++ b/patches/server/0055-Do-not-log-offline-mode-warning.patch
@@ -41,10 +41,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 73430880f231d41b6e2eb3694b4d462863555d1e..42ac2efb4c84c5f15c10934f928183962f179626 100644
+index 8cbad64897ea764a10f044cabb8f77ffbcb3a7a0..30ddaba93a1b2bb228a9fcdf25e8abab036d9f38 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -312,7 +312,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -314,7 +314,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
         String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
         // Paper end - Add Velocity IP Forwarding Support
--- a/patches/server/0056-Softly-log-invalid-pool-element-errors.patch
+++ b/patches/server/0056-Softly-log-invalid-pool-element-errors.patch
@@ -35,7 +35,7 @@ index 0977cd0d65dd1c2dde04d318759458abe452847e..ee5b317e87c4d403b6d7f5ab1d493e44
         nbt.putString("rotation", this.rotation.name());
         ListTag listTag = new ListTag();
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index d95141f43ebbad984db96416623957bd47f3ac1b..ea7f6a826763af8aa10d79e82b9ba99198e31e06 100644
+index a1b98b0f92618764304de484c373ce5e106f34f0..3f8c66b35f1910df7d745056fd8f55d9b035b215 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -4,10 +4,14 @@ package org.galemc.gale.configuration;
@@ -53,7 +53,7 @@ index d95141f43ebbad984db96416623957bd47f3ac1b..ea7f6a826763af8aa10d79e82b9ba991
 @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
 public class GaleGlobalConfiguration extends ConfigurationPart {
     static final int CURRENT_VERSION = 1;
-@@ -87,7 +91,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -51,7 +55,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
     }
 
     public LogToConsole logToConsole;
@@ -62,7 +62,7 @@ index d95141f43ebbad984db96416623957bd47f3ac1b..ea7f6a826763af8aa10d79e82b9ba991
 
         public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
         public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
-@@ -121,6 +125,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -85,5 +89,20 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
         }
         // Gale end - Purpur - do not log plugin library loads
 
@@ -82,5 +82,4 @@ index d95141f43ebbad984db96416623957bd47f3ac1b..ea7f6a826763af8aa10d79e82b9ba991
 +        // Gale end - EMC - softly log invalid pool element errors
 +
     }
- 
 }
--- a/patches/server/0057-Fix-outdated-server-showing-in-ping-before-server-fu.patch
+++ b/patches/server/0057-Fix-outdated-server-showing-in-ping-before-server-fu.patch
--- a/patches/server/0058-Fix-MC-238526.patch
+++ b/patches/server/0058-Fix-MC-238526.patch
--- a/patches/server/0059-Fix-cow-rotation-when-shearing-mooshroom.patch
+++ b/patches/server/0059-Fix-cow-rotation-when-shearing-mooshroom.patch
--- a/patches/server/0060-Fix-MC-121706.patch
+++ b/patches/server/0060-Fix-MC-121706.patch
--- a/patches/server/0061-Fix-MC-110386.patch
+++ b/patches/server/0061-Fix-MC-110386.patch
--- a/patches/server/0062-Fix-MC-31819.patch
+++ b/patches/server/0062-Fix-MC-31819.patch
--- a/patches/server/0063-Fix-MC-26304.patch
+++ b/patches/server/0063-Fix-MC-26304.patch
--- a/patches/server/0064-Make-arrow-movement-resetting-despawn-counter-config.patch
+++ b/patches/server/0064-Make-arrow-movement-resetting-despawn-counter-config.patch
--- a/patches/server/0065-Make-logging-login-locations-configurable.patch
+++ b/patches/server/0065-Make-logging-login-locations-configurable.patch
@@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 98bef79ab2307bf57b13c0ad0f39a5eaf967c3df..87d547fa078bf0b9bde3f919e081af0921ee6225 100644
+index d4de82ad3791f87b6f3ddc1b0ee3efd4761f7ba8..35d0a81ea93389f1d4b6e97692771be54bf453d9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -483,7 +483,13 @@ public abstract class PlayerList {
@@ -31,10 +31,10 @@ index 98bef79ab2307bf57b13c0ad0f39a5eaf967c3df..87d547fa078bf0b9bde3f919e081af09
 
     public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index ea7f6a826763af8aa10d79e82b9ba99198e31e06..b2aa32662335c4d64ac87320fcfb334784d89ec5 100644
+index 3f8c66b35f1910df7d745056fd8f55d9b035b215..b0da100cf972d4e39b130c99550ebcc763f055ee 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -99,6 +99,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -63,6 +63,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
         public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
         public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization
         public boolean nullIdDisconnections = true; // Gale - Pufferfish - do not log disconnections with null id
--- a/patches/server/0066-Reduce-array-allocations.patch
+++ b/patches/server/0066-Reduce-array-allocations.patch
--- a/patches/server/0067-Optimize-sun-burn-tick.patch
+++ b/patches/server/0067-Optimize-sun-burn-tick.patch
--- a/patches/server/0068-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
+++ b/patches/server/0068-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
--- a/patches/server/0069-Replace-game-rules-map-with-optimized-collection.patch
+++ b/patches/server/0069-Replace-game-rules-map-with-optimized-collection.patch
--- a/patches/server/0070-Replace-class-map-with-optimized-collection.patch
+++ b/patches/server/0070-Replace-class-map-with-optimized-collection.patch
--- a/patches/server/0071-Replace-throttle-tracker-map-with-optimized-collecti.patch
+++ b/patches/server/0071-Replace-throttle-tracker-map-with-optimized-collecti.patch
--- a/patches/server/0072-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
+++ b/patches/server/0072-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
--- a/patches/server/0073-Cache-BlockStatePairKey-hash.patch
+++ b/patches/server/0073-Cache-BlockStatePairKey-hash.patch
--- a/patches/server/0074-Replace-division-by-multiplication-in-CubePointRange.patch
+++ b/patches/server/0074-Replace-division-by-multiplication-in-CubePointRange.patch
--- a/patches/server/0075-Replace-parts-by-size-in-CubePointRange.patch
+++ b/patches/server/0075-Replace-parts-by-size-in-CubePointRange.patch
--- a/patches/server/0076-Check-frozen-ticks-before-landing-block.patch
+++ b/patches/server/0076-Check-frozen-ticks-before-landing-block.patch
--- a/patches/server/0077-Faster-chunk-serialization.patch
+++ b/patches/server/0077-Faster-chunk-serialization.patch
--- a/patches/server/0078-Update-boss-bar-within-tick.patch
+++ b/patches/server/0078-Update-boss-bar-within-tick.patch
--- a/patches/server/0079-Cache-ominous-banner-item.patch
+++ b/patches/server/0079-Cache-ominous-banner-item.patch
--- a/patches/server/0080-Cache-world-generator-sea-level.patch
+++ b/patches/server/0080-Cache-world-generator-sea-level.patch
--- a/patches/server/0081-Skip-secondary-POI-sensor-if-absent.patch
+++ b/patches/server/0081-Skip-secondary-POI-sensor-if-absent.patch
--- a/patches/server/0082-Optimize-villager-data-storage.patch
+++ b/patches/server/0082-Optimize-villager-data-storage.patch
--- a/patches/server/0083-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0083-Skip-entity-move-if-movement-is-zero.patch
@@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bb607b83a2e3d836534a74be1dbc773970a42922..393907c53e0c9bae581e1efc2998086c701a9b9f 100644
+index 05ab615451df6d85af426ca7035d26861988dc27..f5708e511611ec64430336f8247526b4a0a062aa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/patches/server/0084-Store-mob-counts-in-an-array.patch
+++ b/patches/server/0084-Store-mob-counts-in-an-array.patch
--- a/patches/server/0085-Use-linked-map-for-entity-trackers.patch
+++ b/patches/server/0085-Use-linked-map-for-entity-trackers.patch
@@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 7946ad36d6a5e90b7bceefc43662b8caa01bc666..41648e29c8f90d1a0a0ebc54be03890383ff15f1 100644
+index caa295231c7d4573dca04eefcceedd2d067cc903..84d5891ed67e9123f9b8f029fb14f944e34c3332 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -178,7 +178,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
--- a/patches/server/0086-Optimize-noise-generation.patch
+++ b/patches/server/0086-Optimize-noise-generation.patch
--- a/patches/server/0087-Optimize-sheep-offspring-color.patch
+++ b/patches/server/0087-Optimize-sheep-offspring-color.patch
--- a/patches/server/0088-Hide-flames-on-entities-with-fire-resistance.patch
+++ b/patches/server/0088-Hide-flames-on-entities-with-fire-resistance.patch
@@ -13,7 +13,7 @@ As part of: Slice (https://github.com/Cryptite/Slice)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6b7780e3899924838dc4431b973b659248acd049..288bef94cfd28dd15c72131381c400a45050bbbc 100644
+index f5708e511611ec64430336f8247526b4a0a062aa..f55019443b3f33dc4e0f845e5906078b1257175a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -916,7 +916,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/patches/server/0089-Skip-cloning-advancement-criteria.patch
+++ b/patches/server/0089-Skip-cloning-advancement-criteria.patch
--- a/patches/server/0090-Reduce-block-destruction-packet-allocations.patch
+++ b/patches/server/0090-Reduce-block-destruction-packet-allocations.patch
--- a/patches/server/0091-Spread-out-sending-all-player-info.patch
+++ b/patches/server/0091-Spread-out-sending-all-player-info.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 87d547fa078bf0b9bde3f919e081af0921ee6225..4cb9ce2d80507a1b73bf09a78e3593612f913d44 100644
+index 35d0a81ea93389f1d4b6e97692771be54bf453d9..dc8cb39d5e9e62f117968a6c0624dea15465a89b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -13,6 +13,8 @@ import java.net.SocketAddress;
--- a/patches/server/0092-Optimize-player-list-for-sending-player-info.patch
+++ b/patches/server/0092-Optimize-player-list-for-sending-player-info.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4cb9ce2d80507a1b73bf09a78e3593612f913d44..e523dbfb89c77e396d8ac4a7678642399fdd28f2 100644
+index dc8cb39d5e9e62f117968a6c0624dea15465a89b..e7ccaf9d0f10f4c0fd24c4b5ca15972bfff67a0f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1020,14 +1020,18 @@ public abstract class PlayerList {
--- a/patches/server/0093-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
+++ b/patches/server/0093-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
--- a/patches/server/0094-Send-multiple-keep-alive-packets.patch
+++ b/patches/server/0094-Send-multiple-keep-alive-packets.patch
@@ -151,13 +151,14 @@ index 97c390c72b8e70affb35487138c55f214953f8e6..e533bb09c9eec023ec44e559969f2cb0
         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
         // CraftBukkit start
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index b2aa32662335c4d64ac87320fcfb334784d89ec5..4650c69295adcc780f00d8d098cf939931147828 100644
+index b0da100cf972d4e39b130c99550ebcc763f055ee..b2ee56fa4be361e9151389787313594493dd7a2e 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -88,6 +88,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
- 
-         }
+@@ -52,6 +52,12 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+     public class Misc extends ConfigurationPart {
 
+         public boolean verifyChatOrder = true; // Gale - Pufferfish - make chat order verification configurable
+
 +        public Keepalive keepalive;
 +        public class Keepalive extends ConfigurationPart {
 +            public boolean sendMultiple = true; // Gale - Purpur - send multiple keep-alive packets
--- a/patches/server/0095-Make-slow-login-timeout-configurable.patch
+++ b/patches/server/0095-Make-slow-login-timeout-configurable.patch
@@ -23,7 +23,7 @@ index a60651bb5e1156db2b3ccd74e18661aa3f19b9c2..1d11d0388b9763a0e0e5f3398425dafa
         }
 
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 4650c69295adcc780f00d8d098cf939931147828..35a59ea0ba0b018278287c7aefb39b18b5a72267 100644
+index b2ee56fa4be361e9151389787313594493dd7a2e..c9f19aa7dbf01d6dd295ae9e8d3df06c16ef75b4 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -52,6 +52,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -32,5 +32,5 @@ index 4650c69295adcc780f00d8d098cf939931147828..35a59ea0ba0b018278287c7aefb39b18
         public boolean verifyChatOrder = true; // Gale - Pufferfish - make chat order verification configurable
 +        public int premiumAccountSlowLoginTimeout = -1; // Gale - make slow login timeout configurable
 
-         public IncludeInTimingsReport includeInTimingsReport;
- 
+         public Keepalive keepalive;
+         public class Keepalive extends ConfigurationPart {
--- a/patches/server/0096-Load-portal-destination-chunk-before-entity-teleport.patch
+++ b/patches/server/0096-Load-portal-destination-chunk-before-entity-teleport.patch
@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 288bef94cfd28dd15c72131381c400a45050bbbc..eba95158855d2dbf9890660d8bfec01b15aa289f 100644
+index f55019443b3f33dc4e0f845e5906078b1257175a..e748a67d9ba349574462a7fb27a5dca69a571dc9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4005,7 +4005,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/patches/server/0097-Don-t-load-chunks-to-spawn-phantoms.patch
+++ b/patches/server/0097-Don-t-load-chunks-to-spawn-phantoms.patch
--- a/patches/server/0098-Don-t-load-chunks-to-activate-climbing-entities.patch
+++ b/patches/server/0098-Don-t-load-chunks-to-activate-climbing-entities.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eba95158855d2dbf9890660d8bfec01b15aa289f..23c7755ecf2d5755f98e7666ca30693725549db1 100644
+index e748a67d9ba349574462a7fb27a5dca69a571dc9..c9896eb6e0bfd8893afda48299e61039c6544a9b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4656,6 +4656,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/patches/server/0099-Broadcast-crit-animations-as-the-entity-being-critte.patch
+++ b/patches/server/0099-Broadcast-crit-animations-as-the-entity-being-critte.patch
--- a/Show More
+++ b/Show More