Merge remote-tracking branch 'origin/master'
# Conflicts: # api/src/main/java/me/tofaa/entitylib/meta/MetaConverterRegistry.java
This commit is contained in:
commit
38d858f5b3
1 changed files with 0 additions and 1 deletions
|
@ -148,7 +148,6 @@ final class MetaConverterRegistry {
|
||||||
put(TEXT_DISPLAY, TextDisplayMeta.class, TextDisplayMeta::new);
|
put(TEXT_DISPLAY, TextDisplayMeta.class, TextDisplayMeta::new);
|
||||||
put(THROWN_EXP_BOTTLE, ThrownExpBottleMeta.class, ThrownExpBottleMeta::new);
|
put(THROWN_EXP_BOTTLE, ThrownExpBottleMeta.class, ThrownExpBottleMeta::new);
|
||||||
put(ENDER_PEARL, ThrownEnderPearlMeta.class, ThrownEnderPearlMeta::new);
|
put(ENDER_PEARL, ThrownEnderPearlMeta.class, ThrownEnderPearlMeta::new);
|
||||||
put(TNT, TntMeta.class, TntMeta::new);
|
|
||||||
put(TNT_MINECART, TntMinecartMeta.class, TntMinecartMeta::new);
|
put(TNT_MINECART, TntMinecartMeta.class, TntMinecartMeta::new);
|
||||||
put(TRADER_LLAMA, TraderLlamaMeta.class, TraderLlamaMeta::new);
|
put(TRADER_LLAMA, TraderLlamaMeta.class, TraderLlamaMeta::new);
|
||||||
put(TRIDENT, ThrownTridentMeta.class, ThrownTridentMeta::new);
|
put(TRIDENT, ThrownTridentMeta.class, ThrownTridentMeta::new);
|
||||||
|
|
Loading…
Reference in a new issue