Initial work on 1.14 pre-5
This commit is contained in:
parent
fb25dc17c6
commit
6c3f04049d
315 changed files with 1547 additions and 1648 deletions
|
@ -1,4 +1,4 @@
|
|||
From 35bbd72e452d3c31afe5217706a2a60df856117f Mon Sep 17 00:00:00 2001
|
||||
From 1083cf344326c8c77207bab66a92c2d06d4f9f7d 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 8e602cf51..dca77bbaf 100644
|
||||
index 8e602cf5..dca77bba 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,7 +29,7 @@ index 8e602cf51..dca77bbaf 100644
|
|||
// Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index 4ee01be5f..3ff3458e7 100644
|
||||
index 4ee01be5..3ff3458e 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 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue