parent
d4ae43fc00
commit
19de9af63c
624 changed files with 2369 additions and 2370 deletions
|
@ -1,4 +1,4 @@
|
|||
From a053762804bf81a788e6de7c9d134d396774902c Mon Sep 17 00:00:00 2001
|
||||
From 5be3ee85ce36300d867bfa63eea2334d876527d8 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 4 May 2016 23:55:48 -0400
|
||||
Subject: [PATCH] Add getI18NDisplayName API
|
||||
|
@ -8,7 +8,7 @@ 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/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
index bb3f7cdc1..3cada3487 100644
|
||||
index bb3f7cdc..3cada348 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
@@ -153,5 +153,16 @@ public interface ItemFactory {
|
||||
|
@ -29,10 +29,10 @@ index bb3f7cdc1..3cada3487 100644
|
|||
// Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index 44f3bec7d..9526cfe02 100644
|
||||
index 8d9ebcb3..65aa1c4e 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -591,5 +591,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -607,5 +607,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
public ItemStack ensureServerConversions() {
|
||||
return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
|
||||
}
|
||||
|
@ -51,5 +51,5 @@ index 44f3bec7d..9526cfe02 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
2.25.0.windows.1
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue