Change spelling of multi-colored collar to American English.

sweetrpg · Jun 13, 2022 · 79ce72e · 79ce72e
1 parent 1f77e0c
commit 79ce72e
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 19 deletions.
diff --git a/src/generated/resources/assets/catherder/lang/de_de.json b/src/generated/resources/assets/catherder/lang/de_de.json
@@ -116,7 +116,7 @@
   "item.catherder.leather_jacket": "TODO",
   "item.catherder.master_treat": "TODO",
   "item.catherder.mouse_trap": "TODO",
-  "item.catherder.multicoloured_collar": "TODO",
+  "item.catherder.multicolored_collar": "TODO",
   "item.catherder.owner_change": "TODO",
   "item.catherder.owner_change.tooltip": "TODO",
   "item.catherder.radar": "TODO",

diff --git a/src/generated/resources/assets/catherder/lang/en_gb.json b/src/generated/resources/assets/catherder/lang/en_gb.json
@@ -116,7 +116,7 @@
   "item.catherder.leather_jacket": "Leather Jacket",
   "item.catherder.master_treat": "Master Treat",
   "item.catherder.mouse_trap": "Mouse Trap",
-  "item.catherder.multicoloured_collar": "Multi-coloured Collar",
+  "item.catherder.multicolored_collar": "Multi-coloured Collar",
   "item.catherder.owner_change": "Change Cat Owner",
   "item.catherder.owner_change.tooltip": "Sets ANY cat to be yours",
   "item.catherder.radar": "Radar",

diff --git a/src/generated/resources/assets/catherder/lang/en_us.json b/src/generated/resources/assets/catherder/lang/en_us.json
@@ -120,7 +120,7 @@
   "item.catherder.leather_jacket": "Leather Jacket",
   "item.catherder.master_treat": "Master Treat",
   "item.catherder.mouse_trap": "Mouse Trap",
-  "item.catherder.multicoloured_collar": "Multi-colored Collar",
+  "item.catherder.multicolored_collar": "Multi-colored Collar",
   "item.catherder.owner_change": "Change Cat Owner",
   "item.catherder.owner_change.tooltip": "Sets ANY cat to be yours",
   "item.catherder.radar": "Radar",

diff --git a/src/generated/resources/assets/catherder/lang/ko_kr.json b/src/generated/resources/assets/catherder/lang/ko_kr.json
@@ -116,7 +116,7 @@
   "item.catherder.leather_jacket": "TODO",
   "item.catherder.master_treat": "TODO",
   "item.catherder.mouse_trap": "TODO",
-  "item.catherder.multicoloured_collar": "TODO",
+  "item.catherder.multicolored_collar": "TODO",
   "item.catherder.owner_change": "TODO",
   "item.catherder.owner_change.tooltip": "TODO",
   "item.catherder.radar": "TODO",

diff --git a/src/generated/resources/assets/catherder/lang/ru_ru.json b/src/generated/resources/assets/catherder/lang/ru_ru.json
@@ -116,7 +116,7 @@
   "item.catherder.leather_jacket": "TODO",
   "item.catherder.master_treat": "TODO",
   "item.catherder.mouse_trap": "TODO",
-  "item.catherder.multicoloured_collar": "TODO",
+  "item.catherder.multicolored_collar": "TODO",
   "item.catherder.owner_change": "TODO",
   "item.catherder.owner_change.tooltip": "TODO",
   "item.catherder.radar": "TODO",

diff --git a/src/generated/resources/assets/catherder/lang/vi_vn.json b/src/generated/resources/assets/catherder/lang/vi_vn.json
@@ -116,7 +116,7 @@
   "item.catherder.leather_jacket": "TODO",
   "item.catherder.master_treat": "TODO",
   "item.catherder.mouse_trap": "TODO",
-  "item.catherder.multicoloured_collar": "TODO",
+  "item.catherder.multicolored_collar": "TODO",
   "item.catherder.owner_change": "TODO",
   "item.catherder.owner_change.tooltip": "TODO",
   "item.catherder.radar": "TODO",

diff --git a/src/generated/resources/assets/catherder/lang/zh_cn.json b/src/generated/resources/assets/catherder/lang/zh_cn.json
@@ -116,7 +116,7 @@
   "item.catherder.leather_jacket": "TODO",
   "item.catherder.master_treat": "TODO",
   "item.catherder.mouse_trap": "TODO",
-  "item.catherder.multicoloured_collar": "TODO",
+  "item.catherder.multicolored_collar": "TODO",
   "item.catherder.owner_change": "TODO",
   "item.catherder.owner_change.tooltip": "TODO",
   "item.catherder.radar": "TODO",

