[ci skip] Add more identifying patch comments, merge related patches

2024-01-19 17:54:05 +01:00
parent 64e5ff904c
commit 3c246dc632
26 changed files with 99 additions and 119 deletions
--- a/patches/server/Add-more-WanderingTrader-API.patch
+++ b/patches/server/Add-more-WanderingTrader-API.patch
@ -15,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper start - Add more WanderingTrader API
 +    public boolean canDrinkPotion = true;
 +    public boolean canDrinkMilk = true;
-+    // Paper end
+    // Paper end - Add more WanderingTrader API
 
     public WanderingTrader(EntityType<? extends WanderingTrader> type, Level world) {
         super(type, world);