Update Upstream
This commit is contained in:
parent
cb24079b77
commit
eeb2ecd789
348 changed files with 1661 additions and 1710 deletions
|
@ -1,4 +1,4 @@
|
|||
From 1083cf344326c8c77207bab66a92c2d06d4f9f7d Mon Sep 17 00:00:00 2001
|
||||
From 5fee301aedb1cbdf582295f335c237a142e82865 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
|
||||
|
@ -29,10 +29,10 @@ index 8e602cf5..dca77bba 100644
|
|||
// Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index 4ee01be5..3ff3458e 100644
|
||||
index 44f3bec7..9526cfe0 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -590,5 +590,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -591,5 +591,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
public ItemStack ensureServerConversions() {
|
||||
return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue