diff --git a/Common/src/main/resources/assets/icarus/lang/en_us.json b/Common/src/main/resources/assets/icarus/lang/en_us.json index 73236b3..c992d9d 100644 --- a/Common/src/main/resources/assets/icarus/lang/en_us.json +++ b/Common/src/main/resources/assets/icarus/lang/en_us.json @@ -8,8 +8,8 @@ "item.icarus.yellow_feathered_wings": "Yellow Feathered Wings", "item.icarus.lime_feathered_wings": "Lime Feathered Wings", "item.icarus.pink_feathered_wings": "Pink Feathered Wings", - "item.icarus.grey_feathered_wings": "Grey Feathered Wings", - "item.icarus.light_grey_feathered_wings": "Light Grey Feathered Wings", + "item.icarus.gray_feathered_wings": "Gray Feathered Wings", + "item.icarus.light_gray_feathered_wings": "Light Gray Feathered Wings", "item.icarus.cyan_feathered_wings": "Cyan Feathered Wings", "item.icarus.purple_feathered_wings": "Purple Feathered Wings", "item.icarus.blue_feathered_wings": "Blue Feathered Wings", @@ -25,8 +25,8 @@ "item.icarus.yellow_dragon_wings": "Yellow Dragon Wings", "item.icarus.lime_dragon_wings": "Lime Dragon Wings", "item.icarus.pink_dragon_wings": "Pink Dragon Wings", - "item.icarus.grey_dragon_wings": "Grey Dragon Wings", - "item.icarus.light_grey_dragon_wings": "Light Grey Dragon Wings", + "item.icarus.gray_dragon_wings": "Gray Dragon Wings", + "item.icarus.light_gray_dragon_wings": "Light Gray Dragon Wings", "item.icarus.cyan_dragon_wings": "Cyan Dragon Wings", "item.icarus.purple_dragon_wings": "Purple Dragon Wings", "item.icarus.blue_dragon_wings": "Blue Dragon Wings", @@ -42,8 +42,8 @@ "item.icarus.yellow_mechanical_feathered_wings": "Yellow Mechanical Feathered Wings", "item.icarus.lime_mechanical_feathered_wings": "Lime Mechanical Feathered Wings", "item.icarus.pink_mechanical_feathered_wings": "Pink Mechanical Feathered Wings", - "item.icarus.grey_mechanical_feathered_wings": "Grey Mechanical Feathered Wings", - "item.icarus.light_grey_mechanical_feathered_wings": "Light Grey Mechanical Feathered Wings", + "item.icarus.gray_mechanical_feathered_wings": "Gray Mechanical Feathered Wings", + "item.icarus.light_gray_mechanical_feathered_wings": "Light Gray Mechanical Feathered Wings", "item.icarus.cyan_mechanical_feathered_wings": "Cyan Mechanical Feathered Wings", "item.icarus.purple_mechanical_feathered_wings": "Purple Mechanical Feathered Wings", "item.icarus.blue_mechanical_feathered_wings": "Blue Mechanical Feathered Wings", @@ -59,8 +59,8 @@ "item.icarus.yellow_mechanical_leather_wings": "Yellow Mechanical Leather Wings", "item.icarus.lime_mechanical_leather_wings": "Lime Mechanical Leather Wings", "item.icarus.pink_mechanical_leather_wings": "Pink Mechanical Leather Wings", - "item.icarus.grey_mechanical_leather_wings": "Grey Mechanical Leather Wings", - "item.icarus.light_grey_mechanical_leather_wings": "Light Grey Mechanical Leather Wings", + "item.icarus.gray_mechanical_leather_wings": "Gray Mechanical Leather Wings", + "item.icarus.light_gray_mechanical_leather_wings": "Light Gray Mechanical Leather Wings", "item.icarus.cyan_mechanical_leather_wings": "Cyan Mechanical Leather Wings", "item.icarus.purple_mechanical_leather_wings": "Purple Mechanical Leather Wings", "item.icarus.blue_mechanical_leather_wings": "Blue Mechanical Leather Wings", @@ -76,8 +76,8 @@ "item.icarus.yellow_light_wings": "Yellow Light Wings", "item.icarus.lime_light_wings": "Lime Light Wings", "item.icarus.pink_light_wings": "Pink Light Wings", - "item.icarus.grey_light_wings": "Grey Light Wings", - "item.icarus.light_grey_light_wings": "Light Grey Light Wings", + "item.icarus.gray_light_wings": "Gray Light Wings", + "item.icarus.light_gray_light_wings": "Light Gray Light Wings", "item.icarus.cyan_light_wings": "Cyan Light Wings", "item.icarus.purple_light_wings": "Purple Light Wings", "item.icarus.blue_light_wings": "Blue Light Wings", diff --git a/Common/src/main/resources/assets/icarus/lang/pt_br.json b/Common/src/main/resources/assets/icarus/lang/pt_br.json index 714a7ac..0f70bce 100644 --- a/Common/src/main/resources/assets/icarus/lang/pt_br.json +++ b/Common/src/main/resources/assets/icarus/lang/pt_br.json @@ -8,8 +8,8 @@ "item.icarus.yellow_feathered_wings": "Asas Emplumadas Amarelo", "item.icarus.lime_feathered_wings": "Asas Emplumadas Verde-Limão", "item.icarus.pink_feathered_wings": "Asas Emplumadas Rosa", - "item.icarus.grey_feathered_wings": "Asas Emplumadas Cinza", - "item.icarus.light_grey_feathered_wings": "Asas Emplumadas Cinza Claro", + "item.icarus.gray_feathered_wings": "Asas Emplumadas Cinza", + "item.icarus.light_gray_feathered_wings": "Asas Emplumadas Cinza Claro", "item.icarus.cyan_feathered_wings": "Asas Emplumadas Ciano", "item.icarus.purple_feathered_wings": "Asas Emplumadas Roxa", "item.icarus.blue_feathered_wings": "Asas Emplumadas Azul", @@ -25,8 +25,8 @@ "item.icarus.yellow_dragon_wings": "Asas de Dragão Amarela", "item.icarus.lime_dragon_wings": "Asas de Dragão Verde-Limão", "item.icarus.pink_dragon_wings": "Asas de Dragão Rosa", - "item.icarus.grey_dragon_wings": "Asas de Dragão Cinza", - "item.icarus.light_grey_dragon_wings": "Asas de Dragão Cinza Claro", + "item.icarus.gray_dragon_wings": "Asas de Dragão Cinza", + "item.icarus.light_gray_dragon_wings": "Asas de Dragão Cinza Claro", "item.icarus.cyan_dragon_wings": "Asas de Dragão Ciano", "item.icarus.purple_dragon_wings": "Asas de Dragão Roxa", "item.icarus.blue_dragon_wings": "Asas de Dragão Azul", @@ -42,8 +42,8 @@ "item.icarus.yellow_mechanical_feathered_wings": "Asas Mecânicas Emplumadas Amarelo", "item.icarus.lime_mechanical_feathered_wings": "Asas Mecânicas Emplumadas Verde-Limão", "item.icarus.pink_mechanical_feathered_wings": "Asas Mecânicas Emplumadas Rosa", - "item.icarus.grey_mechanical_feathered_wings": "Asas Mecânicas Emplumadas Cinza", - "item.icarus.light_grey_mechanical_feathered_wings": "Asas Mecânicas Emplumadas Cinza Claro", + "item.icarus.gray_mechanical_feathered_wings": "Asas Mecânicas Emplumadas Cinza", + "item.icarus.light_gray_mechanical_feathered_wings": "Asas Mecânicas Emplumadas Cinza Claro", "item.icarus.cyan_mechanical_feathered_wings": "Asas Mecânicas Emplumadas Ciano", "item.icarus.purple_mechanical_feathered_wings": "Asas Mecânicas Emplumadas Roxa", "item.icarus.blue_mechanical_feathered_wings": "Asas Mecânicas Emplumadas Azul", @@ -59,8 +59,8 @@ "item.icarus.yellow_mechanical_leather_wings": "Asas Mecânicas de Couro Amarela", "item.icarus.lime_mechanical_leather_wings": "Asas Mecânicas de Couro Verde-Limão", "item.icarus.pink_mechanical_leather_wings": "Asas Mecânicas de Couro Rosa", - "item.icarus.grey_mechanical_leather_wings": "Asas Mecânicas de Couro Cinza", - "item.icarus.light_grey_mechanical_leather_wings": "Asas Mecânicas de Couro Cinza Claro", + "item.icarus.gray_mechanical_leather_wings": "Asas Mecânicas de Couro Cinza", + "item.icarus.light_gray_mechanical_leather_wings": "Asas Mecânicas de Couro Cinza Claro", "item.icarus.cyan_mechanical_leather_wings": "Asas Mecânicas de Couro Ciano", "item.icarus.purple_mechanical_leather_wings": "Asas Mecânicas de Couro Roxa", "item.icarus.blue_mechanical_leather_wings": "Asas Mecânicas de Couro Azul", @@ -76,8 +76,8 @@ "item.icarus.yellow_light_wings": "Asas de Luz Amarela", "item.icarus.lime_light_wings": "Asas de Luz Verde-Limão", "item.icarus.pink_light_wings": "Asas de Luz Rosa", - "item.icarus.grey_light_wings": "Asas de Luz Cinza", - "item.icarus.light_grey_light_wings": "Asas de Luz Cinza Claro", + "item.icarus.gray_light_wings": "Asas de Luz Cinza", + "item.icarus.light_gray_light_wings": "Asas de Luz Cinza Claro", "item.icarus.cyan_light_wings": "Asas de Luz Ciano", "item.icarus.purple_light_wings": "Asas de Luz Roxa", "item.icarus.blue_light_wings": "Asas de Luz Azul", diff --git a/Common/src/main/resources/assets/icarus/models/item/grey_dragon_wings.json b/Common/src/main/resources/assets/icarus/models/item/gray_dragon_wings.json similarity index 100% rename from Common/src/main/resources/assets/icarus/models/item/grey_dragon_wings.json rename to Common/src/main/resources/assets/icarus/models/item/gray_dragon_wings.json diff --git a/Common/src/main/resources/assets/icarus/models/item/grey_feathered_wings.json b/Common/src/main/resources/assets/icarus/models/item/gray_feathered_wings.json similarity index 100% rename from Common/src/main/resources/assets/icarus/models/item/grey_feathered_wings.json rename to Common/src/main/resources/assets/icarus/models/item/gray_feathered_wings.json diff --git a/Common/src/main/resources/assets/icarus/models/item/grey_light_wings.json b/Common/src/main/resources/assets/icarus/models/item/gray_light_wings.json similarity index 100% rename from Common/src/main/resources/assets/icarus/models/item/grey_light_wings.json rename to Common/src/main/resources/assets/icarus/models/item/gray_light_wings.json diff --git a/Common/src/main/resources/assets/icarus/models/item/grey_mechanical_feathered_wings.json b/Common/src/main/resources/assets/icarus/models/item/gray_mechanical_feathered_wings.json similarity index 100% rename from Common/src/main/resources/assets/icarus/models/item/grey_mechanical_feathered_wings.json rename to Common/src/main/resources/assets/icarus/models/item/gray_mechanical_feathered_wings.json diff --git a/Common/src/main/resources/assets/icarus/models/item/grey_mechanical_leather_wings.json b/Common/src/main/resources/assets/icarus/models/item/gray_mechanical_leather_wings.json similarity index 100% rename from Common/src/main/resources/assets/icarus/models/item/grey_mechanical_leather_wings.json rename to Common/src/main/resources/assets/icarus/models/item/gray_mechanical_leather_wings.json diff --git a/Common/src/main/resources/assets/icarus/models/item/light_grey_dragon_wings.json b/Common/src/main/resources/assets/icarus/models/item/light_gray_dragon_wings.json similarity index 100% rename from Common/src/main/resources/assets/icarus/models/item/light_grey_dragon_wings.json rename to Common/src/main/resources/assets/icarus/models/item/light_gray_dragon_wings.json diff --git a/Common/src/main/resources/assets/icarus/models/item/light_grey_feathered_wings.json b/Common/src/main/resources/assets/icarus/models/item/light_gray_feathered_wings.json similarity index 100% rename from Common/src/main/resources/assets/icarus/models/item/light_grey_feathered_wings.json rename to Common/src/main/resources/assets/icarus/models/item/light_gray_feathered_wings.json diff --git a/Common/src/main/resources/assets/icarus/models/item/light_grey_light_wings.json b/Common/src/main/resources/assets/icarus/models/item/light_gray_light_wings.json similarity index 100% rename from Common/src/main/resources/assets/icarus/models/item/light_grey_light_wings.json rename to Common/src/main/resources/assets/icarus/models/item/light_gray_light_wings.json diff --git a/Common/src/main/resources/assets/icarus/models/item/light_grey_mechanical_feathered_wings.json b/Common/src/main/resources/assets/icarus/models/item/light_gray_mechanical_feathered_wings.json similarity index 100% rename from Common/src/main/resources/assets/icarus/models/item/light_grey_mechanical_feathered_wings.json rename to Common/src/main/resources/assets/icarus/models/item/light_gray_mechanical_feathered_wings.json diff --git a/Common/src/main/resources/assets/icarus/models/item/light_grey_mechanical_leather_wings.json b/Common/src/main/resources/assets/icarus/models/item/light_gray_mechanical_leather_wings.json similarity index 100% rename from Common/src/main/resources/assets/icarus/models/item/light_grey_mechanical_leather_wings.json rename to Common/src/main/resources/assets/icarus/models/item/light_gray_mechanical_leather_wings.json diff --git a/Common/src/main/resources/data/icarus/tags/items/dragon_wings.json b/Common/src/main/resources/data/icarus/tags/items/dragon_wings.json index c2480fe..9dd464e 100644 --- a/Common/src/main/resources/data/icarus/tags/items/dragon_wings.json +++ b/Common/src/main/resources/data/icarus/tags/items/dragon_wings.json @@ -9,8 +9,8 @@ "icarus:yellow_dragon_wings", "icarus:lime_dragon_wings", "icarus:pink_dragon_wings", - "icarus:grey_dragon_wings", - "icarus:light_grey_dragon_wings", + "icarus:gray_dragon_wings", + "icarus:light_gray_dragon_wings", "icarus:cyan_dragon_wings", "icarus:purple_dragon_wings", "icarus:blue_dragon_wings", @@ -19,4 +19,4 @@ "icarus:red_dragon_wings", "icarus:black_dragon_wings" ] -} \ No newline at end of file +} diff --git a/Common/src/main/resources/data/icarus/tags/items/feathered_wings.json b/Common/src/main/resources/data/icarus/tags/items/feathered_wings.json index 94cb1a6..e8c6557 100644 --- a/Common/src/main/resources/data/icarus/tags/items/feathered_wings.json +++ b/Common/src/main/resources/data/icarus/tags/items/feathered_wings.json @@ -9,8 +9,8 @@ "icarus:yellow_feathered_wings", "icarus:lime_feathered_wings", "icarus:pink_feathered_wings", - "icarus:grey_feathered_wings", - "icarus:light_grey_feathered_wings", + "icarus:gray_feathered_wings", + "icarus:light_gray_feathered_wings", "icarus:cyan_feathered_wings", "icarus:purple_feathered_wings", "icarus:blue_feathered_wings", @@ -19,4 +19,4 @@ "icarus:red_feathered_wings", "icarus:black_feathered_wings" ] -} \ No newline at end of file +} diff --git a/Common/src/main/resources/data/icarus/tags/items/light_wings.json b/Common/src/main/resources/data/icarus/tags/items/light_wings.json index f7abcc7..24bebbe 100644 --- a/Common/src/main/resources/data/icarus/tags/items/light_wings.json +++ b/Common/src/main/resources/data/icarus/tags/items/light_wings.json @@ -9,8 +9,8 @@ "icarus:yellow_light_wings", "icarus:lime_light_wings", "icarus:pink_light_wings", - "icarus:grey_light_wings", - "icarus:light_grey_light_wings", + "icarus:gray_light_wings", + "icarus:light_gray_light_wings", "icarus:cyan_light_wings", "icarus:purple_light_wings", "icarus:blue_light_wings", @@ -19,4 +19,4 @@ "icarus:red_light_wings", "icarus:black_light_wings" ] -} \ No newline at end of file +} diff --git a/Common/src/main/resources/data/icarus/tags/items/mechanical_feathered_wings.json b/Common/src/main/resources/data/icarus/tags/items/mechanical_feathered_wings.json index 1fda57f..7e680a2 100644 --- a/Common/src/main/resources/data/icarus/tags/items/mechanical_feathered_wings.json +++ b/Common/src/main/resources/data/icarus/tags/items/mechanical_feathered_wings.json @@ -9,8 +9,8 @@ "icarus:yellow_mechanical_feathered_wings", "icarus:lime_mechanical_feathered_wings", "icarus:pink_mechanical_feathered_wings", - "icarus:grey_mechanical_feathered_wings", - "icarus:light_grey_mechanical_feathered_wings", + "icarus:gray_mechanical_feathered_wings", + "icarus:light_gray_mechanical_feathered_wings", "icarus:cyan_mechanical_feathered_wings", "icarus:purple_mechanical_feathered_wings", "icarus:blue_mechanical_feathered_wings", @@ -19,4 +19,4 @@ "icarus:red_mechanical_feathered_wings", "icarus:black_mechanical_feathered_wings" ] -} \ No newline at end of file +} diff --git a/Common/src/main/resources/data/icarus/tags/items/mechanical_leather_wings.json b/Common/src/main/resources/data/icarus/tags/items/mechanical_leather_wings.json index 099150a..d62346c 100644 --- a/Common/src/main/resources/data/icarus/tags/items/mechanical_leather_wings.json +++ b/Common/src/main/resources/data/icarus/tags/items/mechanical_leather_wings.json @@ -9,8 +9,8 @@ "icarus:yellow_mechanical_leather_wings", "icarus:lime_mechanical_leather_wings", "icarus:pink_mechanical_leather_wings", - "icarus:grey_mechanical_leather_wings", - "icarus:light_grey_mechanical_leather_wings", + "icarus:gray_mechanical_leather_wings", + "icarus:light_gray_mechanical_leather_wings", "icarus:cyan_mechanical_leather_wings", "icarus:purple_mechanical_leather_wings", "icarus:blue_mechanical_leather_wings", @@ -19,4 +19,4 @@ "icarus:red_mechanical_leather_wings", "icarus:black_mechanical_leather_wings" ] -} \ No newline at end of file +} diff --git a/Fabric/src/main/resources/data/trinkets/tags/items/chest/cape.json b/Fabric/src/main/resources/data/trinkets/tags/items/chest/cape.json index 141c98e..351a34b 100644 --- a/Fabric/src/main/resources/data/trinkets/tags/items/chest/cape.json +++ b/Fabric/src/main/resources/data/trinkets/tags/items/chest/cape.json @@ -1,93 +1,6 @@ { - "replace": false, - "values": [ - "icarus:white_feathered_wings", - "icarus:orange_feathered_wings", - "icarus:magenta_feathered_wings", - "icarus:light_blue_feathered_wings", - "icarus:yellow_feathered_wings", - "icarus:lime_feathered_wings", - "icarus:pink_feathered_wings", - "icarus:grey_feathered_wings", - "icarus:light_grey_feathered_wings", - "icarus:cyan_feathered_wings", - "icarus:purple_feathered_wings", - "icarus:blue_feathered_wings", - "icarus:brown_feathered_wings", - "icarus:green_feathered_wings", - "icarus:red_feathered_wings", - "icarus:black_feathered_wings", - - "icarus:white_dragon_wings", - "icarus:orange_dragon_wings", - "icarus:magenta_dragon_wings", - "icarus:light_blue_dragon_wings", - "icarus:yellow_dragon_wings", - "icarus:lime_dragon_wings", - "icarus:pink_dragon_wings", - "icarus:grey_dragon_wings", - "icarus:light_grey_dragon_wings", - "icarus:cyan_dragon_wings", - "icarus:purple_dragon_wings", - "icarus:blue_dragon_wings", - "icarus:brown_dragon_wings", - "icarus:green_dragon_wings", - "icarus:red_dragon_wings", - "icarus:black_dragon_wings", - - "icarus:white_mechanical_feathered_wings", - "icarus:orange_mechanical_feathered_wings", - "icarus:magenta_mechanical_feathered_wings", - "icarus:light_blue_mechanical_feathered_wings", - "icarus:yellow_mechanical_feathered_wings", - "icarus:lime_mechanical_feathered_wings", - "icarus:pink_mechanical_feathered_wings", - "icarus:grey_mechanical_feathered_wings", - "icarus:light_grey_mechanical_feathered_wings", - "icarus:cyan_mechanical_feathered_wings", - "icarus:purple_mechanical_feathered_wings", - "icarus:blue_mechanical_feathered_wings", - "icarus:brown_mechanical_feathered_wings", - "icarus:green_mechanical_feathered_wings", - "icarus:red_mechanical_feathered_wings", - "icarus:black_mechanical_feathered_wings", - - "icarus:white_mechanical_leather_wings", - "icarus:orange_mechanical_leather_wings", - "icarus:magenta_mechanical_leather_wings", - "icarus:light_blue_mechanical_leather_wings", - "icarus:yellow_mechanical_leather_wings", - "icarus:lime_mechanical_leather_wings", - "icarus:pink_mechanical_leather_wings", - "icarus:grey_mechanical_leather_wings", - "icarus:light_grey_mechanical_leather_wings", - "icarus:cyan_mechanical_leather_wings", - "icarus:purple_mechanical_leather_wings", - "icarus:blue_mechanical_leather_wings", - "icarus:brown_mechanical_leather_wings", - "icarus:green_mechanical_leather_wings", - "icarus:red_mechanical_leather_wings", - "icarus:black_mechanical_leather_wings", - - "icarus:white_light_wings", - "icarus:orange_light_wings", - "icarus:magenta_light_wings", - "icarus:light_blue_light_wings", - "icarus:yellow_light_wings", - "icarus:lime_light_wings", - "icarus:pink_light_wings", - "icarus:grey_light_wings", - "icarus:light_grey_light_wings", - "icarus:cyan_light_wings", - "icarus:purple_light_wings", - "icarus:blue_light_wings", - "icarus:brown_light_wings", - "icarus:green_light_wings", - "icarus:red_light_wings", - "icarus:black_light_wings", - - "icarus:flandres_wings", - "icarus:discords_wings", - "icarus:zanzas_wings" - ] -} \ No newline at end of file + "replace": false, + "values": [ + "#icarus:wings" + ] +}