diff --git a/src/generated/resources/assets/catherder/lang/zh_tw.json b/src/generated/resources/assets/catherder/lang/zh_tw.json
@@ -116,7 +116,7 @@
   "item.catherder.leather_jacket": "TODO",
   "item.catherder.master_treat": "TODO",
   "item.catherder.mouse_trap": "TODO",
-  "item.catherder.multicoloured_collar": "TODO",
+  "item.catherder.multicolored_collar": "TODO",
   "item.catherder.owner_change": "TODO",
   "item.catherder.owner_change.tooltip": "TODO",
   "item.catherder.radar": "TODO",

diff --git a/...der/models/item/multicoloured_collar.json → ...rder/models/item/multicolored_collar.json b/...der/models/item/multicoloured_collar.json → ...rder/models/item/multicolored_collar.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "catherder:item/multicoloured_collar"
+    "layer0": "catherder:item/multicolored_collar"
   }
 }
diff --git a/...therder/recipes/multicoloured_collar.json → ...atherder/recipes/multicolored_collar.json b/...therder/recipes/multicoloured_collar.json → ...atherder/recipes/multicolored_collar.json
@@ -27,6 +27,6 @@
     }
   ],
   "result": {
-    "item": "catherder:multicoloured_collar"
+    "item": "catherder:multicolored_collar"
   }
 }
