[ci skip] Move some disruptive patches back

patches/server/0146-Implement-getI18NDisplayName.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 4 May 2016 23:59:38 -0400
-Subject: [PATCH] Implement getI18NDisplayName
-
-Gets the Display name as seen in the Client.
-Currently the server only supports the English language. To override this,
-You must replace the language file embedded in the server jar.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 89bc6cb62123bc17d579b578c4d1d2e5f8c40837..71db89105c70cb70726fb6a732b899297aeee82a 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -512,4 +512,19 @@ public final class CraftItemFactory implements ItemFactory {
-         return CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(item));
-     }
-     // Paper end - ensure server conversions API
-+
-+    // Paper start - add getI18NDisplayName
-+    @Override
-+    public String getI18NDisplayName(ItemStack item) {
-+        net.minecraft.world.item.ItemStack nms = null;
-+        if (item instanceof CraftItemStack) {
-+            nms = ((CraftItemStack) item).handle;
-+        }
-+        if (nms == null) {
-+            nms = CraftItemStack.asNMSCopy(item);
-+        }
-+
-+        return nms != null ? net.minecraft.locale.Language.getInstance().getOrDefault(nms.getItem().getDescriptionId(nms)) : null;
-+    }
-+    // Paper end - add getI18NDisplayName
- }