From dc1eab4dd8fc5e66c8097c771f8fc92d1e134bfc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 12 Aug 2016 22:17:12 -0500 Subject: [PATCH] Fix weird model name clash. Closes #436 --- src/main/java/vazkii/botania/common/lib/LibItemNames.java | 2 +- src/main/resources/assets/botania/lang/en_US.lang | 2 +- src/main/resources/assets/botania/lang/es_ES.lang | 2 +- src/main/resources/assets/botania/lang/fr_FR.lang | 2 +- src/main/resources/assets/botania/lang/ja_JP.lang | 2 +- src/main/resources/assets/botania/lang/ko_KR.lang | 2 +- src/main/resources/assets/botania/lang/nl_NL.lang | 2 +- src/main/resources/assets/botania/lang/pt_BR.lang | 2 +- src/main/resources/assets/botania/lang/zh_CN.lang | 2 +- src/main/resources/assets/botania/lang/zh_TW.lang | 2 +- .../assets/botania/models/item/{root.json => livingRoot.json} | 0 11 files changed, 10 insertions(+), 10 deletions(-) rename src/main/resources/assets/botania/models/item/{root.json => livingRoot.json} (100%) diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 98f2643f7..5d6927462 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -208,7 +208,7 @@ public final class LibItemNames { "manasteelNugget", "terrasteelNugget", "elementiumNugget", - "root", + "livingRoot", "pebble", "manaweaveCloth", "manaPowder" diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 905d3716a..ad1ce0a2d 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1588,7 +1588,7 @@ item.botania:terraAxe.name=Terra Truncator item.botania:manasteelNugget.name=Manasteel Nugget item.botania:terrasteelNugget.name=Terrasteel Nugget item.botania:elementiumNugget.name=Elementium Nugget -item.botania:root.name=Living Root +item.botania:livingRoot.name=Living Root item.botania:pebble.name=Pebble item.botania:waterBowl.name=Bowl of Water item.botania:obedienceStick.name=Floral Obedience Stick diff --git a/src/main/resources/assets/botania/lang/es_ES.lang b/src/main/resources/assets/botania/lang/es_ES.lang index fb1b313db..cd8d93f2a 100644 --- a/src/main/resources/assets/botania/lang/es_ES.lang +++ b/src/main/resources/assets/botania/lang/es_ES.lang @@ -1336,7 +1336,7 @@ item.botania:terraAxe.name=Truncador de Terra item.botania:manasteelNugget.name=Pepita de manacero item.botania:terrasteelNugget.name=Pepita de terracero item.botania:elementiumNugget.name=Pepita de elementio -item.botania:root.name=Raíz viviente +item.botania:livingRoot.name=Raíz viviente item.botania:pebble.name=Guijarro item.botania:waterBowl.name=Cuenco con agua item.botania:obedienceStick.name=Palo de obediencia floral diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index 2d49a91e6..7605cbd41 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -1196,7 +1196,7 @@ item.botania:terraAxe.name=Troncateur Terra item.botania:manasteelNugget.name=Pépite de manacier item.botania:terrasteelNugget.name=Pépite de terracier item.botania:elementiumNugget.name=Pépite d'élémentium -item.botania:root.name=Racine vivante +item.botania:livingRoot.name=Racine vivante item.botania:pebble.name=Caillou item.botania:waterBowl.name=bol d'eau item.botania:obedienceStick.name=Bâton d'obéissance floral diff --git a/src/main/resources/assets/botania/lang/ja_JP.lang b/src/main/resources/assets/botania/lang/ja_JP.lang index fc6f9c561..bf4a1b933 100644 --- a/src/main/resources/assets/botania/lang/ja_JP.lang +++ b/src/main/resources/assets/botania/lang/ja_JP.lang @@ -1352,7 +1352,7 @@ item.botania:terraAxe.name=テラトランケーター item.botania:manasteelNugget.name=マナスチールのナゲット item.botania:terrasteelNugget.name=テラスチールのナゲット item.botania:elementiumNugget.name=エレメンチウムのナゲット -item.botania:root.name=リビングルート +item.botania:livingRoot.name=リビングルート item.botania:pebble.name=小石 item.botania:waterBowl.name=水の入ったボウル item.botania:obedienceStick.name=花の指揮棒 diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_KR.lang index 258ce220a..a6ddd8074 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_KR.lang @@ -1298,7 +1298,7 @@ item.botania:terraAxe.name=대지 절단 item.botania:manasteelNugget.name=마나합금 조각 item.botania:terrasteelNugget.name=테라스틸 조각 item.botania:elementiumNugget.name=엘레멘티움 조각 -item.botania:root.name=생명의 뿌리 +item.botania:livingRoot.name=생명의 뿌리 item.botania:pebble.name=옥석 item.botania:waterBowl.name=물이 담긴 그릇 item.botania:obedienceStick.name=꽃의 순종막대 diff --git a/src/main/resources/assets/botania/lang/nl_NL.lang b/src/main/resources/assets/botania/lang/nl_NL.lang index cb5563a04..65d0b5b66 100644 --- a/src/main/resources/assets/botania/lang/nl_NL.lang +++ b/src/main/resources/assets/botania/lang/nl_NL.lang @@ -1431,7 +1431,7 @@ item.botania:terraAxe.name=Terrakapper item.botania:manasteelNugget.name=Klompje Manastaal item.botania:terrasteelNugget.name=Klompje Terrastaal item.botania:elementiumNugget.name=Klompje Elementium -item.botania:root.name=Levenswortel +item.botania:livingRoot.name=Levenswortel item.botania:pebble.name=Kiezel item.botania:waterBowl.name=Kom Water item.botania:obedienceStick.name=Bloemen Gehoorzaamheidsstok diff --git a/src/main/resources/assets/botania/lang/pt_BR.lang b/src/main/resources/assets/botania/lang/pt_BR.lang index 625e7b5d2..a8fc0754e 100644 --- a/src/main/resources/assets/botania/lang/pt_BR.lang +++ b/src/main/resources/assets/botania/lang/pt_BR.lang @@ -1504,7 +1504,7 @@ item.botania:terraAxe.name=Terra-Truncador item.botania:manasteelNugget.name=Pepita de Manasteel item.botania:terrasteelNugget.name=Pepita de Terrasteel item.botania:elementiumNugget.name=Pepita de Elementium -item.botania:root.name=Raíz-viva +item.botania:livingRoot.name=Raíz-viva item.botania:pebble.name=Seixo item.botania:waterBowl.name=Tigela de água item.botania:obedienceStick.name=Varinha da Obediência Floral diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index a62103994..ae0cdb139 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -1535,7 +1535,7 @@ item.botania:terraAxe.name=泰拉断裂者 item.botania:manasteelNugget.name=魔钢粒 item.botania:terrasteelNugget.name=泰拉钢粒 item.botania:elementiumNugget.name=源质钢粒 -item.botania:root.name=活根 +item.botania:livingRoot.name=活根 item.botania:pebble.name=卵石 item.botania:waterBowl.name=一碗水 item.botania:obedienceStick.name=植物遵从法杖 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index e9b345cb3..2f5b1b307 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -1544,7 +1544,7 @@ item.botania:terraAxe.name=泰拉斷裂者 item.botania:manasteelNugget.name=魔鋼粒 item.botania:terrasteelNugget.name=泰拉鋼粒 item.botania:elementiumNugget.name=源質鋼粒 -item.botania:root.name=活根 +item.botania:livingRoot.name=活根 item.botania:pebble.name=卵石 item.botania:waterBowl.name=一碗水 item.botania:obedienceStick.name=植物遵從法杖 diff --git a/src/main/resources/assets/botania/models/item/root.json b/src/main/resources/assets/botania/models/item/livingRoot.json similarity index 100% rename from src/main/resources/assets/botania/models/item/root.json rename to src/main/resources/assets/botania/models/item/livingRoot.json