diff --git a/src/main/java/com/sweetrpg/catherder/common/lib/Constants.java b/src/main/java/com/sweetrpg/catherder/common/lib/Constants.java
@@ -60,7 +60,7 @@ public class Constants {
     public static final String TRANSLATION_KEY_ITEM_CREATIVE_COLLAR = "item.catherder.creative_collar";
     public static final String TRANSLATION_KEY_ITEM_CREATIVE_COLLAR_TOOLTIP = "item.catherder.creative_collar.tooltip";
     public static final String TRANSLATION_KEY_ITEM_SPOTTED_COLLAR = "item.catherder.spotted_collar";
-    public static final String TRANSLATION_KEY_ITEM_MULTICOLORED_COLLAR = "item.catherder.multicoloured_collar";
+    public static final String TRANSLATION_KEY_ITEM_MULTICOLORED_COLLAR = "item.catherder.multicolored_collar";
     public static final String TRANSLATION_KEY_ITEM_RADAR = "item.catherder.radar";
     public static final String TRANSLATION_KEY_ITEM_CREATIVE_RADAR = "item.catherder.creative_radar";
     public static final String TRANSLATION_KEY_ITEM_CREATIVE_RADAR_TOOLTIP = "item.catherder.creative_radar.tooltip";

diff --git a/src/main/java/com/sweetrpg/catherder/common/registry/ModItems.java b/src/main/java/com/sweetrpg/catherder/common/registry/ModItems.java
@@ -69,7 +69,7 @@ public class ModItems {
     public static final RegistryObject<DyeableAccessoryItem> WOOL_COLLAR = registerAccessoryDyed("wool_collar", ModAccessories.DYEABLE_COLLAR);
     public static final RegistryObject<AccessoryItem> CREATIVE_COLLAR = registerAccessory("creative_collar", ModAccessories.GOLDEN_COLLAR);
     public static final RegistryObject<AccessoryItem> SPOTTED_COLLAR = registerAccessory("spotted_collar", ModAccessories.SPOTTED_COLLAR);
-    public static final RegistryObject<AccessoryItem> MULTICOLOURED_COLLAR = registerAccessory("multicoloured_collar", ModAccessories.MULTICOLORED_COLLAR);
+    public static final RegistryObject<AccessoryItem> MULTICOLOURED_COLLAR = registerAccessory("multicolored_collar", ModAccessories.MULTICOLORED_COLLAR);
     public static final RegistryObject<AccessoryItem> CAPE = registerAccessory("cape", ModAccessories.CAPE);
     //    public static final RegistryObject<DyeableAccessoryItem> CAPE_COLOURED = registerAccessoryDyed("cape_coloured", CatAccessories.DYEABLE_CAPE);
     public static final RegistryObject<AccessoryItem> SUNGLASSES = registerAccessory("sunglasses", ModAccessories.SUNGLASSES);

diff --git a/src/main/resources/assets/catherder/lang/de_de.json b/src/main/resources/assets/catherder/lang/de_de.json
@@ -22,7 +22,7 @@
    "item.catherder.wool_collar": "Wollhalsband",
    "item.catherder.creative_collar": "Halsband des Kreativmodus",
    "item.catherder.spotted_collar": "Zebrahalsband",
-   "item.catherder.multicoloured_collar": "Regenbogenhalsband",
+   "item.catherder.multicolored_collar": "Regenbogenhalsband",
    "item.catherder.radar": "Radar",
    "item.catherder.creative_radar": "Radar des kreativen Modus",
    "item.catherder.whistle.0": "Pfeife : Befehlen Stehen",

diff --git a/src/main/resources/assets/catherder/lang/ko_kr.json b/src/main/resources/assets/catherder/lang/ko_kr.json
@@ -22,7 +22,7 @@
    "item.catherder.wool_collar": "양털 목줄",
    "item.catherder.creative_collar": "크리에이티브 목줄",
    "item.catherder.spotted_collar": "얼룩말 무늬 목줄",
-   "item.catherder.multicoloured_collar": "알록달록 목줄",
+   "item.catherder.multicolored_collar": "알록달록 목줄",
    "item.catherder.radar": "위치추적 장치",
    "item.catherder.creative_radar": "크리에이티브 위치추적 장치",
    "item.catherder.whistle.0": "개피리: 일어나!",

diff --git a/src/main/resources/assets/catherder/lang/ru_ru.json b/src/main/resources/assets/catherder/lang/ru_ru.json
@@ -22,7 +22,7 @@
    "item.catherder.wool_collar": "Ошейник",
    "item.catherder.creative_collar": "Творческий ошейник",
    "item.catherder.spotted_collar": "Покрашенный ошейник",
-   "item.catherder.multicoloured_collar": "Разноцветный ошейник",
+   "item.catherder.multicolored_collar": "Разноцветный ошейник",
    "item.catherder.radar": "Радар",
    "item.catherder.creative_radar": "Творческий радар",
    "item.catherder.whistle.0": "Свисток: Команда Ко мне!",

diff --git a/src/main/resources/assets/catherder/lang/vi_vn.json b/src/main/resources/assets/catherder/lang/vi_vn.json
@@ -22,7 +22,7 @@
    "item.catherder.wool_collar": "Vòng cổ Len",
    "item.catherder.creative_collar": "Vòng cổ Sáng Tạo",
    "item.catherder.spotted_collar": "Vòng cổ Chấm",
-   "item.catherder.multicoloured_collar": "Vòng cổ Đa sắc",
+   "item.catherder.multicolored_collar": "Vòng cổ Đa sắc",
    "item.catherder.radar": "Ra-đa",
    "item.catherder.creative_radar": "Ra-đa Sáng Tạo",
    "item.catherder.whistle.0": "Còi: Lệnh Đứng",

diff --git a/src/main/resources/assets/catherder/lang/zh_cn.json b/src/main/resources/assets/catherder/lang/zh_cn.json
@@ -22,7 +22,7 @@
    "item.catherder.wool_collar": "羊毛项圈",
    "item.catherder.creative_collar": "创造项圈",
    "item.catherder.spotted_collar": "斑纹项圈",
-   "item.catherder.multicoloured_collar": "炫彩项圈",
+   "item.catherder.multicolored_collar": "炫彩项圈",
    "item.catherder.radar": "雷达",
    "item.catherder.creative_radar": "创造雷达",
    "item.catherder.whistle.0": "哨子：命令起立",

diff --git a/src/main/resources/assets/catherder/lang/zh_tw.json b/src/main/resources/assets/catherder/lang/zh_tw.json
@@ -22,7 +22,7 @@
    "item.catherder.wool_collar": "羊毛项圈",
    "item.catherder.creative_collar": "创造项圈",
    "item.catherder.spotted_collar": "斑纹项圈",
-   "item.catherder.multicoloured_collar": "炫彩项圈",
+   "item.catherder.multicolored_collar": "炫彩项圈",
    "item.catherder.radar": "雷达",
    "item.catherder.creative_radar": "创造雷达",
    "item.catherder.whistle.0": "哨子：命令起立",

diff --git a/...er/textures/item/multicoloured_collar.png → ...der/textures/item/multicolored_collar.png b/...er/textures/item/multicoloured_collar.png → ...der/textures/item/multicolored_collar.png
diff --git a/.../resources/data/catherder/patchouli_books/cat_care/en_us/entries/recipes/accessories.json b/.../resources/data/catherder/patchouli_books/cat_care/en_us/entries/recipes/accessories.json
@@ -15,7 +15,7 @@
     {
       "type": "patchouli:crafting",
       "title": "Multi-colored Collar",
-      "recipe": "catherder:multicoloured_collar"
+      "recipe": "catherder:multicolored_collar"
     },
     {
       "type": "patchouli:crafting",