From 14ee14dbfd867b369eda9a41ae4a2c86454cef93 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Mon, 20 Jan 2025 00:15:52 +0100 Subject: [PATCH 01/27] patch .properties (concil/compa) --- .../guildes/arbitres/blacksphere/blacksphere.properties | 6 ++++-- .../cit/guildes/arbitres/books/codex/codex.properties | 6 ++++-- .../guildes/arbitres/books/codex/codex_written.properties | 6 ++++-- .../arbitres/books/collecteur/collecteur.properties | 6 ++++-- .../cit/guildes/arbitres/braise/braise.properties | 6 ++++-- .../cit/guildes/arbitres/cercles/cercles.properties | 6 ++++-- .../arbitres/epauliere/3px/concile_alex.properties | 6 ++++-- .../arbitres/epauliere/4px/concile_steve.properties | 6 ++++-- .../cit/guildes/arbitres/fourche/fourche.properties | 6 ++++-- .../optifine/cit/guildes/arbitres/tombe/tombe.properties | 6 ++++-- .../guildes/arbitres/verre_tempete/verretemp.properties | 6 ++++-- .../compagnie/ailes_mutees/ailes_mutees.properties | 1 + .../compagnie/ailes_mutees/ailes_mutees_icone.properties | 1 + .../compagnie/armure_nacre/nacre_bottes.properties | 6 ++++-- .../guildes/compagnie/armure_nacre/nacre_haume.properties | 6 ++++-- .../compagnie/armure_nacre/nacre_jambes.properties | 6 ++++-- .../compagnie/armure_nacre/nacre_plaston.properties | 6 ++++-- .../bouclier_du_protecteur/bouclier_loge.properties | 4 ++-- .../composants/ecaille/ecaille_marine.properties | 4 +++- .../compagnie/composants/os_marin/os_marin.properties | 4 +++- .../elixirologie/elixir_deux/elixir_deux.properties | 6 ++++-- .../elixirologie/elixir_quatre/elixir_quatre.properties | 8 ++++---- .../elixirologie/elixir_trois/elixir_trois.properties | 6 ++++-- .../compagnie/elixirologie/elixir_un/elixir_un.properties | 6 ++++-- .../cit/guildes/compagnie/harpon/harpon.properties | 2 +- .../lanternes/blue_lantern/blue_lantern.properties | 5 ++--- .../lanternes/porte_lanterne/porte_lanterne.properties | 6 +++--- .../cit/guildes/compagnie/maquette/ecume.properties | 4 ++-- .../guildes/compagnie/outils/ancre/ancre_bleue.properties | 4 ++-- .../cit/guildes/compagnie/outils/barre/barre.properties | 4 ++-- .../compagnie/outils/ecailleur/ecailleur.properties | 4 +++- .../compagnie/outils/epee_feuvert/epee_feuvert.properties | 6 ++++-- .../cit/guildes/compagnie/outils/harpon/harpon.properties | 2 +- .../cit/guildes/compagnie/outils/lame/lame.properties | 6 ++++-- .../cit/guildes/compagnie/outils/necro/necro.properties | 6 ++++-- .../compagnie/outils/sablier/sablier_blanc.properties | 6 +++--- .../compagnie/outils/sablier/sablier_jaune.properties | 4 ++-- .../compagnie/outils/statuette/statuette.properties | 4 ++-- .../compagnie/outils/tripailleur/tripailleur.properties | 6 ++++-- 39 files changed, 125 insertions(+), 74 deletions(-) diff --git a/assets/minecraft/optifine/cit/guildes/arbitres/blacksphere/blacksphere.properties b/assets/minecraft/optifine/cit/guildes/arbitres/blacksphere/blacksphere.properties index d62346a4..67172254 100644 --- a/assets/minecraft/optifine/cit/guildes/arbitres/blacksphere/blacksphere.properties +++ b/assets/minecraft/optifine/cit/guildes/arbitres/blacksphere/blacksphere.properties @@ -1,4 +1,6 @@ type=item -matchItems=coal +matchItems=minecraft:coal model=blacksphere -components.custom_data.arbitre=blacksphere \ No newline at end of file +components.custom_data.arbitre=blacksphere + +# /give @s coal[custom_data={arbitre:blacksphere}] diff --git a/assets/minecraft/optifine/cit/guildes/arbitres/books/codex/codex.properties b/assets/minecraft/optifine/cit/guildes/arbitres/books/codex/codex.properties index c6c9b37d..2c468f8c 100644 --- a/assets/minecraft/optifine/cit/guildes/arbitres/books/codex/codex.properties +++ b/assets/minecraft/optifine/cit/guildes/arbitres/books/codex/codex.properties @@ -1,4 +1,6 @@ type=item -matchItems=book +matchItems=minecraft:book model=codex -components.custom_data.arbitre=codex_ecarlate \ No newline at end of file +components.custom_data.arbitre=codex_ecarlate + +# /give @s book[custom_data={arbitre:codex_ecarlate}] diff --git a/assets/minecraft/optifine/cit/guildes/arbitres/books/codex/codex_written.properties b/assets/minecraft/optifine/cit/guildes/arbitres/books/codex/codex_written.properties index 6e33872c..e754568a 100644 --- a/assets/minecraft/optifine/cit/guildes/arbitres/books/codex/codex_written.properties +++ b/assets/minecraft/optifine/cit/guildes/arbitres/books/codex/codex_written.properties @@ -1,4 +1,6 @@ type=item -matchItems=written_book +matchItems=minecraft:written_book model=codex -components.custom_data.arbitre=codex_ecarlate \ No newline at end of file +components.custom_data.arbitre=codex_ecarlate + +# /give @s written_book[custom_data={arbitre:codex_ecarlate}] diff --git a/assets/minecraft/optifine/cit/guildes/arbitres/books/collecteur/collecteur.properties b/assets/minecraft/optifine/cit/guildes/arbitres/books/collecteur/collecteur.properties index d479e883..620b26d3 100644 --- a/assets/minecraft/optifine/cit/guildes/arbitres/books/collecteur/collecteur.properties +++ b/assets/minecraft/optifine/cit/guildes/arbitres/books/collecteur/collecteur.properties @@ -1,4 +1,6 @@ type=item -matchItems=book +matchItems=minecraft:book model=collecteur -components.custom_data.arbitre=collecteur \ No newline at end of file +components.custom_data.arbitre=collecteur + +# /give @s book[custom_data={arbitre:collecteur}] diff --git a/assets/minecraft/optifine/cit/guildes/arbitres/braise/braise.properties b/assets/minecraft/optifine/cit/guildes/arbitres/braise/braise.properties index 63fa54dc..a87e4ae0 100644 --- a/assets/minecraft/optifine/cit/guildes/arbitres/braise/braise.properties +++ b/assets/minecraft/optifine/cit/guildes/arbitres/braise/braise.properties @@ -1,4 +1,6 @@ type=item -matchItems=coal +matchItems=minecraft:coal model=braise -components.custom_data.arbitre=braise \ No newline at end of file +components.custom_data.arbitre=braise + +# /give @s coal[custom_data={arbitre:braise}] diff --git a/assets/minecraft/optifine/cit/guildes/arbitres/cercles/cercles.properties b/assets/minecraft/optifine/cit/guildes/arbitres/cercles/cercles.properties index d25f3cb4..85a710ef 100644 --- a/assets/minecraft/optifine/cit/guildes/arbitres/cercles/cercles.properties +++ b/assets/minecraft/optifine/cit/guildes/arbitres/cercles/cercles.properties @@ -1,4 +1,6 @@ type=item -matchItems=stick +matchItems=minecraft:stick model=cercles -components.custom_data.relique=cercles \ No newline at end of file +components.custom_data.relique=cercles + +# /give @s stick[custom_data={relique:cercles}] diff --git a/assets/minecraft/optifine/cit/guildes/arbitres/epauliere/3px/concile_alex.properties b/assets/minecraft/optifine/cit/guildes/arbitres/epauliere/3px/concile_alex.properties index 51bef216..8831e789 100644 --- a/assets/minecraft/optifine/cit/guildes/arbitres/epauliere/3px/concile_alex.properties +++ b/assets/minecraft/optifine/cit/guildes/arbitres/epauliere/3px/concile_alex.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_ingot +matchItems=minecraft:iron_ingot model=concile_alex -components.custom_data.arbitre=epauliere_alex \ No newline at end of file +components.custom_data.arbitre=epauliere_alex + +# /give @s iron_ingot[custom_data={arbitre:epauliere_alex}] diff --git a/assets/minecraft/optifine/cit/guildes/arbitres/epauliere/4px/concile_steve.properties b/assets/minecraft/optifine/cit/guildes/arbitres/epauliere/4px/concile_steve.properties index 644dc031..196563bd 100644 --- a/assets/minecraft/optifine/cit/guildes/arbitres/epauliere/4px/concile_steve.properties +++ b/assets/minecraft/optifine/cit/guildes/arbitres/epauliere/4px/concile_steve.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_ingot +matchItems=minecraft:iron_ingot model=concile_steve -components.custom_data.arbitre=epauliere_steve \ No newline at end of file +components.custom_data.arbitre=epauliere_steve + +# /give @s iron_ingot[custom_data={arbitre:epauliere_steve}] diff --git a/assets/minecraft/optifine/cit/guildes/arbitres/fourche/fourche.properties b/assets/minecraft/optifine/cit/guildes/arbitres/fourche/fourche.properties index f5cb34c1..4f423123 100644 --- a/assets/minecraft/optifine/cit/guildes/arbitres/fourche/fourche.properties +++ b/assets/minecraft/optifine/cit/guildes/arbitres/fourche/fourche.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_sword +matchItems=minecraft:iron_sword model=fourche -components.custom_data.arbitre=fourche \ No newline at end of file +components.custom_data.arbitre=fourche + +# /give @s iron_sword[custom_data={arbitre:fourche}] diff --git a/assets/minecraft/optifine/cit/guildes/arbitres/tombe/tombe.properties b/assets/minecraft/optifine/cit/guildes/arbitres/tombe/tombe.properties index c45f3e40..d4f10f04 100644 --- a/assets/minecraft/optifine/cit/guildes/arbitres/tombe/tombe.properties +++ b/assets/minecraft/optifine/cit/guildes/arbitres/tombe/tombe.properties @@ -1,4 +1,6 @@ type=item -matchItems=stick +matchItems=minecraft:stick model=tombe -components.custom_data.arbitre=tombe \ No newline at end of file +components.custom_data.arbitre=tombe + +# /give @s stick[custom_data={arbitre:tombe}] diff --git a/assets/minecraft/optifine/cit/guildes/arbitres/verre_tempete/verretemp.properties b/assets/minecraft/optifine/cit/guildes/arbitres/verre_tempete/verretemp.properties index c1efd837..925820fb 100644 --- a/assets/minecraft/optifine/cit/guildes/arbitres/verre_tempete/verretemp.properties +++ b/assets/minecraft/optifine/cit/guildes/arbitres/verre_tempete/verretemp.properties @@ -1,5 +1,7 @@ type=item -matchItems=glass_bottle +matchItems=minecraft:glass_bottle texture=verretemp weight=10 -components.custom_data.arbitre=verre_tempete \ No newline at end of file +components.custom_data.arbitre=verre_tempete + +# /give @s glass_bottle[custom_data={arbitre:verre_tempete}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/ailes_mutees/ailes_mutees.properties b/assets/minecraft/optifine/cit/guildes/compagnie/ailes_mutees/ailes_mutees.properties index 8c8e3e57..01210724 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/ailes_mutees/ailes_mutees.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/ailes_mutees/ailes_mutees.properties @@ -3,3 +3,4 @@ items=minecraft:elytra texture=ailes_mutees components.custom_data.compa=ailes_mutees +# /give @s elytra[custom_data={compa:ailes_mutees}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/ailes_mutees/ailes_mutees_icone.properties b/assets/minecraft/optifine/cit/guildes/compagnie/ailes_mutees/ailes_mutees_icone.properties index 5582e2f6..d91bfb7b 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/ailes_mutees/ailes_mutees_icone.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/ailes_mutees/ailes_mutees_icone.properties @@ -3,3 +3,4 @@ items=minecraft:elytra texture=ailes_mutees_icone components.custom_data.compa=ailes_mutees +# /give @s elytra[custom_data={compa:ailes_mutees}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_bottes.properties b/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_bottes.properties index 7e35b08c..08c5dfcb 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_bottes.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_bottes.properties @@ -1,5 +1,7 @@ type=armor -matchItems=iron_boots +matchItems=minecraft:iron_boots texture.iron_layer_1=nacre1 texture.iron_layer_2=nacre2 -components.custom_data.armure=nacre \ No newline at end of file +components.custom_data.armure=nacre + +# /give @s iron_boots[custom_data={armure:nacre}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_haume.properties b/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_haume.properties index 68901165..c4cdc266 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_haume.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_haume.properties @@ -1,5 +1,7 @@ type=armor -matchItems=iron_helmet +matchItems=minecraft:iron_helmet texture.iron_layer_1=nacre1 texture.iron_layer_2=nacre2 -components.custom_data.armure=nacre \ No newline at end of file +components.custom_data.armure=nacre + +# /give @s iron_helmet[custom_data={armure:nacre}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_jambes.properties b/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_jambes.properties index 9ffb9943..d96d98ec 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_jambes.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_jambes.properties @@ -1,5 +1,7 @@ type=armor -matchItems=iron_leggings +matchItems=minecraft:iron_leggings texture.iron_layer_1=nacre1 texture.iron_layer_2=nacre2 -components.custom_data.armure=nacre \ No newline at end of file +components.custom_data.armure=nacre + +# /give @s iron_leggings[custom_data={armure:nacre}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_plaston.properties b/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_plaston.properties index 58d27318..ddf1982e 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_plaston.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/armure_nacre/nacre_plaston.properties @@ -1,5 +1,7 @@ type=armor -matchItems=iron_chestplate +matchItems=minecraft:iron_chestplate texture.iron_layer_1=nacre1 texture.iron_layer_2=nacre2 -components.custom_data.armure=nacre \ No newline at end of file +components.custom_data.armure=nacre + +# /give @s iron_chestplate[custom_data={armure:nacre}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/bouclier_du_protecteur/bouclier_loge.properties b/assets/minecraft/optifine/cit/guildes/compagnie/bouclier_du_protecteur/bouclier_loge.properties index 618eac73..fdbb1f3f 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/bouclier_du_protecteur/bouclier_loge.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/bouclier_du_protecteur/bouclier_loge.properties @@ -3,7 +3,7 @@ items=minecraft:shield model=bouclier_loge model.shield=bouclier_loge model.shield_blocking=bouclier_loge_blocking -components.custom_name=iregex:Bouclier du Protecteur +components.custom_name=iregex:bouclier du protecteur components.custom_data.compa=protecteur -# /give @s minecraft:shield[custom_data={compa:protecteur} 1] \ No newline at end of file +# /give @s shield[custom_name='{"text":"Bouclier du Protecteur", "italic":false}', custom_data={compa:protecteur}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/composants/ecaille/ecaille_marine.properties b/assets/minecraft/optifine/cit/guildes/compagnie/composants/ecaille/ecaille_marine.properties index 4b84782c..57d15066 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/composants/ecaille/ecaille_marine.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/composants/ecaille/ecaille_marine.properties @@ -1,4 +1,6 @@ type=item matchItems=minecraft:prismarine_shard texture=ecaille_marine -components.custom_data.compa=ecaille_marine \ No newline at end of file +components.custom_data.compa=ecaille_marine + +# /give @s prismarine_shard[custom_data={compa:ecaille_marine}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/composants/os_marin/os_marin.properties b/assets/minecraft/optifine/cit/guildes/compagnie/composants/os_marin/os_marin.properties index 804b1e0a..4c6b5843 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/composants/os_marin/os_marin.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/composants/os_marin/os_marin.properties @@ -1,4 +1,6 @@ type=item items=minecraft:bone texture=os_marin -components.custom_data.compa=os \ No newline at end of file +components.custom_data.compa=os + +# /give @s bone[custom_data={compa:os}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_deux/elixir_deux.properties b/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_deux/elixir_deux.properties index 080d3150..20599da7 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_deux/elixir_deux.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_deux/elixir_deux.properties @@ -1,4 +1,6 @@ type=item -matchItems=potion +matchItems=minecraft:potion model=elixir_deux -components.custom_data.compa=elixir_deux \ No newline at end of file +components.custom_data.compa=elixir_deux + +# /give @s potion[custom_data={compa:elixir_deux}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_quatre/elixir_quatre.properties b/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_quatre/elixir_quatre.properties index c6437010..3407bcd2 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_quatre/elixir_quatre.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_quatre/elixir_quatre.properties @@ -1,6 +1,6 @@ type=item - -matchItems=potion - +matchItems=minecraft:potion model=elixir_quatre -components.custom_data.compa=elixir_quatre \ No newline at end of file +components.custom_data.compa=elixir_quatre + +# /give @s potion[custom_data={compa:elixir_quatre}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_trois/elixir_trois.properties b/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_trois/elixir_trois.properties index b8d958ac..60e1fc2d 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_trois/elixir_trois.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_trois/elixir_trois.properties @@ -1,4 +1,6 @@ type=item -matchItems=potion +matchItems=minecraft:potion model=elixir_trois -components.custom_data.compa=elixir_trois \ No newline at end of file +components.custom_data.compa=elixir_trois + +# /give @s potion[custom_data={compa:elixir_trois}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_un/elixir_un.properties b/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_un/elixir_un.properties index 75c21e8a..bf022fc7 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_un/elixir_un.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/elixirologie/elixir_un/elixir_un.properties @@ -1,4 +1,6 @@ type=item -matchItems=potion +matchItems=minecraft:potion model=elixir_un -components.custom_data.compa=elixir_un \ No newline at end of file +components.custom_data.compa=elixir_un + +# /give @s potion[custom_data={compa:elixir_un}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/harpon/harpon.properties b/assets/minecraft/optifine/cit/guildes/compagnie/harpon/harpon.properties index a103b75f..5b55f49f 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/harpon/harpon.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/harpon/harpon.properties @@ -3,4 +3,4 @@ items=minecraft:iron_sword model=harpon components.custom_data.compa=harpon -# /give @s minecraft:iron_sword[custom_data={compa:harpon} 1] \ No newline at end of file +# /give @s iron_sword[custom_data={compa:harpon}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/lanternes/blue_lantern/blue_lantern.properties b/assets/minecraft/optifine/cit/guildes/compagnie/lanternes/blue_lantern/blue_lantern.properties index e8ba7d78..5dcfef23 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/lanternes/blue_lantern/blue_lantern.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/lanternes/blue_lantern/blue_lantern.properties @@ -2,7 +2,6 @@ type=item matchItems=minecraft:prismarine_crystals model=lantern components.custom_data.compa=lantern -components.custom_name=iregex:.*Lanterne((?!suspendue).)*$ +components.custom_name=iregex:.*?lanterne(?!.*?suspendue).*? -# /give @s minecraft:prismarine_crystals[custom_data.compa=lantern -#.*Lanterne((?!suspendue).)*$ \ No newline at end of file +# /give @s prismarine_crystals[custom_name='{"text":"Lanterne", "italic":false}', custom_data={compa:lantern}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/lanternes/porte_lanterne/porte_lanterne.properties b/assets/minecraft/optifine/cit/guildes/compagnie/lanternes/porte_lanterne/porte_lanterne.properties index ff0276e4..3ce9dd2a 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/lanternes/porte_lanterne/porte_lanterne.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/lanternes/porte_lanterne/porte_lanterne.properties @@ -2,7 +2,7 @@ type=item matchItems=minecraft:prismarine_crystals model=porte_lanterne components.custom_data.compa=lantern -components.custom_name=iregex:.*suspendue.* +components.custom_name=iregex:.*?suspendue.*? -# /give @s minecraft:prismarine_crystals[custom_data.compa=lantern -# /replaceitem entity @s armor.head minecraft:prismarine_crystals{compa:"lantern",display:{Name:"{\"text\":\"Lanterne suspendue\"}"}} \ No newline at end of file +# /give @s prismarine_crystals[custom_name='{"text":"Lanterne suspendue", "italic":false}', custom_data={compa:lantern}] +# /item replace entity @s armor.head with prismarine_crystals[custom_name='{"text":"Lanterne suspendue", "italic":false}', custom_data={compa:lantern}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/maquette/ecume.properties b/assets/minecraft/optifine/cit/guildes/compagnie/maquette/ecume.properties index 56a292e9..64be4269 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/maquette/ecume.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/maquette/ecume.properties @@ -1,6 +1,6 @@ type=item -matchItems=stick +matchItems=minecraft:stick model=ecume components.custom_data.compa=ecume -# /give @s minecraft:stick[custom_data.compa=ecume \ No newline at end of file +# /give @s stick[custom_data={compa:ecume}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/outils/ancre/ancre_bleue.properties b/assets/minecraft/optifine/cit/guildes/compagnie/outils/ancre/ancre_bleue.properties index c468ed17..150836b0 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/outils/ancre/ancre_bleue.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/outils/ancre/ancre_bleue.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond_axe +matchItems=minecraft:diamond_axe model=ancre_bleue components.custom_data.compa=ancre_bleue -# /give @s minecraft:diamond_axe[custom_data={compa:ancre_bleue}] \ No newline at end of file +# /give @s diamond_axe[custom_data={compa:ancre_bleue}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/outils/barre/barre.properties b/assets/minecraft/optifine/cit/guildes/compagnie/outils/barre/barre.properties index 71a3929b..e1a8bfae 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/outils/barre/barre.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/outils/barre/barre.properties @@ -1,6 +1,6 @@ type=item -matchItems=stick +matchItems=minecraft:stick model=barre components.custom_data.compa=barre -# /give @s minecraft:stick[custom_data.compa=barre \ No newline at end of file +# /give @s stick[custom_data={compa:barre}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/outils/ecailleur/ecailleur.properties b/assets/minecraft/optifine/cit/guildes/compagnie/outils/ecailleur/ecailleur.properties index 668afb4e..4043fccb 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/outils/ecailleur/ecailleur.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/outils/ecailleur/ecailleur.properties @@ -1,4 +1,6 @@ type=item matchItems=minecraft:iron_sword texture=ecailleur -components.custom_data.compa=ecailleur \ No newline at end of file +components.custom_data.compa=ecailleur + +# /give @s iron_sword[custom_data={compa:ecailleur}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/outils/epee_feuvert/epee_feuvert.properties b/assets/minecraft/optifine/cit/guildes/compagnie/outils/epee_feuvert/epee_feuvert.properties index 15a61159..2be6ea4c 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/outils/epee_feuvert/epee_feuvert.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/outils/epee_feuvert/epee_feuvert.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_sword +matchItems=minecraft:iron_sword texture=epee_feuvert -components.custom_data.compa=feuvert \ No newline at end of file +components.custom_data.compa=feuvert + +# /give @s iron_sword[custom_data={compa:feuvert}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/outils/harpon/harpon.properties b/assets/minecraft/optifine/cit/guildes/compagnie/outils/harpon/harpon.properties index a103b75f..5b55f49f 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/outils/harpon/harpon.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/outils/harpon/harpon.properties @@ -3,4 +3,4 @@ items=minecraft:iron_sword model=harpon components.custom_data.compa=harpon -# /give @s minecraft:iron_sword[custom_data={compa:harpon} 1] \ No newline at end of file +# /give @s iron_sword[custom_data={compa:harpon}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/outils/lame/lame.properties b/assets/minecraft/optifine/cit/guildes/compagnie/outils/lame/lame.properties index 92d417b3..dfa23c67 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/outils/lame/lame.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/outils/lame/lame.properties @@ -1,4 +1,6 @@ type=item -items=iron_sword +items=minecraft:iron_sword texture=lame -components.custom_data.compa=lame \ No newline at end of file +components.custom_data.compa=lame + +# /give @s iron_sword[custom_data={compa:lame}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/outils/necro/necro.properties b/assets/minecraft/optifine/cit/guildes/compagnie/outils/necro/necro.properties index c0382a90..17d3c683 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/outils/necro/necro.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/outils/necro/necro.properties @@ -1,4 +1,6 @@ type=item -items=book +items=minecraft:book texture=necro -components.custom_data.compa=necro \ No newline at end of file +components.custom_data.compa=necro + +# /give @s book[custom_data={compa:necro}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/outils/sablier/sablier_blanc.properties b/assets/minecraft/optifine/cit/guildes/compagnie/outils/sablier/sablier_blanc.properties index 158bf612..05f79297 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/outils/sablier/sablier_blanc.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/outils/sablier/sablier_blanc.properties @@ -1,7 +1,7 @@ type=item -matchItems=glass_bottle +matchItems=minecraft:glass_bottle texture=sablier_blanc -components.custom_name=iregex:Sablier du temps perdu +components.custom_name=iregex:sablier du temps perdu components.custom_data.compa=sablier_blanc -# /give @s minecraft:glass_bottle[custom_data={compa:sablier_blanc} 1] +# /give @s glass_bottle[custom_name='{"text":"Sablier du temps perdu", "italic":false}', custom_data={compa:sablier_blanc}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/outils/sablier/sablier_jaune.properties b/assets/minecraft/optifine/cit/guildes/compagnie/outils/sablier/sablier_jaune.properties index 02f4e7d9..3fccca8a 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/outils/sablier/sablier_jaune.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/outils/sablier/sablier_jaune.properties @@ -1,7 +1,7 @@ type=item matchItems=glass_bottle texture=sablier_jaune -components.custom_name=iregex:Sablier des flots perdus +components.custom_name=iregex:sablier des flots perdus components.custom_data.compa=sablier_jaune -# /give @s minecraft:glass_bottle[custom_data={compa:sablier_jaune} 1] +# /give @s minecraft:glass_bottle[custom_name='{"text":"Sablier des flots perdus", "italic":false}', custom_data={compa:sablier_jaune}] diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/outils/statuette/statuette.properties b/assets/minecraft/optifine/cit/guildes/compagnie/outils/statuette/statuette.properties index 2f21a731..fe12c9cd 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/outils/statuette/statuette.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/outils/statuette/statuette.properties @@ -3,5 +3,5 @@ items=minecraft:gold_ingot model=statuette components.custom_data.compa=statuette -# /give @s minecraft:gold_ingot[custom_data={compa:statuette} 1] -# /summon armor_stand ~ ~1 ~ {Invisible:1,ArmorItems:[{},{},{},{id:"minecraft:gold_ingot",Count:1b,tag:{compa:statuette}}]} \ No newline at end of file +# /give @s gold_ingot[custom_data={compa:statuette}] +# /summon armor_stand ~ ~1 ~ {Invisible:1, ArmorItems:[{}, {}, {}, {id:"gold_ingot", count:1, components:{"custom_data":{compa:statuette}}}]} diff --git a/assets/minecraft/optifine/cit/guildes/compagnie/outils/tripailleur/tripailleur.properties b/assets/minecraft/optifine/cit/guildes/compagnie/outils/tripailleur/tripailleur.properties index 873779e3..f0c2b8f1 100644 --- a/assets/minecraft/optifine/cit/guildes/compagnie/outils/tripailleur/tripailleur.properties +++ b/assets/minecraft/optifine/cit/guildes/compagnie/outils/tripailleur/tripailleur.properties @@ -1,4 +1,6 @@ type=item -items=iron_sword +items=minecraft:iron_sword texture=tripailleur -components.custom_data.compa=tripailleur \ No newline at end of file +components.custom_data.compa=tripailleur + +# /give @s iron_sword[custom_data={compa:tripailleur}] From b9e23af2d38899feb529688cca141c04045ebbe4 Mon Sep 17 00:00:00 2001 From: Yazor <89312042+Yaazor@users.noreply.github.com> Date: Sun, 19 Jan 2025 18:55:55 -0500 Subject: [PATCH 02/27] Fix shield protecteurs --- .../textures/entity/shield/protecteurs.png | Bin 282 -> 336 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/herobrine/textures/entity/shield/protecteurs.png b/assets/herobrine/textures/entity/shield/protecteurs.png index b443354db180c6cf4d5db85f9ffa9bc0b31bbb03..5e530ba5848258ef8b59100e36ad360bce62437d 100644 GIT binary patch delta 270 zcmbQmbb(2+Gr-TCmrII^fq{Y7)59eQNH>5m2Q!fT@?hf6iHbh;hZz|74l^FlUy%Y7 zJm~4-7*Y}U_OiE7ivka;!-IeA^H~0zV?1%FZmDMBWU~b6ql`dhKv2QVWf6Y*=Z3J_ zYrd6Cw=!&ZhchfHkKw+sJSjY`;aXMMdZs6~zo#?w3Cb|9V04L${^04r<#*uPKmG%@ zjYbYrOdGfyOwI>yNcqk3hcU@;`-6(Ds^SX!|Nr4Gd&ZWM#9j8BSAzp$6|v-j>x{{N Y7-ZMi8{T<1MFXVE)78&qol`;+01mQKIRF3v delta 216 zcmcb>G>b{GGr-TCmrII^fq{Y7)59eQNIQTq2Q!eIyS?$vL`9$aLktXjhZsdQyc&Rl z-JULvArbCxFJ9zpHQ-X? From 367ef6ea1abfc28c144b4f426543a24eb44aeddc Mon Sep 17 00:00:00 2001 From: Inposa Date: Mon, 20 Jan 2025 18:16:22 +0100 Subject: [PATCH 03/27] Fix remaining custom nbt properties (switch to custom data) --- .../cit/general/corps/wings/feathery/white_wings2.properties | 2 +- .../general/corps/wings/feathery/white_wings_icon.properties | 2 +- .../monsters/ecureuil_cristal/ecureuil_cristal.properties | 2 +- .../guildes/garde/armes/cristal/lance_cristal_blanc.properties | 2 +- .../guildes/garde/armes/cristal/lance_cristal_bleu.properties | 2 +- .../guildes/garde/armes/cristal/lance_cristal_jaune.properties | 2 +- .../guildes/garde/armes/cristal/lance_cristal_orange.properties | 2 +- .../guildes/garde/armes/cristal/lance_cristal_rose.properties | 2 +- .../guildes/garde/armes/cristal/lance_cristal_rouge.properties | 2 +- .../guildes/garde/armes/cristal/lance_cristal_vert.properties | 2 +- .../guildes/garde/armes/cristal/lance_cristal_violet.properties | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2.properties b/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2.properties index 164d67af..af263c9e 100644 --- a/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2.properties +++ b/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2.properties @@ -1,4 +1,4 @@ type=elytra matchItems=minecraft:elytra texture.elytra=white_wings2 -nbt.wing=white2 \ No newline at end of file +components.custom_data.wing=white2 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings_icon.properties b/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings_icon.properties index 5e2ac137..6fdea64f 100644 --- a/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings_icon.properties +++ b/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings_icon.properties @@ -1,4 +1,4 @@ type=item matchItems=minecraft:elytra texture=white_wings_icon -nbt.wing=white \ No newline at end of file +components.custom_data.wing=white \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/creatures/monsters/ecureuil_cristal/ecureuil_cristal.properties b/assets/minecraft/optifine/cit/general/creatures/monsters/ecureuil_cristal/ecureuil_cristal.properties index ecaeac13..097e0be3 100644 --- a/assets/minecraft/optifine/cit/general/creatures/monsters/ecureuil_cristal/ecureuil_cristal.properties +++ b/assets/minecraft/optifine/cit/general/creatures/monsters/ecureuil_cristal/ecureuil_cristal.properties @@ -1,6 +1,6 @@ type=item matchItems=rabbit_foot model=ecureuil_cristal -nbt.creature=ecureuil_cristal +components.custom_data.creature=ecureuil_cristal # /give @p minecraft:rabbit_foot{creature:ecureuil_cristal} \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_blanc.properties b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_blanc.properties index 9acf8f5d..c35f7208 100644 --- a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_blanc.properties +++ b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_blanc.properties @@ -2,5 +2,5 @@ type=item matchItems=iron_axe model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json texture=lance_cristal_blanc -nbt.arme=lance_cristal_blanc +components.custom_data.arme=lance_cristal_blanc weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_bleu.properties b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_bleu.properties index a96fff24..5cd69d2a 100644 --- a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_bleu.properties +++ b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_bleu.properties @@ -2,5 +2,5 @@ type=item matchItems=iron_axe model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json texture=lance_cristal_bleu -nbt.arme=lance_cristal_bleu +components.custom_data.arme=lance_cristal_bleu weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_jaune.properties b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_jaune.properties index c1870804..f519a9f2 100644 --- a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_jaune.properties +++ b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_jaune.properties @@ -2,5 +2,5 @@ type=item matchItems=iron_axe model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json texture=lance_cristal_jaune -nbt.arme=lance_cristal_jaune +components.custom_data.arme=lance_cristal_jaune weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_orange.properties b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_orange.properties index 4c38b34d..e9f05aab 100644 --- a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_orange.properties +++ b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_orange.properties @@ -2,5 +2,5 @@ type=item matchItems=iron_axe model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json texture=lance_cristal_orange -nbt.arme=lance_cristal_orange +components.custom_data.arme=lance_cristal_orange weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_rose.properties b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_rose.properties index d0bb36bf..862f16c5 100644 --- a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_rose.properties +++ b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_rose.properties @@ -2,5 +2,5 @@ type=item matchItems=iron_axe model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json texture=lance_cristal_rose -nbt.arme=lance_cristal_rose +components.custom_data.arme=lance_cristal_rose weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_rouge.properties b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_rouge.properties index 6f140203..cb74179f 100644 --- a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_rouge.properties +++ b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_rouge.properties @@ -2,5 +2,5 @@ type=item matchItems=iron_axe model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json texture=lance_cristal_rouge -nbt.arme=lance_cristal_rouge +components.custom_data.arme=lance_cristal_rouge weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_vert.properties b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_vert.properties index accce300..68bcf808 100644 --- a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_vert.properties +++ b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_vert.properties @@ -2,5 +2,5 @@ type=item matchItems=iron_axe model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json texture=lance_cristal_vert -nbt.arme=lance_cristal_vert +components.custom_data.arme=lance_cristal_vert weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_violet.properties b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_violet.properties index 8dae3eb1..7f34dbac 100644 --- a/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_violet.properties +++ b/assets/minecraft/optifine/cit/guildes/garde/armes/cristal/lance_cristal_violet.properties @@ -2,5 +2,5 @@ type=item matchItems=iron_axe model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json texture=lance_cristal_violet -nbt.arme=lance_cristal_violet +components.custom_data.arme=lance_cristal_violet weight=10 \ No newline at end of file From 12a0945923ddb5c0e53bcfbf45602cc6404e1da4 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Wed, 22 Jan 2025 16:55:47 +0100 Subject: [PATCH 04/27] patch animations .properties --- .../optifine/cit/animations/clapclap/clapclap.properties | 6 ++++-- .../optifine/cit/animations/kneel/kneel.properties | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/minecraft/optifine/cit/animations/clapclap/clapclap.properties b/assets/minecraft/optifine/cit/animations/clapclap/clapclap.properties index 1e49603c..5a11b4b7 100644 --- a/assets/minecraft/optifine/cit/animations/clapclap/clapclap.properties +++ b/assets/minecraft/optifine/cit/animations/clapclap/clapclap.properties @@ -1,4 +1,6 @@ type=item -matchItems=paper +items=paper texture=clapclap -components.custom_data={animations:clapclap} \ No newline at end of file +components.custom_data.custom_data={animations:clapclap} + +# /give @s paper[custom_data={custom_data:{animations:clapclap}}] diff --git a/assets/minecraft/optifine/cit/animations/kneel/kneel.properties b/assets/minecraft/optifine/cit/animations/kneel/kneel.properties index d1f4491f..abd932b6 100644 --- a/assets/minecraft/optifine/cit/animations/kneel/kneel.properties +++ b/assets/minecraft/optifine/cit/animations/kneel/kneel.properties @@ -1,4 +1,6 @@ type=item -matchItems=paper +items=paper texture=kneel -components.custom_data={animations:kneel} \ No newline at end of file +components.custom_data.custom_data={animations:kneel} + +# /give @s paper[custom_data={custom_data:{animations:kneel}}] From b4f361c7ef55124ea9996b9df19280036a6d1d23 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Wed, 22 Jan 2025 16:56:25 +0100 Subject: [PATCH 05/27] patch autre .properties --- .../broken_fire_claymore/broken_fire_claymore.properties | 8 +++++--- .../dead_fire_claymore/dead_fire_claymore.properties | 6 ++++-- .../lit_fire_claymore/fire_claymore.properties | 8 +++++--- .../optifine/cit/autre/npc/npc_s/npc_s.properties | 6 ++++-- .../autre/vanilla/armure_maille/maille_bottes.properties | 4 ++-- .../autre/vanilla/armure_maille/maille_haume.properties | 6 ++++-- .../autre/vanilla/armure_maille/maille_jambes.properties | 6 ++++-- .../autre/vanilla/armure_maille/maille_plaston.properties | 6 ++++-- .../autre/void/armure_vide_maille/void_bottes.properties | 6 ++++-- .../autre/void/armure_vide_maille/void_haume.properties | 6 ++++-- .../autre/void/armure_vide_maille/void_jambes.properties | 6 ++++-- .../autre/void/armure_vide_maille/void_plaston.properties | 6 ++++-- .../invisible_redstone_torch/red_torch_void.properties | 6 ++++-- .../cit/autre/void/invisible_torch/torch_void.properties | 6 ++++-- 14 files changed, 56 insertions(+), 30 deletions(-) diff --git a/assets/minecraft/optifine/cit/autre/npc/fire_claymores/broken_fire_claymore/broken_fire_claymore.properties b/assets/minecraft/optifine/cit/autre/npc/fire_claymores/broken_fire_claymore/broken_fire_claymore.properties index 0f134778..2cda5ddb 100644 --- a/assets/minecraft/optifine/cit/autre/npc/fire_claymores/broken_fire_claymore/broken_fire_claymore.properties +++ b/assets/minecraft/optifine/cit/autre/npc/fire_claymores/broken_fire_claymore/broken_fire_claymore.properties @@ -1,5 +1,7 @@ type=item -matchItems=diamond_sword -model=optifine/cit/source_models/2xhand +items=diamond_sword texture=broken_fire_claymore -components.custom_data.relique=broken_fire_claymore \ No newline at end of file +model=optifine/cit/source_models/2xhand +components.custom_data.relique=broken_fire_claymore + +# /give @s diamond_sword[custom_data={relique:broken_fire_claymore}] diff --git a/assets/minecraft/optifine/cit/autre/npc/fire_claymores/dead_fire_claymore/dead_fire_claymore.properties b/assets/minecraft/optifine/cit/autre/npc/fire_claymores/dead_fire_claymore/dead_fire_claymore.properties index bc1616af..f0c6c2b1 100644 --- a/assets/minecraft/optifine/cit/autre/npc/fire_claymores/dead_fire_claymore/dead_fire_claymore.properties +++ b/assets/minecraft/optifine/cit/autre/npc/fire_claymores/dead_fire_claymore/dead_fire_claymore.properties @@ -1,5 +1,7 @@ type=item -matchItems=diamond_sword -model=optifine/cit/source_models/2xhand +items=diamond_sword texture=dead_fire_claymore +model=optifine/cit/source_models/2xhand components.custom_data.relique=dead_fire_claymore + +# /give @s diamond_sword[custom_data={relique:dead_fire_claymore}] diff --git a/assets/minecraft/optifine/cit/autre/npc/fire_claymores/lit_fire_claymore/fire_claymore.properties b/assets/minecraft/optifine/cit/autre/npc/fire_claymores/lit_fire_claymore/fire_claymore.properties index 4db04c0d..6be2c473 100644 --- a/assets/minecraft/optifine/cit/autre/npc/fire_claymores/lit_fire_claymore/fire_claymore.properties +++ b/assets/minecraft/optifine/cit/autre/npc/fire_claymores/lit_fire_claymore/fire_claymore.properties @@ -1,5 +1,7 @@ type=item -matchItems=diamond_sword -model=optifine/cit/source_models/2xhand +items=diamond_sword texture=fire_claymore -components.custom_data.relique=fire_claymore \ No newline at end of file +model=optifine/cit/source_models/2xhand +components.custom_data.relique=fire_claymore + +# /give @s diamond_sword[custom_data={relique:fire_claymore}] diff --git a/assets/minecraft/optifine/cit/autre/npc/npc_s/npc_s.properties b/assets/minecraft/optifine/cit/autre/npc/npc_s/npc_s.properties index 342099de..7748852e 100644 --- a/assets/minecraft/optifine/cit/autre/npc/npc_s/npc_s.properties +++ b/assets/minecraft/optifine/cit/autre/npc/npc_s/npc_s.properties @@ -1,4 +1,6 @@ type=elytra -matchItems=elytra +items=elytra texture=npc_s -components.custom_data.npc=npc_s \ No newline at end of file +components.custom_data.npc=npc_s + +# /give @s elytra[custom_data={npc:npc_s}] diff --git a/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_bottes.properties b/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_bottes.properties index 497dddff..b607117c 100644 --- a/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_bottes.properties +++ b/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_bottes.properties @@ -1,7 +1,7 @@ type=armor -matchItems=chainmail_boots +items=chainmail_boots texture.chainmail_layer_1=chainmail_layer_1 texture.chainmail_layer_2=chainmail_layer_2 components.custom_data.vanilla=armure_maille -# /give @s chainmail_boots[custom_data=[custom_data={vanilla:armure_maille}]] +# /give @s chainmail_boots[custom_data={vanilla:armure_maille}] diff --git a/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_haume.properties b/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_haume.properties index ee0dbb29..f9faddcb 100644 --- a/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_haume.properties +++ b/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_haume.properties @@ -1,5 +1,7 @@ type=armor -matchItems=chainmail_helmet +items=chainmail_helmet texture.chainmail_layer_1=chainmail_layer_1 texture.chainmail_layer_2=chainmail_layer_2 -components.custom_data.vanilla=armure_maille \ No newline at end of file +components.custom_data.vanilla=armure_maille + +# /give @s chainmail_helmet[custom_data={vanilla:armure_maille}] diff --git a/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_jambes.properties b/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_jambes.properties index 9bdf5c25..48870b75 100644 --- a/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_jambes.properties +++ b/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_jambes.properties @@ -1,5 +1,7 @@ type=armor -matchItems=chainmail_leggings +items=chainmail_leggings texture.chainmail_layer_1=chainmail_layer_1 texture.chainmail_layer_2=chainmail_layer_2 -components.custom_data.vanilla=armure_maille \ No newline at end of file +components.custom_data.vanilla=armure_maille + +# /give @s chainmail_leggings[custom_data={vanilla:armure_maille}] diff --git a/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_plaston.properties b/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_plaston.properties index de8ec350..fc4bebc6 100644 --- a/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_plaston.properties +++ b/assets/minecraft/optifine/cit/autre/vanilla/armure_maille/maille_plaston.properties @@ -1,5 +1,7 @@ type=armor -matchItems=chainmail_chestplate +items=chainmail_chestplate texture.chainmail_layer_1=chainmail_layer_1 texture.chainmail_layer_2=chainmail_layer_1 -components.custom_data.vanilla=armure_maille \ No newline at end of file +components.custom_data.vanilla=armure_maille + +# /give @s chainmail_chestplate[custom_data={vanilla:armure_maille}] diff --git a/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_bottes.properties b/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_bottes.properties index ef173738..6edf9c3c 100644 --- a/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_bottes.properties +++ b/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_bottes.properties @@ -1,5 +1,7 @@ type=armor -matchItems=chainmail_boots +items=chainmail_boots texture.chainmail_layer_1=vide1 texture.chainmail_layer_2=vide2 -components.custom_data.armure=void \ No newline at end of file +components.custom_data.armure=void + +# /give @s chainmail_boots[custom_data={armure:void}] diff --git a/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_haume.properties b/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_haume.properties index 03ead7c6..ecccc3c1 100644 --- a/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_haume.properties +++ b/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_haume.properties @@ -1,5 +1,7 @@ type=armor -matchItems=chainmail_helmet +items=chainmail_helmet texture.chainmail_layer_1=vide1 texture.chainmail_layer_2=vide2 -components.custom_data.armure=void \ No newline at end of file +components.custom_data.armure=void + +# /give @s chainmail_helmet[custom_data={armure:void}] diff --git a/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_jambes.properties b/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_jambes.properties index 2fefd244..e9cc6fd4 100644 --- a/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_jambes.properties +++ b/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_jambes.properties @@ -1,5 +1,7 @@ type=armor -matchItems=chainmail_leggings +items=chainmail_leggings texture.chainmail_layer_1=vide1 texture.chainmail_layer_2=vide2 -components.custom_data.armure=void \ No newline at end of file +components.custom_data.armure=void + +# /give @s chainmail_leggings[custom_data={armure:void}] diff --git a/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_plaston.properties b/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_plaston.properties index 4d6c5ff7..d45ac0c5 100644 --- a/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_plaston.properties +++ b/assets/minecraft/optifine/cit/autre/void/armure_vide_maille/void_plaston.properties @@ -1,5 +1,7 @@ type=armor -matchItems=chainmail_chestplate +items=chainmail_chestplate texture.chainmail_layer_1=vide1 texture.chainmail_layer_2=vide2 -components.custom_data.armure=void \ No newline at end of file +components.custom_data.armure=void + +# /give @s chainmail_chestplate[custom_data={armure:void}] diff --git a/assets/minecraft/optifine/cit/autre/void/invisible_redstone_torch/red_torch_void.properties b/assets/minecraft/optifine/cit/autre/void/invisible_redstone_torch/red_torch_void.properties index 8d1d072d..f979ca6a 100644 --- a/assets/minecraft/optifine/cit/autre/void/invisible_redstone_torch/red_torch_void.properties +++ b/assets/minecraft/optifine/cit/autre/void/invisible_redstone_torch/red_torch_void.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:redstone_torch +items=redstone_torch texture=red_torch_void -components.custom_data.autre=void \ No newline at end of file +components.custom_data.autre=void + +# /give @s redstone_torch[custom_data={autre:void}] diff --git a/assets/minecraft/optifine/cit/autre/void/invisible_torch/torch_void.properties b/assets/minecraft/optifine/cit/autre/void/invisible_torch/torch_void.properties index b3030c02..c6e2eda4 100644 --- a/assets/minecraft/optifine/cit/autre/void/invisible_torch/torch_void.properties +++ b/assets/minecraft/optifine/cit/autre/void/invisible_torch/torch_void.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:torch +items=torch texture=torch_void -components.custom_data.autre=void \ No newline at end of file +components.custom_data.autre=void + +# /give @s torch[custom_data={autre:void}] From 0415d06a403e923e9aff0590572b7d7e035923ad Mon Sep 17 00:00:00 2001 From: Mael382 Date: Wed, 22 Jan 2025 17:13:16 +0100 Subject: [PATCH 06/27] patch general/artisanat .properties --- .../general/artisanat/bijoutier/bijoux/bague_or.properties | 6 ++++-- .../artisanat/bijoutier/bijoux/pendentif_or.properties | 6 ++++-- .../artisanat/bijoutier/broyeurs/broyeur/broyeur.properties | 6 ++++-- .../broyeurs/broyeur_diamant/broyeur_diamant.properties | 6 ++++-- .../bijoutier/gemmes/precieuses/diamantaille.properties | 3 ++- .../bijoutier/gemmes/precieuses/diamantpur.properties | 3 ++- .../bijoutier/gemmes/precieuses/emeraudepure.properties | 3 ++- .../artisanat/bijoutier/gemmes/precieuses/rubis.properties | 4 ++-- .../artisanat/bijoutier/gemmes/precieuses/saphir.properties | 4 ++-- .../gemmes/semiprecieuses/agate_violette.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/aiguemarine.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/ambre.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/amethyste.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/citrine.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/cornaline.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/grenat.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/heliodore.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/hematite.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/howlite.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/jade.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/jaspe_rouge.properties | 4 ++-- .../gemmes/semiprecieuses/lapis_lazuli_pur.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/malachite.properties | 3 ++- .../bijoutier/gemmes/semiprecieuses/morganite.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/onyx.properties | 4 ++-- .../gemmes/semiprecieuses/quartz_hematoide.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/quartz_rose.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/rodochrosite.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/selenite.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/septaria.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/sphalerite.properties | 4 ++-- .../gemmes/semiprecieuses/sphalerite_verte.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/topaze.properties | 5 ++--- .../bijoutier/gemmes/semiprecieuses/topazebleu.properties | 4 ++-- .../bijoutier/gemmes/semiprecieuses/tourmaline.properties | 4 ++-- .../gemmes/semiprecieuses/tourmaline_violette.properties | 4 ++-- .../bijoutier/ressources/carbonite/carbonite.properties | 6 ++++-- .../bijoutier/ressources/longfeu/longfeu.properties | 6 ++++-- .../ressources/poudre_diamant/poudre_diamant.properties | 6 ++++-- .../bijoutier/ressources/poudre_obsi/poudre_obsi.properties | 6 ++++-- .../bijoutier/ressources/poudre_or/poudre_or.properties | 6 ++++-- .../general/artisanat/couturier/ciseaux_couture.properties | 6 ++++-- .../cit/general/artisanat/couturier/tissu_blanc.properties | 6 ++++-- .../cit/general/artisanat/couturier/tissu_bleu.properties | 6 ++++-- .../cit/general/artisanat/couturier/tissu_jaune.properties | 6 ++++-- .../cit/general/artisanat/couturier/tissu_orange.properties | 6 ++++-- .../cit/general/artisanat/couturier/tissu_rose.properties | 6 ++++-- .../cit/general/artisanat/couturier/tissu_rouge.properties | 6 ++++-- .../cit/general/artisanat/couturier/tissu_vert.properties | 6 ++++-- .../cit/general/artisanat/couturier/tissu_violet.properties | 6 ++++-- .../general/artisanat/cuisine/ingredients/epices.properties | 6 ++++-- .../general/artisanat/cuisine/outils/casserole.properties | 6 ++++-- .../artisanat/cuisine/outils/casserole_nbt.properties | 6 ++++-- .../artisanat/cuisine/outils/couteau_cuisine.properties | 6 ++++-- .../artisanat/cuisine/outils/couteau_cuisine_nbt.properties | 6 ++++-- .../general/artisanat/cuisine/outils/fourchette.properties | 6 ++++-- .../artisanat/cuisine/outils/fourchette_nbt.properties | 6 ++++-- .../general/artisanat/cuisine/outils/melangeur.properties | 6 ++++-- .../artisanat/cuisine/outils/melangeur_nbt.properties | 6 ++++-- .../cit/general/artisanat/cuisine/outils/poele.properties | 6 ++++-- .../general/artisanat/cuisine/outils/poele_nbt.properties | 6 ++++-- .../artisanat/forge/lingots/acier/lingo_acier.properties | 4 ++-- .../forge/lingots/adamantin/lingot_adamantin.properties | 4 ++-- .../artisanat/forge/lingots/cuivre/copper_ingot.properties | 4 ++-- .../forge/lingots/cuivre/copper_ingot_rename.properties | 6 +++--- .../forge/lingots/obsifer/lingot_obsifer.properties | 4 ++-- .../forge/lingots/vifargent/lingot_vifargent.properties | 4 ++-- .../outils/marteau_forgeron/marteau_forgeron.properties | 6 ++++-- .../forge/outils/marteau_forgeron/marteau_nbt.properties | 6 ++++++ .../outils/pince_forgeron/pinces_de_forgeron.properties | 6 ++++-- .../forge/outils/pince_forgeron/pinces_nbt.properties | 6 ++++-- .../artisanat/maroquinerie/bande_cuir/bande_cuir.properties | 4 ++-- .../general/artisanat/maroquinerie/bourse/bourse.properties | 4 ++-- .../maroquinerie/cuir_renfort/cuir_renfort.properties | 4 ++-- .../artisanat/maroquinerie/fourreau/fourreau.properties | 6 ++++-- .../artisanat/maroquinerie/fourreau/fourreau_tag.properties | 6 ++++-- .../general/artisanat/maroquinerie/gourde/gourde.properties | 6 ++++-- .../cit/general/artisanat/maroquinerie/sac/sac.properties | 4 ++-- .../general/artisanat/menuiserie/manche/manche.properties | 2 +- .../general/artisanat/menuiserie/planche/planche.properties | 2 +- 80 files changed, 233 insertions(+), 154 deletions(-) create mode 100644 assets/minecraft/optifine/cit/general/artisanat/forge/outils/marteau_forgeron/marteau_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/bijoux/bague_or.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/bijoux/bague_or.properties index ef2aee8e..e75c7016 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/bijoux/bague_or.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/bijoux/bague_or.properties @@ -1,4 +1,6 @@ type=item -matchItems=gold_nugget +items=gold_nugget texture=bague_or -components.custom_data.artisanat_bijoutier=bague_or \ No newline at end of file +components.custom_data.artisanat_bijoutier=bague_or + +# /give @s gold_nugget[custom_data={artisanat_bijoutier:bague_or}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/bijoux/pendentif_or.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/bijoux/pendentif_or.properties index 23f63cb5..766913fa 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/bijoux/pendentif_or.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/bijoux/pendentif_or.properties @@ -1,4 +1,6 @@ type=item -matchItems=gold_nugget +items=gold_nugget texture=pendentif_or -components.custom_data.artisanat_bijoutier=pendentif_or \ No newline at end of file +components.custom_data.artisanat_bijoutier=pendentif_or + +# /give @s gold_nugget[custom_data={artisanat_bijoutier:pendentif_or}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/broyeurs/broyeur/broyeur.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/broyeurs/broyeur/broyeur.properties index 4444ed34..4bdc9c5c 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/broyeurs/broyeur/broyeur.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/broyeurs/broyeur/broyeur.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_ingot +items=iron_ingot texture=broyeur -components.custom_data.artisanat_bijoutier=broyeur \ No newline at end of file +components.custom_data.artisanat_bijoutier=broyeur + +# /give @s iron_ingot[custom_data={artisanat_bijoutier:broyeur}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/broyeurs/broyeur_diamant/broyeur_diamant.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/broyeurs/broyeur_diamant/broyeur_diamant.properties index 571461b1..1bede3a7 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/broyeurs/broyeur_diamant/broyeur_diamant.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/broyeurs/broyeur_diamant/broyeur_diamant.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:lapis_lazuli +items=lapis_lazuli texture=broyeur_diamant -components.custom_data.artisanat_bijoutier=broyeur_diamant \ No newline at end of file +components.custom_data.artisanat_bijoutier=broyeur_diamant + +# /give @s lapis_lazuli[custom_data={artisanat_bijoutier:broyeur_diamant}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/diamantaille.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/diamantaille.properties index 53771214..fb899ccb 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/diamantaille.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/diamantaille.properties @@ -1,5 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=diamantaille components.custom_data.gemme=diamanttaille +# /give @s diamond[custom_data={gemme:diamanttaille}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/diamantpur.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/diamantpur.properties index d7d82432..83b357ab 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/diamantpur.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/diamantpur.properties @@ -1,5 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=diamantpur components.custom_data.gemme=diamantpur +# /give @s diamond[custom_data={gemme:diamantpur}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/emeraudepure.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/emeraudepure.properties index fb2d3b2d..f85ffb91 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/emeraudepure.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/emeraudepure.properties @@ -1,5 +1,6 @@ type=item -matchItems=emerald +items=emerald texture=emeraudepure components.custom_data.gemme=emeraudepure +# /give @s emerald[custom_data={gemme:emeraudepure}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/rubis.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/rubis.properties index d968fbce..97e537d6 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/rubis.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/rubis.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=rubis components.custom_data.gemme=rubis - +# /give @s diamond[custom_data={gemme:rubis}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/saphir.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/saphir.properties index 1b39a769..bdc18dc9 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/saphir.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/precieuses/saphir.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=saphir components.custom_data.gemme=saphir - +# /give @s diamond[custom_data={gemme:saphir}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/agate_violette.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/agate_violette.properties index 33c9a502..5d7e7eb1 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/agate_violette.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/agate_violette.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=agate_violette components.custom_data.gemme=agate_violette - +# /give @s diamond[custom_data={gemme:agate_violette}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/aiguemarine.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/aiguemarine.properties index c0b05218..ecb63f7f 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/aiguemarine.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/aiguemarine.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=aiguemarine components.custom_data.gemme=aiguemarine - +# /give @s diamond[custom_data={gemme:aiguemarine}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/ambre.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/ambre.properties index ff8b735f..73bb8569 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/ambre.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/ambre.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=ambre components.custom_data.gemme=ambre - +# /give @s diamond[custom_data={gemme:ambre}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/amethyste.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/amethyste.properties index 030e8697..cba0e91b 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/amethyste.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/amethyste.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=amethyste components.custom_data.gemme=amethyste - +# /give @s diamond[custom_data={gemme:amethyste}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/citrine.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/citrine.properties index 666d7e67..2bd1bab2 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/citrine.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/citrine.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=citrine components.custom_data.gemme=citrine - +# /give @s diamond[custom_data={gemme:citrine}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/cornaline.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/cornaline.properties index 1f27cb00..a82d4971 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/cornaline.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/cornaline.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=cornaline components.custom_data.gemme=cornaline - +# /give @s diamond[custom_data={gemme:cornaline}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/grenat.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/grenat.properties index 55d89722..7af0b3bd 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/grenat.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/grenat.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=grenat components.custom_data.gemme=grenat - +# /give @s diamond[custom_data={gemme:grenat}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/heliodore.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/heliodore.properties index 1d4fbedd..6748aabc 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/heliodore.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/heliodore.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=heliodore components.custom_data.gemme=heliodore - +# /give @s diamond[custom_data={gemme:heliodore}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/hematite.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/hematite.properties index bb210f52..2c3af26c 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/hematite.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/hematite.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=hematite components.custom_data.gemme=hematite - +# /give @s diamond[custom_data={gemme:hematite}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/howlite.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/howlite.properties index 02398786..a1470a54 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/howlite.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/howlite.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=howlite components.custom_data.gemme=howlite - +# /give @s diamond[custom_data={gemme:howlite}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/jade.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/jade.properties index f5858978..8932e5d6 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/jade.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/jade.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=jade components.custom_data.gemme=jade - +# /give @s diamond[custom_data={gemme:jade}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/jaspe_rouge.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/jaspe_rouge.properties index ea663724..42ffa23e 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/jaspe_rouge.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/jaspe_rouge.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=jaspe_rouge components.custom_data.gemme=jaspe_rouge - +# /give @s diamond[custom_data={gemme:jaspe_rouge}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/lapis_lazuli_pur.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/lapis_lazuli_pur.properties index dc8110b3..85aa0cee 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/lapis_lazuli_pur.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/lapis_lazuli_pur.properties @@ -1,6 +1,6 @@ type=item -matchItems=lapis_lazuli +items=lapis_lazuli texture=lapis_lazuli_pur components.custom_data.gemme=lapis_lazuli_pur - +# /give @s lapis_lazuli[custom_data={gemme:lapis_lazuli_pur}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/malachite.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/malachite.properties index 039125bc..6abc97e7 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/malachite.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/malachite.properties @@ -1,5 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=malachite components.custom_data.gemme=malachite +# /give @s diamond[custom_data={gemme:malachite}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/morganite.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/morganite.properties index 0d9d96d8..18b84c15 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/morganite.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/morganite.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=morganite components.custom_data.gemme=morganite - +# /give @s diamond[custom_data={gemme:morganite}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/onyx.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/onyx.properties index 8b026c05..41f743e7 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/onyx.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/onyx.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=onyx components.custom_data.gemme=onyx - +# /give @s diamond[custom_data={gemme:onyx}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/quartz_hematoide.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/quartz_hematoide.properties index 3a0a8ab1..62a0bded 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/quartz_hematoide.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/quartz_hematoide.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=quartz_hematoide components.custom_data.gemme=quartz_hematoide - +# /give @s diamond[custom_data={gemme:quartz_hematoide}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/quartz_rose.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/quartz_rose.properties index 645ed680..c3fee078 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/quartz_rose.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/quartz_rose.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=quartz_rose components.custom_data.gemme=quartz_rose - +# /give @s diamond[custom_data={gemme:quartz_rose}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/rodochrosite.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/rodochrosite.properties index ec100f4e..2e2f0d96 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/rodochrosite.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/rodochrosite.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=rodochrosite components.custom_data.gemme=rodochrosite - +# /give @s diamond[custom_data={gemme:rodochrosite}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/selenite.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/selenite.properties index c9e6a3f6..76feb152 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/selenite.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/selenite.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=selenite components.custom_data.gemme=selenite - +# /give @s diamond[custom_data={gemme:selenite}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/septaria.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/septaria.properties index 6c33ee7e..b7db9622 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/septaria.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/septaria.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=septaria components.custom_data.gemme=septaria - +# /give @s diamond[custom_data={gemme:septaria}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/sphalerite.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/sphalerite.properties index 0f3ee0a1..7457fe3e 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/sphalerite.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/sphalerite.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=sphalerite components.custom_data.gemme=sphalerite - +# /give @s diamond[custom_data={gemme:sphalerite}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/sphalerite_verte.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/sphalerite_verte.properties index a4ca8010..bfcbf8c3 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/sphalerite_verte.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/sphalerite_verte.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=sphalerite_verte components.custom_data.gemme=sphalerite_verte - +# /give @s diamond[custom_data={gemme:sphalerite_verte}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/topaze.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/topaze.properties index 66f0d295..c7fc4e35 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/topaze.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/topaze.properties @@ -1,7 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=topaze components.custom_data.gemme=topaze - - +# /give @s diamond[custom_data={gemme:topaze}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/topazebleu.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/topazebleu.properties index 3746739e..eefe507b 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/topazebleu.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/topazebleu.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=topazebleu components.custom_data.gemme=topazebleu - +# /give @s diamond[custom_data={gemme:topazebleu}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/tourmaline.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/tourmaline.properties index 555b192c..4159f878 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/tourmaline.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/tourmaline.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=tourmaline components.custom_data.gemme=tourmaline - +# /give @s diamond[custom_data={gemme:tourmaline}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/tourmaline_violette.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/tourmaline_violette.properties index 229f59ed..d7cc1313 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/tourmaline_violette.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/gemmes/semiprecieuses/tourmaline_violette.properties @@ -1,6 +1,6 @@ type=item -matchItems=diamond +items=diamond texture=tourmaline_violette components.custom_data.gemme=tourmaline_violette - +# /give @s diamond[custom_data={gemme:tourmaline_violette}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/carbonite/carbonite.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/carbonite/carbonite.properties index 7329db57..1ed0b728 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/carbonite/carbonite.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/carbonite/carbonite.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:flint +items=flint texture=carbonite -components.custom_data.artisanat_bijoutier=carbonite \ No newline at end of file +components.custom_data.artisanat_bijoutier=carbonite + +# /give @s flint[custom_data={artisanat_bijoutier:carbonite}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/longfeu/longfeu.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/longfeu/longfeu.properties index 3fb70a4a..91450e15 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/longfeu/longfeu.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/longfeu/longfeu.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:coal +items=coal texture=longfeu -components.custom_data.artisanat_bijoutier=longfeu \ No newline at end of file +components.custom_data.artisanat_bijoutier=longfeu + +# /give @s coal[custom_data={artisanat_bijoutier:longfeu}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_diamant/poudre_diamant.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_diamant/poudre_diamant.properties index 2f9d676a..6abe657c 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_diamant/poudre_diamant.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_diamant/poudre_diamant.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:lapis_lazuli +items=lapis_lazuli texture=poudre_diamant -components.custom_data.artisanat_bijoutier=poudre_diamant \ No newline at end of file +components.custom_data.artisanat_bijoutier=poudre_diamant + +# /give @s lapis_lazuli[custom_data={artisanat_bijoutier:poudre_diamant}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_obsi/poudre_obsi.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_obsi/poudre_obsi.properties index 463623f6..e2e5003e 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_obsi/poudre_obsi.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_obsi/poudre_obsi.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:lapis_lazuli +items=lapis_lazuli texture=poudre_obsi -components.custom_data.artisanat_bijoutier=poudre_obsi \ No newline at end of file +components.custom_data.artisanat_bijoutier=poudre_obsi + +# /give @s lapis_lazuli[custom_data={artisanat_bijoutier:poudre_obsi}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_or/poudre_or.properties b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_or/poudre_or.properties index 989c8812..0e449751 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_or/poudre_or.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/bijoutier/ressources/poudre_or/poudre_or.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:gold_nugget +items=gold_nugget texture=poudre_or -components.custom_data.artisanat_bijoutier=poudre_or \ No newline at end of file +components.custom_data.artisanat_bijoutier=poudre_or + +# /give @s gold_nugget[custom_data={artisanat_bijoutier:poudre_or}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/couturier/ciseaux_couture.properties b/assets/minecraft/optifine/cit/general/artisanat/couturier/ciseaux_couture.properties index e39db8f9..e31262d6 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/couturier/ciseaux_couture.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/couturier/ciseaux_couture.properties @@ -1,4 +1,6 @@ type=item -matchItems=shears +items=shears texture=ciseaux_couture -components.custom_name=iregex:.*Ciseaux.* \ No newline at end of file +components.custom_name=ipattern:*ciseaux* + +# /give @s shears[custom_name='{text:"Ciseaux", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_blanc.properties b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_blanc.properties index 3bc375a6..62a8dbb6 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_blanc.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_blanc.properties @@ -1,4 +1,6 @@ type=item -matchItems=paper +items=paper texture=tissu_blanc -components.custom_data.artisanat_couturier=tissu_blanc \ No newline at end of file +components.custom_data.artisanat_couturier=tissu_blanc + +# /give @s paper[custom_data={artisanat_couturier:tissu_blanc}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_bleu.properties b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_bleu.properties index aada6cbb..4509272c 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_bleu.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_bleu.properties @@ -1,4 +1,6 @@ type=item -matchItems=paper +items=paper texture=tissu_bleu -components.custom_data.artisanat_couturier=tissu_bleu \ No newline at end of file +components.custom_data.artisanat_couturier=tissu_bleu + +# /give @s paper[custom_data={artisanat_couturier:tissu_bleu}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_jaune.properties b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_jaune.properties index d7b95f41..90b18fe4 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_jaune.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_jaune.properties @@ -1,4 +1,6 @@ type=item -matchItems=paper +items=paper texture=tissu_jaune -components.custom_data.artisanat_couturier=tissu_jaune \ No newline at end of file +components.custom_data.artisanat_couturier=tissu_jaune + +# /give @s paper[custom_data={artisanat_couturier:tissu_jaune}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_orange.properties b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_orange.properties index c556a319..6003f5ce 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_orange.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_orange.properties @@ -1,4 +1,6 @@ type=item -matchItems=paper +items=paper texture=tissu_orange -components.custom_data.artisanat_couturier=tissu_orange \ No newline at end of file +components.custom_data.artisanat_couturier=tissu_orange + +# /give @s paper[custom_data={artisanat_couturier:tissu_orange}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_rose.properties b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_rose.properties index c7fc5a84..f72a8773 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_rose.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_rose.properties @@ -1,4 +1,6 @@ type=item -matchItems=paper +items=paper texture=tissu_rose -components.custom_data.artisanat_couturier=tissu_rose \ No newline at end of file +components.custom_data.artisanat_couturier=tissu_rose + +# /give @s paper[custom_data={artisanat_couturier:tissu_rose}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_rouge.properties b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_rouge.properties index 575380eb..17a4c352 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_rouge.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_rouge.properties @@ -1,4 +1,6 @@ type=item -matchItems=paper +items=paper texture=tissu_rouge -components.custom_data.artisanat_couturier=tissu_rouge \ No newline at end of file +components.custom_data.artisanat_couturier=tissu_rouge + +# /give @s paper[custom_data={artisanat_couturier:tissu_rouge}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_vert.properties b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_vert.properties index 267b3bf9..3aa3a00b 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_vert.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_vert.properties @@ -1,4 +1,6 @@ type=item -matchItems=paper +items=paper texture=tissu_vert -components.custom_data.artisanat_couturier=tissu_vert \ No newline at end of file +components.custom_data.artisanat_couturier=tissu_vert + +# /give @s paper[custom_data={artisanat_couturier:tissu_vert}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_violet.properties b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_violet.properties index 7ad4ec10..cf90fe51 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_violet.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/couturier/tissu_violet.properties @@ -1,4 +1,6 @@ type=item -matchItems=paper +items=paper texture=tissu_violet -components.custom_data.artisanat_couturier=tissu_violet \ No newline at end of file +components.custom_data.artisanat_couturier=tissu_violet + +# /give @s paper[custom_data={artisanat_couturier:tissu_violet}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/cuisine/ingredients/epices.properties b/assets/minecraft/optifine/cit/general/artisanat/cuisine/ingredients/epices.properties index c7b254ec..16af6a33 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/cuisine/ingredients/epices.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/cuisine/ingredients/epices.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:bowl +items=bowl texture=epices -components.custom_data.artisanat_cuisine=epices \ No newline at end of file +components.custom_data.artisanat_cuisine=epices + +# /give @s bowl[custom_data={artisanat_cuisine:epices}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/casserole.properties b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/casserole.properties index 5d960450..beaf85da 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/casserole.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/casserole.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:iron_shovel +items=iron_shovel texture=casserole -components.custom_name=iregex:.*Casserole.* \ No newline at end of file +components.custom_name=ipattern:*casserole* + +# /give @s iron_shovel[custom_name='{text:"Casserole", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/casserole_nbt.properties b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/casserole_nbt.properties index 3415968a..9c8ee00e 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/casserole_nbt.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/casserole_nbt.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:iron_shovel +items=iron_shovel texture=casserole -components.custom_data.artisanat_cuisine=casserole \ No newline at end of file +components.custom_data.artisanat_cuisine=casserole + +# /give @s iron_shovel[custom_data={artisanat_cuisine:casserole}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/couteau_cuisine.properties b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/couteau_cuisine.properties index 39ec9540..124efdef 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/couteau_cuisine.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/couteau_cuisine.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:iron_sword +items=iron_sword texture=couteau_cuisine -components.custom_name=iregex:.*Couteau.*Cuisine.* \ No newline at end of file +components.custom_name=ipattern:*couteau*cuisine* + +# /give @s iron_sword[custom_name='{text:"Couteau de cuisine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/couteau_cuisine_nbt.properties b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/couteau_cuisine_nbt.properties index 36ba85b5..af1f0fd1 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/couteau_cuisine_nbt.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/couteau_cuisine_nbt.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:iron_sword +items=iron_sword texture=couteau_cuisine -components.custom_data.artisanat_cuisine=couteau_cuisine \ No newline at end of file +components.custom_data.artisanat_cuisine=couteau_cuisine + +# /give @s iron_sword[custom_data={artisanat_cuisine:couteau_cuisine}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/fourchette.properties b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/fourchette.properties index 084c95c4..fad26ce7 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/fourchette.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/fourchette.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:iron_sword +items=iron_sword texture=fourchette -components.custom_name=iregex:.*Fourchette.* \ No newline at end of file +components.custom_name=ipattern:*fourchette* + +# /give @s iron_sword[custom_name='{text:"Fourchette", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/fourchette_nbt.properties b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/fourchette_nbt.properties index 28954a28..239ab814 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/fourchette_nbt.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/fourchette_nbt.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:iron_sword +items=iron_sword texture=fourchette -components.custom_data.artisanat_cuisine=fourchette \ No newline at end of file +components.custom_data.artisanat_cuisine=fourchette + +# /give @s iron_sword[custom_data={artisanat_cuisine:fourchette}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/melangeur.properties b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/melangeur.properties index c743c46f..51cdb830 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/melangeur.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/melangeur.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:stone_hoe +items=stone_hoe texture=melangeur -components.custom_name=iregex:.*Melangeur.* \ No newline at end of file +components.custom_name=iregex:.*?m[\u00e9e]langeur.* + +# /give @s stone_hoe[custom_name='{text:"Mélangeur", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/melangeur_nbt.properties b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/melangeur_nbt.properties index ad90121a..a3531ba8 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/melangeur_nbt.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/melangeur_nbt.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:stone_hoe +items=stone_hoe texture=melangeur -components.custom_data.artisanat_cuisine=melangeur \ No newline at end of file +components.custom_data.artisanat_cuisine=melangeur + +# /give @s stone_hoe[custom_data={artisanat_cuisine:melangeur}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/poele.properties b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/poele.properties index f022e547..e9cfd91f 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/poele.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/poele.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:iron_shovel +items=iron_shovel texture=poele -components.custom_name=iregex:.*Poele.* \ No newline at end of file +components.custom_name=iregex:.*?po[\u00eae]le.* + +# /give @s iron_shovel[custom_name='{text:"Poêle", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/poele_nbt.properties b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/poele_nbt.properties index a973f6e8..7d3778b4 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/poele_nbt.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/cuisine/outils/poele_nbt.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:iron_shovel +items=iron_shovel texture=poele -components.custom_data.artisanat_cuisine=poele \ No newline at end of file +components.custom_data.artisanat_cuisine=poele + +# /give @s iron_shovel[custom_data={artisanat_cuisine:poele}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/acier/lingo_acier.properties b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/acier/lingo_acier.properties index b2d5385a..9abff0bc 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/acier/lingo_acier.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/acier/lingo_acier.properties @@ -1,6 +1,6 @@ type=item -matchItems=iron_ingot +items=iron_ingot texture=lingot_acier components.custom_data.artisanat_forge=lingot_acier -# /give @s minecraft:iron_ingot[custom_data={artisanat_forge:lingot_acier}] \ No newline at end of file +# /give @s iron_ingot[custom_data={artisanat_forge:lingot_acier}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/adamantin/lingot_adamantin.properties b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/adamantin/lingot_adamantin.properties index 6a9cb7a1..3cc3fbb7 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/adamantin/lingot_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/adamantin/lingot_adamantin.properties @@ -1,6 +1,6 @@ type=item -matchItems=iron_ingot +items=iron_ingot texture=lingot_adamantin components.custom_data.artisanat_forge=lingot_adamantin -# /give @s minecraft:iron_ingot[custom_data={artisanat_forge:lingot_adamantin}] \ No newline at end of file +# /give @s iron_ingot[custom_data={artisanat_forge:lingot_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/cuivre/copper_ingot.properties b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/cuivre/copper_ingot.properties index 4a86b88c..91ae025b 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/cuivre/copper_ingot.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/cuivre/copper_ingot.properties @@ -1,6 +1,6 @@ type=item -matchItems=iron_ingot +items=iron_ingot texture=copper_ingot components.custom_data.artisanat_forge=lingot_cuivre -# /give @s minecraft:iron_ingot[custom_data={artisanat_forge:lingot_cuivre}] \ No newline at end of file +# /give @s iron_ingot[custom_data={artisanat_forge:lingot_cuivre}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/cuivre/copper_ingot_rename.properties b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/cuivre/copper_ingot_rename.properties index 0f656e05..0fe0dadd 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/cuivre/copper_ingot_rename.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/cuivre/copper_ingot_rename.properties @@ -1,6 +1,6 @@ type=item -matchItems=iron_ingot +items=iron_ingot texture=copper_ingot -components.custom_name=iregex:.*cuivre.* +components.custom_name=ipattern:*cuivre* -# /give @s minecraft:iron_ingot[custom_data={artisanat_forge:lingot_cuivre}] \ No newline at end of file +# /give @s iron_ingot[custom_name='{text:"Lingot de cuivre", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/obsifer/lingot_obsifer.properties b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/obsifer/lingot_obsifer.properties index 6022102d..442d9916 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/obsifer/lingot_obsifer.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/obsifer/lingot_obsifer.properties @@ -1,6 +1,6 @@ type=item -matchItems=iron_ingot +items=iron_ingot texture=lingot_obsifer components.custom_data.artisanat_forge=lingot_obsifer -# /give @s minecraft:iron_ingot[custom_data={artisanat_forge:lingot_obsifer}] \ No newline at end of file +# /give @s iron_ingot[custom_data={artisanat_forge:lingot_obsifer}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/vifargent/lingot_vifargent.properties b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/vifargent/lingot_vifargent.properties index d326c4fd..56de23ba 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/vifargent/lingot_vifargent.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/forge/lingots/vifargent/lingot_vifargent.properties @@ -1,6 +1,6 @@ type=item -matchItems=iron_ingot +items=iron_ingot texture=lingot_vifargent components.custom_data.artisanat_forge=lingot_vifargent -# /give @s minecraft:iron_ingot[custom_data={artisanat_forge:lingot_vifargent}] \ No newline at end of file +# /give @s iron_ingot[custom_data={artisanat_forge:lingot_vifargent}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/forge/outils/marteau_forgeron/marteau_forgeron.properties b/assets/minecraft/optifine/cit/general/artisanat/forge/outils/marteau_forgeron/marteau_forgeron.properties index 28b4310d..30ff5baa 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/forge/outils/marteau_forgeron/marteau_forgeron.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/forge/outils/marteau_forgeron/marteau_forgeron.properties @@ -1,4 +1,6 @@ type=item -matchItems=stone_sword +items=stone_sword texture=marteau_de_forgeron -components.custom_name=iregex:.*Marteau.* \ No newline at end of file +components.custom_name=ipattern:*marteau* + +# /give @s stone_sword[custom_name='{text:"Marteau de forgeron", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/artisanat/forge/outils/marteau_forgeron/marteau_nbt.properties b/assets/minecraft/optifine/cit/general/artisanat/forge/outils/marteau_forgeron/marteau_nbt.properties new file mode 100644 index 00000000..ebfb8dee --- /dev/null +++ b/assets/minecraft/optifine/cit/general/artisanat/forge/outils/marteau_forgeron/marteau_nbt.properties @@ -0,0 +1,6 @@ +type=item +items=stone_sword +texture=marteau_de_forgeron +components.custom_data.outil=marteau + +# /give @s stone_sword[custom_data={outil:marteau}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/forge/outils/pince_forgeron/pinces_de_forgeron.properties b/assets/minecraft/optifine/cit/general/artisanat/forge/outils/pince_forgeron/pinces_de_forgeron.properties index 3ac72570..071f8435 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/forge/outils/pince_forgeron/pinces_de_forgeron.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/forge/outils/pince_forgeron/pinces_de_forgeron.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_shovel +items=iron_shovel texture=pinces_de_forgeron -components.custom_name=iregex:.*Pinces.* \ No newline at end of file +components.custom_name=ipattern:*pinces* + +# /give @s iron_shovel[custom_name='{text:"Pinces de forgeron", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/artisanat/forge/outils/pince_forgeron/pinces_nbt.properties b/assets/minecraft/optifine/cit/general/artisanat/forge/outils/pince_forgeron/pinces_nbt.properties index 00a94cc5..640479ef 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/forge/outils/pince_forgeron/pinces_nbt.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/forge/outils/pince_forgeron/pinces_nbt.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_shovel +items=iron_shovel texture=pinces_de_forgeron -components.custom_data.outil=pinces \ No newline at end of file +components.custom_data.outil=pinces + +# /give @s iron_shovel[custom_data={outil:pinces}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/bande_cuir/bande_cuir.properties b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/bande_cuir/bande_cuir.properties index a8cfb7ab..aeec7ffa 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/bande_cuir/bande_cuir.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/bande_cuir/bande_cuir.properties @@ -1,6 +1,6 @@ type=item -matchItems=minecraft:leather +items=leather texture=bande_cuir components.custom_data.artisanat_maroquinier=bande_cuir -# /give @p minecraft:leather[custom_data={artisanat_maroquinier:bande_cuir}] \ No newline at end of file +# /give @s leather[custom_data={artisanat_maroquinier:bande_cuir}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/bourse/bourse.properties b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/bourse/bourse.properties index feb50a11..edea1c34 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/bourse/bourse.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/bourse/bourse.properties @@ -1,6 +1,6 @@ type=item -matchItems=enchanted_book +items=enchanted_book texture=bourse components.custom_data.artisanat_maroquinier=bourse -# /give @p minecraft:enchanted_book{StoredEnchantments:[[custom_data.id=minecraft:efficiency \ No newline at end of file +# /give @s enchanted_book[custom_data={artisanat_maroquinier:bourse}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/cuir_renfort/cuir_renfort.properties b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/cuir_renfort/cuir_renfort.properties index 665d0164..819726e1 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/cuir_renfort/cuir_renfort.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/cuir_renfort/cuir_renfort.properties @@ -1,6 +1,6 @@ type=item -matchItems=minecraft:leather +items=leather texture=cuir_renfort components.custom_data.artisanat_maroquinier=cuir_renfort -# /give @p minecraft:leather[custom_data={artisanat_maroquinier:cuir_renfort}] \ No newline at end of file +# /give @s leather[custom_data={artisanat_maroquinier:cuir_renfort}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/fourreau/fourreau.properties b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/fourreau/fourreau.properties index 1c298abf..a27fb239 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/fourreau/fourreau.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/fourreau/fourreau.properties @@ -1,4 +1,6 @@ type=item -matchItems=wooden_sword +items=wooden_sword model=fourreau -components.custom_name=iregex:.*Fourreau (.*(.*([\u00E9e]p[\u00E9e]e)(?!.*(batarde|b\u00e2tarde).*)(?!.*(longue).*).*)) \ No newline at end of file +components.custom_name=iregex:(?!.*(?:b[\u00e2a]tarde|longue)).*?fourreau.*?[\u00e9e]p[\u00e9e]e.* + +# /give @s wooden_sword[custom_name='{text:"Fourreau d\'épée", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/fourreau/fourreau_tag.properties b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/fourreau/fourreau_tag.properties index 14705979..7ed7c48e 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/fourreau/fourreau_tag.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/fourreau/fourreau_tag.properties @@ -1,5 +1,7 @@ type=item -matchItems=wooden_sword +items=wooden_sword model=fourreau components.custom_data.artisanat_maroquinier=fourreau -weight=5 \ No newline at end of file +weight=5 + +# /give @s wooden_sword[custom_data={artisanat_maroquinier:fourreau}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/gourde/gourde.properties b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/gourde/gourde.properties index 6c2e01ff..71f22cbe 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/gourde/gourde.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/gourde/gourde.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:leather +items=leather texture=gourde -components.custom_data.artisanat_maroquinier=gourde \ No newline at end of file +components.custom_data.artisanat_maroquinier=gourde + +# /give @s leather[custom_data={artisanat_maroquinier:gourde}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/sac/sac.properties b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/sac/sac.properties index 5f8aef6b..c9108339 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/sac/sac.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/maroquinerie/sac/sac.properties @@ -1,6 +1,6 @@ type=item -matchItems=minecraft:enchanted_book +items=enchanted_book texture=sac components.custom_data.artisanat_maroquinier=sac -# /give @p minecraft:enchanted_book{StoredEnchantments:[[custom_data.id=minecraft:efficiency \ No newline at end of file +# /give @s enchanted_book[custom_data={artisanat_maroquinier:sac}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/menuiserie/manche/manche.properties b/assets/minecraft/optifine/cit/general/artisanat/menuiserie/manche/manche.properties index cfe802e4..2e4d3ae7 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/menuiserie/manche/manche.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/menuiserie/manche/manche.properties @@ -3,4 +3,4 @@ items=stick texture=manche components.custom_data.artisanat_menuisier=manche -# /give @s minecraft:stick[custom_data={artisanat_menuisier:manche} 1] \ No newline at end of file +# /give @s stick[custom_data={artisanat_menuisier:manche}] diff --git a/assets/minecraft/optifine/cit/general/artisanat/menuiserie/planche/planche.properties b/assets/minecraft/optifine/cit/general/artisanat/menuiserie/planche/planche.properties index dda8e53b..e8051c96 100644 --- a/assets/minecraft/optifine/cit/general/artisanat/menuiserie/planche/planche.properties +++ b/assets/minecraft/optifine/cit/general/artisanat/menuiserie/planche/planche.properties @@ -3,4 +3,4 @@ items=stick model=planche components.custom_data.artisanat_menuisier=planche -# /give @s minecraft:stick[custom_data={artisanat_menuisier:planche} 1] \ No newline at end of file +# /give @s stick[custom_data={artisanat_menuisier:planche}] From df1bdfcdc8de44a8c5534f497cb6f88a8a429523 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Wed, 22 Jan 2025 17:26:27 +0100 Subject: [PATCH 07/27] patch general/blocks .properties --- .../cit/general/blocks/acacia_crate/acacia_crate.properties | 6 ++++-- .../optifine/cit/general/blocks/arkose/arkose.properties | 6 ++++-- .../general/blocks/arkose_bricks/arkose_bricks.properties | 6 ++++-- .../general/blocks/arkose_pillar/arkose_pillar.properties | 6 ++++-- .../cit/general/blocks/artefact/artefact.properties | 6 ++++-- .../cit/general/blocks/birch_crate/birch_crate.properties | 6 ++++-- .../cit/general/blocks/bloc_fer/bloc_fer.properties | 6 ++++-- .../blocks/blue_green_cristal/blue_green_cristal.properties | 6 ++++-- .../optifine/cit/general/blocks/chert/chert.properties | 6 ++++-- .../cit/general/blocks/chert_bricks/chert_bricks.properties | 6 ++++-- .../cit/general/blocks/chert_pillar/chert_pillar.properties | 6 ++++-- .../blocks/chiseled_arkose/chiseled_arkose.properties | 6 ++++-- .../general/blocks/chiseled_chert/chiseled_chert.properties | 6 ++++-- .../chiseled_greenschist/chiseled_greenschist.properties | 6 ++++-- .../chiseled_packed_ice/chiseled_packed_ice.properties | 6 ++++-- .../blocks/chiseled_seastone/chiseled_seastone.properties | 6 ++++-- .../general/blocks/crimson_crate/crimson_crate.properties | 6 ++++-- .../cit/general/blocks/cut_arkoze/cut_arkoze.properties | 6 ++++-- .../cit/general/blocks/cut_chert/cut_chert.properties | 6 ++++-- .../blocks/cut_greenschist/cut_greenschist.properties | 6 ++++-- .../cit/general/blocks/cut_kyanite/cut_kyanite.properties | 6 ++++-- .../general/blocks/cut_limestone/cut_limestone.properties | 6 ++++-- .../general/blocks/cut_packed_ice/cut_packed_ice.properties | 6 ++++-- .../cit/general/blocks/cut_seastone/cut_seastone.properties | 6 ++++-- .../cit/general/blocks/cut_shale/cut_shale.properties | 6 ++++-- .../cit/general/blocks/dark_cristal/dark_cristal.properties | 6 ++++-- .../general/blocks/dark_oak_crate/dark_oak_crate.properties | 6 ++++-- .../cit/general/blocks/echo_cristal/echo_cristal.properties | 6 ++++-- .../cit/general/blocks/eso_cristal/eso_cristal.properties | 6 ++++-- .../cit/general/blocks/fireflies/fireflies.properties | 6 ++++-- .../general/blocks/green_cristal/green_cristal.properties | 6 ++++-- .../cit/general/blocks/greenschist/greenschist.properties | 6 ++++-- .../blocks/greenschist_bricks/greenschist_bricks.properties | 6 ++++-- .../blocks/greenschist_pillar/greenschist_pillar.properties | 6 ++++-- .../cit/general/blocks/jungle_crate/jungle_crate.properties | 6 ++++-- .../cit/general/blocks/kitchen_tile/kitchen_tile.properties | 6 ++++-- .../optifine/cit/general/blocks/kyanite/kyanite.properties | 6 ++++-- .../general/blocks/kyanite_bricks/kyanite_bricks.properties | 6 ++++-- .../cit/general/blocks/limestone/limestone.properties | 6 ++++-- .../blocks/limestone_bricks/limestone_bricks.properties | 6 ++++-- .../general/blocks/mangrove_crate/mangrove_crate.properties | 6 ++++-- .../blocks/neutral_cristal/neutral_cristal.properties | 6 ++++-- .../cit/general/blocks/oak_crate/oak_crate.properties | 6 ++++-- .../blocks/packed_ice_bricks/packed_ice_bricks.properties | 6 ++++-- .../blocks/polished_arkose/polished_arkose.properties | 6 ++++-- .../general/blocks/polished_chert/polished_chert.properties | 6 ++++-- .../polished_greenschist/polished_greenschist.properties | 6 ++++-- .../blocks/polished_kyanite/polished_kyanite.properties | 6 ++++-- .../blocks/polished_limestone/polished_limestone.properties | 6 ++++-- .../polished_packed_ice/polished_packed_ice.properties | 6 ++++-- .../blocks/polished_seastone/polished_seastone.properties | 6 ++++-- .../general/blocks/polished_shale/polished_shale.properties | 6 ++++-- .../general/blocks/purple_cristal/purple_cristal.properties | 6 ++++-- .../cit/general/blocks/red_cristal/red_cristal.properties | 6 ++++-- .../cit/general/blocks/seastone/seastone.properties | 6 ++++-- .../blocks/seastone_bricks/seastone_bricks.properties | 6 ++++-- .../optifine/cit/general/blocks/shale/shale.properties | 6 ++++-- .../cit/general/blocks/shale_bricks/shale_bricks.properties | 6 ++++-- .../general/blocks/silver_cristal/silver_cristal.properties | 6 ++++-- .../cit/general/blocks/snow_bricks/snow_bricks.properties | 6 ++++-- .../cit/general/blocks/spruce_crate/spruce_crate.properties | 6 ++++-- .../cit/general/blocks/warped_crate/warped_crate.properties | 6 ++++-- .../general/blocks/white_cristal/white_cristal.properties | 6 ++++-- 63 files changed, 252 insertions(+), 126 deletions(-) diff --git a/assets/minecraft/optifine/cit/general/blocks/acacia_crate/acacia_crate.properties b/assets/minecraft/optifine/cit/general/blocks/acacia_crate/acacia_crate.properties index 05d7372e..2355c46d 100644 --- a/assets/minecraft/optifine/cit/general/blocks/acacia_crate/acacia_crate.properties +++ b/assets/minecraft/optifine/cit/general/blocks/acacia_crate/acacia_crate.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=acacia_crate -components.custom_data.herobrine=acacia_crate \ No newline at end of file +components.custom_data.herobrine=acacia_crate + +# /give @s structure_void[custom_data={herobrine:acacia_crate}] diff --git a/assets/minecraft/optifine/cit/general/blocks/arkose/arkose.properties b/assets/minecraft/optifine/cit/general/blocks/arkose/arkose.properties index 5fb582b9..71f17f38 100644 --- a/assets/minecraft/optifine/cit/general/blocks/arkose/arkose.properties +++ b/assets/minecraft/optifine/cit/general/blocks/arkose/arkose.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=arkose -components.custom_data.herobrine=arkose \ No newline at end of file +components.custom_data.herobrine=arkose + +# /give @s structure_void[custom_data={herobrine:arkose}] diff --git a/assets/minecraft/optifine/cit/general/blocks/arkose_bricks/arkose_bricks.properties b/assets/minecraft/optifine/cit/general/blocks/arkose_bricks/arkose_bricks.properties index 096c3f20..e97cb608 100644 --- a/assets/minecraft/optifine/cit/general/blocks/arkose_bricks/arkose_bricks.properties +++ b/assets/minecraft/optifine/cit/general/blocks/arkose_bricks/arkose_bricks.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=arkose_bricks -components.custom_data.herobrine=arkose_bricks \ No newline at end of file +components.custom_data.herobrine=arkose_bricks + +# /give @s structure_void[custom_data={herobrine:arkose_bricks}] diff --git a/assets/minecraft/optifine/cit/general/blocks/arkose_pillar/arkose_pillar.properties b/assets/minecraft/optifine/cit/general/blocks/arkose_pillar/arkose_pillar.properties index 5c0ceb25..1a0cf3fc 100644 --- a/assets/minecraft/optifine/cit/general/blocks/arkose_pillar/arkose_pillar.properties +++ b/assets/minecraft/optifine/cit/general/blocks/arkose_pillar/arkose_pillar.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=arkose_pillar -components.custom_data.herobrine=arkose_pillar \ No newline at end of file +components.custom_data.herobrine=arkose_pillar + +# /give @s structure_void[custom_data={herobrine:arkose_pillar}] diff --git a/assets/minecraft/optifine/cit/general/blocks/artefact/artefact.properties b/assets/minecraft/optifine/cit/general/blocks/artefact/artefact.properties index 31a8b078..8cc4fe0b 100644 --- a/assets/minecraft/optifine/cit/general/blocks/artefact/artefact.properties +++ b/assets/minecraft/optifine/cit/general/blocks/artefact/artefact.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=artefact -components.custom_data.herobrine=artefact \ No newline at end of file +components.custom_data.herobrine=artefact + +# /give @s structure_void[custom_data={herobrine:artefact}] diff --git a/assets/minecraft/optifine/cit/general/blocks/birch_crate/birch_crate.properties b/assets/minecraft/optifine/cit/general/blocks/birch_crate/birch_crate.properties index 7b96a12b..5ea51d17 100644 --- a/assets/minecraft/optifine/cit/general/blocks/birch_crate/birch_crate.properties +++ b/assets/minecraft/optifine/cit/general/blocks/birch_crate/birch_crate.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=birch_crate -components.custom_data.herobrine=birch_crate \ No newline at end of file +components.custom_data.herobrine=birch_crate + +# /give @s structure_void[custom_data={herobrine:birch_crate}] diff --git a/assets/minecraft/optifine/cit/general/blocks/bloc_fer/bloc_fer.properties b/assets/minecraft/optifine/cit/general/blocks/bloc_fer/bloc_fer.properties index a5fe5b5b..c4177856 100644 --- a/assets/minecraft/optifine/cit/general/blocks/bloc_fer/bloc_fer.properties +++ b/assets/minecraft/optifine/cit/general/blocks/bloc_fer/bloc_fer.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=bloc_fer -components.custom_data.herobrine=bloc_fer \ No newline at end of file +components.custom_data.herobrine=bloc_fer + +# /give @s structure_void[custom_data={herobrine:bloc_fer}] diff --git a/assets/minecraft/optifine/cit/general/blocks/blue_green_cristal/blue_green_cristal.properties b/assets/minecraft/optifine/cit/general/blocks/blue_green_cristal/blue_green_cristal.properties index 0c0c5b5c..fd374af1 100644 --- a/assets/minecraft/optifine/cit/general/blocks/blue_green_cristal/blue_green_cristal.properties +++ b/assets/minecraft/optifine/cit/general/blocks/blue_green_cristal/blue_green_cristal.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=blue_green_cristal -components.custom_data.herobrine=blue_green_cristal \ No newline at end of file +components.custom_data.herobrine=blue_green_cristal + +# /give @s structure_void[custom_data={herobrine:blue_green_cristal}] diff --git a/assets/minecraft/optifine/cit/general/blocks/chert/chert.properties b/assets/minecraft/optifine/cit/general/blocks/chert/chert.properties index 91a82409..91965622 100644 --- a/assets/minecraft/optifine/cit/general/blocks/chert/chert.properties +++ b/assets/minecraft/optifine/cit/general/blocks/chert/chert.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=chert -components.custom_data.herobrine=chert \ No newline at end of file +components.custom_data.herobrine=chert + +# /give @s structure_void[custom_data={herobrine:chert}] diff --git a/assets/minecraft/optifine/cit/general/blocks/chert_bricks/chert_bricks.properties b/assets/minecraft/optifine/cit/general/blocks/chert_bricks/chert_bricks.properties index 82606854..dea79ad0 100644 --- a/assets/minecraft/optifine/cit/general/blocks/chert_bricks/chert_bricks.properties +++ b/assets/minecraft/optifine/cit/general/blocks/chert_bricks/chert_bricks.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=chert_bricks -components.custom_data.herobrine=chert_bricks \ No newline at end of file +components.custom_data.herobrine=chert_bricks + +# /give @s structure_void[custom_data={herobrine:chert_bricks}] diff --git a/assets/minecraft/optifine/cit/general/blocks/chert_pillar/chert_pillar.properties b/assets/minecraft/optifine/cit/general/blocks/chert_pillar/chert_pillar.properties index 58d7ffcf..494d4f4a 100644 --- a/assets/minecraft/optifine/cit/general/blocks/chert_pillar/chert_pillar.properties +++ b/assets/minecraft/optifine/cit/general/blocks/chert_pillar/chert_pillar.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=chert_pillar -components.custom_data.herobrine=chert_pillar \ No newline at end of file +components.custom_data.herobrine=chert_pillar + +# /give @s structure_void[custom_data={herobrine:chert_pillar}] diff --git a/assets/minecraft/optifine/cit/general/blocks/chiseled_arkose/chiseled_arkose.properties b/assets/minecraft/optifine/cit/general/blocks/chiseled_arkose/chiseled_arkose.properties index e2106f8c..4e7d39e1 100644 --- a/assets/minecraft/optifine/cit/general/blocks/chiseled_arkose/chiseled_arkose.properties +++ b/assets/minecraft/optifine/cit/general/blocks/chiseled_arkose/chiseled_arkose.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=chiseled_arkose -components.custom_data.herobrine=chiseled_arkose \ No newline at end of file +components.custom_data.herobrine=chiseled_arkose + +# /give @s structure_void[custom_data={herobrine:chiseled_arkose}] diff --git a/assets/minecraft/optifine/cit/general/blocks/chiseled_chert/chiseled_chert.properties b/assets/minecraft/optifine/cit/general/blocks/chiseled_chert/chiseled_chert.properties index 8d565627..dbe447f4 100644 --- a/assets/minecraft/optifine/cit/general/blocks/chiseled_chert/chiseled_chert.properties +++ b/assets/minecraft/optifine/cit/general/blocks/chiseled_chert/chiseled_chert.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=chiseled_chert -components.custom_data.herobrine=chiseled_chert \ No newline at end of file +components.custom_data.herobrine=chiseled_chert + +# /give @s structure_void[custom_data={herobrine:chiseled_chert}] diff --git a/assets/minecraft/optifine/cit/general/blocks/chiseled_greenschist/chiseled_greenschist.properties b/assets/minecraft/optifine/cit/general/blocks/chiseled_greenschist/chiseled_greenschist.properties index 688dab54..fca9fc39 100644 --- a/assets/minecraft/optifine/cit/general/blocks/chiseled_greenschist/chiseled_greenschist.properties +++ b/assets/minecraft/optifine/cit/general/blocks/chiseled_greenschist/chiseled_greenschist.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=chiseled_greenschist -components.custom_data.herobrine=chiseled_greenschist \ No newline at end of file +components.custom_data.herobrine=chiseled_greenschist + +# /give @s structure_void[custom_data={herobrine:chiseled_greenschist}] diff --git a/assets/minecraft/optifine/cit/general/blocks/chiseled_packed_ice/chiseled_packed_ice.properties b/assets/minecraft/optifine/cit/general/blocks/chiseled_packed_ice/chiseled_packed_ice.properties index 6623dee3..0f5111a7 100644 --- a/assets/minecraft/optifine/cit/general/blocks/chiseled_packed_ice/chiseled_packed_ice.properties +++ b/assets/minecraft/optifine/cit/general/blocks/chiseled_packed_ice/chiseled_packed_ice.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=chiseled_packed_ice -components.custom_data.herobrine=chiseled_packed_ice \ No newline at end of file +components.custom_data.herobrine=chiseled_packed_ice + +# /give @s structure_void[custom_data={herobrine:chiseled_packed_ice}] diff --git a/assets/minecraft/optifine/cit/general/blocks/chiseled_seastone/chiseled_seastone.properties b/assets/minecraft/optifine/cit/general/blocks/chiseled_seastone/chiseled_seastone.properties index 5773c3f9..3ec2824b 100644 --- a/assets/minecraft/optifine/cit/general/blocks/chiseled_seastone/chiseled_seastone.properties +++ b/assets/minecraft/optifine/cit/general/blocks/chiseled_seastone/chiseled_seastone.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=chiseled_seastone -components.custom_data.herobrine=chiseled_seastone \ No newline at end of file +components.custom_data.herobrine=chiseled_seastone + +# /give @s structure_void[custom_data={herobrine:chiseled_seastone}] diff --git a/assets/minecraft/optifine/cit/general/blocks/crimson_crate/crimson_crate.properties b/assets/minecraft/optifine/cit/general/blocks/crimson_crate/crimson_crate.properties index e1005efd..debaf5f7 100644 --- a/assets/minecraft/optifine/cit/general/blocks/crimson_crate/crimson_crate.properties +++ b/assets/minecraft/optifine/cit/general/blocks/crimson_crate/crimson_crate.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=crimson_crate -components.custom_data.herobrine=crimson_crate \ No newline at end of file +components.custom_data.herobrine=crimson_crate + +# /give @s structure_void[custom_data={herobrine:crimson_crate}] diff --git a/assets/minecraft/optifine/cit/general/blocks/cut_arkoze/cut_arkoze.properties b/assets/minecraft/optifine/cit/general/blocks/cut_arkoze/cut_arkoze.properties index e9a73a17..977cd69a 100644 --- a/assets/minecraft/optifine/cit/general/blocks/cut_arkoze/cut_arkoze.properties +++ b/assets/minecraft/optifine/cit/general/blocks/cut_arkoze/cut_arkoze.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=cut_arkoze -components.custom_data.herobrine=cut_arkoze \ No newline at end of file +components.custom_data.herobrine=cut_arkoze + +# /give @s structure_void[custom_data={herobrine:cut_arkoze}] diff --git a/assets/minecraft/optifine/cit/general/blocks/cut_chert/cut_chert.properties b/assets/minecraft/optifine/cit/general/blocks/cut_chert/cut_chert.properties index 4f3c7a41..65e7c3da 100644 --- a/assets/minecraft/optifine/cit/general/blocks/cut_chert/cut_chert.properties +++ b/assets/minecraft/optifine/cit/general/blocks/cut_chert/cut_chert.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=cut_chert -components.custom_data.herobrine=cut_chert \ No newline at end of file +components.custom_data.herobrine=cut_chert + +# /give @s structure_void[custom_data={herobrine:cut_chert}] diff --git a/assets/minecraft/optifine/cit/general/blocks/cut_greenschist/cut_greenschist.properties b/assets/minecraft/optifine/cit/general/blocks/cut_greenschist/cut_greenschist.properties index 462d4715..3882caa3 100644 --- a/assets/minecraft/optifine/cit/general/blocks/cut_greenschist/cut_greenschist.properties +++ b/assets/minecraft/optifine/cit/general/blocks/cut_greenschist/cut_greenschist.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=cut_greenschist -components.custom_data.herobrine=cut_greenschist \ No newline at end of file +components.custom_data.herobrine=cut_greenschist + +# /give @s structure_void[custom_data={herobrine:cut_greenschist}] diff --git a/assets/minecraft/optifine/cit/general/blocks/cut_kyanite/cut_kyanite.properties b/assets/minecraft/optifine/cit/general/blocks/cut_kyanite/cut_kyanite.properties index 4eec7319..1c68e614 100644 --- a/assets/minecraft/optifine/cit/general/blocks/cut_kyanite/cut_kyanite.properties +++ b/assets/minecraft/optifine/cit/general/blocks/cut_kyanite/cut_kyanite.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=cut_kyanite -components.custom_data.herobrine=cut_kyanite \ No newline at end of file +components.custom_data.herobrine=cut_kyanite + +# /give @s structure_void[custom_data={herobrine:cut_kyanite}] diff --git a/assets/minecraft/optifine/cit/general/blocks/cut_limestone/cut_limestone.properties b/assets/minecraft/optifine/cit/general/blocks/cut_limestone/cut_limestone.properties index 9fe7a452..1af16865 100644 --- a/assets/minecraft/optifine/cit/general/blocks/cut_limestone/cut_limestone.properties +++ b/assets/minecraft/optifine/cit/general/blocks/cut_limestone/cut_limestone.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=cut_limestone -components.custom_data.herobrine=cut_limestone \ No newline at end of file +components.custom_data.herobrine=cut_limestone + +# /give @s structure_void[custom_data={herobrine:cut_limestone}] diff --git a/assets/minecraft/optifine/cit/general/blocks/cut_packed_ice/cut_packed_ice.properties b/assets/minecraft/optifine/cit/general/blocks/cut_packed_ice/cut_packed_ice.properties index 3e512cef..4c9df488 100644 --- a/assets/minecraft/optifine/cit/general/blocks/cut_packed_ice/cut_packed_ice.properties +++ b/assets/minecraft/optifine/cit/general/blocks/cut_packed_ice/cut_packed_ice.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=cut_packed_ice -components.custom_data.herobrine=cut_packed_ice \ No newline at end of file +components.custom_data.herobrine=cut_packed_ice + +# /give @s structure_void[custom_data={herobrine:cut_packed_ice}] diff --git a/assets/minecraft/optifine/cit/general/blocks/cut_seastone/cut_seastone.properties b/assets/minecraft/optifine/cit/general/blocks/cut_seastone/cut_seastone.properties index 97f66bb9..e13355d8 100644 --- a/assets/minecraft/optifine/cit/general/blocks/cut_seastone/cut_seastone.properties +++ b/assets/minecraft/optifine/cit/general/blocks/cut_seastone/cut_seastone.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=cut_seastone -components.custom_data.herobrine=cut_seastone \ No newline at end of file +components.custom_data.herobrine=cut_seastone + +# /give @s structure_void[custom_data={herobrine:cut_seastone}] diff --git a/assets/minecraft/optifine/cit/general/blocks/cut_shale/cut_shale.properties b/assets/minecraft/optifine/cit/general/blocks/cut_shale/cut_shale.properties index 9f3edb92..d4604f55 100644 --- a/assets/minecraft/optifine/cit/general/blocks/cut_shale/cut_shale.properties +++ b/assets/minecraft/optifine/cit/general/blocks/cut_shale/cut_shale.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=cut_shale -components.custom_data.herobrine=cut_shale \ No newline at end of file +components.custom_data.herobrine=cut_shale + +# /give @s structure_void[custom_data={herobrine:cut_shale}] diff --git a/assets/minecraft/optifine/cit/general/blocks/dark_cristal/dark_cristal.properties b/assets/minecraft/optifine/cit/general/blocks/dark_cristal/dark_cristal.properties index 5496e36e..fb111712 100644 --- a/assets/minecraft/optifine/cit/general/blocks/dark_cristal/dark_cristal.properties +++ b/assets/minecraft/optifine/cit/general/blocks/dark_cristal/dark_cristal.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=dark_cristal -components.custom_data.herobrine=dark_cristal \ No newline at end of file +components.custom_data.herobrine=dark_cristal + +# /give @s structure_void[custom_data={herobrine:dark_cristal}] diff --git a/assets/minecraft/optifine/cit/general/blocks/dark_oak_crate/dark_oak_crate.properties b/assets/minecraft/optifine/cit/general/blocks/dark_oak_crate/dark_oak_crate.properties index 345eb24f..1cfaf179 100644 --- a/assets/minecraft/optifine/cit/general/blocks/dark_oak_crate/dark_oak_crate.properties +++ b/assets/minecraft/optifine/cit/general/blocks/dark_oak_crate/dark_oak_crate.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=dark_oak_crate -components.custom_data.herobrine=dark_oak_crate \ No newline at end of file +components.custom_data.herobrine=dark_oak_crate + +# /give @s structure_void[custom_data={herobrine:dark_oak_crate}] diff --git a/assets/minecraft/optifine/cit/general/blocks/echo_cristal/echo_cristal.properties b/assets/minecraft/optifine/cit/general/blocks/echo_cristal/echo_cristal.properties index 24f8a77e..97f2db73 100644 --- a/assets/minecraft/optifine/cit/general/blocks/echo_cristal/echo_cristal.properties +++ b/assets/minecraft/optifine/cit/general/blocks/echo_cristal/echo_cristal.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=echo_cristal -components.custom_data.herobrine=echo_cristal \ No newline at end of file +components.custom_data.herobrine=echo_cristal + +# /give @s structure_void[custom_data={herobrine:echo_cristal}] diff --git a/assets/minecraft/optifine/cit/general/blocks/eso_cristal/eso_cristal.properties b/assets/minecraft/optifine/cit/general/blocks/eso_cristal/eso_cristal.properties index 43831bbb..25cee1b9 100644 --- a/assets/minecraft/optifine/cit/general/blocks/eso_cristal/eso_cristal.properties +++ b/assets/minecraft/optifine/cit/general/blocks/eso_cristal/eso_cristal.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=eso_cristal -components.custom_data.herobrine=eso_cristal \ No newline at end of file +components.custom_data.herobrine=eso_cristal + +# /give @s structure_void[custom_data={herobrine:eso_cristal}] diff --git a/assets/minecraft/optifine/cit/general/blocks/fireflies/fireflies.properties b/assets/minecraft/optifine/cit/general/blocks/fireflies/fireflies.properties index de7338a5..1834a5e9 100644 --- a/assets/minecraft/optifine/cit/general/blocks/fireflies/fireflies.properties +++ b/assets/minecraft/optifine/cit/general/blocks/fireflies/fireflies.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=fireflies -components.custom_data.herobrine=fireflies \ No newline at end of file +components.custom_data.herobrine=fireflies + +# /give @s structure_void[custom_data={herobrine:fireflies}] diff --git a/assets/minecraft/optifine/cit/general/blocks/green_cristal/green_cristal.properties b/assets/minecraft/optifine/cit/general/blocks/green_cristal/green_cristal.properties index 7f149d9c..6763754b 100644 --- a/assets/minecraft/optifine/cit/general/blocks/green_cristal/green_cristal.properties +++ b/assets/minecraft/optifine/cit/general/blocks/green_cristal/green_cristal.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=green_cristal -components.custom_data.herobrine=green_cristal \ No newline at end of file +components.custom_data.herobrine=green_cristal + +# /give @s structure_void[custom_data={herobrine:green_cristal}] diff --git a/assets/minecraft/optifine/cit/general/blocks/greenschist/greenschist.properties b/assets/minecraft/optifine/cit/general/blocks/greenschist/greenschist.properties index 5d9a26d2..2aacb2fc 100644 --- a/assets/minecraft/optifine/cit/general/blocks/greenschist/greenschist.properties +++ b/assets/minecraft/optifine/cit/general/blocks/greenschist/greenschist.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=greenschist -components.custom_data.herobrine=greenschist \ No newline at end of file +components.custom_data.herobrine=greenschist + +# /give @s structure_void[custom_data={herobrine:greenschist}] diff --git a/assets/minecraft/optifine/cit/general/blocks/greenschist_bricks/greenschist_bricks.properties b/assets/minecraft/optifine/cit/general/blocks/greenschist_bricks/greenschist_bricks.properties index 2a24ee50..7aeb5c9a 100644 --- a/assets/minecraft/optifine/cit/general/blocks/greenschist_bricks/greenschist_bricks.properties +++ b/assets/minecraft/optifine/cit/general/blocks/greenschist_bricks/greenschist_bricks.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=greenschist_bricks -components.custom_data.herobrine=greenschist_bricks \ No newline at end of file +components.custom_data.herobrine=greenschist_bricks + +# /give @s structure_void[custom_data={herobrine:greenschist_bricks}] diff --git a/assets/minecraft/optifine/cit/general/blocks/greenschist_pillar/greenschist_pillar.properties b/assets/minecraft/optifine/cit/general/blocks/greenschist_pillar/greenschist_pillar.properties index a6bc8e07..37dbd28e 100644 --- a/assets/minecraft/optifine/cit/general/blocks/greenschist_pillar/greenschist_pillar.properties +++ b/assets/minecraft/optifine/cit/general/blocks/greenschist_pillar/greenschist_pillar.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=greenschist_pillar -components.custom_data.herobrine=greenschist_pillar \ No newline at end of file +components.custom_data.herobrine=greenschist_pillar + +# /give @s structure_void[custom_data={herobrine:greenschist_pillar}] diff --git a/assets/minecraft/optifine/cit/general/blocks/jungle_crate/jungle_crate.properties b/assets/minecraft/optifine/cit/general/blocks/jungle_crate/jungle_crate.properties index a4434237..81477bac 100644 --- a/assets/minecraft/optifine/cit/general/blocks/jungle_crate/jungle_crate.properties +++ b/assets/minecraft/optifine/cit/general/blocks/jungle_crate/jungle_crate.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=jungle_crate -components.custom_data.herobrine=jungle_crate \ No newline at end of file +components.custom_data.herobrine=jungle_crate + +# /give @s structure_void[custom_data={herobrine:jungle_crate}] diff --git a/assets/minecraft/optifine/cit/general/blocks/kitchen_tile/kitchen_tile.properties b/assets/minecraft/optifine/cit/general/blocks/kitchen_tile/kitchen_tile.properties index 260acc56..7dc15a83 100644 --- a/assets/minecraft/optifine/cit/general/blocks/kitchen_tile/kitchen_tile.properties +++ b/assets/minecraft/optifine/cit/general/blocks/kitchen_tile/kitchen_tile.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=kitchen_tile -components.custom_data.herobrine=kitchen_tile \ No newline at end of file +components.custom_data.herobrine=kitchen_tile + +# /give @s structure_void[custom_data={herobrine:kitchen_tile}] diff --git a/assets/minecraft/optifine/cit/general/blocks/kyanite/kyanite.properties b/assets/minecraft/optifine/cit/general/blocks/kyanite/kyanite.properties index 656b9846..1b1122ad 100644 --- a/assets/minecraft/optifine/cit/general/blocks/kyanite/kyanite.properties +++ b/assets/minecraft/optifine/cit/general/blocks/kyanite/kyanite.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=kyanite -components.custom_data.herobrine=kyanite \ No newline at end of file +components.custom_data.herobrine=kyanite + +# /give @s structure_void[custom_data={herobrine:kyanite}] diff --git a/assets/minecraft/optifine/cit/general/blocks/kyanite_bricks/kyanite_bricks.properties b/assets/minecraft/optifine/cit/general/blocks/kyanite_bricks/kyanite_bricks.properties index 11c64edc..8c55966b 100644 --- a/assets/minecraft/optifine/cit/general/blocks/kyanite_bricks/kyanite_bricks.properties +++ b/assets/minecraft/optifine/cit/general/blocks/kyanite_bricks/kyanite_bricks.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=kyanite_bricks -components.custom_data.herobrine=kyanite_bricks \ No newline at end of file +components.custom_data.herobrine=kyanite_bricks + +# /give @s structure_void[custom_data={herobrine:kyanite_bricks}] diff --git a/assets/minecraft/optifine/cit/general/blocks/limestone/limestone.properties b/assets/minecraft/optifine/cit/general/blocks/limestone/limestone.properties index ebd5573a..f7bfa815 100644 --- a/assets/minecraft/optifine/cit/general/blocks/limestone/limestone.properties +++ b/assets/minecraft/optifine/cit/general/blocks/limestone/limestone.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=limestone -components.custom_data.herobrine=limestone \ No newline at end of file +components.custom_data.herobrine=limestone + +# /give @s structure_void[custom_data={herobrine:limestone}] diff --git a/assets/minecraft/optifine/cit/general/blocks/limestone_bricks/limestone_bricks.properties b/assets/minecraft/optifine/cit/general/blocks/limestone_bricks/limestone_bricks.properties index 20b9df2b..d6693378 100644 --- a/assets/minecraft/optifine/cit/general/blocks/limestone_bricks/limestone_bricks.properties +++ b/assets/minecraft/optifine/cit/general/blocks/limestone_bricks/limestone_bricks.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=limestone_bricks -components.custom_data.herobrine=limestone_bricks \ No newline at end of file +components.custom_data.herobrine=limestone_bricks + +# /give @s structure_void[custom_data={herobrine:limestone_bricks}] diff --git a/assets/minecraft/optifine/cit/general/blocks/mangrove_crate/mangrove_crate.properties b/assets/minecraft/optifine/cit/general/blocks/mangrove_crate/mangrove_crate.properties index c68b72aa..ba356088 100644 --- a/assets/minecraft/optifine/cit/general/blocks/mangrove_crate/mangrove_crate.properties +++ b/assets/minecraft/optifine/cit/general/blocks/mangrove_crate/mangrove_crate.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=mangrove_crate -components.custom_data.herobrine=mangrove_crate \ No newline at end of file +components.custom_data.herobrine=mangrove_crate + +# /give @s structure_void[custom_data={herobrine:mangrove_crate}] diff --git a/assets/minecraft/optifine/cit/general/blocks/neutral_cristal/neutral_cristal.properties b/assets/minecraft/optifine/cit/general/blocks/neutral_cristal/neutral_cristal.properties index 8e6d3922..259feabd 100644 --- a/assets/minecraft/optifine/cit/general/blocks/neutral_cristal/neutral_cristal.properties +++ b/assets/minecraft/optifine/cit/general/blocks/neutral_cristal/neutral_cristal.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=neutral_cristal -components.custom_data.herobrine=neutral_cristal \ No newline at end of file +components.custom_data.herobrine=neutral_cristal + +# /give @s structure_void[custom_data={herobrine:neutral_cristal}] diff --git a/assets/minecraft/optifine/cit/general/blocks/oak_crate/oak_crate.properties b/assets/minecraft/optifine/cit/general/blocks/oak_crate/oak_crate.properties index 959177bd..0d638b73 100644 --- a/assets/minecraft/optifine/cit/general/blocks/oak_crate/oak_crate.properties +++ b/assets/minecraft/optifine/cit/general/blocks/oak_crate/oak_crate.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=oak_crate -components.custom_data.herobrine=oak_crate \ No newline at end of file +components.custom_data.herobrine=oak_crate + +# /give @s structure_void[custom_data={herobrine:oak_crate}] diff --git a/assets/minecraft/optifine/cit/general/blocks/packed_ice_bricks/packed_ice_bricks.properties b/assets/minecraft/optifine/cit/general/blocks/packed_ice_bricks/packed_ice_bricks.properties index 31ec2bdf..ffabcad7 100644 --- a/assets/minecraft/optifine/cit/general/blocks/packed_ice_bricks/packed_ice_bricks.properties +++ b/assets/minecraft/optifine/cit/general/blocks/packed_ice_bricks/packed_ice_bricks.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=packed_ice_bricks -components.custom_data.herobrine=packed_ice_bricks \ No newline at end of file +components.custom_data.herobrine=packed_ice_bricks + +# /give @s structure_void[custom_data={herobrine:packed_ice_bricks}] diff --git a/assets/minecraft/optifine/cit/general/blocks/polished_arkose/polished_arkose.properties b/assets/minecraft/optifine/cit/general/blocks/polished_arkose/polished_arkose.properties index 8cfb1629..838259d1 100644 --- a/assets/minecraft/optifine/cit/general/blocks/polished_arkose/polished_arkose.properties +++ b/assets/minecraft/optifine/cit/general/blocks/polished_arkose/polished_arkose.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=polished_arkose -components.custom_data.herobrine=polished_arkose \ No newline at end of file +components.custom_data.herobrine=polished_arkose + +# /give @s structure_void[custom_data={herobrine:polished_arkose}] diff --git a/assets/minecraft/optifine/cit/general/blocks/polished_chert/polished_chert.properties b/assets/minecraft/optifine/cit/general/blocks/polished_chert/polished_chert.properties index 53f624b2..366e51c8 100644 --- a/assets/minecraft/optifine/cit/general/blocks/polished_chert/polished_chert.properties +++ b/assets/minecraft/optifine/cit/general/blocks/polished_chert/polished_chert.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=polished_chert -components.custom_data.herobrine=polished_chert \ No newline at end of file +components.custom_data.herobrine=polished_chert + +# /give @s structure_void[custom_data={herobrine:polished_chert}] diff --git a/assets/minecraft/optifine/cit/general/blocks/polished_greenschist/polished_greenschist.properties b/assets/minecraft/optifine/cit/general/blocks/polished_greenschist/polished_greenschist.properties index f1119d07..377c0652 100644 --- a/assets/minecraft/optifine/cit/general/blocks/polished_greenschist/polished_greenschist.properties +++ b/assets/minecraft/optifine/cit/general/blocks/polished_greenschist/polished_greenschist.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=polished_greenschist -components.custom_data.herobrine=polished_greenschist \ No newline at end of file +components.custom_data.herobrine=polished_greenschist + +# /give @s structure_void[custom_data={herobrine:polished_greenschist}] diff --git a/assets/minecraft/optifine/cit/general/blocks/polished_kyanite/polished_kyanite.properties b/assets/minecraft/optifine/cit/general/blocks/polished_kyanite/polished_kyanite.properties index 280e7b20..594d5f41 100644 --- a/assets/minecraft/optifine/cit/general/blocks/polished_kyanite/polished_kyanite.properties +++ b/assets/minecraft/optifine/cit/general/blocks/polished_kyanite/polished_kyanite.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=polished_kyanite -components.custom_data.herobrine=polished_kyanite \ No newline at end of file +components.custom_data.herobrine=polished_kyanite + +# /give @s structure_void[custom_data={herobrine:polished_kyanite}] diff --git a/assets/minecraft/optifine/cit/general/blocks/polished_limestone/polished_limestone.properties b/assets/minecraft/optifine/cit/general/blocks/polished_limestone/polished_limestone.properties index daaeda07..5c21cbe2 100644 --- a/assets/minecraft/optifine/cit/general/blocks/polished_limestone/polished_limestone.properties +++ b/assets/minecraft/optifine/cit/general/blocks/polished_limestone/polished_limestone.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=polished_limestone -components.custom_data.herobrine=polished_limestone \ No newline at end of file +components.custom_data.herobrine=polished_limestone + +# /give @s structure_void[custom_data={herobrine:polished_limestone}] diff --git a/assets/minecraft/optifine/cit/general/blocks/polished_packed_ice/polished_packed_ice.properties b/assets/minecraft/optifine/cit/general/blocks/polished_packed_ice/polished_packed_ice.properties index ed4f34e1..be79f620 100644 --- a/assets/minecraft/optifine/cit/general/blocks/polished_packed_ice/polished_packed_ice.properties +++ b/assets/minecraft/optifine/cit/general/blocks/polished_packed_ice/polished_packed_ice.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=polished_packed_ice -components.custom_data.herobrine=polished_packed_ice \ No newline at end of file +components.custom_data.herobrine=polished_packed_ice + +# /give @s structure_void[custom_data={herobrine:polished_packed_ice}] diff --git a/assets/minecraft/optifine/cit/general/blocks/polished_seastone/polished_seastone.properties b/assets/minecraft/optifine/cit/general/blocks/polished_seastone/polished_seastone.properties index 97c1aa99..add4c678 100644 --- a/assets/minecraft/optifine/cit/general/blocks/polished_seastone/polished_seastone.properties +++ b/assets/minecraft/optifine/cit/general/blocks/polished_seastone/polished_seastone.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=polished_seastone -components.custom_data.herobrine=polished_seastone \ No newline at end of file +components.custom_data.herobrine=polished_seastone + +# /give @s structure_void[custom_data={herobrine:polished_seastone}] diff --git a/assets/minecraft/optifine/cit/general/blocks/polished_shale/polished_shale.properties b/assets/minecraft/optifine/cit/general/blocks/polished_shale/polished_shale.properties index 615852f6..0aaf563a 100644 --- a/assets/minecraft/optifine/cit/general/blocks/polished_shale/polished_shale.properties +++ b/assets/minecraft/optifine/cit/general/blocks/polished_shale/polished_shale.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=polished_shale -components.custom_data.herobrine=polished_shale \ No newline at end of file +components.custom_data.herobrine=polished_shale + +# /give @s structure_void[custom_data={herobrine:polished_shale}] diff --git a/assets/minecraft/optifine/cit/general/blocks/purple_cristal/purple_cristal.properties b/assets/minecraft/optifine/cit/general/blocks/purple_cristal/purple_cristal.properties index fd5f3a30..d6ce46b5 100644 --- a/assets/minecraft/optifine/cit/general/blocks/purple_cristal/purple_cristal.properties +++ b/assets/minecraft/optifine/cit/general/blocks/purple_cristal/purple_cristal.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=purple_cristal -components.custom_data.herobrine=purple_cristal \ No newline at end of file +components.custom_data.herobrine=purple_cristal + +# /give @s structure_void[custom_data={herobrine:purple_cristal}] diff --git a/assets/minecraft/optifine/cit/general/blocks/red_cristal/red_cristal.properties b/assets/minecraft/optifine/cit/general/blocks/red_cristal/red_cristal.properties index c83532d5..290303ff 100644 --- a/assets/minecraft/optifine/cit/general/blocks/red_cristal/red_cristal.properties +++ b/assets/minecraft/optifine/cit/general/blocks/red_cristal/red_cristal.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=red_cristal -components.custom_data.herobrine=red_cristal \ No newline at end of file +components.custom_data.herobrine=red_cristal + +# /give @s structure_void[custom_data={herobrine:red_cristal}] diff --git a/assets/minecraft/optifine/cit/general/blocks/seastone/seastone.properties b/assets/minecraft/optifine/cit/general/blocks/seastone/seastone.properties index 7160e63f..d306a76a 100644 --- a/assets/minecraft/optifine/cit/general/blocks/seastone/seastone.properties +++ b/assets/minecraft/optifine/cit/general/blocks/seastone/seastone.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=seastone -components.custom_data.herobrine=seastone \ No newline at end of file +components.custom_data.herobrine=seastone + +# /give @s structure_void[custom_data={herobrine:seastone}] diff --git a/assets/minecraft/optifine/cit/general/blocks/seastone_bricks/seastone_bricks.properties b/assets/minecraft/optifine/cit/general/blocks/seastone_bricks/seastone_bricks.properties index 8c71cd58..f7c78637 100644 --- a/assets/minecraft/optifine/cit/general/blocks/seastone_bricks/seastone_bricks.properties +++ b/assets/minecraft/optifine/cit/general/blocks/seastone_bricks/seastone_bricks.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=seastone_bricks -components.custom_data.herobrine=seastone_bricks \ No newline at end of file +components.custom_data.herobrine=seastone_bricks + +# /give @s structure_void[custom_data={herobrine:seastone_bricks}] diff --git a/assets/minecraft/optifine/cit/general/blocks/shale/shale.properties b/assets/minecraft/optifine/cit/general/blocks/shale/shale.properties index 2e56921a..bf809937 100644 --- a/assets/minecraft/optifine/cit/general/blocks/shale/shale.properties +++ b/assets/minecraft/optifine/cit/general/blocks/shale/shale.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=shale -components.custom_data.herobrine=shale \ No newline at end of file +components.custom_data.herobrine=shale + +# /give @s structure_void[custom_data={herobrine:shale}] diff --git a/assets/minecraft/optifine/cit/general/blocks/shale_bricks/shale_bricks.properties b/assets/minecraft/optifine/cit/general/blocks/shale_bricks/shale_bricks.properties index b6b17f38..cae59030 100644 --- a/assets/minecraft/optifine/cit/general/blocks/shale_bricks/shale_bricks.properties +++ b/assets/minecraft/optifine/cit/general/blocks/shale_bricks/shale_bricks.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=shale_bricks -components.custom_data.herobrine=shale_bricks \ No newline at end of file +components.custom_data.herobrine=shale_bricks + +# /give @s structure_void[custom_data={herobrine:shale_bricks}] diff --git a/assets/minecraft/optifine/cit/general/blocks/silver_cristal/silver_cristal.properties b/assets/minecraft/optifine/cit/general/blocks/silver_cristal/silver_cristal.properties index c69c04b1..40993721 100644 --- a/assets/minecraft/optifine/cit/general/blocks/silver_cristal/silver_cristal.properties +++ b/assets/minecraft/optifine/cit/general/blocks/silver_cristal/silver_cristal.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=silver_cristal -components.custom_data.herobrine=silver_cristal \ No newline at end of file +components.custom_data.herobrine=silver_cristal + +# /give @s structure_void[custom_data={herobrine:silver_cristal}] diff --git a/assets/minecraft/optifine/cit/general/blocks/snow_bricks/snow_bricks.properties b/assets/minecraft/optifine/cit/general/blocks/snow_bricks/snow_bricks.properties index 637a1500..d1b91a83 100644 --- a/assets/minecraft/optifine/cit/general/blocks/snow_bricks/snow_bricks.properties +++ b/assets/minecraft/optifine/cit/general/blocks/snow_bricks/snow_bricks.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=snow_bricks -components.custom_data.herobrine=snow_bricks \ No newline at end of file +components.custom_data.herobrine=snow_bricks + +# /give @s structure_void[custom_data={herobrine:snow_bricks}] diff --git a/assets/minecraft/optifine/cit/general/blocks/spruce_crate/spruce_crate.properties b/assets/minecraft/optifine/cit/general/blocks/spruce_crate/spruce_crate.properties index 13db718a..a2820bd8 100644 --- a/assets/minecraft/optifine/cit/general/blocks/spruce_crate/spruce_crate.properties +++ b/assets/minecraft/optifine/cit/general/blocks/spruce_crate/spruce_crate.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=spruce_crate -components.custom_data.herobrine=spruce_crate \ No newline at end of file +components.custom_data.herobrine=spruce_crate + +# /give @s structure_void[custom_data={herobrine:spruce_crate}] diff --git a/assets/minecraft/optifine/cit/general/blocks/warped_crate/warped_crate.properties b/assets/minecraft/optifine/cit/general/blocks/warped_crate/warped_crate.properties index e8a54595..cd088215 100644 --- a/assets/minecraft/optifine/cit/general/blocks/warped_crate/warped_crate.properties +++ b/assets/minecraft/optifine/cit/general/blocks/warped_crate/warped_crate.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=warped_crate -components.custom_data.herobrine=warped_crate \ No newline at end of file +components.custom_data.herobrine=warped_crate + +# /give @s structure_void[custom_data={herobrine:warped_crate}] diff --git a/assets/minecraft/optifine/cit/general/blocks/white_cristal/white_cristal.properties b/assets/minecraft/optifine/cit/general/blocks/white_cristal/white_cristal.properties index b3be0ffe..5f8d9e12 100644 --- a/assets/minecraft/optifine/cit/general/blocks/white_cristal/white_cristal.properties +++ b/assets/minecraft/optifine/cit/general/blocks/white_cristal/white_cristal.properties @@ -1,4 +1,6 @@ type=item -matchItems=structure_void +items=structure_void model=white_cristal -components.custom_data.herobrine=white_cristal \ No newline at end of file +components.custom_data.herobrine=white_cristal + +# /give @s structure_void[custom_data={herobrine:white_cristal}] From 9e580096ddaacc6ee457793c01e460923e53c54a Mon Sep 17 00:00:00 2001 From: Mael382 Date: Wed, 22 Jan 2025 17:51:38 +0100 Subject: [PATCH 08/27] patch animations .properties (oops) --- .../optifine/cit/animations/clapclap/clapclap.properties | 4 ++-- .../minecraft/optifine/cit/animations/kneel/kneel.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/minecraft/optifine/cit/animations/clapclap/clapclap.properties b/assets/minecraft/optifine/cit/animations/clapclap/clapclap.properties index 5a11b4b7..f771c89b 100644 --- a/assets/minecraft/optifine/cit/animations/clapclap/clapclap.properties +++ b/assets/minecraft/optifine/cit/animations/clapclap/clapclap.properties @@ -1,6 +1,6 @@ type=item items=paper texture=clapclap -components.custom_data.custom_data={animations:clapclap} +components.custom_data.animations=clapclap -# /give @s paper[custom_data={custom_data:{animations:clapclap}}] +# /give @s paper[custom_data={animations:clapclap}] diff --git a/assets/minecraft/optifine/cit/animations/kneel/kneel.properties b/assets/minecraft/optifine/cit/animations/kneel/kneel.properties index abd932b6..4052394d 100644 --- a/assets/minecraft/optifine/cit/animations/kneel/kneel.properties +++ b/assets/minecraft/optifine/cit/animations/kneel/kneel.properties @@ -1,6 +1,6 @@ type=item items=paper texture=kneel -components.custom_data.custom_data={animations:kneel} +components.custom_data.animations=kneel -# /give @s paper[custom_data={custom_data:{animations:kneel}}] +# /give @s paper[custom_data={animations:kneel}] From d5fcdb257d1c599903df4d5f1eb56fdaa8f496f2 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Thu, 23 Jan 2025 00:46:52 +0100 Subject: [PATCH 09/27] patch general/combat/arme .properties --- .../baton_combat/baton_combat.png | Bin .../baton_combat/baton_combat.properties | 7 +++++++ .../baton_combat/baton_combat_nbt.properties | 8 ++++++++ .../epieux.png => armes_hast/epieu/epieu.png} | Bin .../armes/cac/armes_hast/epieu/epieu.properties | 7 +++++++ .../cac/armes_hast/epieu/epieu_nbt.properties | 8 ++++++++ .../cac/armes_hast/epieu/epieux_nbt.properties | 10 ++++++++++ .../guisarmes/guisarme_acier/guisarme_acier.png | Bin .../guisarme_acier/guisarme_acier.properties | 7 +++++++ .../guisarme_acier/guisarme_acier_nbt.properties | 8 ++++++++ .../guisarme_diamant/guisarme_adamantine.png | Bin .../guisarme_adamantine.properties | 7 +++++++ .../guisarme_adamantine_nbt.properties | 8 ++++++++ .../guisarmes/guisarme_fer/guisarme_fer.png | Bin .../guisarme_fer/guisarme_fer.properties | 7 +++++++ .../guisarme_fer/guisarme_fer_nbt.properties | 8 ++++++++ .../hallebarde_acier/hallebarde_acier.png | Bin .../hallebarde_acier/hallebarde_acier.properties | 7 +++++++ .../hallebarde_acier_nbt.properties | 8 ++++++++ .../hallebarde_diamant/hallebarde_adamantine.png | Bin .../hallebarde_adamantine.properties | 7 +++++++ .../hallebarde_adamantine_nbt.properties | 8 ++++++++ .../hallebarde_fer/hallebarde_fer.png | Bin .../hallebarde_fer/hallebarde_fer.properties | 7 +++++++ .../hallebarde_fer/hallebarde_fer_nbt.properties | 8 ++++++++ .../hampe_arret_acier}/hampe_arret_acier.png | Bin .../hampe_arret_acier.properties | 7 +++++++ .../hampe_arret_acier_nbt.properties | 8 ++++++++ .../hampe_arret_adamantine.png | Bin .../hampe_arret_adamantine.properties | 7 +++++++ .../hampe_arret_adamantine_nbt.properties | 8 ++++++++ .../hampe_arret_fer/hampe_arret_fer.png} | Bin .../hampe_arret_fer/hampe_arret_fer.properties | 7 +++++++ .../hampe_arret_fer_nbt.properties | 8 ++++++++ .../hampe_arret_fer/hampe_arret_nbt.properties | 10 ++++++++++ .../lances/lance}/lance_acier/lance_acier.png | Bin .../lance/lance_acier/lance_acier.properties | 7 +++++++ .../lance/lance_acier/lance_acier_nbt.properties | 8 ++++++++ .../lance}/lance_diamant/lance_adamantine.png | Bin .../lance_diamant/lance_adamantine.properties | 7 +++++++ .../lance_adamantine_nbt.properties | 8 ++++++++ .../lances/lance}/lance_fer/lance_fer.png | Bin .../lances/lance/lance_fer/lance_fer.properties | 7 +++++++ .../lance/lance_fer/lance_fer_nbt.properties | 8 ++++++++ .../naginata/naginata_acier}/naginata_acier.png | Bin .../naginata_acier/naginata_acier.properties | 7 +++++++ .../naginata_acier/naginata_acier_nbt.properties | 8 ++++++++ .../naginata_diamant/naginata_adamantine.png | Bin 0 -> 202 bytes .../naginata_adamantine.properties | 7 +++++++ .../naginata_adamantine_nbt.properties | 8 ++++++++ .../naginata/naginata_fer}/naginata_fer.png | Bin .../naginata_fer/naginata_fer.properties | 7 +++++++ .../naginata_fer/naginata_fer_nbt.properties | 8 ++++++++ .../pertuisane_acier}/pertuisane_acier.png | Bin .../pertuisane_acier/pertuisane_acier.properties | 7 +++++++ .../pertuisane_acier_nbt.properties | 8 ++++++++ .../pertuisane_adamantine.png | Bin .../pertuisane_adamantine.properties | 7 +++++++ .../pertuisane_adamantine_nbt.properties | 8 ++++++++ .../pertuisane_fer}/pertuisane_fer.png | Bin .../pertuisane_fer/pertuisane_fer.properties | 7 +++++++ .../pertuisane_fer/pertuisane_fer_nbt.properties | 8 ++++++++ .../cac/baton_combat/baton_combat.properties | 5 ----- .../cac/baton_combat/baton_combat_nbt.properties | 6 ------ .../claymore_acier/claymore_acier.properties | 5 ----- .../claymore_acier/claymore_acier_nbt.properties | 6 ------ .../claymore_adamantine.properties | 5 ----- .../claymore_adamantine_nbt.properties | 6 ------ .../claymore_fer/claymore_fer.properties | 5 ----- .../claymore_fer/claymore_fer_nbt.properties | 6 ------ .../couperet_acier/couperet_acier.properties | 4 ---- .../couperet_acier/couperet_acier_nbt.properties | 5 ----- .../couperet_adamantin.properties | 4 ---- .../couperet_adamantin_nbt.properties | 5 ----- .../couperet_fer/couperet_fer.properties | 4 ---- .../couperet_fer/couperet_fer_nbt.properties | 5 ----- .../couperet}/couperet_acier/couperet_acier.png | Bin .../couperet_acier/couperet_acier.properties | 6 ++++++ .../couperet_acier/couperet_acier_nbt.properties | 7 +++++++ .../couperet_diamant}/couperet_adamantin.png | Bin .../couperet_adamantin.properties | 6 ++++++ .../couperet_adamantin_nbt.properties | 7 +++++++ .../couperet}/couperet_fer/couperet_fer.png | Bin .../couperet_fer/couperet_fer.properties | 6 ++++++ .../couperet_fer/couperet_fer_nbt.properties | 7 +++++++ .../coutelas/coutelas_acier/coutelas_acier.png | Bin .../coutelas_acier/coutelas_acier.properties | 6 ++++++ .../coutelas_acier/coutelas_acier_nbt.properties | 7 +++++++ .../coutelas_diamant/coutelas_adamantin.png | Bin .../coutelas_adamantin.properties | 6 ++++++ .../coutelas_adamantin_nbt.properties | 7 +++++++ .../coutelas/coutelas_fer/coutelas_fer.png | Bin .../coutelas_fer/coutelas_fer.properties | 6 ++++++ .../coutelas_fer/coutelas_fer_nbt.properties | 7 +++++++ .../stylets/stylet_acier/stylet_acier.png | Bin .../stylets/stylet_acier/stylet_acier.properties | 6 ++++++ .../stylet_acier/stylet_acier_nbt.properties | 7 +++++++ .../stylets/stylet_diamant/stylet_adamantin.png | Bin .../stylet_diamant/stylet_adamantin.properties | 6 ++++++ .../stylet_adamantin_nbt.properties | 7 +++++++ .../stylets/stylet_fer/stylet_fer.png | Bin .../stylets/stylet_fer/stylet_fer.properties | 6 ++++++ .../stylets/stylet_fer/stylet_fer_nbt.properties | 7 +++++++ .../coutelas_acier/coutelas_acier.properties | 4 ---- .../coutelas_acier/coutelas_acier_nbt.properties | 5 ----- .../coutelas_adamantin.properties | 4 ---- .../coutelas_adamantin_nbt.properties | 5 ----- .../coutelas_fer/coutelas_fer.properties | 4 ---- .../coutelas_fer/coutelas_fer_nbt.properties | 5 ----- .../armes/cac/dagues/dague/dague.properties | 6 ++++-- .../armes/cac/dagues/dague/dague_nbt.properties | 6 ++++-- .../dagues/dague_acier/dague_acier.properties | 6 ++++-- .../dague_acier/dague_acier_nbt.properties | 6 ++++-- .../dague_ceremonielle.properties | 6 ++++-- .../dague_ceremonielle_nbt.properties | 6 ++++-- .../dague_diamant/dague_adamantine.properties | 6 ++++-- .../dague_adamantine_nbt.properties | 6 ++++-- .../dagues/dague_noire/dague_noire.properties | 6 ++++-- .../dague_noire/dague_noire_nbt.properties | 6 ++++-- .../armes/cac/epee_1m/epee_1m_acier.properties | 4 ---- .../cac/epee_1m/epee_1m_acier_nbt.properties | 5 ----- .../epee_batarde/epee_batarde_acier.properties | 5 ----- .../epee_batarde_acier_nbt.properties | 6 ------ .../epee_batarde_adamantin.properties | 5 ----- .../epee_batarde_adamantin_nbt.properties | 6 ------ .../cac/epee_batarde/epee_batarde_fer.properties | 5 ----- .../epee_batarde/epee_batarde_fer_nbt.properties | 6 ------ .../epee_entrainement.properties | 4 ---- .../epee_entrainement_nbt.properties | 5 ----- .../claymore}/claymore_acier/claymore_acier.png | Bin .../claymore_acier/claymore_acier.properties | 7 +++++++ .../claymore_acier/claymore_acier_nbt.properties | 8 ++++++++ .../claymore_diamant/claymore_adamantine.png | Bin .../claymore_adamantine.properties | 7 +++++++ .../claymore_adamantine_nbt.properties | 8 ++++++++ .../claymore}/claymore_fer/claymore_fer.png | Bin .../claymore_fer/claymore_fer.properties | 7 +++++++ .../claymore_fer/claymore_fer_nbt.properties | 8 ++++++++ .../cac/{ => epees}/epee_1m/epee_1m_acier.png | Bin .../cac/epees/epee_1m/epee_1m_acier.properties | 6 ++++++ .../epees/epee_1m/epee_1m_acier_nbt.properties | 7 +++++++ .../epee_batarde_acier}/epee_batarde_acier.png | Bin .../epee_batarde_acier.properties | 7 +++++++ .../epee_batarde_acier_nbt.properties | 8 ++++++++ .../epee_batarde_adamantin.properties | 7 +++++++ .../epee_batarde_adamantin_nbt.properties | 8 ++++++++ .../epee_batarde_adamantine.png | Bin .../epee_batarde_fer}/epee_batarde_fer.png | Bin .../epee_batarde_fer/epee_batarde_fer.properties | 7 +++++++ .../epee_batarde_fer_nbt.properties | 8 ++++++++ .../epee_entrainement/epee_entrainement.png | Bin .../epee_entrainement.properties | 6 ++++++ .../epee_entrainement_nbt.properties | 7 +++++++ .../epee_longue_acier/epee_longue_acier.png | Bin .../epee_longue_acier.properties | 7 +++++++ .../epee_longue_acier_nbt.properties | 8 ++++++++ .../epee_longue_adamantine.png | Bin .../epee_longue_adamantine.properties | 7 +++++++ .../epee_longue_adamantine_nbt.properties | 8 ++++++++ .../epee_longue_fer/epee_longue_fer.png | Bin .../epee_longue_fer/epee_longue_fer.properties | 7 +++++++ .../epee_longue_fer_nbt.properties | 8 ++++++++ .../espadon}/espadon_acier/espadon_acier.png | Bin .../espadon_acier/espadon_acier.properties | 7 +++++++ .../espadon_acier/espadon_acier_nbt.properties | 8 ++++++++ .../espadon_diamant/espadon_adamantin.png | Bin 0 -> 384 bytes .../espadon_diamant/espadon_adamantin.properties | 7 +++++++ .../espadon_adamantin_nbt.properties | 8 ++++++++ .../espadon}/espadon_fer/espadon_fer.png | Bin .../espadon/espadon_fer/espadon_fer.properties | 7 +++++++ .../espadon_fer/espadon_fer_nbt.properties | 8 ++++++++ .../glaive}/glaive_acier/glaive_acier.png | Bin .../glaive/glaive_acier/glaive_acier.properties | 6 ++++++ .../glaive_acier/glaive_acier_nbt.properties | 7 +++++++ .../glaive}/glaive_diamant/glaive_adamantin.png | Bin .../glaive_diamant/glaive_adamantin.properties | 6 ++++++ .../glaive_adamantin_nbt.properties | 7 +++++++ .../glaive}/glaive_fer/glaive_fer.png | Bin .../glaive/glaive_fer/glaive_fer.properties | 6 ++++++ .../glaive/glaive_fer/glaive_fer_nbt.properties | 7 +++++++ .../rapiere/rapiere_acier/rapiere_acier.png | Bin .../rapiere_acier/rapiere_acier.properties | 7 +++++++ .../rapiere_acier/rapiere_acier_nbt.properties | 8 ++++++++ .../rapiere_diamant/rapiere_adamantine.png | Bin .../rapiere_adamantine.properties | 7 +++++++ .../rapiere_adamantine_nbt.properties | 8 ++++++++ .../rapiere/rapiere_fer/rapiere_fer.png | Bin .../rapiere/rapiere_fer/rapiere_fer.properties | 7 +++++++ .../rapiere_fer/rapiere_fer_nbt.properties | 8 ++++++++ .../epee_longue_acier.properties | 5 ----- .../epee_longue_acier_nbt.properties | 6 ------ .../epee_longue_adamantine.properties | 5 ----- .../epee_longue_adamantine_nbt.properties | 6 ------ .../epee_longue_fer/epee_longue_fer.properties | 5 ----- .../epee_longue_fer_nbt.properties | 6 ------ .../combat/armes/cac/epieux/epieux.properties | 5 ----- .../armes/cac/epieux/epieux_nbt.properties | 6 ------ .../espadon_acier/espadon_acier.properties | 5 ----- .../espadon_acier/espadon_acier_nbt.properties | 6 ------ .../espadon_diamant/espadon_adamantin.png | Bin 385 -> 0 bytes .../espadon_diamant/espadon_adamantin.properties | 5 ----- .../espadon_adamantin_nbt.properties | 6 ------ .../espadons/espadon_fer/espadon_fer.properties | 5 ----- .../espadon_fer/espadon_fer_nbt.properties | 6 ------ .../glaives/glaive_acier/glaive_acier.properties | 4 ---- .../glaive_acier/glaive_acier_nbt.properties | 5 ----- .../glaive_diamant/glaive_adamantin.properties | 4 ---- .../glaive_adamantin_nbt.properties | 5 ----- .../cac/glaives/glaive_fer/glaive_fer.properties | 4 ---- .../glaives/glaive_fer/glaive_fer_nbt.properties | 5 ----- .../guisarme_acier/guisarme_acier.properties | 5 ----- .../guisarme_acier/guisarme_acier_nbt.properties | 6 ------ .../guisarme_adamantine.properties | 5 ----- .../guisarme_adamantine_nbt.properties | 6 ------ .../guisarme_fer/guisarme_fer.properties | 5 ----- .../guisarme_fer/guisarme_fer_nbt.properties | 6 ------ .../grande_hache_acier/grande_hache_acier.png | Bin 0 -> 394 bytes .../grande_hache_acier.properties | 7 +++++++ .../grande_hache_acier_nbt.properties | 8 ++++++++ .../grande_hache_adamantine.png | Bin .../grande_hache_adamantine.properties | 7 +++++++ .../grande_hache_adamantine_nbt.properties | 8 ++++++++ .../grande_hache_fer/grande_hache_fer.png | Bin .../grande_hache_fer/grande_hache_fer.properties | 7 +++++++ .../grande_hache_fer_nbt.properties | 8 ++++++++ .../grande_hache_acier/grande_hache_acier.png | Bin 396 -> 0 bytes .../grande_hache_acier.properties | 5 ----- .../grande_hache_acier_nbt.properties | 6 ------ .../grande_hache_adamantine.properties | 5 ----- .../grande_hache_adamantine_nbt.properties | 6 ------ .../grande_hache_fer/grande_hache_fer.properties | 5 ----- .../grande_hache_fer_nbt.properties | 6 ------ .../hache_bataille_fer/hache_bataille_fer.png} | Bin .../hache_bataille_fer.properties | 6 ++++++ .../hache_bataille_fer_nbt.properties | 7 +++++++ .../iron_battle_axe_nbt.properties | 9 +++++++++ .../hache_combat_acier/hache_combat_acier.png | Bin .../hache_combat_acier.properties | 6 ++++++ .../hache_combat_acier_nbt.properties | 7 +++++++ .../hache_combat_adamantin.png | Bin .../hache_combat_adamantin.properties | 6 ++++++ .../hache_combat_adamantin_nbt.properties | 7 +++++++ .../hache_combat_fer/hache_combat_fer.png | Bin .../hache_combat_fer/hache_combat_fer.properties | 6 ++++++ .../hache_combat_fer_nbt.properties | 7 +++++++ .../hache_combat_acier.properties | 4 ---- .../hache_combat_acier_nbt.properties | 5 ----- .../hache_combat_adamantin.properties | 4 ---- .../hache_combat_adamantin_nbt.properties | 5 ----- .../hache_combat_fer/hache_combat_fer.properties | 4 ---- .../hache_combat_fer_nbt.properties | 5 ----- .../hache_combat_fer/iron_battle_axe.properties | 4 ---- .../iron_battle_axe_nbt.properties | 5 ----- .../hallebarde_acier/hallebarde_acier.properties | 5 ----- .../hallebarde_acier_nbt.properties | 6 ------ .../hallebarde_adamantine.properties | 5 ----- .../hallebarde_adamantine_nbt.properties | 6 ------ .../hallebarde_fer/hallebarde_fer.properties | 5 ----- .../hallebarde_fer/hallebarde_fer_nbt.properties | 6 ------ .../armes/cac/hampe_arret/hampe_arret.properties | 5 ----- .../cac/hampe_arret/hampe_arret_acier.properties | 5 ----- .../hampe_arret/hampe_arret_acier_nbt.properties | 6 ------ .../hampe_arret_adamantine.properties | 5 ----- .../hampe_arret_adamantine_nbt.properties | 6 ------ .../cac/hampe_arret/hampe_arret_nbt.properties | 6 ------ .../lances/lance_acier/lance_acier.properties | 5 ----- .../lance_acier/lance_acier_nbt.properties | 6 ------ .../lance_diamant/lance_adamantine.properties | 5 ----- .../lance_adamantine_nbt.properties | 6 ------ .../cac/lances/lance_fer/lance_fer.properties | 5 ----- .../lances/lance_fer/lance_fer_nbt.properties | 6 ------ .../lances/naginata/naginata_acier.properties | 5 ----- .../naginata/naginata_acier_nbt.properties | 6 ------ .../cac/lances/naginata/naginata_adamantine.png | Bin 203 -> 0 bytes .../naginata/naginata_adamantine.properties | 5 ----- .../naginata/naginata_adamantine_nbt.properties | 6 ------ .../cac/lances/naginata/naginata_fer.properties | 5 ----- .../lances/naginata/naginata_fer_nbt.properties | 6 ------ .../pertuisane/pertuisane_acier.properties | 5 ----- .../pertuisane/pertuisane_acier_nbt.properties | 6 ------ .../pertuisane/pertuisane_adamantine.properties | 5 ----- .../pertuisane_adamantine_nbt.properties | 6 ------ .../lances/pertuisane/pertuisane_fer.properties | 5 ----- .../pertuisane/pertuisane_fer_nbt.properties | 6 ------ .../bec_corbin_acier/bec_corbin_acier.png | Bin 0 -> 212 bytes .../bec_corbin_acier/bec_corbin_acier.properties | 7 +++++++ .../bec_corbin_acier_nbt.properties | 8 ++++++++ .../bec_corbin_acier/corbin_acier_nbt.properties | 10 ++++++++++ .../bec_corbin_diamant/bec_corbin_adamantin.png} | Bin .../bec_corbin_adamantin.properties | 7 +++++++ .../bec_corbin_adamantin_nbt.properties | 8 ++++++++ .../corbin_adamantin_nbt.properties | 10 ++++++++++ .../bec_corbin_fer/bec_corbin_fer.png} | Bin .../bec_corbin_fer/bec_corbin_fer.properties | 7 +++++++ .../bec_corbin_fer/bec_corbin_fer_nbt.properties | 8 ++++++++ .../bec_corbin_fer/corbin_fer_nbt.properties | 10 ++++++++++ .../armes/cac/marteaux/kanabo/kanabo.properties | 8 +++++--- .../cac/marteaux/kanabo/kanabo_nbt.properties | 8 +++++--- .../marteau_deux_mains_acier.png | Bin .../marteau_deux_mains_acier.properties | 7 +++++++ .../marteau_deux_mains_acier_nbt.properties | 8 ++++++++ .../marteau_deux_mains_adamantin.png | Bin .../marteau_deux_mains_adamantin.properties | 7 +++++++ .../marteau_deux_mains_adamantin_nbt.properties | 8 ++++++++ .../marteau_deux_mains_fer.png | Bin .../marteau_deux_mains_fer.properties | 7 +++++++ .../marteau_deux_mains_fer_nbt.properties | 8 ++++++++ .../marteau_deux_mains_acier/corbin_acier.png | Bin 213 -> 0 bytes .../corbin_acier.properties | 5 ----- .../corbin_acier_nbt.properties | 6 ------ .../marteau_deux_mains_acier.properties | 5 ----- .../marteau_deux_mains_acier_nbt.properties | 6 ------ .../corbin_adamantin.properties | 5 ----- .../corbin_adamantin_nbt.properties | 6 ------ .../marteau_deux_mains_adamantin.properties | 5 ----- .../marteau_deux_mains_adamantin_nbt.properties | 6 ------ .../marteau_deux_mains_fer/corbin_fer.properties | 5 ----- .../corbin_fer_nbt.properties | 6 ------ .../marteau_deux_mains_fer.properties | 5 ----- .../marteau_deux_mains_fer_nbt.properties | 6 ------ .../marteau_guerre/marteau_guerre.properties | 6 ++++-- .../marteau_guerre/marteau_guerre_nbt.properties | 6 ++++-- .../marteau_une_main_acier.png | Bin .../marteau_une_main_acier.properties | 6 ++++++ .../marteau_une_main_acier_nbt.properties | 6 ++++-- .../marteau_une_main_adamantin.png | Bin .../marteau_une_main_adamantin.properties | 6 ++++++ .../marteau_une_main_adamantin_nbt.properties | 6 ++++-- .../marteau_une_main_fer.png | Bin .../marteau_une_main_fer.properties | 6 ++++++ .../marteau_une_main_fer_nbt.properties | 6 ++++-- .../marteau_une_main_acier.properties | 4 ---- .../marteau_une_main_adamantin.properties | 4 ---- .../marteau_une_main_fer.properties | 4 ---- .../masse_ailettes/masse_ailettes_acier.png | Bin 4435 -> 0 bytes .../masse_ailettes_acier.properties | 4 ---- .../masse_ailettes_acier.png | Bin 0 -> 194 bytes .../masse_ailettes_acier.properties | 6 ++++++ .../masse_ailettes_acier_nbt.properties | 6 ++++-- .../masse_ailettes/masse_ailettes_adamantin.png | Bin 4407 -> 0 bytes .../masse_ailettes_adamantin.properties | 4 ---- .../masse_ailettes_adamantin_nbt.properties | 5 ----- .../masse_ailettes_adamantin.png | Bin 0 -> 188 bytes .../masse_ailettes_adamantin.properties | 6 ++++++ .../masse_ailettes_adamantin_nbt.properties | 7 +++++++ .../masse_ailettes/masse_ailettes_fer.png | Bin 4385 -> 0 bytes .../masse_ailettes/masse_ailettes_fer.properties | 4 ---- .../masse_ailettes_fer/masse_ailettes_fer.png | Bin 0 -> 196 bytes .../masse_ailettes_fer.properties | 6 ++++++ .../masse_ailettes_fer_nbt.properties | 7 +++++++ .../masse_ailettes_fer_nbt.properties | 5 ----- .../masse_deux_mains_acier.png | Bin .../masse_deux_mains_acier.properties | 7 +++++++ .../masse_deux_mains_acier_nbt.properties | 8 ++++++++ .../masse_deux_mains_adamantin.png | Bin .../masse_deux_mains_adamantin.properties | 7 +++++++ .../masse_deux_mains_adamantin_nbt.properties | 8 ++++++++ .../masse_deux_mains_fer.png | Bin .../masse_deux_mains_fer.properties | 7 +++++++ .../masse_deux_mains_fer_nbt.properties | 8 ++++++++ .../masse_deux_mains_acier.properties | 5 ----- .../masse_deux_mains_acier_nbt.properties | 6 ------ .../masse_deux_mains_adamantin.properties | 5 ----- .../masse_deux_mains_adamantin_nbt.properties | 6 ------ .../masse_deux_mains_fer.properties | 5 ----- .../masse_deux_mains_fer_nbt.properties | 6 ------ .../marteaux/tetsubo/tetsubo_acier.properties | 5 ----- .../{ => tetsubo_acier}/tetsubo_acier.png | Bin .../tetsubo_acier/tetsubo_acier.properties | 7 +++++++ .../tetsubo_acier/tetsubo_acier_nbt.properties | 8 ++++++++ .../tetsubo/tetsubo_acier_nbt.properties | 6 ------ .../tetsubo/tetsubo_adamantin.properties | 5 ----- .../tetsubo/tetsubo_adamantin_nbt.properties | 6 ------ .../{ => tetsubo_diamant}/tetsubo_adamantin.png | Bin .../tetsubo_diamant/tetsubo_adamantin.properties | 7 +++++++ .../tetsubo_adamantin_nbt.properties | 8 ++++++++ .../cac/marteaux/tetsubo/tetsubo_fer.properties | 5 ----- .../tetsubo/{ => tetsubo_fer}/tetsubo_fer.png | Bin .../tetsubo/tetsubo_fer/tetsubo_fer.properties | 7 +++++++ .../tetsubo_fer/tetsubo_fer_nbt.properties | 8 ++++++++ .../marteaux/tetsubo/tetsubo_fer_nbt.properties | 6 ------ .../rapiere_acier/rapiere_acier.properties | 5 ----- .../rapiere_acier/rapiere_acier_nbt.properties | 6 ------ .../rapiere_adamantine.properties | 5 ----- .../rapiere_adamantine_nbt.properties | 6 ------ .../rapiere/rapiere_fer/rapiere_fer.properties | 5 ----- .../rapiere_fer/rapiere_fer_nbt.properties | 6 ------ .../katanas/katana_acier/katana_acier.properties | 8 +++++--- .../katana_acier/katana_acier_nbt.properties | 8 +++++--- .../katana_adamantin/katana_adamantin.properties | 5 ----- .../katana_adamantin_nbt.properties | 6 ------ .../katana_adamantin.png | Bin .../katana_diamant/katana_adamantin.properties | 7 +++++++ .../katana_adamantin_nbt.properties | 8 ++++++++ .../katanas/katana_fer/katana_fer.properties | 8 +++++--- .../katanas/katana_fer/katana_fer_nbt.properties | 8 +++++--- .../messer_1m_acier/messer_acier.png | Bin .../messer_1m_acier/messer_acier.properties | 7 +++++++ .../messer_1m_acier/messer_acier_nbt.properties | 8 ++++++++ .../messer_1m_diamant}/messer_adamantin.png | Bin .../messer_adamantin.properties | 7 +++++++ .../messer_adamantin_nbt.properties | 8 ++++++++ .../{ => messer_1m}/messer_1m_fer/messer.png | Bin .../messer_1m/messer_1m_fer/messer.properties | 7 +++++++ .../messer_1m_fer/messer_nbt.properties | 8 ++++++++ .../messer_1m_acier/messer_acier.properties | 5 ----- .../messer_1m_acier/messer_acier_nbt.properties | 6 ------ .../messer_adamantin.properties | 5 ----- .../messer_adamantin_nbt.properties | 6 ------ .../messers/messer_1m_fer/messer.properties | 5 ----- .../messers/messer_1m_fer/messer_nbt.properties | 6 ------ .../messer_2m_acier/messer_2m_acier.png | Bin .../messer_2m_acier/messer_2m_acier.properties | 7 +++++++ .../messer_2m_acier_nbt.properties | 8 ++++++++ .../messer_2m_diamant}/messer_2m_adamantin.png | Bin .../messer_2m_adamantin.properties | 7 +++++++ .../messer_2m_adamantin_nbt.properties | 8 ++++++++ .../{ => messer_2m}/messer_2m_fer/messer_2m.png | Bin .../messer_2m/messer_2m_fer/messer_2m.properties | 7 +++++++ .../messer_2m_fer/messer_2m_nbt.properties | 8 ++++++++ .../messer_2m_acier/messer_2m_acier.properties | 5 ----- .../messer_2m_acier_nbt.properties | 6 ------ .../messer_2m_adamantin.properties | 5 ----- .../messer_2m_adamantin_nbt.properties | 6 ------ .../messers/messer_2m_fer/messer_2m.properties | 5 ----- .../messer_2m_fer/messer_2m_nbt.properties | 6 ------ .../nodachi_acier/nodachi_acier.properties | 8 +++++--- .../nodachi_acier/nodachi_acier_nbt.properties | 8 +++++--- .../nodachi_diamant/nodachi_adamantin.properties | 8 +++++--- .../nodachi_adamantin_nbt.properties | 8 +++++--- .../nodachis/nodachi_fer/nodachi_fer.properties | 8 +++++--- .../nodachi_fer/nodachi_fer_nbt.properties | 8 +++++--- .../{ => sabre}/sabre_acier/sabre_acier.png | Bin .../sabre/sabre_acier/sabre_acier.properties | 7 +++++++ .../sabre/sabre_acier/sabre_acier_nbt.properties | 8 ++++++++ .../sabre_diamant}/sabre_adamantin.png | Bin .../sabre_diamant/sabre_adamantin.properties | 7 +++++++ .../sabre_diamant/sabre_adamantin_nbt.properties | 8 ++++++++ .../sabres/{ => sabre}/sabre_fer/sabre_fer.png | Bin .../sabres/sabre/sabre_fer/sabre_fer.properties | 7 +++++++ .../sabre/sabre_fer/sabre_fer_nbt.properties | 8 ++++++++ .../sabres/sabre_acier/sabre_acier.properties | 5 ----- .../sabre_acier/sabre_acier_nbt.properties | 6 ------ .../sabre_adamantin/sabre_adamantin.properties | 5 ----- .../sabre_adamantin_nbt.properties | 6 ------ .../cac/sabres/sabre_fer/sabre_fer.properties | 5 ----- .../sabres/sabre_fer/sabre_fer_nbt.properties | 6 ------ .../stylets/stylet_acier/stylet_acier.properties | 4 ---- .../stylet_acier/stylet_acier_nbt.properties | 5 ----- .../stylet_diamant/stylet_adamantin.properties | 4 ---- .../stylet_adamantin_nbt.properties | 5 ----- .../cac/stylets/stylet_fer/stylet_fer.properties | 4 ---- .../stylets/stylet_fer/stylet_fer_nbt.properties | 5 ----- .../armes/distance/arc_long/arc_long.properties | 8 +++++--- .../distance/arc_long/arc_long_nbt.properties | 8 +++++--- .../armes/distance/arc_renforce/arc.properties | 7 ------- .../distance/arc_renforce/arc_nbt.properties | 11 +++++++++++ .../arc_renforce/{arc.png => arc_renforce.png} | Bin .../arc_renforce/arc_renforce.properties | 9 +++++++++ .../{arc_0.png => arc_renforce_0.png} | Bin .../{arc_1.png => arc_renforce_1.png} | Bin .../{arc_2.png => arc_renforce_2.png} | Bin .../arc_renforce/arc_renforce_nbt.properties | 9 +++++++++ .../couteau_lancer/couteau_lancer.properties | 6 ++++-- .../couteau_lancer/couteau_lancer_nbt.properties | 6 ++++-- 465 files changed, 1414 insertions(+), 941 deletions(-) rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => armes_contondantes}/baton_combat/baton_combat.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{epieux/epieux.png => armes_hast/epieu/epieu.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieux_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => armes_hast}/guisarmes/guisarme_acier/guisarme_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => armes_hast}/guisarmes/guisarme_diamant/guisarme_adamantine.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => armes_hast}/guisarmes/guisarme_fer/guisarme_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => armes_hast}/hallebardes/hallebarde_acier/hallebarde_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => armes_hast}/hallebardes/hallebarde_diamant/hallebarde_adamantine.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => armes_hast}/hallebardes/hallebarde_fer/hallebarde_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{hampe_arret => armes_hast/hampe_arret/hampe_arret_acier}/hampe_arret_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{hampe_arret => armes_hast/hampe_arret/hampe_arret_diamant}/hampe_arret_adamantine.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{hampe_arret/hampe_arret.png => armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{lances => armes_hast/lances/lance}/lance_acier/lance_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{lances => armes_hast/lances/lance}/lance_diamant/lance_adamantine.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{lances => armes_hast/lances/lance}/lance_fer/lance_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{lances/naginata => armes_hast/naginata/naginata_acier}/naginata_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine.png create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{lances/naginata => armes_hast/naginata/naginata_fer}/naginata_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_fer/naginata_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_fer/naginata_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{lances/pertuisane => armes_hast/pertuisane/pertuisane_acier}/pertuisane_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{lances/pertuisane => armes_hast/pertuisane/pertuisane_diamant}/pertuisane_adamantine.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{lances/pertuisane => armes_hast/pertuisane/pertuisane_fer}/pertuisane_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/baton_combat/baton_combat.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/baton_combat/baton_combat_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/claymores/claymore_acier/claymore_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/claymores/claymore_acier/claymore_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/claymores/claymore_diamant/claymore_adamantine.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/claymores/claymore_diamant/claymore_adamantine_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/claymores/claymore_fer/claymore_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/claymores/claymore_fer/claymore_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couperets/couperet_acier/couperet_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couperets/couperet_acier/couperet_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couperets/couperet_adamantin/couperet_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couperets/couperet_adamantin/couperet_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couperets/couperet_fer/couperet_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couperets/couperet_fer/couperet_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{couperets => couteaux/couperet}/couperet_acier/couperet_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_acier/couperet_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_acier/couperet_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{couperets/couperet_adamantin => couteaux/couperet/couperet_diamant}/couperet_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_diamant/couperet_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_diamant/couperet_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{couperets => couteaux/couperet}/couperet_fer/couperet_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_fer/couperet_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_fer/couperet_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => couteaux}/coutelas/coutelas_acier/coutelas_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_acier/coutelas_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_acier/coutelas_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => couteaux}/coutelas/coutelas_diamant/coutelas_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_diamant/coutelas_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_diamant/coutelas_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => couteaux}/coutelas/coutelas_fer/coutelas_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_fer/coutelas_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_fer/coutelas_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => couteaux}/stylets/stylet_acier/stylet_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_acier/stylet_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_acier/stylet_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => couteaux}/stylets/stylet_diamant/stylet_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_diamant/stylet_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_diamant/stylet_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => couteaux}/stylets/stylet_fer/stylet_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_fer/stylet_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_fer/stylet_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/coutelas/coutelas_acier/coutelas_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/coutelas/coutelas_acier/coutelas_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/coutelas/coutelas_diamant/coutelas_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/coutelas/coutelas_diamant/coutelas_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/coutelas/coutelas_fer/coutelas_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/coutelas/coutelas_fer/coutelas_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epee_1m/epee_1m_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epee_1m/epee_1m_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epee_batarde/epee_batarde_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epee_batarde/epee_batarde_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epee_batarde/epee_batarde_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epee_batarde/epee_batarde_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epee_batarde/epee_batarde_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epee_batarde/epee_batarde_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epee_entrainement/epee_entrainement.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epee_entrainement/epee_entrainement_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{claymores => epees/claymore}/claymore_acier/claymore_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_acier/claymore_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_acier/claymore_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{claymores => epees/claymore}/claymore_diamant/claymore_adamantine.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_diamant/claymore_adamantine.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_diamant/claymore_adamantine_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{claymores => epees/claymore}/claymore_fer/claymore_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_fer/claymore_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_fer/claymore_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => epees}/epee_1m/epee_1m_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_1m/epee_1m_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_1m/epee_1m_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{epee_batarde => epees/epee_batarde/epee_batarde_acier}/epee_batarde_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{epee_batarde => epees/epee_batarde/epee_batarde_diamant}/epee_batarde_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/{epee_batarde => epees/epee_batarde/epee_batarde_fer}/epee_batarde_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => epees}/epee_entrainement/epee_entrainement.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_entrainement/epee_entrainement.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_entrainement/epee_entrainement_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{epees_longues => epees/epee_longue}/epee_longue_acier/epee_longue_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_acier/epee_longue_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_acier/epee_longue_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{epees_longues => epees/epee_longue}/epee_longue_diamant/epee_longue_adamantine.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{epees_longues => epees/epee_longue}/epee_longue_fer/epee_longue_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_fer/epee_longue_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_fer/epee_longue_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{espadons => epees/espadon}/espadon_acier/espadon_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_acier/espadon_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_acier/espadon_acier_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_diamant/espadon_adamantin.png create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_diamant/espadon_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_diamant/espadon_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{espadons => epees/espadon}/espadon_fer/espadon_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_fer/espadon_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_fer/espadon_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{glaives => epees/glaive}/glaive_acier/glaive_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_acier/glaive_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_acier/glaive_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{glaives => epees/glaive}/glaive_diamant/glaive_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_diamant/glaive_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_diamant/glaive_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{glaives => epees/glaive}/glaive_fer/glaive_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_fer/glaive_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_fer/glaive_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => epees}/rapiere/rapiere_acier/rapiere_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_acier/rapiere_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_acier/rapiere_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => epees}/rapiere/rapiere_diamant/rapiere_adamantine.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_diamant/rapiere_adamantine.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/{ => epees}/rapiere/rapiere_fer/rapiere_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_fer/rapiere_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_fer/rapiere_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees_longues/epee_longue_acier/epee_longue_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees_longues/epee_longue_acier/epee_longue_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees_longues/epee_longue_diamant/epee_longue_adamantine.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees_longues/epee_longue_diamant/epee_longue_adamantine_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees_longues/epee_longue_fer/epee_longue_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epees_longues/epee_longue_fer/epee_longue_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epieux/epieux.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/epieux/epieux_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/espadons/espadon_acier/espadon_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/espadons/espadon_acier/espadon_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/espadons/espadon_diamant/espadon_adamantin.png delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/espadons/espadon_diamant/espadon_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/espadons/espadon_diamant/espadon_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/espadons/espadon_fer/espadon_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/espadons/espadon_fer/espadon_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/glaives/glaive_acier/glaive_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/glaives/glaive_acier/glaive_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/glaives/glaive_diamant/glaive_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/glaives/glaive_diamant/glaive_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/glaives/glaive_fer/glaive_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/glaives/glaive_fer/glaive_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_acier/guisarme_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_acier/guisarme_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_diamant/guisarme_adamantine.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_diamant/guisarme_adamantine_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_fer/guisarme_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_fer/guisarme_fer_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_acier/grande_hache_acier.png create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_acier/grande_hache_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_acier/grande_hache_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/haches/{ => grande_hache}/grande_hache_adamantine/grande_hache_adamantine.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/haches/{ => grande_hache}/grande_hache_fer/grande_hache_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_fer/grande_hache_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_fer/grande_hache_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_acier/grande_hache_acier.png delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_acier/grande_hache_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_acier/grande_hache_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_adamantine/grande_hache_adamantine.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_adamantine/grande_hache_adamantine_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_fer/grande_hache_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_fer/grande_hache_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/haches/{hache_combat_fer/iron_battle_axe.png => hache_bataille/hache_bataille_fer/hache_bataille_fer.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/haches/{ => hache_combat}/hache_combat_acier/hache_combat_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/haches/{ => hache_combat}/hache_combat_adamantin/hache_combat_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/haches/{ => hache_combat}/hache_combat_fer/hache_combat_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_acier/hache_combat_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_acier/hache_combat_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_adamantin/hache_combat_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_adamantin/hache_combat_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/hache_combat_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/hache_combat_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/iron_battle_axe.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/iron_battle_axe_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_acier/hallebarde_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_acier/hallebarde_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_diamant/hallebarde_adamantine.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_diamant/hallebarde_adamantine_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_fer/hallebarde_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_fer/hallebarde_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_adamantine.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_adamantine_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_acier/lance_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_acier/lance_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_diamant/lance_adamantine.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_diamant/lance_adamantine_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_fer/lance_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_fer/lance_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_adamantine.png delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_adamantine.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_adamantine_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_adamantine.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_adamantine_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_fer_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.png create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/corbin_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{marteau_deux_mains_adamantin/corbin_adamantin.png => bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/corbin_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{marteau_deux_mains_fer/corbin_fer.png => bec_corbin/bec_corbin_fer/bec_corbin_fer.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/corbin_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{ => marteau_deux_mains}/marteau_deux_mains_acier/marteau_deux_mains_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{marteau_deux_mains_adamantin => marteau_deux_mains/marteau_deux_mains_diamant}/marteau_deux_mains_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{ => marteau_deux_mains}/marteau_deux_mains_fer/marteau_deux_mains_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_acier/corbin_acier.png delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_acier/corbin_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_acier/corbin_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_acier/marteau_deux_mains_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_adamantin/corbin_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_adamantin/corbin_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_adamantin/marteau_deux_mains_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_adamantin/marteau_deux_mains_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_fer/corbin_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_fer/corbin_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_fer/marteau_deux_mains_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{ => marteau_une_main}/marteau_une_main_acier/marteau_une_main_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{ => marteau_une_main}/marteau_une_main_acier/marteau_une_main_acier_nbt.properties (50%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{marteau_une_main_adamantin => marteau_une_main/marteau_une_main_diamant}/marteau_une_main_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{marteau_une_main_adamantin => marteau_une_main/marteau_une_main_diamant}/marteau_une_main_adamantin_nbt.properties (50%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{ => marteau_une_main}/marteau_une_main_fer/marteau_une_main_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{ => marteau_une_main}/marteau_une_main_fer/marteau_une_main_fer_nbt.properties (50%) delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main_acier/marteau_une_main_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main_adamantin/marteau_une_main_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main_fer/marteau_une_main_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_acier.png delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.png create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/{ => masse_ailettes_acier}/masse_ailettes_acier_nbt.properties (50%) delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_adamantin.png delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_adamantin_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.png create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer.png delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.png create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{ => masse_deux_mains}/masse_deux_mains_acier/masse_deux_mains_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{masse_deux_mains_adamantin => masse_deux_mains/masse_deux_mains_diamant}/masse_deux_mains_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/{ => masse_deux_mains}/masse_deux_mains_fer/masse_deux_mains_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_acier/masse_deux_mains_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_adamantin/masse_deux_mains_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_adamantin/masse_deux_mains_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_fer/masse_deux_mains_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/{ => tetsubo_acier}/tetsubo_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/{ => tetsubo_diamant}/tetsubo_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/{ => tetsubo_fer}/tetsubo_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_acier/rapiere_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_acier/rapiere_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_diamant/rapiere_adamantine.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_fer/rapiere_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_fer/rapiere_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_adamantin/katana_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_adamantin/katana_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/{katana_adamantin => katana_diamant}/katana_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/{ => messer_1m}/messer_1m_acier/messer_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/{messer_1m_adamatin => messer_1m/messer_1m_diamant}/messer_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/{ => messer_1m}/messer_1m_fer/messer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_acier/messer_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_acier/messer_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_adamatin/messer_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_adamatin/messer_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_fer/messer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_fer/messer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/{ => messer_2m}/messer_2m_acier/messer_2m_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/{messer_2m_adamantin => messer_2m/messer_2m_diamant}/messer_2m_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/{ => messer_2m}/messer_2m_fer/messer_2m.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_acier/messer_2m_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_acier/messer_2m_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_adamantin/messer_2m_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_adamantin/messer_2m_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_fer/messer_2m.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_fer/messer_2m_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{ => sabre}/sabre_acier/sabre_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{sabre_adamantin => sabre/sabre_diamant}/sabre_adamantin.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{ => sabre}/sabre_fer/sabre_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_acier/sabre_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_acier/sabre_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_adamantin/sabre_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_adamantin/sabre_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_fer/sabre_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_fer/sabre_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_acier/stylet_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_acier/stylet_acier_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_diamant/stylet_adamantin.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_diamant/stylet_adamantin_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_fer/stylet_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_fer/stylet_fer_nbt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/{arc.png => arc_renforce.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce.properties rename assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/{arc_0.png => arc_renforce_0.png} (100%) rename assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/{arc_1.png => arc_renforce_1.png} (100%) rename assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/{arc_2.png => arc_renforce_2.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/baton_combat/baton_combat.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/baton_combat/baton_combat.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat.properties new file mode 100644 index 00000000..62b9f6dd --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat.properties @@ -0,0 +1,7 @@ +type=item +items=wooden_sword +texture=baton_combat +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=iregex:.*?b[\u00e2a]ton.*?combat.* + +# /give @s wooden_sword[custom_name='{text:"Bâton de combat", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat_nbt.properties new file mode 100644 index 00000000..114d43ab --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=wooden_sword +texture=baton_combat +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=baton_combat +weight=10 + +# /give @s wooden_sword[custom_data={arme:baton_combat}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epieux/epieux.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epieux/epieux.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu.properties new file mode 100644 index 00000000..c40610ae --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu.properties @@ -0,0 +1,7 @@ +type=item +items=wooden_sword +texture=epieux +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=iregex:.*?[\u00e9e]pieu.* + +# /give @s wooden_sword[custom_name='{text:"Épieu", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu_nbt.properties new file mode 100644 index 00000000..e8b3e79f --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=wooden_sword +texture=epieu +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=epieu +weight=10 + +# /give @s wooden_sword[custom_data={arme:epieu}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieux_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieux_nbt.properties new file mode 100644 index 00000000..837521a3 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieux_nbt.properties @@ -0,0 +1,10 @@ +# Duplicata de 'epieu_nbt.properties' pour ne pas casser les items avec l'ancien tag 'epieux' (avec un "x") + +type=item +items=wooden_sword +texture=epieu +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=epieux +weight=10 + +# /give @s wooden_sword[custom_data={arme:epieux}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_acier/guisarme_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_acier/guisarme_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier.properties new file mode 100644 index 00000000..5573db78 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=guisarme_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=ipattern:*guisarme*acier* + +# /give @s iron_axe[custom_name='{text:"Guisarme en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier_nbt.properties new file mode 100644 index 00000000..1ec76426 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=guisarme_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=guisarme_acier +weight=10 + +# /give @s iron_axe[custom_data={arme:guisarme_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_diamant/guisarme_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_diamant/guisarme_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine.properties new file mode 100644 index 00000000..78181b95 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_axe +texture=guisarme_adamantine +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=ipattern:*guisarme* + +# /give @s diamond_axe[custom_name='{text:"Guisarme adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine_nbt.properties new file mode 100644 index 00000000..aa9ec034 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_axe +texture=guisarme_adamantine +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=guisarme_adamantine +weight=10 + +# /give @s diamond_axe[custom_data={arme:guisarme_adamantine}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_fer/guisarme_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/guisarmes/guisarme_fer/guisarme_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer.properties new file mode 100644 index 00000000..d0518527 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=guisarme_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=iregex:(?!.*acier).*?guisarme.* + +# /give @s iron_axe[custom_name='{text:"Guisarme en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer_nbt.properties new file mode 100644 index 00000000..632024ca --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=guisarme_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=guisarme_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:guisarme_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_acier/hallebarde_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_acier/hallebarde_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier.properties new file mode 100644 index 00000000..a9c8f0b4 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=hallebarde_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=ipattern:*hallebarde*acier* + +# /give @s iron_axe[custom_name='{text:"Hallebarde en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier_nbt.properties new file mode 100644 index 00000000..a0168e19 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=hallebarde_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=hallebarde_acier +weight=10 + +# /give @s iron_axe[custom_data={arme:hallebarde_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_diamant/hallebarde_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_diamant/hallebarde_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine.properties new file mode 100644 index 00000000..1333501b --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_axe +texture=hallebarde_adamantine +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=ipattern:*hallebarde* + +# /give @s diamond_axe[custom_name='{text:"Hallebarde adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine_nbt.properties new file mode 100644 index 00000000..a3be6423 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_axe +texture=hallebarde_adamantine +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=hallebarde_adamantine +weight=10 + +# /give @s diamond_axe[custom_data={arme:hallebarde_adamantine}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_fer/hallebarde_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_fer/hallebarde_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer.properties new file mode 100644 index 00000000..14d1dc8d --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=hallebarde_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=iregex:(?!.*acier).*?hallebarde.* + +# /give @s iron_axe[custom_name='{text:"Hallebarde en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer_nbt.properties new file mode 100644 index 00000000..d36eb744 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=hallebarde_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=hallebarde_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:hallebarde_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.properties new file mode 100644 index 00000000..307bd59a --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=hampe_arret_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=iregex:.*?hampe.*?arr[\u00eae]t.*?acier.* + +# /give @s iron_axe[custom_name='{text:"Hampe d'arrêt en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier_nbt.properties new file mode 100644 index 00000000..63c89b67 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=hampe_arret_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=hampe_arret_acier +weight=10 + +# /give @s iron_axe[custom_data={arme:hampe_arret_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.properties new file mode 100644 index 00000000..71ff2440 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_axe +texture=hampe_arret_adamantine +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=iregex:.*?hampe.*?arr[\u00eae]t.* + +# /give @s diamond_axe[custom_name='{text:"Hampe d'arrêt adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine_nbt.properties new file mode 100644 index 00000000..f2f2ecc8 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_axe +texture=hampe_arret_adamantine +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=hampe_arret_adamantine +weight=10 + +# /give @s diamond_axe[custom_data={arme:hampe_arret_adamantine}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.properties new file mode 100644 index 00000000..04829ca7 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=hampe_arret_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=iregex:(?!.*acier).*?hampe.*?arr[\u00eae]t.* + +# /give @s iron_axe[custom_name='{text:"Hampe d'arrêt en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer_nbt.properties new file mode 100644 index 00000000..3b354c83 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=hampe_arret_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=hampe_arret_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:hampe_arret_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties new file mode 100644 index 00000000..32089045 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties @@ -0,0 +1,10 @@ +# Duplicata de 'hampe_arret_fer_nbt.properties' pour ne pas casser les items avec l'ancien tag 'hampe_arret' (sans "_fer") + +type=item +items=iron_axe +texture=hampe_arret_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=hampe_arret +weight=10 + +# /give @s iron_axe[custom_data={arme:hampe_arret}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_acier/lance_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_acier/lance_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier.properties new file mode 100644 index 00000000..e8446b9f --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=lance_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=ipattern:*lance*acier* + +# /give @s iron_axe[custom_name='{text:"Lance en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier_nbt.properties new file mode 100644 index 00000000..926afb5a --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=lance_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=lance_acier +weight=10 + +# /give @s iron_axe[custom_data={arme:lance_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_diamant/lance_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_diamant/lance_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine.properties new file mode 100644 index 00000000..3bcd0689 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_axe +texture=lance_adamantine +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=ipattern:*lance* + +# /give @s diamond_axe[custom_name='{text:"Lance adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine_nbt.properties new file mode 100644 index 00000000..80c18560 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_axe +texture=lance_adamantine +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=lance_adamantine +weight=10 + +# /give @s diamond_axe[custom_data={arme:lance_adamantine}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_fer/lance_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_fer/lance_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer.properties new file mode 100644 index 00000000..685e6280 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=lance_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=iregex:(?!.*acier).*?lance.* + +# /give @s iron_axe[custom_name='{text:"Lance en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer_nbt.properties new file mode 100644 index 00000000..b2fefc5d --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=lance_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=lance_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:lance_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier.properties new file mode 100644 index 00000000..af166d5d --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=naginata_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=ipattern:*naginata*acier* + +# /give @s iron_axe[custom_name='{text:"Naginata en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier_nbt.properties new file mode 100644 index 00000000..6c54a0dc --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=naginata_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=naginata_acier +weight=10 + +# /give @s iron_axe[custom_data={arme:naginata_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine.png new file mode 100644 index 0000000000000000000000000000000000000000..d5c79a0a57cc5927a0e8fdde950469d32cb7104c GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvl>na**Z=?jYshiy=xFFACb~?V z;AtkB;V0LbuHJj<GG_|NnHSWs?_7ojb?5G+yXy`un4rqD~p?haVg&&3$_y)!&{~Ysu&Pw|~u^fAg|= z`=?)jwtiH+y6(pEeLHHubsubb*8A6LDer~HeQodaAF;hCxNlgyjMw4h!5+h;TU)M` z9@uwBg8$OBzMus&#uVu{L`NL x7@kvm%-$q5)Xd*2c;xun{2T_QdGgZI`xq8Q3rzbL!PyG(o2RRv%Q~loCIHNxmqP!E z4A-apeQ%_2K51f)QTO?eFYIcsoZq)O_*8W~->qvub7!Aw^p>+{J$3x+`_#YBvOoQJ zHetWo-&-MeaS64tl;Q#;s9UYwu z7A(xl%64^itE;QmkmEKsHuf|VjgF4V@RO64mIkT>l0e09DWGDAE};6(bakN0l#~>p zVxS4@w_IEaG@ZXB$S)X3BLns2hqnOv7d%}YLn`97PV_80qQJxYQz)Ta?Lcw*j{m00 z9IN|W!V;rHoow#d%P!hqabQ9_L%-nni`|Bg1P((k9m-d4*$O_lkyi&1NSrq;QqruKXK>-jEv zt33NNQU3QiX5WlI*I%5gRoQSRJ@m!@&1-)8ik{g1f8uw;Y^Jk^Bv03J2efS4&+wA* zTIS64tl;Q#;s9UYwu z7A(xl%64^itE;QmkmEKsHuf|VjgF4V@RO64mIkT>l0e09DWGDYuFiCIphln;pvsh# z6rf_D2_choKLJhWFA4Gs2GYntefi-nK>j697srr_xUCm&m$fMHv?i7_z4#*X!RGR} zzww(Jt4y^QhJXF`d;6oLAIsZc==Z;<>fv}%>EYNt&zbwZ_EMi$9v3xFRd)U2J^8uz zHtY89;XCxA_EhYEvNN(1EvL4>JN##B*V~YNsSa^r2flP3GvcW{>Hq)u ze*TNmO3(hxod12gyVS*)gB-8^3PjvLpH^`9{GKQL#tRHqI{)v#$(0e5e&)DTBFo!9 zT)WtB@Ev>QUTQ6|^6hG?^o;6n&DrnSbKkRHzsG-TpZJwp`+)bX_I>BMAK06$)du<2 M)78&qol`;+0Jwjk{{R30 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_acier/grande_hache_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_acier/grande_hache_acier.properties deleted file mode 100644 index 9863f731..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_acier/grande_hache_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=grande_hache_acier -components.custom_name=iregex:(?=.*acier.*)(.*Grande.*Hache.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_acier/grande_hache_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_acier/grande_hache_acier_nbt.properties deleted file mode 100644 index 6def7df8..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_acier/grande_hache_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=grande_hache_acier -components.custom_data.arme=grande_hache_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_adamantine/grande_hache_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_adamantine/grande_hache_adamantine.properties deleted file mode 100644 index ba6bac38..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_adamantine/grande_hache_adamantine.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=grande_hache_adamantine -components.custom_name=iregex:.*Grande.*Hache.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_adamantine/grande_hache_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_adamantine/grande_hache_adamantine_nbt.properties deleted file mode 100644 index 7f7f4f5f..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_adamantine/grande_hache_adamantine_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=grande_hache_adamantine -components.custom_data.arme=grande_hache_adamantine -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_fer/grande_hache_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_fer/grande_hache_fer.properties deleted file mode 100644 index 94bef05f..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_fer/grande_hache_fer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=grande_hache_fer -components.custom_name=iregex:(?!Acier|acier)(.*Grande.*Hache) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_fer/grande_hache_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_fer/grande_hache_fer_nbt.properties deleted file mode 100644 index c8e7400d..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache_fer/grande_hache_fer_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=grande_hache_fer -components.custom_data.arme=grande_hache_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/iron_battle_axe.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/iron_battle_axe.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.properties new file mode 100644 index 00000000..14de7e58 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.properties @@ -0,0 +1,6 @@ +type=item +items=iron_axe +texture=hache_bataille_fer +components.custom_name=iregex:(?!.*acier).*?hache.*?bataille.* + +# /give @s iron_axe[custom_name='{text:"Hache de bataille en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer_nbt.properties new file mode 100644 index 00000000..446989b7 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer_nbt.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=hache_bataille_fer +components.custom_data.arme=hache_bataille_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:hache_bataille_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties new file mode 100644 index 00000000..91879eb8 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties @@ -0,0 +1,9 @@ +# Duplicata de 'hache_bataille_fer_nbt.properties' pour ne pas casser les items avec l'ancien tag 'iron_battle_axe' (en anglais) + +type=item +items=iron_axe +texture=hache_bataille_fer +components.custom_data.arme=iron_battle_axe +weight=10 + +# /give @s iron_axe[custom_data={arme:iron_battle_axe}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_acier/hache_combat_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_acier/hache_combat_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier.properties new file mode 100644 index 00000000..4f261f40 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier.properties @@ -0,0 +1,6 @@ +type=item +items=iron_axe +texture=hache_combat_acier +components.custom_name=ipattern:*hache*combat*acier* + +# /give @s iron_axe[custom_name='{text:"Hache de combat en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier_nbt.properties new file mode 100644 index 00000000..069918f1 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier_nbt.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=hache_combat_acier +components.custom_data.arme=hache_combat_acier +weight=10 + +# /give @s iron_axe[custom_data={arme:hache_combat_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_adamantin/hache_combat_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_adamantin/hache_combat_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.properties new file mode 100644 index 00000000..41458607 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.properties @@ -0,0 +1,6 @@ +type=item +items=diamond_axe +texture=hache_combat_adamantin +components.custom_name=ipattern:*hache*combat* + +# /give @s diamond_axe[custom_name='{text:"Hache de combat adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin_nbt.properties new file mode 100644 index 00000000..062041ef --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin_nbt.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_axe +texture=hache_combat_adamantin +components.custom_data.arme=hache_combat_adamantin +weight=10 + +# /give @s diamond_axe[custom_data={arme:hache_combat_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/hache_combat_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/hache_combat_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer.properties new file mode 100644 index 00000000..5de645d2 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer.properties @@ -0,0 +1,6 @@ +type=item +items=iron_axe +texture=hache_combat_fer +components.custom_name=iregex:(?!.*acier).*?hache.*?combat.* + +# /give @s iron_axe[custom_name='{text:"Hache de combat en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer_nbt.properties new file mode 100644 index 00000000..917fbfb6 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer_nbt.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=hache_combat_fer +components.custom_data.arme=hache_combat_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:hache_combat_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_acier/hache_combat_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_acier/hache_combat_acier.properties deleted file mode 100644 index 99b22b99..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_acier/hache_combat_acier.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=iron_axe -texture=hache_combat_acier -components.custom_name=iregex:(?=.*acier.*)(.*Hache.*combat.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_acier/hache_combat_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_acier/hache_combat_acier_nbt.properties deleted file mode 100644 index 6315a6ad..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_acier/hache_combat_acier_nbt.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -texture=hache_combat_acier -components.custom_data.arme=hache_combat_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_adamantin/hache_combat_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_adamantin/hache_combat_adamantin.properties deleted file mode 100644 index 7720b5f0..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_adamantin/hache_combat_adamantin.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=diamond_axe -texture=hache_combat_adamantin -components.custom_name=iregex:.*Hache.*combat.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_adamantin/hache_combat_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_adamantin/hache_combat_adamantin_nbt.properties deleted file mode 100644 index 41270364..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_adamantin/hache_combat_adamantin_nbt.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_axe -texture=hache_combat_adamantin -components.custom_data.arme=hache_combat_adamantin -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/hache_combat_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/hache_combat_fer.properties deleted file mode 100644 index 2fc60c2c..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/hache_combat_fer.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=iron_axe -texture=hache_combat_fer -components.custom_name=iregex:(?!Acier|acier)(.*Hache.*combat.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/hache_combat_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/hache_combat_fer_nbt.properties deleted file mode 100644 index eb59d860..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/hache_combat_fer_nbt.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -texture=hache_combat_fer -components.custom_data.arme=hache_combat_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/iron_battle_axe.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/iron_battle_axe.properties deleted file mode 100644 index b6971033..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/iron_battle_axe.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=iron_axe -texture=iron_battle_axe -components.custom_name=iregex:(?!Acier|acier)(.*Hache de combat.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/iron_battle_axe_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/iron_battle_axe_nbt.properties deleted file mode 100644 index 22f118ca..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat_fer/iron_battle_axe_nbt.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -texture=iron_battle_axe -components.custom_data.arme=iron_battle_axe -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_acier/hallebarde_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_acier/hallebarde_acier.properties deleted file mode 100644 index b5033faf..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_acier/hallebarde_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hallebarde_acier -components.custom_name=iregex:(?=.*acier.*)(.*Hallebarde.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_acier/hallebarde_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_acier/hallebarde_acier_nbt.properties deleted file mode 100644 index 6e5853e7..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_acier/hallebarde_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hallebarde_acier -components.custom_data.arme=hallebarde_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_diamant/hallebarde_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_diamant/hallebarde_adamantine.properties deleted file mode 100644 index 52156a9b..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_diamant/hallebarde_adamantine.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hallebarde_adamantine -components.custom_name=iregex:.*Hallebarde.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_diamant/hallebarde_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_diamant/hallebarde_adamantine_nbt.properties deleted file mode 100644 index 4d877880..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_diamant/hallebarde_adamantine_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hallebarde_adamantine -components.custom_data.arme=hallebarde_adamantine -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_fer/hallebarde_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_fer/hallebarde_fer.properties deleted file mode 100644 index 44c2fc85..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_fer/hallebarde_fer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hallebarde_fer -components.custom_name=iregex:(?!Acier|acier)(.*Hallebarde.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_fer/hallebarde_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_fer/hallebarde_fer_nbt.properties deleted file mode 100644 index 0c789748..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hallebardes/hallebarde_fer/hallebarde_fer_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hallebarde_fer -components.custom_data.arme=hallebarde_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret.properties deleted file mode 100644 index 43ad9979..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hampe_arret -components.custom_name=iregex:(?!.*Acier.*).*Hampe.*(arret|arr\u00EAt).* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_acier.properties deleted file mode 100644 index a8485b00..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hampe_arret_acier -components.custom_name=iregex:.*Hampe.*(arret|arr\u00EAt).*acier.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_acier_nbt.properties deleted file mode 100644 index 7ed3ef09..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hampe_arret_acier -components.custom_data.arme=hampe_arret_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_adamantine.properties deleted file mode 100644 index d9dae9ec..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_adamantine.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hampe_arret_adamantine -components.custom_name=iregex:.*Hampe.*(arret|arr\u00EAt).* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_adamantine_nbt.properties deleted file mode 100644 index 87c453cb..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_adamantine_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hampe_arret_adamantine -components.custom_data.arme=hampe_arret_adamantine -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_nbt.properties deleted file mode 100644 index fa318afd..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/hampe_arret/hampe_arret_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=hampe_arret -components.custom_data.arme=hampe_arret -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_acier/lance_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_acier/lance_acier.properties deleted file mode 100644 index af7cfa35..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_acier/lance_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=lance_acier -components.custom_name=iregex:(?=.*acier.*)(.*Lance.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_acier/lance_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_acier/lance_acier_nbt.properties deleted file mode 100644 index a314fbc3..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_acier/lance_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=lance_acier -components.custom_data.arme=lance_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_diamant/lance_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_diamant/lance_adamantine.properties deleted file mode 100644 index 919ede8d..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_diamant/lance_adamantine.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=lance_adamantine -components.custom_name=iregex:.*Lance.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_diamant/lance_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_diamant/lance_adamantine_nbt.properties deleted file mode 100644 index 91a236d1..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_diamant/lance_adamantine_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=lance_adamantine -components.custom_data.arme=lance_adamantine -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_fer/lance_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_fer/lance_fer.properties deleted file mode 100644 index 10708cc2..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_fer/lance_fer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=lance_fer -components.custom_name=iregex:(?!Acier|acier)(.*Lance.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_fer/lance_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_fer/lance_fer_nbt.properties deleted file mode 100644 index 7a1ac47f..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/lance_fer/lance_fer_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=lance_fer -components.custom_data.arme=lance_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_acier.properties deleted file mode 100644 index 07298346..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=naginata_acier -components.custom_name=iregex:(?=.*acier.*)(.*Naginata.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_acier_nbt.properties deleted file mode 100644 index c1b82c1d..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=naginata_acier -components.custom_data.arme=naginata_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_adamantine.png deleted file mode 100644 index feb410a61152595539d0b78589bb96d02a85095d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvl>na**Z=?jYshiy=xFFACb~?V z;AtkB;V0LbuHJj<2 zda>4qdwW?z53bYX)8JZj;l~+mS&0iG1`}2!u&rWJJ1xc*vY>HQL!%+5Z(~FQ)2gN* x6V^wJ8EQ*}f&#h{S(*2)T@b_AtRW@OaQn63ZHqO+?|~LDc)I$ztaD0e0swuIM3Vpj diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_adamantine.properties deleted file mode 100644 index 68cba196..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_adamantine.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=naginata_adamantine -components.custom_name=iregex:.*Naginata.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_adamantine_nbt.properties deleted file mode 100644 index b0f44730..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_adamantine_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=naginata_adamantine -components.custom_data.arme=naginata_adamantine -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_fer.properties deleted file mode 100644 index f90dd96e..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_fer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=naginata_fer -components.custom_name=iregex:(?!Acier|acier)(.*Naginata.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_fer_nbt.properties deleted file mode 100644 index d0394635..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/naginata/naginata_fer_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=naginata_fer -components.custom_data.arme=naginata_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_acier.properties deleted file mode 100644 index c732ba15..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=pertuisane_acier -components.custom_name=iregex:(?=.*acier.*)(.*Pertuisane.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_acier_nbt.properties deleted file mode 100644 index c040b04f..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=pertuisane_acier -components.custom_data.arme=pertuisane_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_adamantine.properties deleted file mode 100644 index 60510a9e..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_adamantine.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=pertuisane_adamantine -components.custom_name=iregex:.*Pertuisane.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_adamantine_nbt.properties deleted file mode 100644 index 64b271b7..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_adamantine_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=pertuisane_adamantine -components.custom_data.arme=pertuisane_adamantine -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_fer.properties deleted file mode 100644 index 23fd059f..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_fer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=pertuisane_fer -components.custom_name=iregex:(?!Acier|acier)(.*Pertuisane.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_fer_nbt.properties deleted file mode 100644 index 2d5227ac..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/lances/pertuisane/pertuisane_fer_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json -texture=pertuisane_fer -components.custom_data.arme=pertuisane_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.png new file mode 100644 index 0000000000000000000000000000000000000000..f61292b91b16baa0ff869062ca9b585833704f73 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5uR|W<~0RaJBU0qpOSx+<3 z@bHL^j!susw+ufy4LNRGTidLx?39$0&UEz!3l_@%W>^c<$XF8O7tG-B>_!@p6YA;W z7@~1LIbnfjf{XYBVTa%ey=n&(L^{^F%f_Buq7-6R+`Wpat6^%RR2ReNL^d@MMrmd? zwiL!^M>E3C7&tsFj&lruVDN!U<${O-+d}sJOiKkh7?P6sRrCI^Jq238;OXk;vd$@? F2>>awJlg;O literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.properties new file mode 100644 index 00000000..cc407f4d --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=bec_corbin_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=ipattern:*bec*corbin*acier* + +# /give @s iron_axe[custom_name='{text:"Bec de corbin en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier_nbt.properties new file mode 100644 index 00000000..a6532e8d --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=bec_corbin_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=bec_corbin_acier +weight=10 + +# /give @s iron_axe[custom_data={arme:bec_corbin_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/corbin_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/corbin_acier_nbt.properties new file mode 100644 index 00000000..20e013bc --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/corbin_acier_nbt.properties @@ -0,0 +1,10 @@ +# Duplicata de 'bec_corbin_acier_nbt.properties' pour ne pas casser les items avec l'ancien tag 'corbin_acier' (sans "bec_") + +type=item +items=iron_axe +texture=bec_corbin_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=corbin_acier +weight=10 + +# /give @s iron_axe[custom_data={arme:corbin_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_adamantin/corbin_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_adamantin/corbin_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.properties new file mode 100644 index 00000000..f054c5b3 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_axe +texture=bec_corbin_adamantin +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=ipattern:*bec*corbin* + +# /give @s diamond_axe[custom_name='{text:"Bec de corbin adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin_nbt.properties new file mode 100644 index 00000000..7731c5e8 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_axe +texture=bec_corbin_adamantin +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=bec_corbin_adamantin +weight=10 + +# /give @s diamond_axe[custom_data={arme:bec_corbin_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/corbin_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/corbin_adamantin_nbt.properties new file mode 100644 index 00000000..ea13a7dd --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/corbin_adamantin_nbt.properties @@ -0,0 +1,10 @@ +# Duplicata de 'bec_corbin_adamantin_nbt.properties' pour ne pas casser les items avec l'ancien tag 'corbin_adamantin' (sans "bec_") + +type=item +items=diamond_axe +texture=bec_corbin_adamantin +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=corbin_adamantin +weight=10 + +# /give @s diamond_axe[custom_data={arme:corbin_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_fer/corbin_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_fer/corbin_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.properties new file mode 100644 index 00000000..a87c7c10 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=bec_corbin_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=iregex:(?!.*acier).*?bec.*?corbin.* + +# /give @s iron_axe[custom_name='{text:"Bec de corbin en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer_nbt.properties new file mode 100644 index 00000000..eab40e97 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=bec_corbin_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=bec_corbin_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:bec_corbin_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/corbin_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/corbin_fer_nbt.properties new file mode 100644 index 00000000..185c1338 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/corbin_fer_nbt.properties @@ -0,0 +1,10 @@ +# Duplicata de 'bec_corbin_fer_nbt.properties' pour ne pas casser les items avec l'ancien tag 'corbin_fer' (sans "bec_") + +type=item +items=iron_axe +texture=bec_corbin_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=corbin_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:corbin_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo.properties index 3209a088..905484be 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo.properties @@ -1,5 +1,7 @@ type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json +items=iron_axe texture=kanabo -components.custom_name=iregex:(.*Kanabo.*) \ No newline at end of file +model=optifine/cit/general/combat/armes/grande_epee +components.custom_name=ipattern:*kanabo* + +# /give @s iron_axe[custom_name='{text:"Kanabo", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo_nbt.properties index 22b92c28..794e0bc4 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo_nbt.properties @@ -1,6 +1,8 @@ type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json +items=iron_axe texture=kanabo +model=optifine/cit/general/combat/armes/grande_epee components.custom_data.arme=kanabo -weight=10 \ No newline at end of file +weight=10 + +# /give @s iron_axe[custom_data={arme:kanabo}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_acier/marteau_deux_mains_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_acier/marteau_deux_mains_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.properties new file mode 100644 index 00000000..ba5756ce --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=marteau_deux_mains_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=ipattern:*marteau*deux*mains*acier* + +# /give @s iron_axe[custom_name='{text:"Marteau à deux mains en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties new file mode 100644 index 00000000..9de8d2ee --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=marteau_deux_mains_acier +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=marteau_deux_mains_acier +weight=10 + +# /give @s iron_axe[custom_data={arme:marteau_deux_mains_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_adamantin/marteau_deux_mains_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_adamantin/marteau_deux_mains_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.properties new file mode 100644 index 00000000..1b4c6c45 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_axe +texture=marteau_deux_mains_adamantin +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=ipattern:*marteau*deux*mains* + +# /give @s diamond_axe[custom_name='{text:"Marteau à deux mains adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin_nbt.properties new file mode 100644 index 00000000..b8cc6751 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_axe +texture=marteau_deux_mains_adamantin +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=marteau_deux_mains_adamantin +weight=10 + +# /give @s diamond_axe[custom_data={arme:marteau_deux_mains_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_fer/marteau_deux_mains_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_fer/marteau_deux_mains_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.properties new file mode 100644 index 00000000..b6bac747 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=marteau_deux_mains_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_name=iregex:(?!.*acier).*?marteau.*?deux.*?mains.* + +# /give @s iron_axe[custom_name='{text:"Marteau à deux mains en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties new file mode 100644 index 00000000..4a0f54ab --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=marteau_deux_mains_fer +model=optifine/cit/general/combat/armes/arme_hast +components.custom_data.arme=marteau_deux_mains_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:marteau_deux_mains_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_acier/corbin_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains_acier/corbin_acier.png deleted file mode 100644 index e273ce398cb009a920554864e51bf038d96b6533..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5uR|W<~0RaJBU0qpOSx+<3 z@bHL^j!susw+ufy4LNRGTidLx?39$0&UEz!3l_@%W>^c<$XF8O7tG-B>_!@p6XxmS z7*Y|Jyg)a>MSOy=L-2%NwF3$wCmPtUT%78ooYO=kCHC z1gfGSmIh@)6JyMnv}h7D-o!#R2_c49+gJoUiepR^DWp|n6fvp6nuET3d`~meVW#s1TPMTASlF?X2=2WaOnvO1piCE8K%Iit;~`q=1^|f z#dCJHh=IjY7XvdM)(%0Q&mGy%gnoi9c+el0l(MnoT%TB!c6n>xi;AfA0U5=lr`Zh<82e`t@n#K;ZkQekC*c zt~4F(d|}xu+@|D(i+1m-?#AC@!gC39cA0j5^CiCGlMhZVsLc)B)j9!6;)u*=0=x0rt{NGDlGN2_}uFIDMPnz7)obf$XYjVm7(N42nyK2>h;+sy?!hh z5W@b7dR^MdmC>g*oliHeH+&8E?sp;SVUlt$0_P63)|Xu zpE|s~w#ggnt%L^ydcW>zye|9s5E9p1Gtl$ilK$Je+uZ>v?{r#}dmu{({)e|4^J2X< zZENR*|2f=RlX0f&{QFf}?O!hH%FA182NL>)Ep_ka;88shyCO2x3BAR=gNF_Z-A~lL zd$=+DKt$GJF}XL@+pajV*_)Jb=S)rg+0KVkYfhzywd>9tu1?qLqt{qoxLZ}(9(+yS z`CMxo`Q4Yug5Ng(Bl;p+7gJ?ytlt(C71EWx(^zrg^?Iu;}IA50WaNyImK~ zg}7WnnU>h+JNmBpT3db3A3A?E?4eKjzBl{!{sbgl2@8@d&zwopoI^p`I4h&@I9wp> zAV|Byoy^Zmg0?h_$Y4K2EY!*J%-OJ>;~AJx5DHXo^sptkYM9kR-@w9WK8W z5PJ$zWbG4TP4P{d@rN_n5nw*fI|V%!yB`ctW;1Ev=wit|lR+nw)+cQo&DuzRQ-di9 zf~M4RT&Yyc3BroYHA$dF(-`C?(EdDr=$~Q&Nd? zLPcBUR!WJ=ZECw(#n@?^ieV;EWbrJ>N~&nGR}z&CP}x;#Ws(ZD$?a;ZZh{Nm`6PJo_fcmd?1#EPK`<;aY*F(e2FNJ~kX3JClb zAR1E7GnB~j7LF^@$t0&>$#Q(!3<}CdiIjm789<8S1c?$PrnKNFi6)XNJRZeKbP}Gk zvG&scg_g<(){bm?8Y_VHOZ`J5HI>V39_fvAi&%d#!LYw9NQxc_L7++)o8M2sH8MpP zP|kb?oFAhJJ2uY#Kr#?YN`q0LvTZaWB?GROCt)ZfSKC!8hF}OKjcTT{3!GhaQ#_NL z4|D`tfduty1;>tVRoqm(yMU4Q0Z1lC36OK+lF5+KU=iuW7>ibm{FfeDKVZ@k1MEh| zz|jRxLS+0X9MwxYbbiF&=sx_2D*)=5MW&_ij9fEvO-q4kfoHO7My_coFfH&*cKzSv z3ZA%3F;4IW=leajZmddQWwPJp2K5z-R??b{y-2Iq+; zvvJ<_IU$b(66+Wi-~s|nhGa`p`)l<_pF4?$S8w?v{c`;3n2nXks~0A>ilGHx<=ok~ zd}T&(=T94jt0&8;~Rg+E;g**;l0^&d8m1N z_pydYjH}@~`f<}Nn$Ih&S{s;?Zdp@Bn2&x@@$ug1rb{6o;@Rl~p6KMlkZaL@gt-CTe!Nq zd76oaheu@i$z^3_*VWZ`baZy6t8ZDinFXknu_VYZn8D%MjWi&~)6>N~O$k6QKo6xdDu_ lD;Si094;}Oir`twxLS|Kr-%gnia4(&mm zE{ByX0w`bV1Ss%wRs`{0vSoi3b)1O!?we!nHuSd@85h=r`~nrUuDF;o%q$>-I-gJ7uBocGCao@BS^>_oKBZ*)af1v z14DSbyiS{Td`V*a%iZaQ)%u%gf9)Ts9>YG>win|3OSuI{uIIV_9WNuFOBUBu7W(~L z+MCu_ANEE2D$#o({Wtp>21UR69#1|}b-V9_IYYO!x2}XN{Y#fwT8o%ZO5Sg5$er)2 z@~;ey`A3YUDx>pk_un>XG$$@-UwiFn_3ed2?zJ_CawIeRW^9_VOu4YXxc}b%eeNqs zHHVrSV)o3)n#HH|r}{d?ZEJk0gEG-OX)VY%S$e?(L~q@ZOEyf{?>| z8k8-ozlun>947X))PEHI+gr%ItPk0=nyUwrw|0E|U}pL9*o4-fg{}Df3iUu$j@&tW z?$aozGh&%}{;MYkK7V-h=)+g{clSJ!(%fq@;rfJIlr!Q#p_Eu$ERO-!>63lMv4 zPFQsaqFL;9(o7-XQ47fD>{`)KOPdJgSgmNK+(ek1I#9r+mASz3vP?5mR>-JX(c(ps z8ZQL_Y=EaxudT@Lro38F0GEPeL5z#gfC^uz73G?;QJupDP?=aJCNP7SE0Ks6MWPxP zYo&7ZF9sptOe-qjc_)SA9*;-tk%}Fze4JFP)i@!+B@zs3VD3^oPkS-Dd!7I>f}sa) z#>F{#&S6IdOxofo=CvXbTt^@KXLFiNqwscjkOjyG?xmeLDJF264IgXa<_#qfB50e%@FJmKn8o7Q2c9;jj!2ihvEOy5X+mxGhtSrtDD*fr5O_ z<_uUtvd3xiob?G=<9riV0^y8x1e%ZHj?;b|dq5d#nM{=4!4wPb8TDF`us_8*7>=a^ zL#do52!@bj3W8Q(GD2p>Xt{*Nq*4j|T3HnV*fCH>yPK!&3=p6oxR`@Dv|MdbsYrmy zWeO!Gvj7D~t7!(alB7aTDx^w=0b?MtTpX-Qx@fFd0u&3O2n8)=EhK>{NtG3oDFBPn zDiw>Vff~qF62P)bNdSsvs23eB8x7OR+30+LJMH;_1%YrXCEKVKNyNkxNp=y$OD#UQ7ZEKo`nn3Ax{F`1f_Vk(Qug2^Q^IYZK0JQyr4oEVRz)!;wi zLlaOKbHqTq5g9zX;7N#&9)&@^pszpWCzywyatjol++;%hPSQ0=*Mu0Dkn&`8P0}?X z1}3CDSzZ4(x+0%krhpy(1M8i9+22>Z{>EH&Yu2`Ft;U}>(gU74V$Pw2GnKnBkj<~DAN2aD3~zqEU} z4qeEK=UFz>L`$t%a@OhH3PDk!$5<2EetLBa<;AIO@cmc*sNTG|*56Pgg&ebxsLQ0F-w?JOBUy literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.properties new file mode 100644 index 00000000..7b3dba50 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.properties @@ -0,0 +1,6 @@ +type=item +items=diamond_axe +texture=masse_ailettes_adamantin +components.custom_name=ipattern:*masse*ailettes* + +# /give @s diamond_axe[custom_name='{text:"Masse à ailettes adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin_nbt.properties new file mode 100644 index 00000000..27b6260f --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin_nbt.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_axe +texture=masse_ailettes_adamantin +components.custom_data.arme=masse_ailettes_adamantin +weight=10 + +# /give @s diamond_axe[custom_data={arme:masse_ailettes_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer.png deleted file mode 100644 index 236df668dd868b16d6e8cc7150df23a4e834456c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4385 zcmeHLeNYtV89ylH;{*lKfTz8)+zE%C(&LPXO`B!+J=kzx-Y(oB zGAe!qV?)52jQOydDN0HzC5hFV3$aJWj}8bkqQyFiGLS~BM&id5qgDFu@*zw!(_yCh zkDJ-ucc1rpe$Vs#-sgR0-`kzHIy*-GtXw9O#h7!9R``q+ugGwCPr5fu!$;dDTY+Gu zeTc{FwsQ`E2o)ZH06%A!$^2KGc^NZ5N1_AQ=T>HBhQ@TgSGwq%h{`9c%#9zNpM7R` zs&2=>dhTVMsC{n5n+e#T=7j&D&=S*DapU#{CcP6SE6n-H?4_;b+SpwdL>C zyuUf>Ze`+4hi%X1VR>%Q@(&jd5M)MNjA$$KL~Lp+zF ztgS8$246qjw0+OV%`=;;kq04tw|W}}6bqkVDaUH=^!_<%@V4Rh)sV~&I&JDYneDvl zqu)0aBsbRt*M-HNi7l#G*>SP^Z00~riR#q@oSzHGWxQc+m)v_HtUys+fh^B)ftyvb2@icyP>0LS8jUN{I#~% z?(VE^mtRLaUv3RjLtkOhZyfu_{2s3MXFE*|_1hxn#azsL#Z-0aP<@eNQ+9#F6P(s?_J(1|LdLY!@)t<`MdY`y)!2_v>4^6|k2U7+xOWa1a$%I3h^pGN%Rwrs(gPuQH=uNqVKwg2VOysG@T#Ls>l{=%16 zsYm)M+1-nmF2r~|k*jRUmFN4veB9dlxbjH%wOLW;y#0;+`{%-{E9YQ!62UFs-=L6iDL59zm;#Yhgi?c|z>uZ5!`yS_-RO=EGIu}^?9yLf?iF+hZZ;7ShSFt|#c zMiMlt))e8W#?I$NbN zG(wG%0BBGc1yIv^hOyIn35sQ?6>hJShRex0>0*F+T*cCaNH~>|XErEQO8luL&p``z zXaM&B=VIMH{^^vBbAo(<7WpJ}gc?`lIu)VTs&(XuD+%!h;N@X0il_vxRHsSi;=)ic z9Y`%LRw@LL3 zg%hbbyid?~vz)!+e`$-`2T31U^c;?d{wpNW$ezjv8%N$oULBmYnGi(U78K2lq`=eV zfR*BeSR+$R3GFHduz!pe?3kSUo?_4eMg>ScjcQnp4%N`O79~kWkE+#rO&U(9v?{%3 zGCJ?J3qINlGKwLOkSkcA5?4s_=u)Lj*7ubFaUCFKD6WA;HcpuW8%-7yJH}YH>DYhq zkuE7rXfe=kL7vCFSYrnx<vbjhC{rhp560r}uj$@Ir4A3SD-7p=@TN(V04cUgfga1`aqSV z+wVRc`ff2-+>>;xuB(w8I+%9jiVQ#5)b(kI_4&6>6a+e}L@vyx)yC$`m#Y5*d9FYW diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer.properties deleted file mode 100644 index 29b32355..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=iron_axe -texture=masse_ailettes_fer -components.custom_name=iregex:(?!Acier|acier)(.*Masse.*ailettes.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.png new file mode 100644 index 0000000000000000000000000000000000000000..dd7fd09c41cc6cb17a8085f9d9d7d0245fb0233e GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?b1=11{5*l*cE-o&fW}-em zK7oOO8Gdq|>FU#_P20C`-;EnL{{8-)x^YH7P$^?ckY6x^!?PP{K#sSki(^PdTyg`0 zqekuyb%sL|A}d9FjJ?j@;!5+FAHzIx(oA71#xo~ucm)&gh;dz1X1#j)3YV$xT}G_{ pCeaHGTn2|&mM|~qSsEb4uxKeC_chMPjX+}=JYD@<);T3K0RW-AK34z$ literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.properties new file mode 100644 index 00000000..ba71a62b --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.properties @@ -0,0 +1,6 @@ +type=item +items=iron_axe +texture=masse_ailettes_fer +components.custom_name=iregex:(?!.*acier).*?masse.*?ailettes.* + +# /give @s iron_axe[custom_name='{text:"Masse à ailettes en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer_nbt.properties new file mode 100644 index 00000000..19f8fa3f --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer_nbt.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=masse_ailettes_fer +components.custom_data.arme=masse_ailettes_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:masse_ailettes_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer_nbt.properties deleted file mode 100644 index 60262aa4..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer_nbt.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -texture=masse_ailettes_fer -components.custom_data.arme=masse_ailettes_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_acier/masse_deux_mains_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_acier/masse_deux_mains_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.properties new file mode 100644 index 00000000..ae31663a --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=masse_deux_mains_acier +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=ipattern:*masse*deux*main*acier* + +# /give @s iron_axe[custom_name='{text:"Masse à deux mains en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties new file mode 100644 index 00000000..a6fa3a72 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=masse_deux_mains_acier +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=masse_deux_mains_acier +weight=10 + +# /give @s iron_axe[custom_data={arme:masse_deux_mains_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_adamantin/masse_deux_mains_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_adamantin/masse_deux_mains_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.properties new file mode 100644 index 00000000..300c633a --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_axe +texture=masse_deux_mains_adamantin +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=ipattern:*masse*deux*main* + +# /give @s diamond_axe[custom_name='{text:"Masse à deux mains adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin_nbt.properties new file mode 100644 index 00000000..0f99143b --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_axe +texture=masse_deux_mains_adamantin +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=masse_deux_mains_adamantin +weight=10 + +# /give @s diamond_axe[custom_data={arme:masse_deux_mains_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_fer/masse_deux_mains_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_fer/masse_deux_mains_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.properties new file mode 100644 index 00000000..b1977e64 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=masse_deux_mains_fer +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=iregex:(?!.*acier).*?masse.*?deux.*?main.* + +# /give @s iron_axe[custom_name='{text:"Masse à deux mains en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties new file mode 100644 index 00000000..c849363f --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=masse_deux_mains_fer +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=masse_deux_mains_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:masse_deux_mains_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_acier/masse_deux_mains_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_acier/masse_deux_mains_acier.properties deleted file mode 100644 index 5ba0c648..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_acier/masse_deux_mains_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=masse_deux_mains_acier -components.custom_name=iregex:(?=.*acier.*)(.*Masse.*deux.*main.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties deleted file mode 100644 index f7cfd32a..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=masse_deux_mains_acier -components.custom_data.arme=masse_deux_mains_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_adamantin/masse_deux_mains_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_adamantin/masse_deux_mains_adamantin.properties deleted file mode 100644 index f320e584..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_adamantin/masse_deux_mains_adamantin.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=masse_deux_mains_adamantin -components.custom_name=iregex:.*Masse.*deux.*main.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_adamantin/masse_deux_mains_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_adamantin/masse_deux_mains_adamantin_nbt.properties deleted file mode 100644 index 24b8f470..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_adamantin/masse_deux_mains_adamantin_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=masse_deux_mains_adamantin -components.custom_data.arme=masse_deux_mains_adamantin -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_fer/masse_deux_mains_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_fer/masse_deux_mains_fer.properties deleted file mode 100644 index eaed0fe2..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_fer/masse_deux_mains_fer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=masse_deux_mains_fer -components.custom_name=iregex:(?!Acier|acier)(.*Masse.*deux.*main.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties deleted file mode 100644 index 247688a1..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=masse_deux_mains_fer -components.custom_data.arme=masse_deux_mains_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier.properties deleted file mode 100644 index a13205b0..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json -texture=tetsubo_acier -components.custom_name=iregex:(?=.*acier.*)(.*Tetsubo.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.properties new file mode 100644 index 00000000..7eb140f0 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=tetsubo_acier +model=optifine/cit/general/combat/armes/grande_epee +components.custom_name=ipattern:*tetsubo*acier* + +# /give @s iron_axe[custom_name='{text:"Tetsubo en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier_nbt.properties new file mode 100644 index 00000000..39d7ea6c --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=tetsubo_acier +model=optifine/cit/general/combat/armes/grande_epee +components.custom_data.arme=tetsubo_acier +weight=10 + +# /give @s iron_axe[custom_data={arme:tetsubo_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier_nbt.properties deleted file mode 100644 index 9908f610..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json -texture=tetsubo_acier -components.custom_data.arme=tetsubo_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_adamantin.properties deleted file mode 100644 index 91d96df1..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_adamantin.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json -texture=tetsubo_adamantin -components.custom_name=iregex:.*Tetsubo.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_adamantin_nbt.properties deleted file mode 100644 index 3624616e..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_adamantin_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json -texture=tetsubo_adamantin -components.custom_data.arme=tetsubo_adamantin -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.properties new file mode 100644 index 00000000..307a9dc6 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_axe +texture=tetsubo_adamantin +model=optifine/cit/general/combat/armes/grande_epee +components.custom_name=ipattern:*tetsubo* + +# /give @s diamond_axe[custom_name='{text:"Tetsubo adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin_nbt.properties new file mode 100644 index 00000000..ce1ceb01 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_axe +texture=tetsubo_adamantin +model=optifine/cit/general/combat/armes/grande_epee +components.custom_data.arme=tetsubo_adamantin +weight=10 + +# /give @s diamond_axe[custom_data={arme:tetsubo_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer.properties deleted file mode 100644 index 6595611a..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json -texture=tetsubo_fer -components.custom_name=iregex:(?!Acier|acier)(.*Tetsubo.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.properties new file mode 100644 index 00000000..e41c0b1d --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.properties @@ -0,0 +1,7 @@ +type=item +items=iron_axe +texture=tetsubo_fer +model=optifine/cit/general/combat/armes/grande_epee +components.custom_name=iregex:(?!.*acier).*?tetsubo.* + +# /give @s iron_axe[custom_name='{text:"Tetsubo en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties new file mode 100644 index 00000000..c68d420a --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_axe +texture=tetsubo_fer +model=optifine/cit/general/combat/armes/grande_epee +components.custom_data.arme=tetsubo_fer +weight=10 + +# /give @s iron_axe[custom_data={arme:tetsubo_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer_nbt.properties deleted file mode 100644 index 359b8b33..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json -texture=tetsubo_fer -components.custom_data.arme=tetsubo_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_acier/rapiere_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_acier/rapiere_acier.properties deleted file mode 100644 index eff5b285..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_acier/rapiere_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=rapiere_acier -components.custom_name=iregex:(?=.*acier.*)(.*[rR]api[\u00e8e]re.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_acier/rapiere_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_acier/rapiere_acier_nbt.properties deleted file mode 100644 index e3843d5b..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_acier/rapiere_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=rapiere_acier -components.custom_data.arme=rapiere_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_diamant/rapiere_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_diamant/rapiere_adamantine.properties deleted file mode 100644 index a28cbaa9..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_diamant/rapiere_adamantine.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=rapiere_adamantine -components.custom_name=iregex:.*rapi[\u00e8e]re.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties deleted file mode 100644 index c6dea9c9..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=rapiere_adamantine -components.custom_data.arme=rapiere_adamantine -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_fer/rapiere_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_fer/rapiere_fer.properties deleted file mode 100644 index f57f20bb..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_fer/rapiere_fer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=rapiere_fer -components.custom_name=iregex:(?!Acier)(.*rapi[\u00e8e]re.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_fer/rapiere_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_fer/rapiere_fer_nbt.properties deleted file mode 100644 index 0379aa72..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/rapiere/rapiere_fer/rapiere_fer_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=rapiere_fer -components.custom_data.arme=rapiere_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier.properties index 93846aa5..446c165d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier.properties @@ -1,5 +1,7 @@ type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json +items=iron_sword texture=katana_acier -components.custom_name=iregex:(?=.*acier.*)(.*Katana.*) \ No newline at end of file +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=ipattern:*katana*acier* + +# /give @s iron_sword[custom_name='{text:"Katana en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier_nbt.properties index 734a13ed..221afca8 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier_nbt.properties @@ -1,6 +1,8 @@ type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json +items=iron_sword texture=katana_acier +model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=katana_acier -weight=10 \ No newline at end of file +weight=10 + +# /give @s iron_sword[custom_data={arme:katana_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_adamantin/katana_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_adamantin/katana_adamantin.properties deleted file mode 100644 index bdd194b8..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_adamantin/katana_adamantin.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=katana_adamantin -components.custom_name=iregex:.*Katana.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_adamantin/katana_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_adamantin/katana_adamantin_nbt.properties deleted file mode 100644 index be78be95..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_adamantin/katana_adamantin_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=katana_adamantin -components.custom_data.arme=katana_adamantin -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_adamantin/katana_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_adamantin/katana_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin.properties new file mode 100644 index 00000000..1a2ea842 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_sword +texture=katana_adamantin +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=ipattern:*katana* + +# /give @s diamond_sword[custom_name='{text:"Katana adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin_nbt.properties new file mode 100644 index 00000000..ec7dddff --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_sword +texture=katana_adamantin +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=katana_adamantin +weight=10 + +# /give @s diamond_sword[custom_data={arme:katana_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer.properties index 303ecec5..a7f2008a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer.properties @@ -1,5 +1,7 @@ type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json +items=iron_sword texture=katana_fer -components.custom_name=iregex:(?!Acier|acier)(.*Katana.*) \ No newline at end of file +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=iregex:(?!.*acier).*?katana.* + +# /give @s iron_sword[custom_name='{text:"Katana en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer_nbt.properties index 51a0578d..bb2efc71 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer_nbt.properties @@ -1,6 +1,8 @@ type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json +items=iron_sword texture=katana_fer +model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=katana_fer -weight=10 \ No newline at end of file +weight=10 + +# /give @s iron_sword[custom_data={arme:katana_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_acier/messer_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_acier/messer_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier.properties new file mode 100644 index 00000000..be4798c5 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_sword +texture=messer_acier +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=iregex:(?!.*grand).*?messer.*?acier.* + +# /give @s iron_sword[custom_name='{text:"Messer en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier_nbt.properties new file mode 100644 index 00000000..e41dfcfe --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_sword +texture=messer_acier +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=messer_acier +weight=10 + +# /give @s iron_sword[custom_data={arme:messer_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_adamatin/messer_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_adamatin/messer_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin.properties new file mode 100644 index 00000000..ba85fdb8 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_sword +texture=messer_adamantin +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=iregex:(?!.*grand).*?messer.* + +# /give @s diamond_sword[custom_name='{text:"Messer adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties new file mode 100644 index 00000000..dfd6b68f --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_sword +texture=messer_adamantin +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=messer_adamantin +weight=10 + +# /give @s diamond_sword[custom_data={arme:messer_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_fer/messer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_fer/messer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer.properties new file mode 100644 index 00000000..cdf2f75e --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer.properties @@ -0,0 +1,7 @@ +type=item +items=iron_sword +texture=messer +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=iregex:(?!.*(?:grand|acier)).*?messer.* + +# /give @s iron_sword[custom_name='{text:"Messer en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer_nbt.properties new file mode 100644 index 00000000..0a13dba7 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_sword +texture=messer +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=messer +weight=10 + +# /give @s iron_sword[custom_data={arme:messer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_acier/messer_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_acier/messer_acier.properties deleted file mode 100644 index d9a6dd65..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_acier/messer_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=messer_acier -components.custom_name=iregex:(?=.*acier.*)(?!.*Grand.*)(.*Messer.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_acier/messer_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_acier/messer_acier_nbt.properties deleted file mode 100644 index 8a6879fc..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_acier/messer_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=messer_acier -components.custom_data.arme=messer_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_adamatin/messer_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_adamatin/messer_adamantin.properties deleted file mode 100644 index 66a5ba08..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_adamatin/messer_adamantin.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_sword -texture=messer_adamantin -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -components.custom_name=iregex:(?!.*Grand.*)(.*Messer.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_adamatin/messer_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_adamatin/messer_adamantin_nbt.properties deleted file mode 100644 index a557d889..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_adamatin/messer_adamantin_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_sword -texture=messer_adamantin -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -components.custom_data.arme=messer_adamantin -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_fer/messer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_fer/messer.properties deleted file mode 100644 index 2b543850..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_fer/messer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_sword -texture=messer -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -components.custom_name=iregex:(?!Acier|acier)(?!.*Grand.*)(.*Messer.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_fer/messer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_fer/messer_nbt.properties deleted file mode 100644 index d833790f..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m_fer/messer_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_sword -texture=messer -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -components.custom_data.arme=messer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_acier/messer_2m_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_acier/messer_2m_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier.properties new file mode 100644 index 00000000..8c7c1dac --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_sword +texture=messer_2m_acier +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=ipattern:*grand*messer*acier* + +# /give @s iron_sword[custom_name='{text:"Grand messer en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties new file mode 100644 index 00000000..48f8d53d --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_sword +texture=messer_2m_acier +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=messer_2m_acier +weight=10 + +# /give @s iron_sword[custom_data={arme:messer_2m_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_adamantin/messer_2m_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_adamantin/messer_2m_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties new file mode 100644 index 00000000..95918434 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_sword +texture=messer_2m_adamantin +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=ipattern:*grand*messer* + +# /give @s diamond_sword[custom_name='{text:"Grand messer adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties new file mode 100644 index 00000000..94080464 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_sword +texture=messer_2m_adamantin +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=messer_2m_adamantin +weight=10 + +# /give @s diamond_sword[custom_data={arme:messer_2m_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_fer/messer_2m.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_fer/messer_2m.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m.properties new file mode 100644 index 00000000..1bbade15 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m.properties @@ -0,0 +1,7 @@ +type=item +items=iron_sword +texture=messer_2m +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=iregex:(?!.*acier).*?grand.*?messer.* + +# /give @s iron_sword[custom_name='{text:"Grand messer en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m_nbt.properties new file mode 100644 index 00000000..f27d182b --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_sword +texture=messer_2m +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=messer_2m +weight=10 + +# /give @s iron_sword[custom_data={arme:messer_2m}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_acier/messer_2m_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_acier/messer_2m_acier.properties deleted file mode 100644 index 0d81843b..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_acier/messer_2m_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_sword -texture=messer_2m_acier -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -components.custom_name=iregex:(?=.*acier.*)(.*Grand.*)(.*Messer.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_acier/messer_2m_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_acier/messer_2m_acier_nbt.properties deleted file mode 100644 index 45149823..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_acier/messer_2m_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_sword -texture=messer_2m_acier -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -components.custom_data.arme=messer_2m_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_adamantin/messer_2m_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_adamantin/messer_2m_adamantin.properties deleted file mode 100644 index c33c2262..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_adamantin/messer_2m_adamantin.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_sword -texture=messer_2m_adamantin -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -components.custom_name=iregex:(.*Grand.*)(.*Messer.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_adamantin/messer_2m_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_adamantin/messer_2m_adamantin_nbt.properties deleted file mode 100644 index 1988ae9e..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_adamantin/messer_2m_adamantin_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_sword -texture=messer_2m_adamantin -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -components.custom_data.arme=messer_2m_adamantin -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_fer/messer_2m.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_fer/messer_2m.properties deleted file mode 100644 index ee3eb970..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_fer/messer_2m.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_sword -texture=messer_2m -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -components.custom_name=iregex:(?!Acier|acier)(.*Grand.*)(.*Messer.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_fer/messer_2m_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_fer/messer_2m_nbt.properties deleted file mode 100644 index 94b7a8ea..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m_fer/messer_2m_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_sword -texture=messer_2m -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -components.custom_data.arme=messer_2m -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier.properties index 6b8402d8..55fa0f44 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier.properties @@ -1,5 +1,7 @@ type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json +items=iron_axe texture=nodachi_acier -components.custom_name=iregex:(?=.*acier.*)(.*Nodachi.*) \ No newline at end of file +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=ipattern:*nodachi*acier* + +# /give @s iron_axe[custom_name='{text:"Nodachi en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier_nbt.properties index 368f463e..a2c22f42 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier_nbt.properties @@ -1,6 +1,8 @@ type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json +items=iron_axe texture=nodachi_acier +model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=nodachi_acier -weight=10 \ No newline at end of file +weight=10 + +# /give @s iron_axe[custom_data={arme:nodachi_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin.properties index 707c5ab7..3298f059 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin.properties @@ -1,5 +1,7 @@ type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json +items=diamond_axe texture=nodachi_adamantin -components.custom_name=iregex:.*Nodachi.* \ No newline at end of file +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=ipattern:*nodachi* + +# /give @s diamond_axe[custom_name='{text:"Nodachi adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin_nbt.properties index 3c5d8fea..2fa6559a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin_nbt.properties @@ -1,6 +1,8 @@ type=item -matchItems=diamond_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json +items=diamond_axe texture=nodachi_adamantin +model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=nodachi_adamantin -weight=10 \ No newline at end of file +weight=10 + +# /give @s diamond_axe[custom_data={arme:nodachi_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer.properties index a223a7e3..b62898a0 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer.properties @@ -1,5 +1,7 @@ type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json +items=iron_axe texture=nodachi_fer -components.custom_name=iregex:(?!Acier|acier)(.*Nodachi.*) \ No newline at end of file +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=iregex:(?!.*acier).*?nodachi.* + +# /give @s iron_axe[custom_name='{text:"Nodachi en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer_nbt.properties index 15bfbf2d..3e36b30e 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer_nbt.properties @@ -1,6 +1,8 @@ type=item -matchItems=iron_axe -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json +items=iron_axe texture=nodachi_fer +model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=nodachi_fer -weight=10 \ No newline at end of file +weight=10 + +# /give @s iron_axe[custom_data={arme:nodachi_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_acier/sabre_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_acier/sabre_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier.properties new file mode 100644 index 00000000..20dd911d --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier.properties @@ -0,0 +1,7 @@ +type=item +items=iron_sword +texture=sabre_acier +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=ipattern:*sabre*acier* + +# /give @s iron_sword[custom_name='{text:"Sabre en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier_nbt.properties new file mode 100644 index 00000000..217a1f1b --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_sword +texture=sabre_acier +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=sabre_acier +weight=10 + +# /give @s iron_sword[custom_data={arme:sabre_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_adamantin/sabre_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_adamantin/sabre_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin.properties new file mode 100644 index 00000000..24261855 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin.properties @@ -0,0 +1,7 @@ +type=item +items=diamond_sword +texture=sabre_adamantin +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=ipattern:*sabre* + +# /give @s diamond_sword[custom_name='{text:"Sabre adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin_nbt.properties new file mode 100644 index 00000000..178c9740 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_sword +texture=sabre_adamantin +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=sabre_adamantin +weight=10 + +# /give @s diamond_sword[custom_data={arme:sabre_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_fer/sabre_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_fer/sabre_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer.properties new file mode 100644 index 00000000..72a53245 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer.properties @@ -0,0 +1,7 @@ +type=item +items=iron_sword +texture=sabre_fer +model=optifine/cit/general/combat/armes/epee_longue +components.custom_name=iregex:(?!.*acier).*?sabre.* + +# /give @s iron_sword[custom_name='{text:"Sabre en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer_nbt.properties new file mode 100644 index 00000000..0b86d8b0 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_sword +texture=sabre_fer +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=sabre_fer +weight=10 + +# /give @s iron_sword[custom_data={arme:sabre_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_acier/sabre_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_acier/sabre_acier.properties deleted file mode 100644 index b13e42cc..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_acier/sabre_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=sabre_acier -components.custom_name=iregex:(?=.*acier.*)(.*Sabre.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_acier/sabre_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_acier/sabre_acier_nbt.properties deleted file mode 100644 index ec0f0369..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_acier/sabre_acier_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=sabre_acier -components.custom_data.arme=sabre_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_adamantin/sabre_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_adamantin/sabre_adamantin.properties deleted file mode 100644 index f06ec261..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_adamantin/sabre_adamantin.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=sabre_adamantin -components.custom_name=iregex:.*Sabre.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_adamantin/sabre_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_adamantin/sabre_adamantin_nbt.properties deleted file mode 100644 index bf30c9a8..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_adamantin/sabre_adamantin_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=diamond_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=sabre_adamantin -components.custom_data.arme=sabre_adamantin -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_fer/sabre_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_fer/sabre_fer.properties deleted file mode 100644 index 4d902496..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_fer/sabre_fer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=sabre_fer -components.custom_name=iregex:(?!Acier|acier)(.*Sabre.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_fer/sabre_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_fer/sabre_fer_nbt.properties deleted file mode 100644 index 5a61265e..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre_fer/sabre_fer_nbt.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=iron_sword -model=assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json -texture=sabre_fer -components.custom_data.arme=sabre_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_acier/stylet_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_acier/stylet_acier.properties deleted file mode 100644 index 38ca2b37..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_acier/stylet_acier.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=iron_sword -texture=stylet_acier -components.custom_name=iregex:(?=.*acier.*)(.*Stylet.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_acier/stylet_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_acier/stylet_acier_nbt.properties deleted file mode 100644 index 0d179ba6..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_acier/stylet_acier_nbt.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_sword -texture=stylet_acier -components.custom_data.arme=stylet_acier -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_diamant/stylet_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_diamant/stylet_adamantin.properties deleted file mode 100644 index 504c813b..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_diamant/stylet_adamantin.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=diamond_sword -texture=stylet_adamantin -components.custom_name=iregex:.*Stylet.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_diamant/stylet_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_diamant/stylet_adamantin_nbt.properties deleted file mode 100644 index cfe1be94..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_diamant/stylet_adamantin_nbt.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=diamond_sword -texture=stylet_adamantin -components.custom_data.arme=stylet_adamantin -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_fer/stylet_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_fer/stylet_fer.properties deleted file mode 100644 index 041495b4..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_fer/stylet_fer.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=iron_sword -texture=stylet_fer -components.custom_name=iregex:(?!Acier|acier)(.*Stylet.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_fer/stylet_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_fer/stylet_fer_nbt.properties deleted file mode 100644 index 6d9d43e6..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/stylets/stylet_fer/stylet_fer_nbt.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=iron_sword -texture=stylet_fer -components.custom_data.arme=stylet_fer -weight=10 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_long/arc_long.properties b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_long/arc_long.properties index b4d35bcc..ab2efb9d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_long/arc_long.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_long/arc_long.properties @@ -1,8 +1,10 @@ type=item -items=minecraft:bow -model=arc_long +items=bow texture.bow_standby=arc_long texture.bow_pulling_0=arc_long_0 texture.bow_pulling_1=arc_long_1 texture.bow_pulling_2=arc_long_2 -components.custom_name=iregex:.*Arc.*long.* \ No newline at end of file +model=arc_long +components.custom_name=ipattern:*arc*long* + +# /give @s bow[custom_name='{text:"Arc long", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_long/arc_long_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_long/arc_long_nbt.properties index d8f60939..ffe8ffbb 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_long/arc_long_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_long/arc_long_nbt.properties @@ -1,8 +1,10 @@ type=item -items=minecraft:bow -model=arc_long +items=bow texture.bow_standby=arc_long texture.bow_pulling_0=arc_long_0 texture.bow_pulling_1=arc_long_1 texture.bow_pulling_2=arc_long_2 -components.custom_data.arme=arc_long \ No newline at end of file +model=arc_long +components.custom_data.arme=arc_long + +# /give @s bow[custom_data={arme:arc_long}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc.properties b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc.properties deleted file mode 100644 index df47d06b..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc.properties +++ /dev/null @@ -1,7 +0,0 @@ -type=item -items=minecraft:bow -texture.bow_standby=arc -texture.bow_pulling_0=arc_0 -texture.bow_pulling_1=arc_1 -texture.bow_pulling_2=arc_2 -components.custom_data.artisanat_menuisier=arc \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_nbt.properties new file mode 100644 index 00000000..cc051646 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_nbt.properties @@ -0,0 +1,11 @@ +# Duplicata de 'arc_renforce_nbt.properties' pour ne pas casser les items avec l'ancien tag 'arc' (clef : "artisanat_menuisier") + +type=item +items=bow +texture.bow_standby=arc_renforce +texture.bow_pulling_0=arc_renforce_0 +texture.bow_pulling_1=arc_renforce_1 +texture.bow_pulling_2=arc_renforce_2 +components.custom_data.artisanat_menuisier=arc + +# /give @s bow[custom_data={artisanat_menuisier:arc}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc.png b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc.png rename to assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce.properties b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce.properties new file mode 100644 index 00000000..fb93d7b4 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce.properties @@ -0,0 +1,9 @@ +type=item +items=bow +texture.bow_standby=arc_renforce +texture.bow_pulling_0=arc_renforce_0 +texture.bow_pulling_1=arc_renforce_1 +texture.bow_pulling_2=arc_renforce_2 +components.custom_name=iregex:.*?arc.*?renforc[\u00e9e].* + +# /give @s bow[custom_name='{text:"Arc renforcé", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_0.png b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce_0.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_0.png rename to assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce_0.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_1.png b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce_1.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_1.png rename to assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce_1.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_2.png b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce_2.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_2.png rename to assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce_2.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce_nbt.properties new file mode 100644 index 00000000..64f109c8 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_renforce_nbt.properties @@ -0,0 +1,9 @@ +type=item +items=bow +texture.bow_standby=arc_renforce +texture.bow_pulling_0=arc_renforce_0 +texture.bow_pulling_1=arc_renforce_1 +texture.bow_pulling_2=arc_renforce_2 +components.custom_data.arme=arc_renforce + +# /give @s bow[custom_data={arme:arc_renforce}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/couteau_lancer/couteau_lancer.properties b/assets/minecraft/optifine/cit/general/combat/armes/distance/couteau_lancer/couteau_lancer.properties index 08f370ec..47e830af 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/distance/couteau_lancer/couteau_lancer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/distance/couteau_lancer/couteau_lancer.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_sword +items=iron_sword texture=couteau_lancer -components.custom_name=iregex:.*Couteau.*lancer.* \ No newline at end of file +components.custom_name=ipattern:*couteau*lancer* + +# /give @s iron_sword[custom_name='{text:"Couteau de lancer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/couteau_lancer/couteau_lancer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/distance/couteau_lancer/couteau_lancer_nbt.properties index 2e325613..43652327 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/distance/couteau_lancer/couteau_lancer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/distance/couteau_lancer/couteau_lancer_nbt.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_sword +items=iron_sword texture=couteau_lancer -components.custom_data.arme=couteau_lancer \ No newline at end of file +components.custom_data.arme=couteau_lancer + +# /give @s iron_sword[custom_data={arme:couteau_lancer}] From e520e5fb29819109326a283ee866355e27a87198 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Thu, 23 Jan 2025 00:57:23 +0100 Subject: [PATCH 10/27] patch general/combat/arme (oops) --- .../guisarme_acier/guisarme_acier.png | Bin .../guisarme_acier/guisarme_acier.properties | 0 .../guisarme_acier/guisarme_acier_nbt.properties | 0 .../guisarme_diamant/guisarme_adamantine.png | Bin .../guisarme_diamant/guisarme_adamantine.properties | 0 .../guisarme_adamantine_nbt.properties | 0 .../guisarme_fer/guisarme_fer.png | Bin .../guisarme_fer/guisarme_fer.properties | 0 .../guisarme_fer/guisarme_fer_nbt.properties | 0 .../hallebarde_acier/hallebarde_acier.png | Bin .../hallebarde_acier/hallebarde_acier.properties | 0 .../hallebarde_acier_nbt.properties | 0 .../hallebarde_diamant/hallebarde_adamantine.png | Bin .../hallebarde_adamantine.properties | 0 .../hallebarde_adamantine_nbt.properties | 0 .../hallebarde_fer/hallebarde_fer.png | Bin .../hallebarde_fer/hallebarde_fer.properties | 0 .../hallebarde_fer/hallebarde_fer_nbt.properties | 0 .../lance/lance_acier/lance_acier.png | Bin .../lance/lance_acier/lance_acier.properties | 0 .../lance/lance_acier/lance_acier_nbt.properties | 0 .../lance/lance_diamant/lance_adamantine.png | Bin .../lance/lance_diamant/lance_adamantine.properties | 0 .../lance_diamant/lance_adamantine_nbt.properties | 0 .../{lances => lance}/lance/lance_fer/lance_fer.png | Bin .../lance/lance_fer/lance_fer.properties | 0 .../lance/lance_fer/lance_fer_nbt.properties | 0 .../katana_acier/katana_acier.png | Bin .../katana_acier/katana_acier.properties | 0 .../katana_acier/katana_acier_nbt.properties | 0 .../katana_diamant/katana_adamantin.png | Bin .../katana_diamant/katana_adamantin.properties | 0 .../katana_diamant/katana_adamantin_nbt.properties | 0 .../{katanas => katana}/katana_fer/katana_fer.png | Bin .../katana_fer/katana_fer.properties | 0 .../katana_fer/katana_fer_nbt.properties | 0 .../messer_1m/messer_1m_acier/messer_acier.png | Bin .../messer_1m_acier/messer_acier.properties | 0 .../messer_1m_acier/messer_acier_nbt.properties | 0 .../messer_1m_diamant/messer_adamantin.png | Bin .../messer_1m_diamant/messer_adamantin.properties | 0 .../messer_adamantin_nbt.properties | 0 .../messer_1m/messer_1m_fer/messer.png | Bin .../messer_1m/messer_1m_fer/messer.properties | 0 .../messer_1m/messer_1m_fer/messer_nbt.properties | 0 .../messer_2m/messer_2m_acier/messer_2m_acier.png | Bin .../messer_2m_acier/messer_2m_acier.properties | 0 .../messer_2m_acier/messer_2m_acier_nbt.properties | 0 .../messer_2m_diamant/messer_2m_adamantin.png | Bin .../messer_2m_adamantin.properties | 0 .../messer_2m_adamantin_nbt.properties | 0 .../messer_2m/messer_2m_fer/messer_2m.png | Bin .../messer_2m/messer_2m_fer/messer_2m.properties | 0 .../messer_2m_fer/messer_2m_nbt.properties | 0 .../nodachi_acier/nodachi_acier.png | Bin .../nodachi_acier/nodachi_acier.properties | 0 .../nodachi_acier/nodachi_acier_nbt.properties | 0 .../nodachi_diamant/nodachi_adamantin.png | Bin .../nodachi_diamant/nodachi_adamantin.properties | 0 .../nodachi_adamantin_nbt.properties | 0 .../nodachi_fer/nodachi_fer.png | Bin .../nodachi_fer/nodachi_fer.properties | 0 .../nodachi_fer/nodachi_fer_nbt.properties | 0 63 files changed, 0 insertions(+), 0 deletions(-) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{guisarmes => guisarme}/guisarme_acier/guisarme_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{guisarmes => guisarme}/guisarme_acier/guisarme_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{guisarmes => guisarme}/guisarme_acier/guisarme_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{guisarmes => guisarme}/guisarme_diamant/guisarme_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{guisarmes => guisarme}/guisarme_diamant/guisarme_adamantine.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{guisarmes => guisarme}/guisarme_diamant/guisarme_adamantine_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{guisarmes => guisarme}/guisarme_fer/guisarme_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{guisarmes => guisarme}/guisarme_fer/guisarme_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{guisarmes => guisarme}/guisarme_fer/guisarme_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{hallebardes => hallebarde}/hallebarde_acier/hallebarde_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{hallebardes => hallebarde}/hallebarde_acier/hallebarde_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{hallebardes => hallebarde}/hallebarde_acier/hallebarde_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{hallebardes => hallebarde}/hallebarde_diamant/hallebarde_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{hallebardes => hallebarde}/hallebarde_diamant/hallebarde_adamantine.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{hallebardes => hallebarde}/hallebarde_diamant/hallebarde_adamantine_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{hallebardes => hallebarde}/hallebarde_fer/hallebarde_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{hallebardes => hallebarde}/hallebarde_fer/hallebarde_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{hallebardes => hallebarde}/hallebarde_fer/hallebarde_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{lances => lance}/lance/lance_acier/lance_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{lances => lance}/lance/lance_acier/lance_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{lances => lance}/lance/lance_acier/lance_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{lances => lance}/lance/lance_diamant/lance_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{lances => lance}/lance/lance_diamant/lance_adamantine.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{lances => lance}/lance/lance_diamant/lance_adamantine_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{lances => lance}/lance/lance_fer/lance_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{lances => lance}/lance/lance_fer/lance_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/{lances => lance}/lance/lance_fer/lance_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{katanas => katana}/katana_acier/katana_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{katanas => katana}/katana_acier/katana_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{katanas => katana}/katana_acier/katana_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{katanas => katana}/katana_diamant/katana_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{katanas => katana}/katana_diamant/katana_adamantin.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{katanas => katana}/katana_diamant/katana_adamantin_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{katanas => katana}/katana_fer/katana_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{katanas => katana}/katana_fer/katana_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{katanas => katana}/katana_fer/katana_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_1m/messer_1m_acier/messer_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_1m/messer_1m_acier/messer_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_1m/messer_1m_acier/messer_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_1m/messer_1m_diamant/messer_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_1m/messer_1m_diamant/messer_adamantin.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_1m/messer_1m_fer/messer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_1m/messer_1m_fer/messer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_1m/messer_1m_fer/messer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_2m/messer_2m_acier/messer_2m_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_2m/messer_2m_acier/messer_2m_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_2m/messer_2m_diamant/messer_2m_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_2m/messer_2m_fer/messer_2m.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_2m/messer_2m_fer/messer_2m.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{messers => messer}/messer_2m/messer_2m_fer/messer_2m_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{nodachis => nodachi}/nodachi_acier/nodachi_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{nodachis => nodachi}/nodachi_acier/nodachi_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{nodachis => nodachi}/nodachi_acier/nodachi_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{nodachis => nodachi}/nodachi_diamant/nodachi_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{nodachis => nodachi}/nodachi_diamant/nodachi_adamantin.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{nodachis => nodachi}/nodachi_diamant/nodachi_adamantin_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{nodachis => nodachi}/nodachi_fer/nodachi_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{nodachis => nodachi}/nodachi_fer/nodachi_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/{nodachis => nodachi}/nodachi_fer/nodachi_fer_nbt.properties (100%) diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_acier/guisarme_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_diamant/guisarme_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarmes/guisarme_fer/guisarme_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_acier/hallebarde_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_diamant/hallebarde_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebardes/hallebarde_fer/hallebarde_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_acier/lance_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_diamant/lance_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lances/lance/lance_fer/lance_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_acier/katana_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_diamant/katana_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katanas/katana_fer/katana_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_acier/messer_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_1m/messer_1m_fer/messer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messers/messer_2m/messer_2m_fer/messer_2m_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_acier/nodachi_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_diamant/nodachi_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachis/nodachi_fer/nodachi_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer_nbt.properties From f9c62cfa5568ac756af815c4938343eda62a1b41 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Thu, 23 Jan 2025 17:29:45 +0100 Subject: [PATCH 11/27] patch general/combat/armures .properties --- .../armures/acier/{acier1.png => acier_1.png} | Bin .../armures/acier/{acier2.png => acier_2.png} | Bin .../combat/armures/acier/acier_bottes.properties | 10 ++++++---- .../combat/armures/acier/acier_haume.properties | 10 ++++++---- .../combat/armures/acier/acier_jambes.properties | 10 ++++++---- .../armures/acier/acier_plaston.properties | 10 ++++++---- .../armure_acier_legere_bottes_icon.properties | 6 ++++-- .../armure_acier_legere_casque_icon.properties | 6 ++++-- ...armure_acier_legere_jambieres_icon.properties | 6 ++++-- .../armure_acier_legere_plastron_icon.properties | 6 ++++-- .../models/armure_acier_legere_bottes.properties | 6 ++++-- .../models/armure_acier_legere_casque.properties | 6 ++++-- .../armure_acier_legere_jambieres.properties | 6 ++++-- .../armure_acier_legere_plastron.properties | 6 ++++-- .../{adamantin1.png => adamantin_1.png} | Bin .../{adamantin2.png => adamantin_2.png} | Bin .../adamantin/adamantin_bottes.properties | 10 ++++++---- .../armures/adamantin/adamantin_haume.properties | 10 ++++++---- .../adamantin/adamantin_jambes.properties | 10 ++++++---- .../adamantin/adamantin_plaston.properties | 10 ++++++---- .../armure_de_fer_legere_bottes_icon.properties | 6 ++++-- .../armure_de_fer_legere_casque_icon.properties | 6 ++++-- ...rmure_de_fer_legere_jambieres_icon.properties | 6 ++++-- ...armure_de_fer_legere_plastron_icon.properties | 6 ++++-- .../armure_de_fer_legere_bottes.properties | 6 ++++-- .../armure_de_fer_legere_casque.properties | 6 ++++-- .../armure_de_fer_legere_jambieres.properties | 6 ++++-- .../armure_de_fer_legere_plastron.properties | 6 ++++-- .../harnois/icons/harnois_bottes_icon.properties | 6 ++++-- .../harnois/icons/harnois_casque_icon.properties | 6 ++++-- .../icons/harnois_jambieres_icon.properties | 6 ++++-- .../icons/harnois_plastron_icon.properties | 6 ++++-- .../harnois/models/harnois_bottes.properties | 6 ++++-- .../harnois/models/harnois_casque.properties | 6 ++++-- .../harnois/models/harnois_jambieres.properties | 6 ++++-- .../harnois/models/harnois_plastron.properties | 6 ++++-- .../armure_de_fer_lourde_bottes_icon.properties | 6 ++++-- .../armure_de_fer_lourde_casque_icon.properties | 6 ++++-- ...rmure_de_fer_lourde_jambieres_icon.properties | 6 ++++-- ...armure_de_fer_lourde_plastron_icon.properties | 6 ++++-- .../armure_de_fer_lourde_bottes.properties | 6 ++++-- .../armure_de_fer_lourde_casque.properties | 6 ++++-- .../armure_de_fer_lourde_jambieres.properties | 6 ++++-- .../armure_de_fer_lourde_plastron.properties | 6 ++++-- .../general/combat/armures/obsifer/obsifer1.png | Bin 1842 -> 0 bytes .../general/combat/armures/obsifer/obsifer2.png | Bin 349 -> 0 bytes .../general/combat/armures/obsifer/obsifer_1.png | Bin 0 -> 1584 bytes .../general/combat/armures/obsifer/obsifer_2.png | Bin 0 -> 249 bytes .../armures/obsifer/obsifer_bottes.properties | 10 ++++++---- .../armures/obsifer/obsifer_haume.properties | 10 ++++++---- .../armures/obsifer/obsifer_jambes.properties | 10 ++++++---- .../armures/obsifer/obsifer_plaston.properties | 10 ++++++---- 52 files changed, 200 insertions(+), 112 deletions(-) rename assets/minecraft/optifine/cit/general/combat/armures/acier/{acier1.png => acier_1.png} (100%) rename assets/minecraft/optifine/cit/general/combat/armures/acier/{acier2.png => acier_2.png} (100%) rename assets/minecraft/optifine/cit/general/combat/armures/adamantin/{adamantin1.png => adamantin_1.png} (100%) rename assets/minecraft/optifine/cit/general/combat/armures/adamantin/{adamantin2.png => adamantin_2.png} (100%) delete mode 100644 assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer1.png delete mode 100644 assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer2.png create mode 100644 assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_1.png create mode 100644 assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_2.png diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier/acier1.png b/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_1.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armures/acier/acier1.png rename to assets/minecraft/optifine/cit/general/combat/armures/acier/acier_1.png diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier/acier2.png b/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_2.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armures/acier/acier2.png rename to assets/minecraft/optifine/cit/general/combat/armures/acier/acier_2.png diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_bottes.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_bottes.properties index 07323e4c..055eac66 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_bottes.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_bottes.properties @@ -1,5 +1,7 @@ type=armor -matchItems=iron_boots -texture.iron_layer_1=acier1 -texture.iron_layer_2=acier2 -components.custom_data.armure=acier \ No newline at end of file +items=iron_boots +texture.iron_layer_1=acier_1 +texture.iron_layer_2=acier_2 +components.custom_data.armure=acier + +# /give @s iron_boots[custom_data={armure:acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_haume.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_haume.properties index 8757a36c..e3f655d0 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_haume.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_haume.properties @@ -1,5 +1,7 @@ type=armor -matchItems=iron_helmet -texture.iron_layer_1=acier1 -texture.iron_layer_2=acier2 -components.custom_data.armure=acier \ No newline at end of file +items=iron_helmet +texture.iron_layer_1=acier_1 +texture.iron_layer_2=acier_2 +components.custom_data.armure=acier + +# /give @s iron_helmet[custom_data={armure:acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_jambes.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_jambes.properties index dd8195b8..c1485e5a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_jambes.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_jambes.properties @@ -1,5 +1,7 @@ type=armor -matchItems=iron_leggings -texture.iron_layer_1=acier1 -texture.iron_layer_2=acier2 -components.custom_data.armure=acier \ No newline at end of file +items=iron_leggings +texture.iron_layer_1=acier_1 +texture.iron_layer_2=acier_2 +components.custom_data.armure=acier + +# /give @s iron_leggings[custom_data={armure:acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_plaston.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_plaston.properties index 3ef66c56..ff9603ad 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_plaston.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier/acier_plaston.properties @@ -1,5 +1,7 @@ type=armor -matchItems=iron_chestplate -texture.iron_layer_1=acier1 -texture.iron_layer_2=acier2 -components.custom_data.armure=acier \ No newline at end of file +items=iron_chestplate +texture.iron_layer_1=acier_1 +texture.iron_layer_2=acier_2 +components.custom_data.armure=acier + +# /give @s iron_chestplate[custom_data={armure:acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_bottes_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_bottes_icon.properties index 64cd2523..aa45b134 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_bottes_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_bottes_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_boots +items=iron_boots texture=armure_acier_legere_bottes_icon -components.custom_data.armure=acier_legere \ No newline at end of file +components.custom_data.armure=acier_legere + +# /give @s iron_boots[custom_data={armure:acier_legere}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_casque_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_casque_icon.properties index cdb8846a..0a3a8e7e 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_casque_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_casque_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_helmet +items=iron_helmet texture=armure_acier_legere_casque_icon -components.custom_data.armure=acier_legere \ No newline at end of file +components.custom_data.armure=acier_legere + +# /give @s iron_helmet[custom_data={armure:acier_legere}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_jambieres_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_jambieres_icon.properties index aa0f0b3f..f8e10694 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_jambieres_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_jambieres_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_leggings +items=iron_leggings texture=armure_acier_legere_jambieres_icon -components.custom_data.armure=acier_legere \ No newline at end of file +components.custom_data.armure=acier_legere + +# /give @s iron_leggings[custom_data={armure:acier_legere}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_plastron_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_plastron_icon.properties index d9aba7e9..cc607eca 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_plastron_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/icons/armure_acier_legere_plastron_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_chestplate +items=iron_chestplate texture=armure_acier_legere_plastron_icon -components.custom_data.armure=acier_legere \ No newline at end of file +components.custom_data.armure=acier_legere + +# /give @s iron_chestplate[custom_data={armure:acier_legere}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_bottes.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_bottes.properties index 38889290..27700f7d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_bottes.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_bottes.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_boots +items=iron_boots texture.iron_layer_1=armure_acier_legere_1 -components.custom_data.armure=acier_legere \ No newline at end of file +components.custom_data.armure=acier_legere + +# /give @s iron_boots[custom_data={armure:acier_legere}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_casque.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_casque.properties index 0890a8c0..6a6bf44a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_casque.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_casque.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_helmet +items=iron_helmet texture.iron_layer_1=armure_acier_legere_1 -components.custom_data.armure=acier_legere \ No newline at end of file +components.custom_data.armure=acier_legere + +# /give @s iron_helmet[custom_data={armure:acier_legere}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_jambieres.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_jambieres.properties index f34dd582..8a38b2bd 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_jambieres.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_jambieres.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_leggings +items=iron_leggings texture.iron_layer_2=armure_acier_legere_2 -components.custom_data.armure=acier_legere \ No newline at end of file +components.custom_data.armure=acier_legere + +# /give @s iron_leggings[custom_data={armure:acier_legere}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_plastron.properties b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_plastron.properties index e86c61db..66ae68d2 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_plastron.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/acier_legere/models/armure_acier_legere_plastron.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_chestplate +items=iron_chestplate texture.iron_layer_1=armure_acier_legere_1 -components.custom_data.armure=acier_legere \ No newline at end of file +components.custom_data.armure=acier_legere + +# /give @s iron_chestplate[custom_data={armure:acier_legere}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin1.png b/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_1.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin1.png rename to assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_1.png diff --git a/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin2.png b/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_2.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin2.png rename to assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_2.png diff --git a/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_bottes.properties b/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_bottes.properties index 09e67d8a..7f88fd8d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_bottes.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_bottes.properties @@ -1,5 +1,7 @@ type=armor -matchItems=diamond_boots -texture.diamond_layer_1=adamantin1 -texture.diamond_layer_2=adamantin2 -components.custom_data.armure=adamantin \ No newline at end of file +items=diamond_boots +texture.diamond_layer_1=adamantin_1 +texture.diamond_layer_2=adamantin_2 +components.custom_data.armure=adamantin + +# /give @s diamond_boots[custom_data={armure:adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_haume.properties b/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_haume.properties index 662e4f93..03ca8f0c 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_haume.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_haume.properties @@ -1,5 +1,7 @@ type=armor -matchItems=diamond_helmet -texture.diamond_layer_1=adamantin1 -texture.diamond_layer_2=adamantin2 -components.custom_data.armure=adamantin \ No newline at end of file +items=diamond_helmet +texture.diamond_layer_1=adamantin_1 +texture.diamond_layer_2=adamantin_2 +components.custom_data.armure=adamantin + +# /give @s diamond_helmet[custom_data={armure:adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_jambes.properties b/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_jambes.properties index 2d267d48..fb723901 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_jambes.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_jambes.properties @@ -1,5 +1,7 @@ type=armor -matchItems=diamond_leggings -texture.diamond_layer_1=adamantin1 -texture.diamond_layer_2=adamantin2 -components.custom_data.armure=adamantin \ No newline at end of file +items=diamond_leggings +texture.diamond_layer_1=adamantin_1 +texture.diamond_layer_2=adamantin_2 +components.custom_data.armure=adamantin + +# /give @s diamond_leggings[custom_data={armure:adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_plaston.properties b/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_plaston.properties index 9d5f7b20..f3e578de 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_plaston.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/adamantin/adamantin_plaston.properties @@ -1,5 +1,7 @@ type=armor -matchItems=diamond_chestplate -texture.diamond_layer_1=adamantin1 -texture.diamond_layer_2=adamantin2 -components.custom_data.armure=adamantin \ No newline at end of file +items=diamond_chestplate +texture.diamond_layer_1=adamantin_1 +texture.diamond_layer_2=adamantin_2 +components.custom_data.armure=adamantin + +# /give @s diamond_chestplate[custom_data={armure:adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_bottes_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_bottes_icon.properties index e66f9eeb..a665fae3 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_bottes_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_bottes_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_boots +items=iron_boots texture=armure_de_fer_legere_bottes_icon -components.custom_name=iregex:.*Armure de fer l\u00E9g\u00E8re \ No newline at end of file +components.custom_name=iregex:.*?(?:bottes.*?fer.*?l[\u00e9e]g[\u00e8e]res|armure.*?fer.*?l[\u00e9e]g[\u00e8e]re).* + +# /give @s iron_boots[custom_name='{text:"Bottes en fer légères", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_casque_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_casque_icon.properties index 18c24253..f31e0c03 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_casque_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_casque_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_helmet +items=iron_helmet texture=armure_de_fer_legere_casque_icon -components.custom_name=iregex:.*Armure de fer l\u00E9g\u00E8re \ No newline at end of file +components.custom_name=iregex:.*?(?:casque.*?fer.*?l[\u00e9e]ger|armure.*?fer.*?l[\u00e9e]g[\u00e8e]re).* + +# /give @s iron_helmet[custom_name='{text:"Casque en fer léger", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_jambieres_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_jambieres_icon.properties index 7466ec17..8283958c 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_jambieres_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_jambieres_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_leggings +items=iron_leggings texture=armure_de_fer_legere_jambieres_icon -components.custom_name=iregex:.*Armure de fer l\u00E9g\u00E8re \ No newline at end of file +components.custom_name=iregex:.*?(?:jambi[\u00e8e]res.*?fer.*?l[\u00e9e]g[\u00e8e]res|armure.*?fer.*?l[\u00e9e]g[\u00e8e]re).* + +# /give @s iron_leggings[custom_name='{text:"Jambières en fer légères", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_plastron_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_plastron_icon.properties index e4f407c6..a34fc801 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_plastron_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/icons/armure_de_fer_legere_plastron_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_chestplate +items=iron_chestplate texture=armure_de_fer_legere_plastron_icon -components.custom_name=iregex:.*Armure de fer l\u00E9g\u00E8re \ No newline at end of file +components.custom_name=iregex:.*?(?:plastron.*?fer.*?l[\u00e9e]ger|armure.*?fer.*?l[\u00e9e]g[\u00e8e]re).* + +# /give @s iron_chestplate[custom_name='{text:"Plastron en fer léger", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_bottes.properties b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_bottes.properties index 8f1c0059..b5f46c84 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_bottes.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_bottes.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_boots +items=iron_boots texture.iron_layer_1=armure_de_fer_legere_1 -components.custom_name=iregex:.*Armure de fer l\u00E9g\u00E8re \ No newline at end of file +components.custom_name=iregex:.*?(?:bottes.*?fer.*?l[\u00e9e]g[\u00e8e]res|armure.*?fer.*?l[\u00e9e]g[\u00e8e]re).* + +# /give @s iron_boots[custom_name='{text:"Bottes en fer légères", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_casque.properties b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_casque.properties index 06cb4553..0405704b 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_casque.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_casque.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_helmet +items=iron_helmet texture.iron_layer_1=armure_de_fer_legere_1 -components.custom_name=iregex:.*Armure de fer l\u00E9g\u00E8re \ No newline at end of file +components.custom_name=iregex:.*?(?:casque.*?fer.*?l[\u00e9e]ger|armure.*?fer.*?l[\u00e9e]g[\u00e8e]re).* + +# /give @s iron_helmet[custom_name='{text:"Casque en fer léger", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_jambieres.properties b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_jambieres.properties index 9e8431f5..b7c8039f 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_jambieres.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_jambieres.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_leggings +items=iron_leggings texture.iron_layer_2=armure_de_fer_legere_2 -components.custom_name=iregex:.*Armure de fer l\u00E9g\u00E8re \ No newline at end of file +components.custom_name=iregex:.*?(?:jambi[\u00e8e]res.*?fer.*?l[\u00e9e]g[\u00e8e]res|armure.*?fer.*?l[\u00e9e]g[\u00e8e]re).* + +# /give @s iron_leggings[custom_name='{text:"Jambières en fer légères", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_plastron.properties b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_plastron.properties index ca6d973d..f679a75f 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_plastron.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/fer_legere/models/armure_de_fer_legere_plastron.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_chestplate +items=iron_chestplate texture.iron_layer_1=armure_de_fer_legere_1 -components.custom_name=iregex:.*Armure de fer l\u00E9g\u00E8re \ No newline at end of file +components.custom_name=iregex:.*?(?:plastron.*?fer.*?l[\u00e9e]ger|armure.*?fer.*?l[\u00e9e]g[\u00e8e]re).* + +# /give @s iron_chestplate[custom_name='{text:"Plastron en fer léger", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_bottes_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_bottes_icon.properties index df8fd893..010aa287 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_bottes_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_bottes_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=diamond_boots +items=diamond_boots texture=harnois_bottes_icon -components.custom_name=iregex:Harnois +components.custom_name=ipattern:*harnois* + +# /give @s diamond_boots[custom_name='{text:"Harnois (bottes)", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_casque_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_casque_icon.properties index c14071ce..11cd1f45 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_casque_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_casque_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=diamond_helmet +items=diamond_helmet texture=harnois_casque_icon -components.custom_name=iregex:Harnois +components.custom_name=ipattern:*harnois* + +# /give @s diamond_helmet[custom_name='{text:"Harnois (casque)", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_jambieres_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_jambieres_icon.properties index 68e1bb74..9616bdf8 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_jambieres_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_jambieres_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=diamond_leggings +items=diamond_leggings texture=harnois_jambieres_icon -components.custom_name=iregex:Harnois +components.custom_name=ipattern:*harnois* + +# /give @s diamond_leggings[custom_name='{text:"Harnois (jambières)", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_plastron_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_plastron_icon.properties index 44510e89..09e30a67 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_plastron_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/harnois/icons/harnois_plastron_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=diamond_chestplate +items=diamond_chestplate texture=harnois_plastron_icon -components.custom_name=iregex:Harnois +components.custom_name=ipattern:*harnois* + +# /give @s diamond_chestplate[custom_name='{text:"Harnois (plastron)", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_bottes.properties b/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_bottes.properties index 6bc711ff..903b0314 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_bottes.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_bottes.properties @@ -1,4 +1,6 @@ type=armor -matchItems=diamond_boots +items=diamond_boots texture.diamond_layer_1=harnois_1 -components.custom_name=iregex:Harnois +components.custom_name=ipattern:*harnois* + +# /give @s diamond_boots[custom_name='{text:"Harnois (bottes)", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_casque.properties b/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_casque.properties index d6cda1b8..70e21895 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_casque.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_casque.properties @@ -1,4 +1,6 @@ type=armor -matchItems=diamond_helmet +items=diamond_helmet texture.diamond_layer_1=harnois_1 -components.custom_name=iregex:Harnois +components.custom_name=ipattern:*harnois* + +# /give @s diamond_helmet[custom_name='{text:"Harnois (casque)", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_jambieres.properties b/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_jambieres.properties index 7fb7fb95..11dd54a3 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_jambieres.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_jambieres.properties @@ -1,4 +1,6 @@ type=armor -matchItems=diamond_leggings +items=diamond_leggings texture.diamond_layer_2=harnois_2 -components.custom_name=iregex:Harnois +components.custom_name=ipattern:*harnois* + +# /give @s diamond_leggings[custom_name='{text:"Harnois (jambières)", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_plastron.properties b/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_plastron.properties index 7d1226fb..d59a2de6 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_plastron.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/harnois/models/harnois_plastron.properties @@ -1,4 +1,6 @@ type=armor -matchItems=diamond_chestplate +items=diamond_chestplate texture.diamond_layer_1=harnois_1 -components.custom_name=iregex:Harnois +components.custom_name=ipattern:*harnois* + +# /give @s diamond_chestplate[custom_name='{text:"Harnois (plastron)", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_bottes_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_bottes_icon.properties index 887bd420..9efd36c5 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_bottes_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_bottes_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_boots +items=iron_boots texture=armure_de_fer_lourde_bottes_icon -components.custom_name=iregex:.*Fer.*(lourd|lourde).* \ No newline at end of file +components.custom_name=iregex:.*?(?:bottes.*?fer.*?lourdes|armure.*?fer.*?lourde).* + +# /give @s iron_boots[custom_name='{text:"Bottes en fer lourdes", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_casque_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_casque_icon.properties index f0ae8f12..614278d5 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_casque_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_casque_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_helmet +items=iron_helmet texture=armure_de_fer_lourde_casque_icon -components.custom_name=iregex:.*Fer.*(lourd|lourde).* +components.custom_name=iregex:.*?(?:casque.*?fer.*?lourd|armure.*?fer.*?lourde).* + +# /give @s iron_helmet[custom_name='{text:"Casque en fer lourd", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_jambieres_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_jambieres_icon.properties index 8a6d0e46..6de0cd1f 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_jambieres_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_jambieres_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_leggings +items=iron_leggings texture=armure_de_fer_lourde_jambieres_icon -components.custom_name=iregex:.*Fer.*(lourd|lourde).* +components.custom_name=iregex:.*?(?:jambi[\u00e8e]res.*?fer.*?lourdes|armure.*?fer.*?lourde).* + +# /give @s iron_leggings[custom_name='{text:"Jambières en fer lourdes", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_plastron_icon.properties b/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_plastron_icon.properties index e3d73e36..aab4bbda 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_plastron_icon.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/lourde/icons/armure_de_fer_lourde_plastron_icon.properties @@ -1,4 +1,6 @@ type=item -matchItems=iron_chestplate +items=iron_chestplate texture=armure_de_fer_lourde_plastron_icon -components.custom_name=iregex:.*Fer.*(lourd|lourde).* +components.custom_name=iregex:.*?(?:plastron.*?fer.*?lourd|armure.*?fer.*?lourde).* + +# /give @s iron_chestplate[custom_name='{text:"Plastron en fer lourd", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_bottes.properties b/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_bottes.properties index d1f45aa6..4783be3c 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_bottes.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_bottes.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_boots +items=iron_boots texture.iron_layer_1=armure_de_fer_lourde_1 -components.custom_name=iregex:.*Fer.*(lourd|lourde).* +components.custom_name=iregex:.*?(?:bottes.*?fer.*?lourdes|armure.*?fer.*?lourde).* + +# /give @s iron_boots[custom_name='{text:"Bottes en fer lourdes", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_casque.properties b/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_casque.properties index 10f93ceb..c37d38b7 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_casque.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_casque.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_helmet +items=iron_helmet texture.iron_layer_1=armure_de_fer_lourde_1 -components.custom_name=iregex:.*Fer.*(lourd|lourde).* +components.custom_name=iregex:.*?(?:casque.*?fer.*?lourd|armure.*?fer.*?lourde).* + +# /give @s iron_helmet[custom_name='{text:"Casque en fer lourd", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_jambieres.properties b/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_jambieres.properties index e37ef92b..7bf2bff4 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_jambieres.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_jambieres.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_leggings +items=iron_leggings texture.iron_layer_2=armure_de_fer_lourde_2 -components.custom_name=iregex:.*Fer.*(lourd|lourde).* +components.custom_name=iregex:.*?(?:jambi[\u00e8e]res.*?fer.*?lourdes|armure.*?fer.*?lourde).* + +# /give @s iron_leggings[custom_name='{text:"Jambières en fer lourdes", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_plastron.properties b/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_plastron.properties index 5162ab3d..d71a52cb 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_plastron.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/lourde/models/armure_de_fer_lourde_plastron.properties @@ -1,4 +1,6 @@ type=armor -matchItems=iron_chestplate +items=iron_chestplate texture.iron_layer_1=armure_de_fer_lourde_1 -components.custom_name=iregex:.*Fer.*(lourd|lourde).* +components.custom_name=iregex:.*?(?:plastron.*?fer.*?lourd|armure.*?fer.*?lourde).* + +# /give @s iron_chestplate[custom_name='{text:"Plastron en fer lourd", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer1.png b/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer1.png deleted file mode 100644 index af4df9b57bfd13bf3523eb06af627ea4fdfeb39a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1842 zcmV-22hI42P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2A)YoK~!i%)tT#Z z+c*q`-R(?c%hrW*6Q}*#_kTw1`3^uwapg-AC$ozg3@wTxaSj3S;?*@7w)<&leon)N za-4>(bVsS@9r|-B+o!4Q9;ar#vzGQz&rj3XK26!p|5prt{dgpx7XiJANCLJ&0KoH; z6~9LjP__qsdst`nhousnk6$AOy2b+p98D5}0M(0tC8JD2C*sym-?HjMLVwlczKjGJ z|9xm6K)NX+Knejz54dd1y$q$F0@-+DBT_}g*O35F+&?|QgrJ)Fp}lO#J&X+SdxaBT zSamNi`~ni}0SuT)us0F;yk#aL*)17D-PnCR2?D%qG|uKJLovsP6lpg5Jb`I|_YQ+3 zKn4ws3=;TC#GC|!*9uT}hdU4;@EWVENvIkNG8oe#_yq(E9R!S1w;85>H)!ApgI=@H z%aER!bU3^$gB85X?O`qbrr2%z&EpSL&)>8At5Q~f{xJ!7fQgUU?-hQ$%VzJFGRVcq z)&kJC072Ec%A(R9Am9~T)gS|Mf`pzVCByjEeTXE-t+Y2`p*4rlFXW~fucVHVkA9Bt zvOkT}X)ltm|7!mx8QHX?8~0KV0I)Q&g3snhp{`3390pcMz)0%CSocR?Xyy^C>&9uf z>Cg6G_4IkEj_0||-(7mYV#6}ZU2)k80^>RiY{$iqtMIOGi)Xzzc!*3A@CKDfG81_B ziUft$R^MwjFOBn7p|5fKOL;@;T=jR3>b9CZ;aic#*|B-oCITY1r2=(o6wga_xW8Q* z;Ij~NtS%66B;mN9xNS*W8h=S>Q?}1jdH6k*AJXReF9H~o5LcEB0xI}$<7My_#L_#! z`wRf^E=ULhG|PCD6DfO%1TS@5n}F*c;4zpOjdM%e(r8lg04W|m|Hgemfb0|j%s$H* zt^#;~ybMB#+IVJCBz5aBc;1GYkHnear6emnAP7j+a%vBtuX?b$A=FG}ogjU8wY}OF zC1*lli2zopu@?c}T9UN{ zMt$dXKfh;IncbHh5L;<}Lx96T@6w*DG6!SBze+d*umvqLya-TMpOsgjadCb_6yUXN zX0vw-{o!TaB5RCTav_$9DEB9(Xr^=~uK zHmP%i$+&Lco5h2XD3ueuY+R9!BXfdol`PvM0rG<8V;-QbZ(Ptof)7aKFGvV7ur-_B zPa?C60G;f-Y+R8}Nv&NEQYE;DGVMeFMEERm4+500I2YI>A%NfV&^RQiZuRGT>Rm2k zu1eQ*npx?lQ>^y_*&A#SfCosO07XE(RMBrd#a>}mTfUL9HEyMqFfL*S#dq9AD*o+} znswA+00EjHN)wYr;ITJM*oURF!2o_Sywl8g0uL|)H32Wb0c~O)K-p=!Ts2VewU&3^(AT3J|j>7e+~b&JEUhZuK6G)gnTq z8gG|phEq+VR*;?pjFvju_R)tgXtZ0T}qZ0%$!?Al*DdRbLwaO12IYPfF zD-m8c)n*Qg-}K9}TS=K~HoGcsY5Q(zHZO)TbG|*Qp1^O_87$zn5$bob^*z<>?kMN# z{}Xb_=pX?VSi3l000Dr%zK36ubK~7bYUlF-&OKM%YhS>h9`iO;sB^4Bgw$?s@VCY8 zsraHrSskt8=c}V!s?VS2rT74&c0>l{fK#6fCq33xU!JhUJgLoIBrGp8d^11- zz$rEJJM9(n^_#@ty}U`i6vk0~uGqps?zH}F7FD?}JsvjHb^`3h~E)*07+0Cbk{}T}S0DDkgQOSPQvONZ7YrAqgy?c~(8H8y&Dp}VFSgrmA7eP&nSq_xu00000NkvXXu0mjf0000TbVXQnO>bmn gYyePfVR>b8b1zeLWp-sCC{1Z@X>DO_DJ}ca1R%Lv{r~^~ diff --git a/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer2.png b/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer2.png deleted file mode 100644 index 2f86c6a81462ad4cc22a0512f6f84882a5cdfcc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjK*5uqE{-7?&Tp@r6lzuwU&-s%&2LXH(G9aB~zMwnuozk_7vX&^WeyE z2KBye$1OZQHt&7&is4P>>@ZnGd`;E90)7{pqh@Q%UEocL!&fiZm*@Z_n`)59!_N z$}}sOa;u5R`W!Y-s2cNyz)U|No6lWmYx9HnQ;;X<`*o0f?(IyKWALFMg>TrsR%OYOyU- z>O^{M<+z6&r`(;V+@B`b^pxyRa(teOKTn7M`;Xw8(@a1V0-{?G&?x}`Uhlzv5dv~I z%DrQ=moAmy#}WXb4J<%_w+bF4C;>+ju%;AA2tr(Qe%cFswYZ0oAjputs+x5sxDQKwrU? z7)gX3cUTDxcDG&N=Rpv_b1Uy@&*qBuevl$^cMAa103Mra2~a}7J5fl$S0X+HL66KZ z?m&Qmmv`l6v|ud9c&7#7`@29GX!@Z|Q|yzbL2-d7s}Mzz2%n@oT+?6$&uuq0B2VJG zF1DvfW+(SM{z%#`!T?r#KaJ-1wixwqQ0GFo4xuPfLCx;lnjug zB*b17!@YclGrtvyBuu5o5Ih&;Zb^5{0M6H$Jmlc3#O@M}s2 zBY|$vnI$kaT9ABCK)VqBSEjy=H=n-*_I?4@uDNypXXg(nSc;e{Otyl6asdkZ@@15d zK6BM0!Jm|XY7PB@OamU?kRYzrWmcAZMs&Ji_bPGYmGNUOMukomPw*YGRcx%<=+j4n zi7P2?jZJk21xnxx7oxAO5D*pw)L^!SfUTy^)Y)C8{PORVpGDl|qe~%+h@J=5@eA;3 z#_QlKh_!R<3E)lu9+U(npwOBE18I5V23k)Hn=F9up#L8?U7Ovg79au(UnM~FJm~5p zot@dP}|Mi+;qWMj5*;a3%IQGqdH4YR;bP}+L0jmToNWinbiyK!zvku8{ z(Kc~}lC zhj)bN0Z@WwS%m&&^u=Fzl$Ob>N04aTS zK;vqIWTkPdWI)&b31DOw0;IEJ+W3k97bo8&kv#dAJoQ2Vh+r?V2LaX>WFsMAzd2iz zbVPsf%jD@HF(SAyQQ9EB9tC71SS6sS6)*rM9jH*!1WTb+P~=+NBZAV{w{a#6gP0`# zt+Pn&FKUmGoRJ}&BDW;Qh=9e0h7;4b#@{gDow5m7(&r)<1otkl=L>4{Xj(wXcnk~v)+-Mb- zbp&rh5<7^vM4va+0eDXe<^BY4RpvrR3Ghv=9#g&9SM}4(|L@T&8T=}aX zMAlZ})^U}=j}tz6+#-R#3L>0>j|89p2t>4W2l=kGYX%=*!QHbA7DB))*iqsNKe*1M@Ek!~ z0mSPsD%}PPC|OoFVLCFBgu!EkbWzYajw4Np{Xl=Q#z?^r@&1)o>DA>pv|;0;gw(B) iqn1&}dzGv$1pEdUK~0OIC-^%60000O|n literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_2.png b/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..a83b558d2214fdacaed85bf218825943c693d24c GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQU^R;978hhy}f#xuUSEWH9$P~ z>B=V7jsO48zsz%W$*Rmie_vcUQ4y>Qj&Mp2g%dkF9UFz+e@Air=Qct!m`@yh-Gp}gN`ol9$ wUwcxUe@W<2$yxg&H>K~-|GSEjfkET4G?$IvRL=tCSdh~^UHx3vIVCg!0MF28i~s-t literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_bottes.properties b/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_bottes.properties index d8083b15..203bfd1b 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_bottes.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_bottes.properties @@ -1,5 +1,7 @@ type=armor -matchItems=diamond_boots -texture.diamond_layer_1=obsifer1 -texture.diamond_layer_2=obsifer2 -components.custom_data.armure=obsifer \ No newline at end of file +items=diamond_boots +texture.diamond_layer_1=obsifer_1 +texture.diamond_layer_2=obsifer_2 +components.custom_data.armure=obsifer + +# /give @s diamond_boots[custom_data={armure:obsifer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_haume.properties b/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_haume.properties index fd5be32e..79b5a08a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_haume.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_haume.properties @@ -1,5 +1,7 @@ type=armor -matchItems=diamond_helmet -texture.diamond_layer_1=obsifer1 -texture.diamond_layer_2=obsifer2 -components.custom_data.armure=obsifer \ No newline at end of file +items=diamond_helmet +texture.diamond_layer_1=obsifer_1 +texture.diamond_layer_2=obsifer_2 +components.custom_data.armure=obsifer + +# /give @s diamond_helmet[custom_data={armure:obsifer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_jambes.properties b/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_jambes.properties index 79b65cf5..81b26c44 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_jambes.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_jambes.properties @@ -1,5 +1,7 @@ type=armor -matchItems=diamond_leggings -texture.diamond_layer_1=obsifer1 -texture.diamond_layer_2=obsifer2 -components.custom_data.armure=obsifer \ No newline at end of file +items=diamond_leggings +texture.diamond_layer_1=obsifer_1 +texture.diamond_layer_2=obsifer_2 +components.custom_data.armure=obsifer + +# /give @s diamond_leggings[custom_data={armure:obsifer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_plaston.properties b/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_plaston.properties index f0979c2e..16d0cd79 100644 --- a/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_plaston.properties +++ b/assets/minecraft/optifine/cit/general/combat/armures/obsifer/obsifer_plaston.properties @@ -1,5 +1,7 @@ type=armor -matchItems=diamond_chestplate -texture.diamond_layer_1=obsifer1 -texture.diamond_layer_2=obsifer2 -components.custom_data.armure=obsifer \ No newline at end of file +items=diamond_chestplate +texture.diamond_layer_1=obsifer_1 +texture.diamond_layer_2=obsifer_2 +components.custom_data.armure=obsifer + +# /give @s diamond_chestplate[custom_data={armure:obsifer}] From ffb9dd3beeb3545637f38fae261dc2760ebbc835 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Thu, 23 Jan 2025 17:32:00 +0100 Subject: [PATCH 12/27] patch general/combat/arme .properties (oops bis) --- .../optifine/cit/general/combat/armes/arme_hast.json | 4 ++-- .../optifine/cit/general/combat/armes/epee_batarde.json | 4 ++-- .../optifine/cit/general/combat/armes/epee_longue.json | 4 ++-- .../optifine/cit/general/combat/armes/grande_epee.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json b/assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json index 5eb23425..1454f778 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json +++ b/assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json @@ -2,7 +2,7 @@ "credit": "Made by Letutout for Herobrine.fr", "parent": "item/handheld", "textures": { - "layer0": "./cac/lances/naginata/naginata_acier" + "layer0": "./cac/armes_hast/naginata/naginata_acier/naginata_acier" }, "gui_light": "front", "display": { @@ -39,4 +39,4 @@ "scale": [4, 4, 1.5] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/armes/epee_batarde.json b/assets/minecraft/optifine/cit/general/combat/armes/epee_batarde.json index 15c03fc1..fa508c8d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/epee_batarde.json +++ b/assets/minecraft/optifine/cit/general/combat/armes/epee_batarde.json @@ -2,7 +2,7 @@ "credit": "Made by Letutout for Herobrine.fr", "parent": "item/generated", "textures": { - "layer0": "./cac/epee_batarde/epee_batarde_fer" + "layer0": "./cac/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer" }, "gui_light": "front", "display": { @@ -40,4 +40,4 @@ "scale": [3.4, 3.4, 1.7] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json b/assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json index 7b6ba542..fbcc2ee1 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json +++ b/assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json @@ -2,7 +2,7 @@ "credit": "Made by Letutout for Herobrine.fr", "parent": "item/handheld", "textures": { - "layer0": "./cac/claymores/claymore_acier/claymore_acier" + "layer0": "./cac/epees/claymore/claymore_acier/claymore_acier" }, "gui_light": "front", "display": { @@ -39,4 +39,4 @@ "scale": [3.6, 3.6, 1.5] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json b/assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json index 3def7b83..57de10ea 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json +++ b/assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json @@ -2,7 +2,7 @@ "credit": "Made by Letutout for Herobrine.fr", "parent": "item/handheld", "textures": { - "layer0": "./cac/marteaux/tetsubo/tetsubo_fer" + "layer0": "./cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer" }, "gui_light": "front", "display": { @@ -35,4 +35,4 @@ "scale": [3.6, 3.6, 1.5] } } -} \ No newline at end of file +} From 459b235e8db37b26508bba23f9582054d7e6268d Mon Sep 17 00:00:00 2001 From: Mael382 Date: Thu, 23 Jan 2025 18:41:06 +0100 Subject: [PATCH 13/27] patch general/combat/boucliers .properties --- .../boucliers/{bocles => bocle}/bocle.json | 2 +- .../bocle_acier}/bocle_acier.png | Bin .../bocle/bocle_acier/bocle_acier.properties | 7 + .../bocle_bois}/bocle_bois.png | Bin .../bocle/bocle_bois/bocle_bois.properties | 7 + .../{bocles => bocle/bocle_fer}/bocle_fer.png | Bin .../bocle/bocle_fer/bocle_fer.properties | 7 + .../boucliers/bocles/bocle_acier.properties | 5 - .../boucliers/bocles/bocle_bois.properties | 5 - .../boucliers/bocles/bocle_fer.properties | 5 - .../bouclier_long/bouclier_long.properties | 8 +- ...locking.json => bouclier_long_parade.json} | 0 .../bouclier_ovale/bouclier_ovale.properties | 6 +- .../bouclier_rond_bois.json | 0 .../bouclier_rond_bois.png | Bin .../bouclier_rond_bois.properties | 6 + .../bouclier_rond_bois_alt.json | 0 .../bouclier_rond_bois_alt.png | Bin .../bouclier_rond_bois_alt.properties | 6 + .../bouclier_rond_fer/bouclier_rond_fer.json} | 2 +- .../bouclier_rond_fer/bouclier_rond_fer.png} | Bin .../bouclier_rond_fer.properties | 6 + .../bois/bouclier_rond_bois.properties | 6 - .../bouclier_rond_bois_alt.properties | 4 - .../fer/bouclier_rond.properties | 4 - .../ecu_bois/ecu_bois.json} | 4 +- .../ecu.png => ecu/ecu_bois/ecu_bois.png} | Bin .../ecu/ecu_bois/ecu_bois.properties | 6 + .../ecu.json => ecu/ecu_fer/ecu_fer.json} | 4 +- .../ecu-fer.png => ecu/ecu_fer/ecu_fer.png} | Bin .../boucliers/ecu/ecu_fer/ecu_fer.properties | 6 + .../boucliers/ecus/ecu_bois/ecu.properties | 4 - .../boucliers/ecus/ecu_fer/ecu-fer.properties | 4 - .../combat/boucliers/loge/bouclier_loge.json | 1113 ----------------- .../boucliers/loge/bouclier_loge.properties | 6 - .../loge/bouclier_loge_blocking.json | 1113 ----------------- .../boucliers/loge/spruce_log_shield.png | Bin 218 -> 0 bytes .../combat/boucliers/loge/stone_shield.png | Bin 197 -> 0 bytes 38 files changed, 66 insertions(+), 2280 deletions(-) rename assets/minecraft/optifine/cit/general/combat/boucliers/{bocles => bocle}/bocle.json (95%) rename assets/minecraft/optifine/cit/general/combat/boucliers/{bocles => bocle/bocle_acier}/bocle_acier.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_acier/bocle_acier.properties rename assets/minecraft/optifine/cit/general/combat/boucliers/{bocles => bocle/bocle_bois}/bocle_bois.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_bois/bocle_bois.properties rename assets/minecraft/optifine/cit/general/combat/boucliers/{bocles => bocle/bocle_fer}/bocle_fer.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_fer/bocle_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_bois.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_fer.properties rename assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_long/{shield_custom_blocking.json => bouclier_long_parade.json} (100%) rename assets/minecraft/optifine/cit/general/combat/boucliers/{boucliers_rond/bois => bouclier_rond/bouclier_rond_bois}/bouclier_rond_bois.json (100%) rename assets/minecraft/optifine/cit/general/combat/boucliers/{boucliers_rond/bois => bouclier_rond/bouclier_rond_bois}/bouclier_rond_bois.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois/bouclier_rond_bois.properties rename assets/minecraft/optifine/cit/general/combat/boucliers/{boucliers_rond/bois_alt => bouclier_rond/bouclier_rond_bois_alt}/bouclier_rond_bois_alt.json (100%) rename assets/minecraft/optifine/cit/general/combat/boucliers/{boucliers_rond/bois_alt => bouclier_rond/bouclier_rond_bois_alt}/bouclier_rond_bois_alt.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois_alt/bouclier_rond_bois_alt.properties rename assets/minecraft/optifine/cit/general/combat/boucliers/{boucliers_rond/fer/bouclier_rond.json => bouclier_rond/bouclier_rond_fer/bouclier_rond_fer.json} (96%) rename assets/minecraft/optifine/cit/general/combat/boucliers/{boucliers_rond/fer/bouclier_rond.png => bouclier_rond/bouclier_rond_fer/bouclier_rond_fer.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_fer/bouclier_rond_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois/bouclier_rond_bois.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois_alt/bouclier_rond_bois_alt.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/fer/bouclier_rond.properties rename assets/minecraft/optifine/cit/general/combat/boucliers/{ecus/ecu_fer/ecu-fer.json => ecu/ecu_bois/ecu_bois.json} (97%) rename assets/minecraft/optifine/cit/general/combat/boucliers/{ecus/ecu_bois/ecu.png => ecu/ecu_bois/ecu_bois.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_bois/ecu_bois.properties rename assets/minecraft/optifine/cit/general/combat/boucliers/{ecus/ecu_bois/ecu.json => ecu/ecu_fer/ecu_fer.json} (97%) rename assets/minecraft/optifine/cit/general/combat/boucliers/{ecus/ecu_fer/ecu-fer.png => ecu/ecu_fer/ecu_fer.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_fer/ecu_fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_bois/ecu.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_fer/ecu-fer.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge.json delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge_blocking.json delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/loge/spruce_log_shield.png delete mode 100644 assets/minecraft/optifine/cit/general/combat/boucliers/loge/stone_shield.png diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle.json b/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle.json similarity index 95% rename from assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle.json rename to assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle.json index d16272b2..5db1a040 100644 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle.json +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle.json @@ -2,7 +2,7 @@ "credit": "Made by Letutout for Herobrine.fr", "parent": "item/generated", "textures": { - "layer0": "./bocle_bois" + "layer0": "./bocle_bois/bocle_bois" }, "display": { "thirdperson_righthand": { diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_acier.png b/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_acier/bocle_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_acier.png rename to assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_acier/bocle_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_acier/bocle_acier.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_acier/bocle_acier.properties new file mode 100644 index 00000000..276bfddf --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_acier/bocle_acier.properties @@ -0,0 +1,7 @@ +type=item +items=shield +texture=bocle_acier +model=optifine/cit/general/combat/boucliers/bocle/bocle +components.custom_name=ipattern:*bocle*acier* + +# /give @s shield[custom_name='{text:"Bocle en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_bois.png b/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_bois/bocle_bois.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_bois.png rename to assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_bois/bocle_bois.png diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_bois/bocle_bois.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_bois/bocle_bois.properties new file mode 100644 index 00000000..48c98ad5 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_bois/bocle_bois.properties @@ -0,0 +1,7 @@ +type=item +items=shield +texture=bocle_bois +model=optifine/cit/general/combat/boucliers/bocle/bocle +components.custom_name=ipattern:*bocle*bois* + +# /give @s shield[custom_name='{text:"Bocle en bois", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_fer.png b/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_fer/bocle_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_fer.png rename to assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_fer/bocle_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_fer/bocle_fer.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_fer/bocle_fer.properties new file mode 100644 index 00000000..a92951d3 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/bocle/bocle_fer/bocle_fer.properties @@ -0,0 +1,7 @@ +type=item +items=shield +texture=bocle_fer +model=optifine/cit/general/combat/boucliers/bocle/bocle +components.custom_name=ipattern:*bocle*fer* + +# /give @s shield[custom_name='{text:"Bocle en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_acier.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_acier.properties deleted file mode 100644 index 74c200ef..00000000 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_acier.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=minecraft:shield -model=bocle -texture=bocle_acier -components.custom_name=iregex:.*Bocle.*acier.* diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_bois.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_bois.properties deleted file mode 100644 index bc19e4e2..00000000 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_bois.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=minecraft:shield -model=bocle -texture=bocle_bois -components.custom_name=iregex:.*Bocle.*bois.* diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_fer.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_fer.properties deleted file mode 100644 index aea231ca..00000000 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/bocles/bocle_fer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=minecraft:shield -model=bocle -texture=bocle_fer -components.custom_name=iregex:.*Bocle.*fer.* diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_long/bouclier_long.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_long/bouclier_long.properties index 58248f72..e5dd99b0 100644 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_long/bouclier_long.properties +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_long/bouclier_long.properties @@ -1,5 +1,7 @@ type=item -matchItems=minecraft:shield +items=shield model=bouclier_long -components.custom_name=iregex:.*Bouclier.*long.* -model.shield_blocking=./shield_custom_blocking \ No newline at end of file +model.shield_blocking=bouclier_long_parade +components.custom_name=ipattern:*bouclier*long* + +# /give @s shield[custom_name='{text:"Bouclier long", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_long/shield_custom_blocking.json b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_long/bouclier_long_parade.json similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_long/shield_custom_blocking.json rename to assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_long/bouclier_long_parade.json diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_ovale/bouclier_ovale.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_ovale/bouclier_ovale.properties index 836e8c37..90f20bd3 100644 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_ovale/bouclier_ovale.properties +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_ovale/bouclier_ovale.properties @@ -1,4 +1,6 @@ type=item -matchItems=minecraft:shield +items=shield model=bouclier_ovale -components.custom_name=iregex:.*Bouclier.*ovale.* +components.custom_name=ipattern:*bouclier*ovale* + +# /give @s shield[custom_name='{text:"Bouclier ovale", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois/bouclier_rond_bois.json b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois/bouclier_rond_bois.json similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois/bouclier_rond_bois.json rename to assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois/bouclier_rond_bois.json diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois/bouclier_rond_bois.png b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois/bouclier_rond_bois.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois/bouclier_rond_bois.png rename to assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois/bouclier_rond_bois.png diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois/bouclier_rond_bois.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois/bouclier_rond_bois.properties new file mode 100644 index 00000000..796f767e --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois/bouclier_rond_bois.properties @@ -0,0 +1,6 @@ +type=item +items=shield +model=bouclier_rond_bois +components.custom_data.bouclier=rond_bois + +# /give @s shield[custom_data={bouclier:rond_bois}] diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois_alt/bouclier_rond_bois_alt.json b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois_alt/bouclier_rond_bois_alt.json similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois_alt/bouclier_rond_bois_alt.json rename to assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois_alt/bouclier_rond_bois_alt.json diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois_alt/bouclier_rond_bois_alt.png b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois_alt/bouclier_rond_bois_alt.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois_alt/bouclier_rond_bois_alt.png rename to assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois_alt/bouclier_rond_bois_alt.png diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois_alt/bouclier_rond_bois_alt.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois_alt/bouclier_rond_bois_alt.properties new file mode 100644 index 00000000..1ab2b9fa --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_bois_alt/bouclier_rond_bois_alt.properties @@ -0,0 +1,6 @@ +type=item +items=shield +model=bouclier_rond_bois_alt +components.custom_name=ipattern:*bouclier*rond*bois* + +# /give @s shield[custom_name='{text:"Bouclier rond en bois", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/fer/bouclier_rond.json b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_fer/bouclier_rond_fer.json similarity index 96% rename from assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/fer/bouclier_rond.json rename to assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_fer/bouclier_rond_fer.json index f0a0b0ad..692bf05f 100644 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/fer/bouclier_rond.json +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_fer/bouclier_rond_fer.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "./bouclier_rond" + "layer0": "./bouclier_rond_fer" }, "display": { "thirdperson_righthand": { diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/fer/bouclier_rond.png b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_fer/bouclier_rond_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/fer/bouclier_rond.png rename to assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_fer/bouclier_rond_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_fer/bouclier_rond_fer.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_fer/bouclier_rond_fer.properties new file mode 100644 index 00000000..777fc460 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/bouclier_rond/bouclier_rond_fer/bouclier_rond_fer.properties @@ -0,0 +1,6 @@ +type=item +items=shield +model=bouclier_rond_fer +components.custom_name=iregex:(?!.*bois).*?bouclier.*?rond.* + +# /give @s shield[custom_name='{text:"Bouclier rond en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois/bouclier_rond_bois.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois/bouclier_rond_bois.properties deleted file mode 100644 index 3751105e..00000000 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois/bouclier_rond_bois.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=minecraft:shield -model=bouclier_rond_bois -components.custom_data.bouclier=rond_bois - -#/give @s minecraft:shield[custom_data={bouclier:rond_bois}] \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois_alt/bouclier_rond_bois_alt.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois_alt/bouclier_rond_bois_alt.properties deleted file mode 100644 index af6c8ba4..00000000 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/bois_alt/bouclier_rond_bois_alt.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=minecraft:shield -model=bouclier_rond_bois_alt -components.custom_name=iregex:.*Bouclier.*rond.*bois.* diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/fer/bouclier_rond.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/fer/bouclier_rond.properties deleted file mode 100644 index b3c58054..00000000 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/boucliers_rond/fer/bouclier_rond.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=minecraft:shield -model=bouclier_rond -components.custom_name=iregex:.*Bouclier.*rond.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_fer/ecu-fer.json b/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_bois/ecu_bois.json similarity index 97% rename from assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_fer/ecu-fer.json rename to assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_bois/ecu_bois.json index 263a0774..15142c9c 100644 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_fer/ecu-fer.json +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_bois/ecu_bois.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "./ecu-fer" + "layer0": "./ecu_bois" }, "display": { "thirdperson_righthand": { @@ -65,4 +65,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_bois/ecu.png b/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_bois/ecu_bois.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_bois/ecu.png rename to assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_bois/ecu_bois.png diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_bois/ecu_bois.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_bois/ecu_bois.properties new file mode 100644 index 00000000..c9f305c6 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_bois/ecu_bois.properties @@ -0,0 +1,6 @@ +type=item +items=shield +model=ecu_bois +components.custom_name=iregex:(?!.*(?:fer|m[\u00e9e]tal)).*?[\u00e9e]cu.* + +# /give @s shield[custom_name='{text:"Écu en bois", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_bois/ecu.json b/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_fer/ecu_fer.json similarity index 97% rename from assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_bois/ecu.json rename to assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_fer/ecu_fer.json index 5df44f90..aafe5ccc 100644 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_bois/ecu.json +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_fer/ecu_fer.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "./ecu" + "layer0": "./ecu_fer" }, "display": { "thirdperson_righthand": { @@ -65,4 +65,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_fer/ecu-fer.png b/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_fer/ecu_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_fer/ecu-fer.png rename to assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_fer/ecu_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_fer/ecu_fer.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_fer/ecu_fer.properties new file mode 100644 index 00000000..e48b5c72 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/boucliers/ecu/ecu_fer/ecu_fer.properties @@ -0,0 +1,6 @@ +type=item +items=shield +model=ecu_fer +components.custom_name=iregex:.*?[\u00e9e]cu.*?(?:fer|m[\u00e9e]tal(?:lique)?).* + +# /give @s shield[custom_name='{text:"Écu en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_bois/ecu.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_bois/ecu.properties deleted file mode 100644 index 3987db1b..00000000 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_bois/ecu.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=minecraft:shield -model=ecu -components.custom_name=iregex:.*[\u00E9eE\u00C9]cu((?!fer|metal|m\u00E9tal).)*$ \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_fer/ecu-fer.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_fer/ecu-fer.properties deleted file mode 100644 index 809a8586..00000000 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/ecus/ecu_fer/ecu-fer.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=minecraft:shield -model=ecu-fer -components.custom_name=iregex:.*[\u00E9eE\u00C9]cu.*(fer|m\u00E9tal|m\u00E9talique).* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge.json b/assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge.json deleted file mode 100644 index 8f93d473..00000000 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge.json +++ /dev/null @@ -1,1113 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "0": "./spruce_log_shield", - "1": "./stone_shield", - "particle": "block/spruce_log" - }, - "gui_light": "front", - "elements": [ - { - "from": [-6, 0, 4], - "to": [22, 1, 12], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "up": {"uv": [0, 2.5, 14, 6.5], "texture": "#0"}, - "down": {"uv": [0, 2.5, 14, 6.5], "texture": "#0"} - } - }, - { - "from": [-5, 0, 12], - "to": [21, 1, 15], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#0"}, - "up": {"uv": [2, 5.5, 15, 6.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 7, 12, 8], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [4, 0, -6], - "to": [12, 1, -5], - "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-5, 0, 1], - "to": [21, 1, 4], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 13, 1.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 13, 1.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-4, 0, 15], - "to": [20, 1, 17], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, - "up": {"uv": [0, 8.5, 12, 9.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 8.5, 12, 9.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-4, 0, -1], - "to": [20, 1, 1], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, - "up": {"uv": [0, 8.5, 12, 9.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 8.5, 12, 9.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-3, 0, 17], - "to": [19, 1, 18], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 11, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 11, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-3, 0, -2], - "to": [19, 1, -1], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 11, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 11, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-2, 0, 18], - "to": [18, 1, 19], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 10, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 10, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-2, 0, -3], - "to": [18, 1, -2], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 10, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 10, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-1, 0, 19], - "to": [17, 1, 20], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 9, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 9, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-1, 0, -4], - "to": [17, 1, -3], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 9, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 9, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [1, 0, 20], - "to": [15, 1, 21], - "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 7, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 7, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [1, 0, -5], - "to": [15, 1, -4], - "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 7, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 7, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [4, 0, 21], - "to": [12, 1, 22], - "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "N", - "from": [4, -0.5, -7], - "to": [12, 1.5, -6], - "faces": { - "north": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 0.5], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 0.5], "texture": "#1"} - } - }, - { - "name": "E", - "from": [22, -0.5, 4], - "to": [23, 1.5, 12], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 0.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 4, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "name": "S", - "from": [4, -0.5, 22], - "to": [12, 1.5, 23], - "faces": { - "north": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "name": "W", - "from": [-7, -0.5, 4], - "to": [-6, 1.5, 12], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 0.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 4, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [-3, -0.5, 18], - "to": [-2, 1.5, 19], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 5, 0.5, 6], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [-2, -0.5, 19], - "to": [-1, 1.5, 20], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [7, 3.5, 7.5, 4.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [-4, -0.5, 17], - "to": [-3, 1.5, 18], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [1.5, 2, 2, 3], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [-6, -0.5, 12], - "to": [-5, 1.5, 15], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [1.5, 5.5, 3, 6.5], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [1, -0.5, 21], - "to": [4, 1.5, 22], - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [2.5, 6.5, 4, 7.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [6, 4, 6.5, 5.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [-5, -0.5, 15], - "to": [-4, 1.5, 17], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [-1, -0.5, 20], - "to": [1, 1.5, 21], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [18, -0.5, 18], - "to": [19, 1.5, 19], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 5, 0.5, 6], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [19, -0.5, 17], - "to": [20, 1.5, 18], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [7, 3.5, 7.5, 4.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [17, -0.5, 19], - "to": [18, 1.5, 20], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [1.5, 2, 2, 3], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [12, -0.5, 21], - "to": [15, 1.5, 22], - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [1.5, 5.5, 3, 6.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [21, -0.5, 12], - "to": [22, 1.5, 15], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [2.5, 6.5, 4, 7.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "up": {"uv": [6, 4, 6.5, 5.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [15, -0.5, 20], - "to": [17, 1.5, 21], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [20, -0.5, 15], - "to": [21, 1.5, 17], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [18, -0.5, -3], - "to": [19, 1.5, -2], - "faces": { - "north": {"uv": [0, 5, 0.5, 6], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [17, -0.5, -4], - "to": [18, 1.5, -3], - "faces": { - "north": {"uv": [7, 3.5, 7.5, 4.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [19, -0.5, -2], - "to": [20, 1.5, -1], - "faces": { - "north": {"uv": [1.5, 2, 2, 3], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [21, -0.5, 1], - "to": [22, 1.5, 4], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [1.5, 5.5, 3, 6.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [12, -0.5, -6], - "to": [15, 1.5, -5], - "faces": { - "north": {"uv": [2.5, 6.5, 4, 7.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [6, 4, 6.5, 5.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [20, -0.5, -1], - "to": [21, 1.5, 1], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [15, -0.5, -5], - "to": [17, 1.5, -4], - "faces": { - "north": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-3, -0.5, -3], - "to": [-2, 1.5, -2], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 5, 0.5, 6], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-4, -0.5, -2], - "to": [-3, 1.5, -1], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [7, 3.5, 7.5, 4.5], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-2, -0.5, -4], - "to": [-1, 1.5, -3], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [1.5, 2, 2, 3], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [1, -0.5, -6], - "to": [4, 1.5, -5], - "faces": { - "north": {"uv": [1.5, 5.5, 3, 6.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-6, -0.5, 1], - "to": [-5, 1.5, 4], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [2.5, 6.5, 4, 7.5], "texture": "#1"}, - "up": {"uv": [6, 4, 6.5, 5.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [-1, -0.5, -5], - "to": [1, 1.5, -4], - "faces": { - "north": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-5, -0.5, -1], - "to": [-4, 1.5, 1], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 2, 9], - "faces": { - "north": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "from": [6, 1, 6], - "to": [10, 1.5, 10], - "faces": { - "north": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#1"} - } - }, - { - "from": [-5, 1, 7], - "to": [-4, 1.5, 9], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "texture": "#1"} - } - }, - { - "from": [20, 1, 7], - "to": [21, 1.5, 9], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [-4, 1, 2], - "to": [-3, 1.5, 4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "texture": "#1"} - } - }, - { - "from": [12, 1, -4], - "to": [14, 1.5, -3], - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [19, 1, 12], - "to": [20, 1.5, 14], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [2, 1, 19], - "to": [4, 1.5, 20], - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [2, 1, -4], - "to": [4, 1.5, -3], - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [19, 1, 2], - "to": [20, 1.5, 4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [12, 1, 19], - "to": [14, 1.5, 20], - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [-4, 1, 12], - "to": [-3, 1.5, 14], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "texture": "#1"} - } - }, - { - "from": [-1.4, 1, -1.4], - "to": [-0.4, 1.5, -0.4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [16.4, 1, -1.4], - "to": [17.4, 1.5, -0.4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [16.4, 1, 16.4], - "to": [17.4, 1.5, 17.4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [-1.4, 1, 16.4], - "to": [-0.4, 1.5, 17.4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [7, 1, -3], - "to": [9, 1.5, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [1, 3, 2.5, 4], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [9, 1, 0], - "to": [11, 1.5, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 8, 6, 9], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [7, 1, 3], - "to": [9, 1.5, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [5, 8, 6, 9], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [5, 1, 2], - "to": [7, 1.5, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 6, 5, 7], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [6, 1, -5], - "to": [8, 1.5, -3], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 2]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 6, 5, 7], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [6, 1, 4], - "to": [7, 1.5, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [6, 1, -3], - "to": [7, 1.5, -2], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 2]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [9, 1, 4], - "to": [10, 1.5, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [9, 1, -1], - "to": [10, 1.5, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [8, 1, 0], - "to": [9, 1.5, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [7, 1, 16], - "to": [9, 1.5, 19], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [1, 3, 2.5, 4], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [5, 1, 12], - "to": [7, 1.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 8, 6, 9], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [7, 1, 11], - "to": [9, 1.5, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [5, 8, 6, 9], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [9, 1, 12], - "to": [11, 1.5, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 6, 5, 7], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [8, 1, 19], - "to": [10, 1.5, 21], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 6, 5, 7], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [9, 1, 11], - "to": [10, 1.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [9, 1, 18], - "to": [10, 1.5, 19], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [6, 1, 11], - "to": [7, 1.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [6, 1, 16], - "to": [7, 1.5, 17], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [7, 1, 15], - "to": [8, 1.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [90, 0, -90], - "translation": [6, -2, 1.75], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [90, 0, -90], - "translation": [6, 0, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [90, 0, -130], - "translation": [5.75, 0, -0.75], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [90, 0, -130], - "translation": [5.75, 0, -0.75], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "rotation": [45, 0, 0], - "translation": [0, 4.75, 2.5], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, -42, -49], - "translation": [2.25, 0.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, 13.75, 0] - }, - "fixed": { - "rotation": [90, 0, 180], - "translation": [0, 0, -4], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "bouc", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18] - }, - { - "name": "contour SW", - "origin": [8, 8, 8], - "children": [19, 20, 21, 22, 23, 24, 25] - }, - { - "name": "contour SE", - "origin": [8, 8, 8], - "children": [26, 27, 28, 29, 30, 31, 32] - }, - { - "name": "contour NE", - "origin": [8, 8, 8], - "children": [33, 34, 35, 36, 37, 38, 39] - }, - { - "name": "contour NW", - "origin": [8, 8, 8], - "children": [40, 41, 42, 43, 44, 45, 46] - }, - { - "name": "décoration", - "origin": [8, 8, 8], - "children": [47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62] - }, - { - "name": "décp loge", - "origin": [8, 8, 8], - "children": [63, 64, 65, 66, 67, 68, 69, 70, 71, 72] - }, - { - "name": "décp loge", - "origin": [8, 8, 8], - "children": [73, 74, 75, 76, 77, 78, 79, 80, 81, 82] - } - ] -} \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge.properties b/assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge.properties deleted file mode 100644 index 0e2cea96..00000000 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -items=minecraft:shield -model=bouclier_loge -model.shield=bouclier_loge -model.shield_blocking=bouclier_loge_blocking -components.custom_name=iregex:Loge \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge_blocking.json b/assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge_blocking.json deleted file mode 100644 index 50497448..00000000 --- a/assets/minecraft/optifine/cit/general/combat/boucliers/loge/bouclier_loge_blocking.json +++ /dev/null @@ -1,1113 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "0": "./spruce_log_shield", - "1": "./stone_shield", - "particle": "block/spruce_log" - }, - "gui_light": "front", - "elements": [ - { - "from": [4, 0, -6], - "to": [12, 1, -5], - "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-6, 0, 4], - "to": [22, 1, 12], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "up": {"uv": [0, 2.5, 14, 6.5], "texture": "#0"}, - "down": {"uv": [0, 2.5, 14, 6.5], "texture": "#0"} - } - }, - { - "from": [-5, 0, 12], - "to": [21, 1, 15], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#0"}, - "up": {"uv": [2, 5.5, 15, 6.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 7, 12, 8], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-5, 0, 1], - "to": [21, 1, 4], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 13, 1.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 13, 1.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-4, 0, 15], - "to": [20, 1, 17], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, - "up": {"uv": [0, 8.5, 12, 9.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 8.5, 12, 9.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-4, 0, -1], - "to": [20, 1, 1], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#0"}, - "up": {"uv": [0, 8.5, 12, 9.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 8.5, 12, 9.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-3, 0, 17], - "to": [19, 1, 18], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 11, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 11, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-3, 0, -2], - "to": [19, 1, -1], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 11, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 11, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-2, 0, 18], - "to": [18, 1, 19], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 10, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 10, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-2, 0, -3], - "to": [18, 1, -2], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 10, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 10, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-1, 0, 19], - "to": [17, 1, 20], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 9, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 9, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [-1, 0, -4], - "to": [17, 1, -3], - "faces": { - "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 9, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 9, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [1, 0, 20], - "to": [15, 1, 21], - "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 7, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 7, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [1, 0, -5], - "to": [15, 1, -4], - "faces": { - "north": {"uv": [0, 0, 14, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 7, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 7, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [4, 0, 21], - "to": [12, 1, 22], - "faces": { - "north": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, - "up": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "name": "N", - "from": [4, -0.5, -7], - "to": [12, 1.5, -6], - "faces": { - "north": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 0.5], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 0.5], "texture": "#1"} - } - }, - { - "name": "E", - "from": [22, -0.5, 4], - "to": [23, 1.5, 12], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 0.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 4, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "name": "S", - "from": [4, -0.5, 22], - "to": [12, 1.5, 23], - "faces": { - "north": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 4, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "name": "W", - "from": [-7, -0.5, 4], - "to": [-6, 1.5, 12], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 4, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 4, 0.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 4, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [-3, -0.5, 18], - "to": [-2, 1.5, 19], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 5, 0.5, 6], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [-2, -0.5, 19], - "to": [-1, 1.5, 20], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [7, 3.5, 7.5, 4.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [-4, -0.5, 17], - "to": [-3, 1.5, 18], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [1.5, 2, 2, 3], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [-6, -0.5, 12], - "to": [-5, 1.5, 15], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [1.5, 5.5, 3, 6.5], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [1, -0.5, 21], - "to": [4, 1.5, 22], - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [2.5, 6.5, 4, 7.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [6, 4, 6.5, 5.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [-5, -0.5, 15], - "to": [-4, 1.5, 17], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [-1, -0.5, 20], - "to": [1, 1.5, 21], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [18, -0.5, 18], - "to": [19, 1.5, 19], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 5, 0.5, 6], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [19, -0.5, 17], - "to": [20, 1.5, 18], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [7, 3.5, 7.5, 4.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [17, -0.5, 19], - "to": [18, 1.5, 20], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [1.5, 2, 2, 3], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [12, -0.5, 21], - "to": [15, 1.5, 22], - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [1.5, 5.5, 3, 6.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [21, -0.5, 12], - "to": [22, 1.5, 15], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [2.5, 6.5, 4, 7.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "up": {"uv": [6, 4, 6.5, 5.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [15, -0.5, 20], - "to": [17, 1.5, 21], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [20, -0.5, 15], - "to": [21, 1.5, 17], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [18, -0.5, -3], - "to": [19, 1.5, -2], - "faces": { - "north": {"uv": [0, 5, 0.5, 6], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [17, -0.5, -4], - "to": [18, 1.5, -3], - "faces": { - "north": {"uv": [7, 3.5, 7.5, 4.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [19, -0.5, -2], - "to": [20, 1.5, -1], - "faces": { - "north": {"uv": [1.5, 2, 2, 3], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [21, -0.5, 1], - "to": [22, 1.5, 4], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [1.5, 5.5, 3, 6.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [12, -0.5, -6], - "to": [15, 1.5, -5], - "faces": { - "north": {"uv": [2.5, 6.5, 4, 7.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [6, 4, 6.5, 5.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [20, -0.5, -1], - "to": [21, 1.5, 1], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [15, -0.5, -5], - "to": [17, 1.5, -4], - "faces": { - "north": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-3, -0.5, -3], - "to": [-2, 1.5, -2], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 5, 0.5, 6], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-4, -0.5, -2], - "to": [-3, 1.5, -1], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [7, 3.5, 7.5, 4.5], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-2, -0.5, -4], - "to": [-1, 1.5, -3], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [1.5, 2, 2, 3], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [1, -0.5, -6], - "to": [4, 1.5, -5], - "faces": { - "north": {"uv": [1.5, 5.5, 3, 6.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-6, -0.5, 1], - "to": [-5, 1.5, 4], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [2.5, 6.5, 4, 7.5], "texture": "#1"}, - "up": {"uv": [6, 4, 6.5, 5.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [-1, -0.5, -5], - "to": [1, 1.5, -4], - "faces": { - "north": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-5, -0.5, -1], - "to": [-4, 1.5, 1], - "faces": { - "north": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "west": {"uv": [1.5, 5.5, 2.5, 6.5], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 2, 9], - "faces": { - "north": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.5], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "texture": "#1"} - } - }, - { - "from": [6, 1, 6], - "to": [10, 1.5, 10], - "faces": { - "north": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#1"} - } - }, - { - "from": [-5, 1, 7], - "to": [-4, 1.5, 9], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "texture": "#1"} - } - }, - { - "from": [20, 1, 7], - "to": [21, 1.5, 9], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [-4, 1, 2], - "to": [-3, 1.5, 4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "texture": "#1"} - } - }, - { - "from": [12, 1, -4], - "to": [14, 1.5, -3], - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [19, 1, 12], - "to": [20, 1.5, 14], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [2, 1, 19], - "to": [4, 1.5, 20], - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [2, 1, -4], - "to": [4, 1.5, -3], - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [19, 1, 2], - "to": [20, 1.5, 4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [12, 1, 19], - "to": [14, 1.5, 20], - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [-4, 1, 12], - "to": [-3, 1.5, 14], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 1], "texture": "#1"} - } - }, - { - "from": [-1.4, 1, -1.4], - "to": [-0.4, 1.5, -0.4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [16.4, 1, -1.4], - "to": [17.4, 1.5, -0.4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [16.4, 1, 16.4], - "to": [17.4, 1.5, 17.4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [-1.4, 1, 16.4], - "to": [-0.4, 1.5, 17.4], - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 0.5], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [7, 1, -3], - "to": [9, 1.5, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [1, 3, 2.5, 4], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [9, 1, 0], - "to": [11, 1.5, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 8, 6, 9], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [7, 1, 3], - "to": [9, 1.5, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [5, 8, 6, 9], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [5, 1, 2], - "to": [7, 1.5, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 6, 5, 7], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [6, 1, -5], - "to": [8, 1.5, -3], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 2]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 6, 5, 7], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [6, 1, 4], - "to": [7, 1.5, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [6, 1, -3], - "to": [7, 1.5, -2], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 2]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [9, 1, 4], - "to": [10, 1.5, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [9, 1, -1], - "to": [10, 1.5, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [8, 1, 0], - "to": [9, 1.5, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#1"} - } - }, - { - "from": [7, 1, 16], - "to": [9, 1.5, 19], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [1, 3, 2.5, 4], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [5, 1, 12], - "to": [7, 1.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 8, 6, 9], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [7, 1, 11], - "to": [9, 1.5, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [5, 8, 6, 9], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [9, 1, 12], - "to": [11, 1.5, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 6, 5, 7], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [8, 1, 19], - "to": [10, 1.5, 21], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 1, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 0.25], "texture": "#1"}, - "up": {"uv": [4, 6, 5, 7], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [9, 1, 11], - "to": [10, 1.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [9, 1, 18], - "to": [10, 1.5, 19], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [6, 1, 11], - "to": [7, 1.5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [6, 1, 16], - "to": [7, 1.5, 17], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [7, 1, 15], - "to": [8, 1.5, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#1"}, - "up": {"uv": [2.5, 3.5, 3, 4], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 0.5, 0.5], "rotation": 180, "texture": "#1"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [-45, -2, -32], - "translation": [3.51, 2, -2], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "rotation": [-15, -2, -32], - "translation": [3.51, 3.5, 0.75], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "rotation": [-78, -2, -12], - "translation": [-5, 2.25, 0.75], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "rotation": [-78, -2, -12], - "translation": [-5, 2.25, 0.75], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "rotation": [45, 0, 0], - "translation": [0, 4.75, 2.5], - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, -42, -49], - "translation": [2.25, 0.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, 13.75, 0] - }, - "fixed": { - "rotation": [90, 0, 180], - "translation": [0, 0, -4], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "bouc", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18] - }, - { - "name": "contour SW", - "origin": [8, 8, 8], - "children": [19, 20, 21, 22, 23, 24, 25] - }, - { - "name": "contour SE", - "origin": [8, 8, 8], - "children": [26, 27, 28, 29, 30, 31, 32] - }, - { - "name": "contour NE", - "origin": [8, 8, 8], - "children": [33, 34, 35, 36, 37, 38, 39] - }, - { - "name": "contour NW", - "origin": [8, 8, 8], - "children": [40, 41, 42, 43, 44, 45, 46] - }, - { - "name": "décoration", - "origin": [8, 8, 8], - "children": [47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62] - }, - { - "name": "décp loge", - "origin": [8, 8, 8], - "children": [63, 64, 65, 66, 67, 68, 69, 70, 71, 72] - }, - { - "name": "décp loge", - "origin": [8, 8, 8], - "children": [73, 74, 75, 76, 77, 78, 79, 80, 81, 82] - } - ] -} \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/loge/spruce_log_shield.png b/assets/minecraft/optifine/cit/general/combat/boucliers/loge/spruce_log_shield.png deleted file mode 100644 index 283e6e5ed5d55ed61f0f39ea8aa0c7dbee03294c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{S3NNfJsB=TIc{rpVP9kM zP%HU0r*{4V$~JqtIEH8hzrC=L_ppHgvjdYG8^;vhC13v6@F#Q%Yuu}!9-_0!dDUzF z5RG#a#qMl;{3cWI{EZak^|Lg&?OshSKDFrH z)uNXhRv0Uzopr08JrMaR2}S diff --git a/assets/minecraft/optifine/cit/general/combat/boucliers/loge/stone_shield.png b/assets/minecraft/optifine/cit/general/combat/boucliers/loge/stone_shield.png deleted file mode 100644 index fae3ee6273ef6da52232890580cd25bd94d0387d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*Nlvel9H18`uhI9Y9%L^lpcP#Uk{ay4zDWOX$EP;VZ z#r^Yk2b=!|7S0DZ*RVEeb!oo%b(X8EWDbk%>)8)B{?Xv@jpq8ZXD{pgyl+j}Ga?z; t-!c6@tKYPBhdPtH9Md*u<@Dcw82KO0(Ja}(l?Sw+!PC{xWt~$(69C1nMk@dS From d3d7cb859ef13177cf843ce930ad563b23951c39 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Thu, 23 Jan 2025 18:43:22 +0100 Subject: [PATCH 14/27] patch general/combat/armes (oops ter) .properties --- .../lance/{lance => }/lance_acier/lance_acier.png | Bin .../{lance => }/lance_acier/lance_acier.properties | 0 .../lance_acier/lance_acier_nbt.properties | 0 .../{lance => }/lance_diamant/lance_adamantine.png | Bin .../lance_diamant/lance_adamantine.properties | 0 .../lance_diamant/lance_adamantine_nbt.properties | 0 .../lance/{lance => }/lance_fer/lance_fer.png | Bin .../{lance => }/lance_fer/lance_fer.properties | 0 .../{lance => }/lance_fer/lance_fer_nbt.properties | 0 .../armes/cac/dagues/dague/dague_nbt.properties | 7 ------- .../{dague/dague.png => dague_fer/dague_fer.png} | Bin .../dague_fer.properties} | 2 +- .../cac/dagues/dague_fer/dague_fer_nbt.properties | 7 +++++++ .../armes/cac/dagues/dague_fer/dague_nbt.properties | 9 +++++++++ .../{messer_acier.png => messer_1m_acier.png} | Bin ..._acier.properties => messer_1m_acier.properties} | 2 +- .../messer_1m_acier/messer_1m_acier_nbt.properties | 8 ++++++++ .../messer_1m_acier/messer_acier_nbt.properties | 4 +++- ...messer_adamantin.png => messer_1m_adamantin.png} | Bin ...in.properties => messer_1m_adamantin.properties} | 2 +- .../messer_1m_adamantin_nbt.properties | 8 ++++++++ .../messer_adamantin_nbt.properties | 4 +++- .../messer_1m_fer/{messer.png => messer_1m_fer.png} | Bin .../{messer.properties => messer_1m_fer.properties} | 2 +- .../messer_1m_fer/messer_1m_fer_nbt.properties | 8 ++++++++ .../messer_1m/messer_1m_fer/messer_nbt.properties | 4 +++- .../{messer_2m.png => messer_2m_fer.png} | Bin ...esser_2m.properties => messer_2m_fer.properties} | 0 .../messer_2m_fer/messer_2m_fer_nbt.properties | 8 ++++++++ .../messer_2m_fer/messer_2m_nbt.properties | 2 ++ 30 files changed, 63 insertions(+), 14 deletions(-) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/{lance => }/lance_acier/lance_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/{lance => }/lance_acier/lance_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/{lance => }/lance_acier/lance_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/{lance => }/lance_diamant/lance_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/{lance => }/lance_diamant/lance_adamantine.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/{lance => }/lance_diamant/lance_adamantine_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/{lance => }/lance_fer/lance_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/{lance => }/lance_fer/lance_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/{lance => }/lance_fer/lance_fer_nbt.properties (100%) delete mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague/dague_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/{dague/dague.png => dague_fer/dague_fer.png} (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/{dague/dague.properties => dague_fer/dague_fer.properties} (91%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer_nbt.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/{messer_acier.png => messer_1m_acier.png} (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/{messer_acier.properties => messer_1m_acier.properties} (90%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/{messer_adamantin.png => messer_1m_adamantin.png} (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/{messer_adamantin.properties => messer_1m_adamantin.properties} (88%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/{messer.png => messer_1m_fer.png} (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/{messer.properties => messer_1m_fer.properties} (90%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer_nbt.properties rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/{messer_2m.png => messer_2m_fer.png} (100%) rename assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/{messer_2m.properties => messer_2m_fer.properties} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_acier/lance_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_diamant/lance_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance/lance_fer/lance_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague/dague_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague/dague_nbt.properties deleted file mode 100644 index c9b2aaee..00000000 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague/dague_nbt.properties +++ /dev/null @@ -1,7 +0,0 @@ -type=item -items=iron_sword -texture=dague -components.custom_data.arme=dague -weight=10 - -# /give @s iron_sword[custom_data={arme:dague}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague/dague.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague/dague.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague/dague.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer.properties similarity index 91% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague/dague.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer.properties index 3e20c158..0d0e7207 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague/dague.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer.properties @@ -1,6 +1,6 @@ type=item items=iron_sword -texture=dague +texture=dague_fer components.custom_name=iregex:(?!.*(?:acier|noire|sombre|c[\u00e9e]r[\u00e9e]monielle)).*?dague.* # /give @s iron_sword[custom_name='{text:"Dague en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer_nbt.properties new file mode 100644 index 00000000..2f20b61d --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer_nbt.properties @@ -0,0 +1,7 @@ +type=item +items=iron_sword +texture=dague_fer +components.custom_data.arme=dague_fer +weight=10 + +# /give @s iron_sword[custom_data={arme:dague_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_nbt.properties new file mode 100644 index 00000000..1747d119 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_nbt.properties @@ -0,0 +1,9 @@ +# Duplicata de 'dague_fer_nbt.properties' pour ne pas casser les items avec l'ancien tag 'dague' (sans "_fer") + +type=item +items=iron_sword +texture=dague_fer +components.custom_data.arme=dague +weight=10 + +# /give @s iron_sword[custom_data={arme:dague}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.properties similarity index 90% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.properties index be4798c5..1b2b9f0e 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.properties @@ -1,6 +1,6 @@ type=item items=iron_sword -texture=messer_acier +texture=messer_1m_acier model=optifine/cit/general/combat/armes/epee_longue components.custom_name=iregex:(?!.*grand).*?messer.*?acier.* diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier_nbt.properties new file mode 100644 index 00000000..417f9385 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_sword +texture=messer_1m_acier +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=messer_1m_acier +weight=10 + +# /give @s iron_sword[custom_data={arme:messer_1m_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties index e41dfcfe..0f85a47b 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties @@ -1,6 +1,8 @@ +# Duplicata de 'messer_1m_acier_nbt.properties' pour ne pas casser les items avec l'ancien tag 'messer_acier' (sans "_1m_") + type=item items=iron_sword -texture=messer_acier +texture=messer_1m_acier model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=messer_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.properties similarity index 88% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.properties index ba85fdb8..b96a6d95 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.properties @@ -1,6 +1,6 @@ type=item items=diamond_sword -texture=messer_adamantin +texture=messer_1m_adamantin model=optifine/cit/general/combat/armes/epee_longue components.custom_name=iregex:(?!.*grand).*?messer.* diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin_nbt.properties new file mode 100644 index 00000000..a9ece337 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=diamond_sword +texture=messer_1m_adamantin +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=messer_1m_adamantin +weight=10 + +# /give @s diamond_sword[custom_data={arme:messer_1m_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties index dfd6b68f..d9cbc84d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties @@ -1,6 +1,8 @@ +# Duplicata de 'messer_1m_adamantin_nbt.properties' pour ne pas casser les items avec l'ancien tag 'messer_adamantin' (sans "_1m_") + type=item items=diamond_sword -texture=messer_adamantin +texture=messer_1m_adamantin model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=messer_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.properties similarity index 90% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.properties index cdf2f75e..ada74cad 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.properties @@ -1,6 +1,6 @@ type=item items=iron_sword -texture=messer +texture=messer_1m_fer model=optifine/cit/general/combat/armes/epee_longue components.custom_name=iregex:(?!.*(?:grand|acier)).*?messer.* diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer_nbt.properties new file mode 100644 index 00000000..bc298b93 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_sword +texture=messer_1m_fer +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=messer +weight=10 + +# /give @s iron_sword[custom_data={arme:messer_1m_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties index 0a13dba7..e6d07258 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties @@ -1,6 +1,8 @@ +# Duplicata de 'messer_1m_fer_nbt.properties' pour ne pas casser les items avec l'ancien tag 'messer' (sans "_1m_fer") + type=item items=iron_sword -texture=messer +texture=messer_1m_fer model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=messer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m.png b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m.png rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m.properties rename to assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer_nbt.properties new file mode 100644 index 00000000..9d7cad70 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer_nbt.properties @@ -0,0 +1,8 @@ +type=item +items=iron_sword +texture=messer_2m +model=optifine/cit/general/combat/armes/epee_longue +components.custom_data.arme=messer_2m_fer +weight=10 + +# /give @s iron_sword[custom_data={arme:messer_2m_fer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties index f27d182b..17d9fc9d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties @@ -1,3 +1,5 @@ +# Duplicata de 'messer_2m_fer_nbt.properties' pour ne pas casser les items avec l'ancien tag 'messer_2m' (sans "_fer") + type=item items=iron_sword texture=messer_2m From 95157055791405e1f89a5911a272e9c53a4cfef4 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Thu, 23 Jan 2025 18:43:54 +0100 Subject: [PATCH 15/27] patch general/combat/carquois .properties --- .../cit/general/combat/carquois/carquois.properties | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/minecraft/optifine/cit/general/combat/carquois/carquois.properties b/assets/minecraft/optifine/cit/general/combat/carquois/carquois.properties index 23a6902e..a0436464 100644 --- a/assets/minecraft/optifine/cit/general/combat/carquois/carquois.properties +++ b/assets/minecraft/optifine/cit/general/combat/carquois/carquois.properties @@ -1,5 +1,7 @@ type=item -matchItems=leather -model=carquois +items=leather texture=carquois -components.custom_name=iregex:.*Carquois.* \ No newline at end of file +model=carquois +components.custom_name=ipattern:*carquois* + +# /give @s leather[custom_name='{text:"Carquois", italic:false}'] From 967608c2b7d6c2980dfa6c3740dabbf1d3735c4a Mon Sep 17 00:00:00 2001 From: Mael382 Date: Thu, 23 Jan 2025 18:44:13 +0100 Subject: [PATCH 16/27] patch general/combat/fourreaux .properties --- .../claymore_fourreau.properties | 4 ---- .../coutelas_fourreau/coutelas_fourreau.json | 2 +- .../coutelas_fourreau/coutelas_fourreau.png | Bin .../coutelas_fourreau.properties | 6 ++++++ .../coutelas_fourreau.properties | 4 ---- .../epee_batarde_fourreau.properties | 4 ---- .../claymore_fourreau/claymore_fourreau.json | 2 +- .../claymore_fourreau/claymore_fourreau.png | Bin .../claymore_fourreau.properties | 6 ++++++ .../epee_batarde_fourreau.json | 2 +- .../epee_batarde_fourreau.png | Bin .../epee_batarde_fourreau.properties | 6 ++++++ .../epee_longue_fourreau.json | 2 +- .../epee_longue_fourreau/epee_longue_fourreau.png | Bin .../epee_longue_fourreau.properties | 6 ++++++ .../espadon_acier_fourreau.png | Bin 0 -> 433 bytes .../espadon_acier_fourreau.properties | 8 ++++++++ .../espadon_adamantin_fourreau.png | Bin 0 -> 444 bytes .../espadon_adamantin_fourreau.properties | 8 ++++++++ .../espadon_fer_fourreau.png} | Bin .../espadon_fer_fourreau.properties | 7 +++++++ .../espadon_fourreau/espadon_fourreau.json | 4 ++-- .../glaive_fourreau/glaive_fourreau.json | 2 +- .../glaive_fourreau/glaive_fourreau.png | Bin .../glaive_fourreau/glaive_fourreau.properties | 6 ++++++ .../rapiere_fourreau/rapiere_fourreau.json | 2 +- .../rapiere_fourreau/rapiere_fourreau.png | Bin .../rapiere_fourreau/rapiere_fourreau.properties | 6 ++++++ .../epee_longue_fourreau.properties | 4 ---- .../espadon_fourreau/espadon_fourreau_acier.png | Bin 721 -> 0 bytes .../espadon_fourreau_acier.properties | 6 ------ .../espadon_fourreau_adamantine.png | Bin 714 -> 0 bytes .../espadon_fourreau_adamantine.properties | 6 ------ .../espadon_fourreau_fer.properties | 5 ----- .../{fourreau_generique.json => fourreau.json} | 2 +- .../glaive_fourreau/glaive_fourreau.properties | 4 ---- .../katana_fourreau/katana_fourreau.properties | 4 ---- .../messer_2m_fourreau.properties | 4 ---- .../messer_fourreau/messer_fourreau.properties | 4 ---- .../nodachi_fourreau/nodachi_fourreau.properties | 5 ----- .../rapiere_fourreau/rapiere_fourreau.properties | 4 ---- .../sabre_fourreau/sabre_fourreau.properties | 4 ---- .../katana_fourreau/katana_fourreau.json | 2 +- .../katana_fourreau/katana_fourreau.png | Bin .../katana_fourreau/katana_fourreau.properties | 6 ++++++ .../messer_1m_fourreau/messer_1m_fourreau.json} | 4 ++-- .../messer_1m_fourreau/messer_1m_fourreau.png} | Bin .../messer_1m_fourreau.properties | 6 ++++++ .../messer_2m_fourreau/messer_2m_fourreau.json | 2 +- .../messer_2m_fourreau/messer_2m_fourreau.png | Bin .../messer_2m_fourreau.properties | 6 ++++++ .../nodachi_fourreau/nodachi_fourreau.json | 2 +- .../nodachi_fourreau/nodachi_fourreau.png | Bin .../nodachi_fourreau/nodachi_fourreau.properties | 7 +++++++ .../sabre_fourreau/sabre_fourreau.json | 2 +- .../sabre_fourreau/sabre_fourreau.png | Bin .../sabre_fourreau/sabre_fourreau.properties | 6 ++++++ 57 files changed, 105 insertions(+), 77 deletions(-) delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/claymore_fourreau/claymore_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => couteau_fourreaux}/coutelas_fourreau/coutelas_fourreau.json (99%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => couteau_fourreaux}/coutelas_fourreau/coutelas_fourreau.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/couteau_fourreaux/coutelas_fourreau/coutelas_fourreau.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/coutelas_fourreau/coutelas_fourreau.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => epee_fourreaux}/claymore_fourreau/claymore_fourreau.json (99%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => epee_fourreaux}/claymore_fourreau/claymore_fourreau.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/claymore_fourreau/claymore_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => epee_fourreaux}/epee_batarde_fourreau/epee_batarde_fourreau.json (99%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => epee_fourreaux}/epee_batarde_fourreau/epee_batarde_fourreau.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => epee_fourreaux}/epee_longue_fourreau/epee_longue_fourreau.json (99%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => epee_fourreaux}/epee_longue_fourreau/epee_longue_fourreau.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_longue_fourreau/epee_longue_fourreau.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_acier_fourreau/espadon_acier_fourreau.png create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_acier_fourreau/espadon_acier_fourreau.properties create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_diamant_fourreau/espadon_adamantin_fourreau.png create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_diamant_fourreau/espadon_adamantin_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{espadon_fourreau/espadon_fourreau_fer.png => epee_fourreaux/espadon_fourreau/espadon_fer_fourreau/espadon_fer_fourreau.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_fer_fourreau/espadon_fer_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => epee_fourreaux}/espadon_fourreau/espadon_fourreau.json (94%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => epee_fourreaux}/glaive_fourreau/glaive_fourreau.json (99%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => epee_fourreaux}/glaive_fourreau/glaive_fourreau.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/glaive_fourreau/glaive_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => epee_fourreaux}/rapiere_fourreau/rapiere_fourreau.json (99%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => epee_fourreaux}/rapiere_fourreau/rapiere_fourreau.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/rapiere_fourreau/rapiere_fourreau.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/epee_longue_fourreau/epee_longue_fourreau.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_acier.png delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_acier.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_adamantine.png delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_adamantine.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_fer.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{fourreau_generique.json => fourreau.json} (90%) delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/glaive_fourreau/glaive_fourreau.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/katana_fourreau/katana_fourreau.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/messer_2m_fourreau/messer_2m_fourreau.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/messer_fourreau/messer_fourreau.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/nodachi_fourreau/nodachi_fourreau.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/rapiere_fourreau/rapiere_fourreau.properties delete mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreau/sabre_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => sabre_fourreaux}/katana_fourreau/katana_fourreau.json (99%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => sabre_fourreaux}/katana_fourreau/katana_fourreau.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/katana_fourreau/katana_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{messer_fourreau/messer_fourreau.json => sabre_fourreaux/messer_fourreau/messer_1m_fourreau/messer_1m_fourreau.json} (96%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{messer_fourreau/messer_fourreau.png => sabre_fourreaux/messer_fourreau/messer_1m_fourreau/messer_1m_fourreau.png} (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_1m_fourreau/messer_1m_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => sabre_fourreaux/messer_fourreau}/messer_2m_fourreau/messer_2m_fourreau.json (99%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => sabre_fourreaux/messer_fourreau}/messer_2m_fourreau/messer_2m_fourreau.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_2m_fourreau/messer_2m_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => sabre_fourreaux}/nodachi_fourreau/nodachi_fourreau.json (99%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => sabre_fourreaux}/nodachi_fourreau/nodachi_fourreau.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/nodachi_fourreau/nodachi_fourreau.properties rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => sabre_fourreaux}/sabre_fourreau/sabre_fourreau.json (99%) rename assets/minecraft/optifine/cit/general/combat/fourreaux/{ => sabre_fourreaux}/sabre_fourreau/sabre_fourreau.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/sabre_fourreau/sabre_fourreau.properties diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/claymore_fourreau/claymore_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/claymore_fourreau/claymore_fourreau.properties deleted file mode 100644 index 30e37857..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/claymore_fourreau/claymore_fourreau.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=wooden_sword -model=claymore_fourreau -components.custom_name=iregex:.*Fourreau .*Claymore.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/coutelas_fourreau/coutelas_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/couteau_fourreaux/coutelas_fourreau/coutelas_fourreau.json similarity index 99% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/coutelas_fourreau/coutelas_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/couteau_fourreaux/coutelas_fourreau/coutelas_fourreau.json index 679b322c..b524399b 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/coutelas_fourreau/coutelas_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/couteau_fourreaux/coutelas_fourreau/coutelas_fourreau.json @@ -45,4 +45,4 @@ "scale": [3, 3, 1.44] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/coutelas_fourreau/coutelas_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/couteau_fourreaux/coutelas_fourreau/coutelas_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/coutelas_fourreau/coutelas_fourreau.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/couteau_fourreaux/coutelas_fourreau/coutelas_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/couteau_fourreaux/coutelas_fourreau/coutelas_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/couteau_fourreaux/coutelas_fourreau/coutelas_fourreau.properties new file mode 100644 index 00000000..2da49141 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/couteau_fourreaux/coutelas_fourreau/coutelas_fourreau.properties @@ -0,0 +1,6 @@ +type=item +items=wooden_sword +model=coutelas_fourreau +components.custom_name=ipattern:*fourreau*coutelas* + +# /give @s wooden_sword[custom_name='{text:"Fourreau de coutelas", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/coutelas_fourreau/coutelas_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/coutelas_fourreau/coutelas_fourreau.properties deleted file mode 100644 index cec1efde..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/coutelas_fourreau/coutelas_fourreau.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=wooden_sword -model=coutelas_fourreau -components.custom_name=iregex:.*Fourreau .*Coutelas.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.properties deleted file mode 100644 index 96f38297..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=wooden_sword -model=epee_batarde_fourreau -components.custom_name=iregex:.*Fourreau .*(.*[\u00E9e]p[\u00E9e]e.*(batarde|b\u00e2tarde).*).* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/claymore_fourreau/claymore_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/claymore_fourreau/claymore_fourreau.json similarity index 99% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/claymore_fourreau/claymore_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/claymore_fourreau/claymore_fourreau.json index fd159a73..415df004 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/claymore_fourreau/claymore_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/claymore_fourreau/claymore_fourreau.json @@ -45,4 +45,4 @@ "scale": [3, 3, 1.44] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/claymore_fourreau/claymore_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/claymore_fourreau/claymore_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/claymore_fourreau/claymore_fourreau.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/claymore_fourreau/claymore_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/claymore_fourreau/claymore_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/claymore_fourreau/claymore_fourreau.properties new file mode 100644 index 00000000..0be7fe9d --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/claymore_fourreau/claymore_fourreau.properties @@ -0,0 +1,6 @@ +type=item +items=wooden_sword +model=claymore_fourreau +components.custom_name=ipattern:*fourreau*claymore* + +# /give @s wooden_sword[custom_name='{text:"Fourreau de claymore", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.json similarity index 99% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.json index 07adbc7a..f32887ab 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.json @@ -45,4 +45,4 @@ "scale": [3, 3, 1] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.properties new file mode 100644 index 00000000..64304fba --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_batarde_fourreau/epee_batarde_fourreau.properties @@ -0,0 +1,6 @@ +type=item +items=wooden_sword +model=epee_batarde_fourreau +components.custom_name=iregex:.*?fourreau.*?[\u00e9e]p[\u00e9e]e.*?b[\u00e2a]tarde.* + +# /give @s wooden_sword[custom_name='{text:"Fourreau d\'épée bâtarde", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_longue_fourreau/epee_longue_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_longue_fourreau/epee_longue_fourreau.json similarity index 99% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/epee_longue_fourreau/epee_longue_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_longue_fourreau/epee_longue_fourreau.json index 7866c239..01901554 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_longue_fourreau/epee_longue_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_longue_fourreau/epee_longue_fourreau.json @@ -45,4 +45,4 @@ "scale": [3, 3, 1.44] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_longue_fourreau/epee_longue_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_longue_fourreau/epee_longue_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/epee_longue_fourreau/epee_longue_fourreau.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_longue_fourreau/epee_longue_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_longue_fourreau/epee_longue_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_longue_fourreau/epee_longue_fourreau.properties new file mode 100644 index 00000000..1d724dcd --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_longue_fourreau/epee_longue_fourreau.properties @@ -0,0 +1,6 @@ +type=item +items=wooden_sword +model=epee_longue_fourreau +components.custom_name=iregex:.*?fourreau.*?[\u00e9e]p[\u00e9e]e.*?longue.* + +# /give @s wooden_sword[custom_name='{text:"Fourreau d\'épée longue", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_acier_fourreau/espadon_acier_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_acier_fourreau/espadon_acier_fourreau.png new file mode 100644 index 0000000000000000000000000000000000000000..aa72d80485cdfe5e79d0cc658c3dda4f3a278cd4 GIT binary patch literal 433 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyy#YQUu0UEqK)_?>%>V!Ydzy*r zB_>KsOD}o$42Xc@y1KeQ^y{Hm&|?(XhD#eO=%K*f4`de#a& z7Se3V$;tX+EIK+mrZQX}rXn6@qUPonva+)3vfQ@v98M~H8gksOu5RJs5efe*gc+GZQ3_9Xj7zUA<3b!JO~Q?e43bzp5aiYs#o#yEji@!oM5Z zB~H(FIxBpxb=VjCtiJJ!%l%6w2W9hiT(Lawd|=VF=Zp!}cB-=k9>}e!`IL5reMgm= z#gCLg`we@47nk$wh$sjpSh3SgTe~DWM4f2Lq_0 literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_diamant_fourreau/espadon_adamantin_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_diamant_fourreau/espadon_adamantin_fourreau.properties new file mode 100644 index 00000000..53bbec62 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_diamant_fourreau/espadon_adamantin_fourreau.properties @@ -0,0 +1,8 @@ +type=item +items=wooden_sword +texture=espadon_adamantin_fourreau +model=optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_fourreau +components.custom_name=ipattern:*fourreau*espadon*adamantin* +weight=5 + +# /give @s wooden_sword[custom_name='{text:"Fourreau d\'espadon adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_fer.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_fer_fourreau/espadon_fer_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_fer.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_fer_fourreau/espadon_fer_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_fer_fourreau/espadon_fer_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_fer_fourreau/espadon_fer_fourreau.properties new file mode 100644 index 00000000..d86f61d9 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_fer_fourreau/espadon_fer_fourreau.properties @@ -0,0 +1,7 @@ +type=item +items=wooden_sword +texture=espadon_fer_fourreau +model=optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_fourreau +components.custom_name=ipattern:*fourreau*espadon* + +# /give @s wooden_sword[custom_name='{text:"Fourreau d\'espadon en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_fourreau.json similarity index 94% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_fourreau.json index 823d4b6d..e7ed45bf 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/espadon_fourreau/espadon_fourreau.json @@ -2,7 +2,7 @@ "credit": "Retextured and enhanced by Letutout", "parent": "item/handheld", "textures": { - "layer0": "./espadon_fourreau_fer" + "layer0": "./espadon_fer_fourreau/espadon_fer_fourreau" }, "gui_light": "front", "display": { @@ -45,4 +45,4 @@ "scale": [3, 3, 1.44] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/glaive_fourreau/glaive_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/glaive_fourreau/glaive_fourreau.json similarity index 99% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/glaive_fourreau/glaive_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/glaive_fourreau/glaive_fourreau.json index ee6f5608..354db75e 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/glaive_fourreau/glaive_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/glaive_fourreau/glaive_fourreau.json @@ -45,4 +45,4 @@ "scale": [3, 3, 1.44] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/glaive_fourreau/glaive_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/glaive_fourreau/glaive_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/glaive_fourreau/glaive_fourreau.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/glaive_fourreau/glaive_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/glaive_fourreau/glaive_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/glaive_fourreau/glaive_fourreau.properties new file mode 100644 index 00000000..6f9cd593 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/glaive_fourreau/glaive_fourreau.properties @@ -0,0 +1,6 @@ +type=item +items=wooden_sword +model=glaive_fourreau +components.custom_name=ipattern:*fourreau*glaive* + +# /give @s wooden_sword[custom_name='{text:"Fourreau de glaive", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/rapiere_fourreau/rapiere_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/rapiere_fourreau/rapiere_fourreau.json similarity index 99% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/rapiere_fourreau/rapiere_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/rapiere_fourreau/rapiere_fourreau.json index 6ea0c56d..b891d4f2 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/rapiere_fourreau/rapiere_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/rapiere_fourreau/rapiere_fourreau.json @@ -45,4 +45,4 @@ "scale": [3, 3, 1.44] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/rapiere_fourreau/rapiere_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/rapiere_fourreau/rapiere_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/rapiere_fourreau/rapiere_fourreau.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/rapiere_fourreau/rapiere_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/rapiere_fourreau/rapiere_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/rapiere_fourreau/rapiere_fourreau.properties new file mode 100644 index 00000000..8ccf28be --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_fourreaux/rapiere_fourreau/rapiere_fourreau.properties @@ -0,0 +1,6 @@ +type=item +items=wooden_sword +model=rapiere_fourreau +components.custom_name=iregex:.*?fourreau.*?rapi[\u00e8e]re.* + +# /give @s wooden_sword[custom_name='{text:"Fourreau de rapière", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_longue_fourreau/epee_longue_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_longue_fourreau/epee_longue_fourreau.properties deleted file mode 100644 index a5887379..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/epee_longue_fourreau/epee_longue_fourreau.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=wooden_sword -model=epee_longue_fourreau -components.custom_name=iregex:.*Fourreau .*[\u00E9e]p[\u00E9e]e longue.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_acier.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_acier.png deleted file mode 100644 index 85727ecc7d612273363b9574f070083f60b823a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 721 zcmV;?0xtcDP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0%l1>K~z{ry_Lah z(@-48f6u9S7}^Gchn9Nj$=2bZRD_Ls*rDq{mrvw|gDwtH*0{hfs*( z_3b$gr2CJd*=&L=%dorqhHqmBMFZ`28}OrpH@(c%0U^G={s=ZUp2F#`A#^$&$Y!%# z9L3myTZx}I@?Rae@!~nvO$tAL_Q5dEK{w7}@5G!aHjbG)aJs$C#s3&47hin%4338L z_KxWZY~ZD)UB=1{!{FlmfyFED^?LS>U<8VQiC=$RS?Gz%zYLOKSr#N$R*15*L;bRz z#MB0`awcvFajbmETK}>AJFuvmsSP|?l%33l_y_i%ZvQ+p7tR1yUMLhI5l1dGfNggV zT$tj>#0b2Zi-A)VB{XqlqJgL~_c9Ve)R}u3F%Wg;UjB)|-S((5_u_QG+jiMJiCi3U z3}D+22U09;cjFk)b)B0~tYmEB$kdPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0$)i)K~z{ry;aR? z6G0SzTZ(unH4%b`O`?MIk{A?%xd??)Fx69UB6#Ru(S!IOc$XHTCl8)_@DS=vikEnh zmaWwu`myd(jG)mpuIcXPId8};>!e9Dad&?(nVD?Z-^Y71(GU?-p=nxgr4C)!X(Cdz zZF^#Zc1fb7pTbQx3Wb7}N~JJS0Sk9BG~v}N7vX649se#d0fKz?RvO-JeaFvV+FG;O z)Dr0dL7r#MiTsn<4vfd1fb2X>PKYc4xw~mI%(*}$0t9)nSOj|C&W^#l-Q~|{fB4lo zlbjGq37BJ=G{Z0;pU*?Jx&Yhu1t90c$O(}MAP5n)T8;17Ifqx9zxa9>BI|+b$_h>R zY;h6p&dfliQsME}>vd$uZJ^Oe1cb>q4iDhowd-6&E|=pXEXx`wVr&6|ls+y!e*#b6 zd<6UC1oWvXc(lBX=K4AjVm6x{Du63g9YoFsZtU-)>-#u&W16pxMgvPrOWoe9f!*~q zg8fTMbX?njGsC5c#*&RZjlL^*H&94;J8q$I5P$1-v{y zo+Rh4>vHmT$LG$iR;%|5H7J#Ukx#$AU-~JW?{(7P`#z-S=PCB?_S%}Vp^*iUb4Kn8 za&mskqJMAwR;sy-kp(=woe63#$m{Gsz4v%*oEsTAFPF=)kQ2@oK(U7#E=qF3z!Jzc z7Y%2cW@O}qfdb;Hxs1LN#9eb4eFEaHxr~2G5RN^rn#%|hkYmqyjo8TvfdGnqw{tm> w*uw|}IF7?bn0`7ja>B@0aa`y-1<3;7FI0I5<_0CIXaE2J07*qoM6N<$g5EbnQ~&?~ diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_adamantine.properties deleted file mode 100644 index 829ddb9d..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_adamantine.properties +++ /dev/null @@ -1,6 +0,0 @@ -type=item -matchItems=wooden_sword -model=espadon_fourreau -texture=espadon_fourreau_adamantine -components.custom_name=iregex:.*Fourreau .*Espadon.*Adamantin.* -weight=5 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_fer.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_fer.properties deleted file mode 100644 index d4f22ef4..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/espadon_fourreau/espadon_fourreau_fer.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=wooden_sword -model=espadon_fourreau -texture=espadon_fourreau_fer -components.custom_name=iregex:.*Fourreau .*Espadon.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/fourreau_generique.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/fourreau.json similarity index 90% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/fourreau_generique.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/fourreau.json index 9e5c4200..0ad4326d 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/fourreau_generique.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/fourreau.json @@ -2,7 +2,7 @@ "credit": "Retextured and enhanced by Letutout", "parent": "item/handheld", "textures": { - "layer0": "optifine/cit/general/combat/fourreaux/epee_longue_fourreau/epee_longue_fourreau" + "layer0": "optifine/cit/general/combat/fourreaux/epee_fourreaux/epee_longue_fourreau/epee_longue_fourreau" }, "gui_light": "front", "display": { diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/glaive_fourreau/glaive_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/glaive_fourreau/glaive_fourreau.properties deleted file mode 100644 index 7cacba33..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/glaive_fourreau/glaive_fourreau.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=wooden_sword -model=glaive_fourreau -components.custom_name=iregex:.*Fourreau .*Glaive.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/katana_fourreau/katana_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/katana_fourreau/katana_fourreau.properties deleted file mode 100644 index eb1157a9..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/katana_fourreau/katana_fourreau.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=wooden_sword -model=katana_fourreau -components.custom_name=iregex:.*Fourreau .*Katana.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_2m_fourreau/messer_2m_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_2m_fourreau/messer_2m_fourreau.properties deleted file mode 100644 index 18361093..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_2m_fourreau/messer_2m_fourreau.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=wooden_sword -model=messer_2m_fourreau -components.custom_name=iregex:.*Fourreau .*Grand.*Messer.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_fourreau/messer_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_fourreau/messer_fourreau.properties deleted file mode 100644 index 36dde1e5..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_fourreau/messer_fourreau.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=wooden_sword -model=messer_fourreau -components.custom_name=iregex:(.*Fourreau.*)(?!.*Grand.*)(.*Messer.*) \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/nodachi_fourreau/nodachi_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/nodachi_fourreau/nodachi_fourreau.properties deleted file mode 100644 index 450fea5c..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/nodachi_fourreau/nodachi_fourreau.properties +++ /dev/null @@ -1,5 +0,0 @@ -type=item -matchItems=wooden_sword -model=nodachi_fourreau -texture=nodachi_fourreau -components.custom_name=iregex:.*Fourreau .*Nodachi.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/rapiere_fourreau/rapiere_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/rapiere_fourreau/rapiere_fourreau.properties deleted file mode 100644 index 4e94048b..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/rapiere_fourreau/rapiere_fourreau.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=wooden_sword -model=rapiere_fourreau -components.custom_name=iregex:.*Fourreau .*[rR]api[\u00e8e]re.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreau/sabre_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreau/sabre_fourreau.properties deleted file mode 100644 index 8a795d18..00000000 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreau/sabre_fourreau.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=wooden_sword -model=sabre_fourreau -components.custom_name=iregex:.*Fourreau .*Sabre.* \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/katana_fourreau/katana_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/katana_fourreau/katana_fourreau.json similarity index 99% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/katana_fourreau/katana_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/katana_fourreau/katana_fourreau.json index b9e9c7c7..c3bf52fd 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/katana_fourreau/katana_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/katana_fourreau/katana_fourreau.json @@ -45,4 +45,4 @@ "scale": [3, 3, 1.44] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/katana_fourreau/katana_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/katana_fourreau/katana_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/katana_fourreau/katana_fourreau.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/katana_fourreau/katana_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/katana_fourreau/katana_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/katana_fourreau/katana_fourreau.properties new file mode 100644 index 00000000..f601363a --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/katana_fourreau/katana_fourreau.properties @@ -0,0 +1,6 @@ +type=item +items=wooden_sword +model=katana_fourreau +components.custom_name=ipattern:*fourreau*katana* + +# /give @s wooden_sword[custom_name='{text:"Fourreau de katana", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_fourreau/messer_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_1m_fourreau/messer_1m_fourreau.json similarity index 96% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/messer_fourreau/messer_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_1m_fourreau/messer_1m_fourreau.json index 293ffd72..9a2421bf 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_fourreau/messer_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_1m_fourreau/messer_1m_fourreau.json @@ -2,7 +2,7 @@ "credit": "Retextured and enhanced by Letutout", "parent": "item/handheld", "textures": { - "layer0": "./messer_fourreau" + "layer0": "./messer_1m_fourreau" }, "gui_light": "front", "display": { @@ -45,4 +45,4 @@ "scale": [3, 3, 1.44] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_fourreau/messer_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_1m_fourreau/messer_1m_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/messer_fourreau/messer_fourreau.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_1m_fourreau/messer_1m_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_1m_fourreau/messer_1m_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_1m_fourreau/messer_1m_fourreau.properties new file mode 100644 index 00000000..68a917dc --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_1m_fourreau/messer_1m_fourreau.properties @@ -0,0 +1,6 @@ +type=item +items=wooden_sword +model=messer_1m_fourreau +components.custom_name=iregex:(?!.*grand).*?fourreau.*?messer.* + +# /give @s wooden_sword[custom_name='{text:"Fourreau de messer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_2m_fourreau/messer_2m_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_2m_fourreau/messer_2m_fourreau.json similarity index 99% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/messer_2m_fourreau/messer_2m_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_2m_fourreau/messer_2m_fourreau.json index dc18495b..11ca5cdc 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_2m_fourreau/messer_2m_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_2m_fourreau/messer_2m_fourreau.json @@ -45,4 +45,4 @@ "scale": [3, 3, 1.44] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/messer_2m_fourreau/messer_2m_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_2m_fourreau/messer_2m_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/messer_2m_fourreau/messer_2m_fourreau.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_2m_fourreau/messer_2m_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_2m_fourreau/messer_2m_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_2m_fourreau/messer_2m_fourreau.properties new file mode 100644 index 00000000..6e0864d1 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/messer_fourreau/messer_2m_fourreau/messer_2m_fourreau.properties @@ -0,0 +1,6 @@ +type=item +items=wooden_sword +model=messer_2m_fourreau +components.custom_name=ipattern:*fourreau*grand*messer* + +# /give @s wooden_sword[custom_name='{text:"Fourreau de grand messer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/nodachi_fourreau/nodachi_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/nodachi_fourreau/nodachi_fourreau.json similarity index 99% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/nodachi_fourreau/nodachi_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/nodachi_fourreau/nodachi_fourreau.json index 8a982777..8785bec8 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/nodachi_fourreau/nodachi_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/nodachi_fourreau/nodachi_fourreau.json @@ -45,4 +45,4 @@ "scale": [3, 3, 1.44] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/nodachi_fourreau/nodachi_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/nodachi_fourreau/nodachi_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/nodachi_fourreau/nodachi_fourreau.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/nodachi_fourreau/nodachi_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/nodachi_fourreau/nodachi_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/nodachi_fourreau/nodachi_fourreau.properties new file mode 100644 index 00000000..4a8c2703 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/nodachi_fourreau/nodachi_fourreau.properties @@ -0,0 +1,7 @@ +type=item +items=wooden_sword +texture=nodachi_fourreau +model=nodachi_fourreau +components.custom_name=ipattern:*fourreau*nodachi* + +# /give @s wooden_sword[custom_name='{text:"Fourreau de nodachi", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreau/sabre_fourreau.json b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/sabre_fourreau/sabre_fourreau.json similarity index 99% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreau/sabre_fourreau.json rename to assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/sabre_fourreau/sabre_fourreau.json index a708b999..14640e9a 100644 --- a/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreau/sabre_fourreau.json +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/sabre_fourreau/sabre_fourreau.json @@ -45,4 +45,4 @@ "scale": [3, 3, 1.44] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreau/sabre_fourreau.png b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/sabre_fourreau/sabre_fourreau.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreau/sabre_fourreau.png rename to assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/sabre_fourreau/sabre_fourreau.png diff --git a/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/sabre_fourreau/sabre_fourreau.properties b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/sabre_fourreau/sabre_fourreau.properties new file mode 100644 index 00000000..640bd3c1 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/combat/fourreaux/sabre_fourreaux/sabre_fourreau/sabre_fourreau.properties @@ -0,0 +1,6 @@ +type=item +items=wooden_sword +model=sabre_fourreau +components.custom_name=ipattern:*fourreau*sabre* + +# /give @s wooden_sword[custom_name='{text:"Fourreau de sabre", italic:false}'] From 66837862be35c2af4a91bfd55e1e7151698c18d4 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Thu, 23 Jan 2025 19:39:54 +0100 Subject: [PATCH 17/27] remove deprecated comments --- .../combat/armes/cac/armes_hast/epieu/epieux_nbt.properties | 2 -- .../hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties | 2 -- .../combat/armes/cac/dagues/dague_fer/dague_nbt.properties | 2 -- .../hache_bataille_fer/iron_battle_axe_nbt.properties | 2 -- .../messer_1m/messer_1m_acier/messer_acier_nbt.properties | 2 -- .../messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties | 2 -- .../sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties | 2 -- .../messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties | 2 -- .../combat/armes/distance/arc_renforce/arc_nbt.properties | 2 -- 9 files changed, 18 deletions(-) diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieux_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieux_nbt.properties index 837521a3..147a7629 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieux_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieux_nbt.properties @@ -6,5 +6,3 @@ texture=epieu model=optifine/cit/general/combat/armes/arme_hast components.custom_data.arme=epieux weight=10 - -# /give @s wooden_sword[custom_data={arme:epieux}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties index 32089045..3f21f9b9 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties @@ -6,5 +6,3 @@ texture=hampe_arret_fer model=optifine/cit/general/combat/armes/arme_hast components.custom_data.arme=hampe_arret weight=10 - -# /give @s iron_axe[custom_data={arme:hampe_arret}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_nbt.properties index 1747d119..723ea414 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_nbt.properties @@ -5,5 +5,3 @@ items=iron_sword texture=dague_fer components.custom_data.arme=dague weight=10 - -# /give @s iron_sword[custom_data={arme:dague}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties index 91879eb8..91828df1 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties @@ -5,5 +5,3 @@ items=iron_axe texture=hache_bataille_fer components.custom_data.arme=iron_battle_axe weight=10 - -# /give @s iron_axe[custom_data={arme:iron_battle_axe}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties index 0f85a47b..c133eea5 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties @@ -6,5 +6,3 @@ texture=messer_1m_acier model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=messer_acier weight=10 - -# /give @s iron_sword[custom_data={arme:messer_acier}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties index d9cbc84d..ea056134 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties @@ -6,5 +6,3 @@ texture=messer_1m_adamantin model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=messer_adamantin weight=10 - -# /give @s diamond_sword[custom_data={arme:messer_adamantin}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties index e6d07258..3c999d48 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties @@ -6,5 +6,3 @@ texture=messer_1m_fer model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=messer weight=10 - -# /give @s iron_sword[custom_data={arme:messer}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties index 17d9fc9d..7fbb870d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties @@ -6,5 +6,3 @@ texture=messer_2m model=optifine/cit/general/combat/armes/epee_longue components.custom_data.arme=messer_2m weight=10 - -# /give @s iron_sword[custom_data={arme:messer_2m}] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_nbt.properties index cc051646..682293d9 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/distance/arc_renforce/arc_nbt.properties @@ -7,5 +7,3 @@ texture.bow_pulling_0=arc_renforce_0 texture.bow_pulling_1=arc_renforce_1 texture.bow_pulling_2=arc_renforce_2 components.custom_data.artisanat_menuisier=arc - -# /give @s bow[custom_data={artisanat_menuisier:arc}] From 2452564f3b064f75bd12452bdaad71531f8fe8e8 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Thu, 23 Jan 2025 20:27:03 +0100 Subject: [PATCH 18/27] patch general/corps .properties --- .../corps/ailes/ailes_corbeau/ailes_corbeau.png | Bin 0 -> 249 bytes .../ailes/ailes_corbeau/ailes_corbeau.properties | 6 ++++++ .../ailes/ailes_corbeau/ailes_corbeau_icon.png | Bin 0 -> 182 bytes .../ailes_corbeau/ailes_corbeau_icon.properties | 6 ++++++ .../general/corps/ailes/ailes_corbeau/credit.txt | 2 ++ .../ailes/ailes_corbeau/wing_crow.properties | 6 ++++++ .../ailes_blanches/ailes_blanches.png | Bin 0 -> 278 bytes .../ailes_blanches/ailes_blanches.properties | 6 ++++++ .../ailes_blanches/ailes_blanches_icon.png | Bin 0 -> 265 bytes .../ailes_blanches_icon.properties | 6 ++++++ .../ailes_blanches/wings_white.properties | 6 ++++++ .../ailes_lezard/ailes_noires/ailes_noires.png | Bin 0 -> 277 bytes .../ailes_noires/ailes_noires.properties | 6 ++++++ .../ailes_noires/ailes_noires_icon.png | Bin 0 -> 265 bytes .../ailes_noires/ailes_noires_icon.properties | 6 ++++++ .../ailes_noires/wings_black.properties | 6 ++++++ .../ailes_blanches_1/ailes_blanches_1.png | Bin 0 -> 1238 bytes .../ailes_blanches_1/ailes_blanches_1.properties | 6 ++++++ .../ailes_blanches_1_icon.properties | 6 ++++++ .../ailes_blanches_1/white_wings_1.properties | 6 ++++++ .../ailes_blanches_2/ailes_blanches_2.png | Bin 0 -> 717 bytes .../ailes_blanches_2/ailes_blanches_2.properties | 6 ++++++ .../ailes_blanches_2_icon.properties | 6 ++++++ .../ailes_blanches_2/white_wings_2.properties | 6 ++++++ .../ailes/ailes_plumes/ailes_blanches_icon.png | Bin 0 -> 228 bytes .../cit/general/corps/bois/bois_cerf.properties | 4 +++- .../corps/cornes/belier/classique/corne.png | Bin 1311 -> 0 bytes .../cornes/belier/obsidienne/corne_obsi.png | Bin 5284 -> 0 bytes .../belier/obsidienne/corne_obsi.properties | 4 ---- .../cornes_classiques/cornes_classiques.json} | 6 +++--- .../cornes_classiques/cornes_classiques.png | Bin 0 -> 387 bytes .../cornes_classiques.properties} | 4 +++- .../cornes_obsidienne/cornes_obsi.properties | 6 ++++++ .../cornes_obsidienne/cornes_obsidienne.json} | 6 +++--- .../cornes_obsidienne/cornes_obsidienne.png | Bin 0 -> 387 bytes .../cornes_obsidienne.properties | 6 ++++++ .../petites_cornes_bois.json} | 6 +++--- .../petites_cornes_bois/petites_cornes_bois.png | Bin 0 -> 511 bytes .../petites_cornes_bois.properties | 6 ++++++ .../small_cornes_bois.properties | 6 ++++++ .../petites_cornes_noires.json} | 6 +++--- .../petites_cornes_noires.png | Bin 0 -> 498 bytes .../petites_cornes_noires.properties | 6 ++++++ .../small_cornes_noir.properties | 6 ++++++ .../petites_cornes_os/petites_cornes_os.json} | 6 +++--- .../petites_cornes_os/petites_cornes_os.png | Bin 0 -> 511 bytes .../petites_cornes_os.properties | 6 ++++++ .../petites_cornes_os/small_cornes_os.properties | 6 ++++++ .../small_cornes_bois/small_cornes_bois.png | Bin 5286 -> 0 bytes .../small_cornes_bois.properties | 4 ---- .../small_cornes_noir/small_cornes_noir.png | Bin 5534 -> 0 bytes .../small_cornes_noir.properties | 4 ---- .../small_cornes_os/small_cornes_os.png | Bin 5634 -> 0 bytes .../small_cornes_os/small_cornes_os.properties | 4 ---- .../spikes.json => epines/epines_dos.json} | 2 +- .../general/corps/epines/epines_dos.properties | 6 ++++++ .../spikes_head.json => epines/epines_tete.json} | 2 +- .../general/corps/epines/epines_tete.properties | 6 ++++++ .../cit/general/corps/spikes/spikes.properties | 6 ------ .../general/corps/spikes/spikes_head.properties | 6 ------ .../cit/general/corps/wings/crow/credit.txt | 1 - .../cit/general/corps/wings/crow/crow_elytra.png | Bin 368 -> 0 bytes .../corps/wings/crow/crow_elytra.properties | 4 ---- .../corps/wings/crow/crow_elytra_icon.png | Bin 321 -> 0 bytes .../cit/general/corps/wings/crow/icon.properties | 4 ---- .../general/corps/wings/feathery/white_wings.png | Bin 3139 -> 0 bytes .../corps/wings/feathery/white_wings.properties | 4 ---- .../corps/wings/feathery/white_wings2.png | Bin 1166 -> 0 bytes .../corps/wings/feathery/white_wings2.properties | 4 ---- .../wings/feathery/white_wings2_icon.properties | 4 ---- .../corps/wings/feathery/white_wings_icon.png | Bin 461 -> 0 bytes .../wings/feathery/white_wings_icon.properties | 4 ---- .../corps/wings/lizard/black/icon.properties | 4 ---- .../corps/wings/lizard/black/wings_black.png | Bin 607 -> 0 bytes .../wings/lizard/black/wings_black.properties | 4 ---- .../wings/lizard/black/wings_black_icon.png | Bin 419 -> 0 bytes .../corps/wings/lizard/white/icon.properties | 4 ---- .../corps/wings/lizard/white/wings_white.png | Bin 640 -> 0 bytes .../wings/lizard/white/wings_white.properties | 4 ---- .../wings/lizard/white/wings_white_icon.png | Bin 433 -> 0 bytes 80 files changed, 175 insertions(+), 88 deletions(-) create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/ailes_corbeau.png create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/ailes_corbeau.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/ailes_corbeau_icon.png create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/ailes_corbeau_icon.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/credit.txt create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/wing_crow.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/ailes_blanches.png create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/ailes_blanches.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/ailes_blanches_icon.png create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/ailes_blanches_icon.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/wings_white.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_noires/ailes_noires.png create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_noires/ailes_noires.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_noires/ailes_noires_icon.png create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_noires/ailes_noires_icon.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_noires/wings_black.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_1/ailes_blanches_1.png create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_1/ailes_blanches_1.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_1/ailes_blanches_1_icon.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_1/white_wings_1.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/ailes_blanches_2.png create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/ailes_blanches_2.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/ailes_blanches_2_icon.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/white_wings_2.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_icon.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/belier/classique/corne.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/belier/obsidienne/corne_obsi.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/belier/obsidienne/corne_obsi.properties rename assets/minecraft/optifine/cit/general/corps/cornes/{belier/classique/corne.json => cornes_belier/cornes_classiques/cornes_classiques.json} (99%) create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_classiques/cornes_classiques.png rename assets/minecraft/optifine/cit/general/corps/cornes/{belier/classique/corne.properties => cornes_belier/cornes_classiques/cornes_classiques.properties} (50%) create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsi.properties rename assets/minecraft/optifine/cit/general/corps/cornes/{belier/obsidienne/corne_obsi.json => cornes_belier/cornes_obsidienne/cornes_obsidienne.json} (99%) create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsidienne.png create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsidienne.properties rename assets/minecraft/optifine/cit/general/corps/cornes/{small_cornes/small_cornes_noir/small_cornes_noir.json => petites_cornes/petites_cornes_bois/petites_cornes_bois.json} (98%) create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_bois/petites_cornes_bois.png create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_bois/petites_cornes_bois.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_bois/small_cornes_bois.properties rename assets/minecraft/optifine/cit/general/corps/cornes/{small_cornes/small_cornes_os/small_cornes_os.json => petites_cornes/petites_cornes_noires/petites_cornes_noires.json} (98%) create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_noires/petites_cornes_noires.png create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_noires/petites_cornes_noires.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_noires/small_cornes_noir.properties rename assets/minecraft/optifine/cit/general/corps/cornes/{small_cornes/small_cornes_bois/small_cornes_bois.json => petites_cornes/petites_cornes_os/petites_cornes_os.json} (99%) create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_os/petites_cornes_os.png create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_os/petites_cornes_os.properties create mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_os/small_cornes_os.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_bois/small_cornes_bois.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_bois/small_cornes_bois.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_noir/small_cornes_noir.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_noir/small_cornes_noir.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_os/small_cornes_os.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_os/small_cornes_os.properties rename assets/minecraft/optifine/cit/general/corps/{spikes/spikes.json => epines/epines_dos.json} (99%) create mode 100644 assets/minecraft/optifine/cit/general/corps/epines/epines_dos.properties rename assets/minecraft/optifine/cit/general/corps/{spikes/spikes_head.json => epines/epines_tete.json} (99%) create mode 100644 assets/minecraft/optifine/cit/general/corps/epines/epines_tete.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/spikes/spikes.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/spikes/spikes_head.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/crow/credit.txt delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/crow/crow_elytra.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/crow/crow_elytra.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/crow/crow_elytra_icon.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/crow/icon.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2_icon.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings_icon.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings_icon.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/lizard/black/icon.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/lizard/black/wings_black.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/lizard/black/wings_black.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/lizard/black/wings_black_icon.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/lizard/white/icon.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/lizard/white/wings_white.png delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/lizard/white/wings_white.properties delete mode 100644 assets/minecraft/optifine/cit/general/corps/wings/lizard/white/wings_white_icon.png diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/ailes_corbeau.png b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/ailes_corbeau.png new file mode 100644 index 0000000000000000000000000000000000000000..2535e96a16bec49f4e6b853656e89f97e7856f2d GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQqloFA+A80ot>SZpI=N&OiD^h zRaMo*#KgwNCLtl=$o0s3KxxL3AirP+hi5m^fSevr7srr_xVPu_@-Zojv|QZ1V&m1O zT82%XYj1uCb~cQ7_w=v)F}6jlGtZq{uk^&hZQt(uzZRa@GyTJAs$mpYX41{ZwctmN%$T-qw@6t!lxh=+%Vh{XZp0?z{n8&*De(B;us*^qC; ue6?6Wcy2-0MQ+x=%tl4Rd}cpg|KFQmAe>;iOJ^_8T@0SCelF{r5}E*x3=%TQE_>LPw-`H+QUP<`b_!a(W3urs;5R+{buaH>1UiJl)78&qol`;+05JVR*Z=?k literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/ailes_corbeau_icon.properties b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/ailes_corbeau_icon.properties new file mode 100644 index 00000000..88940a1b --- /dev/null +++ b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/ailes_corbeau_icon.properties @@ -0,0 +1,6 @@ +type=item +items=elytra +texture=ailes_corbeau_icon +components.custom_data.ailes=corbeau + +# /give @s elytra[custom_data={ailes:corbeau}] diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/credit.txt b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/credit.txt new file mode 100644 index 00000000..34295336 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/credit.txt @@ -0,0 +1,2 @@ +'Crow wings' by ATOMICtheCrow +[https://www.planetminecraft.com/texture-pack/elytra-to-crow-wings-optifine-optional/] diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/wing_crow.properties b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/wing_crow.properties new file mode 100644 index 00000000..2e222600 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_corbeau/wing_crow.properties @@ -0,0 +1,6 @@ +# Duplicata de 'ailes_corbeau.properties' pour ne pas casser les items avec l'ancien tag 'crow' (clef : "wing") + +type=elytra +items=elytra +texture.elytra=ailes_corbeau +components.custom_data.wing=crow diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/ailes_blanches.png b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/ailes_blanches.png new file mode 100644 index 0000000000000000000000000000000000000000..2822817e11a960e310d2f80810b65c1b27cbd198 GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQi=gSA+A7LNJuCxEp6?Z4O_SD z*t2{8jqA4`+-T9>@OX1 zatA^(XdZpv zR#N_FUxJ3`+9UD-!QQcIk9l8dK2!_i{UM_B?Z|tUwxj2|Ki)d9;mDCDM*R%4v;~Y3 atPE>al&TKoM*amlm%-E3&t;ucLK6V)j&QmF literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/ailes_blanches.properties b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/ailes_blanches.properties new file mode 100644 index 00000000..857b749f --- /dev/null +++ b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/ailes_blanches.properties @@ -0,0 +1,6 @@ +type=elytra +items=elytra +texture.elytra=ailes_blanches +components.custom_data.drak=ailes_blanches + +# /give @s elytra[custom_data={drak:ailes_blanches}] diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/ailes_blanches_icon.png b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_blanches/ailes_blanches_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f4f39ef66da597b65b989c248b7116663adeeb59 GIT binary patch literal 265 zcmV+k0rvihP)P)t-s|NsBJ zy}iA?z3AxZ<>lqPyu9h@>GARL^z`)N;^M%-z`MJ<>+9>kzrX70>chjs+}zyq^77{9 z=HTGq?d|RF@9*K^;l94U-QC@U-oE(&0007XQchC<_{H_N761SMYe_^wRCr#6j!6>2 zKnw$+J$p9R<^L}QkCGG@3fHYaZfQgQ)4A+A80i;IhwmzSTPUr0zu zL_|bWQ&Ue*&)C>FEiG+&=5cqR3dWKkzhDN3XE)M-oTZ*Fjv*CsZ!akFA2JYOd7wN& zP-Z3LZl9d0rbN!jbWSGQjqA#8Iz{_(yp@0Of08820ZW*?*XY?#0t&v?n>R)d#zz;ZGB58oL= XW+*<()Nw(7_Czu6{1-oD!MEakt5!c%1F2v->!@SV8(oEp+|9CFBjUwV) zcdtwfz4ce%z;s)KEBDNv=dCw>c+SQqqA071_)bNdChCR~4}5EY~}mwEBw zy&a2;T|0BV-)-O6P$9A)Zc2psm($k{rms2>_hA0Ko&!wBfBlbr3bdBN)78&qol`;+ E08~Iw=Kufz literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_noires/ailes_noires_icon.properties b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_noires/ailes_noires_icon.properties new file mode 100644 index 00000000..63fe0efd --- /dev/null +++ b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_noires/ailes_noires_icon.properties @@ -0,0 +1,6 @@ +type=item +items=elytra +texture=ailes_noires_icon +components.custom_data.drak=ailes_noires + +# /give @s elytra[custom_data={drak:ailes_noires}] diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_noires/wings_black.properties b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_noires/wings_black.properties new file mode 100644 index 00000000..cfe0614a --- /dev/null +++ b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_lezard/ailes_noires/wings_black.properties @@ -0,0 +1,6 @@ +# Duplicata de 'ailes_noires.properties' pour ne pas casser les items avec l'ancien tag 'wings_black' (en anglais) + +type=elytra +items=elytra +texture.elytra=ailes_noires +components.custom_data.drak=wings_black diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_1/ailes_blanches_1.png b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_1/ailes_blanches_1.png new file mode 100644 index 0000000000000000000000000000000000000000..1bec79c3501847bc07ed1859d00252013f214484 GIT binary patch literal 1238 zcmV;{1S$K8P)rj*fVFd6Sfsot~bbprD|lp`fCo zq@|^}xw*Z*zRAkU($dn?)YRJB+uz{e;o;%r<>h;Pe0qC(o1LBQ?d@}Qbm-{lczSxO ztgDfeldP?+u(7dye}1{Sxw^Z%yS=@_!^6YF!^FkK#mC2+ot$oOZ+?J))z;S7+1ZPX zi`?AYgocHNhlb(e;-aIY=I7_6rKIWV>g(+6s;sQ;@9*&O@b~xkr>LmL$H$tRn%39X zt*)-FuC8@=ccrJM^YrxH-rkUrk&BFsw6wIfwzj3Gr>Ux{$jHdd&CQsZnZ(7!(9zMF zo12!HnA6nL*VotB+1QnqmhkcMpP--K;NNyVO>hKPrwqocmQzQ4f0^78WY^z(Rnd9AIjiHnM>tgLf&b+ECpsj8{tjrI2Sk&}}6`T5Dp$siY@+5i9m1$0tQQvd(}0YI&+ zc3=Pi0=r2>K~#8N?bg$hE=d%I;mYaxRvABS8%^7`v1!}J*t*``5q&yGeUNoh?+xS= zYehz;aMsvKbvY=z&iP#IB*Cs&FeGsU;C}$Kx+ahNRsYZ95i912_$bvRO72~oY5{yE z;IVWuc31B7%_?^-jcB(3JsWV3lz9PIU1Q!vr>k?qQs`mQxGzHQaz6zGJ~75r#=;V7 z_nN-?oa)v4*YUXI#$|8aAi3VqVu&C{s8my@$1+xsmcnh)urkO8zvwtayXkFh2pKhy@nO=2C$&F zn|iWzm=Tq$J1y`B)IFB|Pr~yUq5H+lE&eNDrqoathW5$>#-+j(YyiYV@$^OatzXfd z4h+96fj1y18I9w)KoL4+o^6!C9nesI@EWn?A`qef262!33MLfAB%*tHP&E86_)oxf zt`Q^gQw<)8=px+Q0qusXE;R%1kH`~!DNDslKeNzOb;qv$MXmw6U|kzPGo&xVXN(y|S~u!p7pl$Ku1t;>5_}#mVBv z%Hqt=;?B_G&e7t}(&Ez8;?mXPv$Vdet-jXS;@8>Y*xBN&ufE#f{k6Bgr>efFtG?df z;@;x@-sAn>HX*G{psxe>g@gP@BQxZ{qOPp@bUe< zvWxTd{q*(yy|k44?!Nr+#r*Ni{PfnnwU_+$-Te9P{Q2+v`ttqH(EaP{{qFDm^78%j z^Zohyy|tL{VOLE60007XQchC<0CtnjH~;_v14%?dRCr$P%tM!hK@f%EzSSRMJ7e3n zZQHi}S2v4R#|9S|ZLv>G6%@VrxxjE|@bn|>U2$-MY#euG%{(oYaRH1tJ1!^VkHu^t zx2<~oHtdyLz+LY<+}5V^SJ^=Az>&)y%~<9Fuwl#@33>Pc`WgcWdNe-ZZs^5ccYg{% z-5_?`EqnkqIY4WK55NYXIluyvH9`E>(xv+ZR<0vIG&hFu00000NkvXXu0mjfO5ng5 literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/ailes_blanches_2.properties b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/ailes_blanches_2.properties new file mode 100644 index 00000000..c87e19db --- /dev/null +++ b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/ailes_blanches_2.properties @@ -0,0 +1,6 @@ +type=elytra +items=elytra +texture.elytra=ailes_blanches_2 +components.custom_data.ailes=blanches_2 + +# /give @s elytra[custom_data={ailes:blanches_2}] diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/ailes_blanches_2_icon.properties b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/ailes_blanches_2_icon.properties new file mode 100644 index 00000000..9c159bbc --- /dev/null +++ b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/ailes_blanches_2_icon.properties @@ -0,0 +1,6 @@ +type=item +items=elytra +texture=optifine/cit/general/corps/ailes/plumes/ailes_blanches_icon +components.custom_data.ailes=blanches_2 + +# /give @s elytra[custom_data={ailes:blanches_2}] diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/white_wings_2.properties b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/white_wings_2.properties new file mode 100644 index 00000000..36aa6be9 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_2/white_wings_2.properties @@ -0,0 +1,6 @@ +# Duplicata de 'ailes_blanches_2.properties' pour ne pas casser les items avec l'ancien tag 'white2' (clef : "wing") + +type=elytra +items=elytra +texture.elytra=ailes_blanches_2 +components.custom_data.wing=white2 diff --git a/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_icon.png b/assets/minecraft/optifine/cit/general/corps/ailes/ailes_plumes/ailes_blanches_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d0e7cdddda202ef9fc861aa5af9642f23176cafa GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv3GfMV1=9cj{|^fbn>uysqD70A zELpN|-@fC=k6*la@y3lCFJ8R({P}aV<-b^ULm_fnX2(v(=)!ZjeoYE1Qzb%K6`T3@m zt&b)~3QJfRcXJ;-yWBS+VLn%qi7b90~;%3!D(p5ob|i^f}G= Y-crH+^kM6BK#LhXUHx3vIVCg!057&v{{R30 literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/corps/bois/bois_cerf.properties b/assets/minecraft/optifine/cit/general/corps/bois/bois_cerf.properties index 18e729ef..79435608 100644 --- a/assets/minecraft/optifine/cit/general/corps/bois/bois_cerf.properties +++ b/assets/minecraft/optifine/cit/general/corps/bois/bois_cerf.properties @@ -1,4 +1,6 @@ type=item -matchItems=bone +items=bone model=bois_cerf components.custom_data.vetement=bois_cerf + +# /give @s bone[custom_data={vetement:bois_cerf}] diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/belier/classique/corne.png b/assets/minecraft/optifine/cit/general/corps/cornes/belier/classique/corne.png deleted file mode 100644 index 2ba66eecbd15b90f901835e6b5ddec3feff9c349..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1311 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVusrj0aSVxQO?sn!{`dbcH?`ZW z{pE~ToH${$r{;g3V@yED!^hwCc@z$uKY3U|SM}J3r^n0N`rq3fe)_Yu;$V$H!^&1h z#W+T`&{WH|^Yix`h?M#zxlD9n6YU#6`ukipLnZ-fcQE$)RD$gM_(6X^=a8=3?} zt{8ATGE9?m=rp@@hW)U^gr_G=;^1C!`Y2db(jdcFB(vf~D`UWl1ZIQd2N!XRXf1fL zdbWjhJqIH08bz%Z*!0D4HhS4la6DnjBw~7lOKL(~L|JR9^CAXByhSoFDR@tCW(b?o zbc$t0;)$$_j77d2Odoc!$ioA@shxpCp`Ae^zqy7dd&z-Q%mVULY!i1fN;VX=S#>Mj zC<-uB;eaPnrgjD$-i9XG6bp@yji0QGlv%}?He3_jc7dU?Va61GL~tcFMRF~2T-Wxz zHlsl4vVy5X|2{0Y6247w!DQ0Z&G6<*C{iF`OO&-n#-2y@NbmS z+<#bxCk6x)erOz3qgBflF*ub-(BM=& zULgm7_?t?J@1!a!|$FY-H{ zg@xla@}#+5Gjh$%X8*Xu@yxY5lP@p9cnS8lEte8qCJsbdfb(q<(vE#H_TKL~yM5OR zEAv}wEIh3|Q|Rqbq)U*!{d1?EP91cpHY4&L<}b@!Q`b;(5)7JKy$80H<+YhgTqj<0 zwA;`yTkf}Im8P)FeC5wq_s+X*cH1(9T4mJ!H2@fGRJglKMDFfy@*%UxU60euFCS@<&`PIa);#2vD4_V!t5Rx;sZe?!6lC38m zpa1m!rDz95@zsge+id6VNTFDAvV4;^QjSl~ z8KtGF=%=$aWuw1vdGMt*@?}n;#180==n*5~?H1ERb!(!#?)Dh{ELnbm_v2Y>$hV;L zIlcRFcV|~C>&WZ%K$Mp@e|%4`F#t>oRFDN0EM6**sg-mTQ%iAryi!9}9soGG#%oYn zG)_>Zc!WabOzSQ`L!&A%XWDX(7!qsT@koVtq89g0^a+q9M#~V4=IUbN6fYnNlsJJ> z8k9fsunC4>y4c$i+L8&ZMPgAtEv7)(0EP%0TCJ#>V}YLa9qpuhCc z1(1Ep@WXZLSgj2ASdFU)n~@ZlY}j8DtBodK=p)kgjvOx}?i-T+y3V{g3m4Pgbi?Wyy3dy+K5mX|TjzCp1Tu()k(-kBS!a-mb z46{HU6PJT*84m-cd^Qfsa6X^S#^n$PW{sd&rd5ztiN=hKN>7F9sdzk?1F@MP#Nm_C z$Pf-F<#DATn=9j^xRejG5srZhlLFx*BFJNnW$7l zTL@6uUuy}tpGir&Xqz_h3hD84A74;V2%2v6JCy$DM8TdpyJiNlvU3kK{?-{+ z|2R_KvZl57bnE=@5}(l7g@vl?0X3s!E05c2T1HWI9z_moJD|FP-W5?_umFXcZOhs6 z6zFj5*w-@QbuIQX;{uWKo$|Bqs+vrJ6%Tt_63R{Yw@$m5kTdH3scnti<_PU|sc=yQ z0xyp&I?qb~b!y?W*3OUr?0*G>WHW2p!zd?1n&m;aOz)kwNyW7-Pw{o<>)WPVmrz>S z*CRRks_O$UdXFZj&pWE3pa0&ep?udxqhsqNtosDee<6?Yg9cZ;4vm~s(ozuUQ zzc6HM2N>2-|L;W-b5=|RSd*m9q4DYDI?_S)_l#k(DR_Enew3G)<6_iug?Spn3oEdFPidEB}J z&lTBext}F6>U@H%2~+Dac~#!^T@_85f%|D{dcdpGea#b+e38v#S45pY%rMT%?W&XBcFb#A zSbJ%jYs>aUQ)XRtKo1v9PIk()@tj_MV*$JHS$c6sYG&+ydyDj|?ql+@T-FUZO?*%m z{knBeN>vDKnN%+8>pA~z_)8yNiS483B+l_dRds4c$}Q8pP-*1>$vt9>)Qn;soSk;O zzUY^!N0gGXCH5tDW}bVTryM+Yt@&XZW>>Rj>}0dYQG3gM^6OTrul`)zm3k_S z#mHHZ(QQ?mFwd)E-HT4~CZD+Ui;~o&%IJM5o4SuTY>7krK*)ob-FcS$uD-F{e71S? U^-(u+$ZiBg9zMe2#o@{S1u*H@3jhEB diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/belier/obsidienne/corne_obsi.properties b/assets/minecraft/optifine/cit/general/corps/cornes/belier/obsidienne/corne_obsi.properties deleted file mode 100644 index b468c248..00000000 --- a/assets/minecraft/optifine/cit/general/corps/cornes/belier/obsidienne/corne_obsi.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=bone -model=corne_obsi -components.custom_data.vetements=cornesObsi diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/belier/classique/corne.json b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_classiques/cornes_classiques.json similarity index 99% rename from assets/minecraft/optifine/cit/general/corps/cornes/belier/classique/corne.json rename to assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_classiques/cornes_classiques.json index a46001a4..ab91d435 100644 --- a/assets/minecraft/optifine/cit/general/corps/cornes/belier/classique/corne.json +++ b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_classiques/cornes_classiques.json @@ -2,8 +2,8 @@ "credit": "Made by Lellion and Niben for Herobrine.fr", "texture_size": [32, 32], "textures": { - "0": "./corne", - "particle": "./corne" + "0": "./cornes_classiques", + "particle": "./cornes_classiques" }, "elements": [ { @@ -221,4 +221,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_classiques/cornes_classiques.png b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_classiques/cornes_classiques.png new file mode 100644 index 0000000000000000000000000000000000000000..6c58c297bcf6a9c306ff1997cd27878999cf82f5 GIT binary patch literal 387 zcmV-}0et?6P)b6r?=VO)Z5WsY}lmVb1cgnFoxhxy8+3IG5A0d!JMQvg8b*k%9#0T4+< zK~#8N&CM}xgD@0_aaTf}130Oaso1^%JeRHn1FTdk_8JwiS0uokphu{Bhn%u1CPQz~ zZ~W=6_t1tQM1|E)5n+;6nLF~63C?(y|^z!Nn z$Rned4ag}@A5DNkj{Dm>PW33N70G4;-Sb6c{`rRV)h+U<@|mr`2T`lW!D^+l%M$qag&vV= h2P**m&1&?&`T^z@Lv7XwGWh@i002ovPDHLkV1jS(qmKXp literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/belier/classique/corne.properties b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_classiques/cornes_classiques.properties similarity index 50% rename from assets/minecraft/optifine/cit/general/corps/cornes/belier/classique/corne.properties rename to assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_classiques/cornes_classiques.properties index a464bba4..4bc32b7c 100644 --- a/assets/minecraft/optifine/cit/general/corps/cornes/belier/classique/corne.properties +++ b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_classiques/cornes_classiques.properties @@ -1,4 +1,6 @@ type=item -matchItems=bone +items=bone model=corne components.custom_data.vetements=cornes + +# /give @s bone[custom_data={vetements:cornes}] diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsi.properties b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsi.properties new file mode 100644 index 00000000..43dfd4a5 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsi.properties @@ -0,0 +1,6 @@ +# Duplicata de 'cornes_obsi.properties' pour ne pas casser les items avec l'ancien tag 'cornesObsi' (avec "O" maj) + +type=item +items=bone +model=cornes_obsi +components.custom_data.vetements=cornesObsi diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/belier/obsidienne/corne_obsi.json b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsidienne.json similarity index 99% rename from assets/minecraft/optifine/cit/general/corps/cornes/belier/obsidienne/corne_obsi.json rename to assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsidienne.json index 752317ee..7b5dcbd3 100644 --- a/assets/minecraft/optifine/cit/general/corps/cornes/belier/obsidienne/corne_obsi.json +++ b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsidienne.json @@ -2,8 +2,8 @@ "credit": "Made by Lellion and Niben for Herobrine.fr", "texture_size": [32, 32], "textures": { - "0": "./corne_obsi", - "particle": "./corne_obsi" + "0": "./cornes_obsidienne", + "particle": "./cornes_obsidienne" }, "elements": [ { @@ -221,4 +221,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsidienne.png b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsidienne.png new file mode 100644 index 0000000000000000000000000000000000000000..49d92f3d32e2f5d12cf4a43cb94782fea398567b GIT binary patch literal 387 zcmV-}0et?6P)tQM1|E)5n+;6nLF~63C?(y|^z!Nn z$Rned4ag}@A5DNkj{Dm>PW33N70G4;-Sb6c{`rRV)h+U<@|mr`2T`lW!D^+l%M$qag&vV= h2P**m&1&?&`T^z@Lv7XwGWh@i002ovPDHLkV1nL0n?C>m literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsidienne.properties b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsidienne.properties new file mode 100644 index 00000000..4b725d98 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/corps/cornes/cornes_belier/cornes_obsidienne/cornes_obsidienne.properties @@ -0,0 +1,6 @@ +type=item +items=bone +model=cornes_obsi +components.custom_data.vetements=cornes_obsidienne + +# /give @s bone[custom_data={vetements:cornes_obsidienne}] diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_noir/small_cornes_noir.json b/assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_bois/petites_cornes_bois.json similarity index 98% rename from assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_noir/small_cornes_noir.json rename to assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_bois/petites_cornes_bois.json index 3d905351..bf7c7bcc 100644 --- a/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_noir/small_cornes_noir.json +++ b/assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_bois/petites_cornes_bois.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "small_cornes_noir", - "particle": "small_cornes_noir" + "0": "petites_cornes_bois", + "particle": "petites_cornes_bois" }, "elements": [ { @@ -189,4 +189,4 @@ "children": [6, 7, 8, 9, 10, 11] } ] -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_bois/petites_cornes_bois.png b/assets/minecraft/optifine/cit/general/corps/cornes/petites_cornes/petites_cornes_bois/petites_cornes_bois.png new file mode 100644 index 0000000000000000000000000000000000000000..537b7f6c2f24ade9ed83d654f601dcd5463ecbed GIT binary patch literal 511 zcmVa}`UwU$1hJR~6CH1-h0004WQchCfx~3_9qDwpU476;JQ_z9Oc!Rv=OlZU*< zgTSjXYJ1HD25HdOQ9njwhN?pj2;!vlZEVsB8&7Qx5RZV@jd#){xROEW`@2-#Y-cSj z8TAj4)bH(l{g2EW2Ps;-UAa-~A( zc=fdRpP!>mx#jlrmZV9apSkk61^x;OkX{>y{W&*Kk9uA2!W;JOYzo<}B|;H6c-qf1 z*sLP(Gl-+~Xl6U@vx<6+mtDOUmR_yH*FwcJE{wpJ4qujOUI9YXdI!Jw^VGZfz3gP! z!k&r-qbf@U0f+@4{u5~oM4SVnLaZz*tPq&;nsFQAg;k>##sG*BBCMNV4y;zHz{(h@ zTCUoXfgD_z0qbJPu-yhn|IK*H3v|0tHMS!5`esOy%xl30ZJoPz1JOf@2-bt6>N(Q0dH>uC7owcxJ)Gr{Z9X0?t z0D-DbOWgc{azJNYmT6Wr7wQECAW2&6;P`MZ-pSw=Zm7?F?6xZvLKpFL^537MO}Rx! zP12?B&s_W50xzHd8MJdajk$pawEMOSA2{`^DP*^n2u0xF>9o#Zvx>m4AdWJiTkUkp zD%w5Xs&+3dgIb55g^E|)8G-L-{Me>>1qe~w3V!qFX{+_URkCeiuSJ7Vm92sR!~zii zi8KZx&H+&&Ru&aj2uyj+cntB*s!fx~3_9qDwpU476;JQ_z9Oc!Rv=OlZU*< zgTSjXYJ1HD25HdOQ9njwhN?pj2;!vlZEVsB8&7Qx5RZV@jd#){xROEW`@2-#Y-cSj z8TAj4)bH(l{g2EW2Ps;-UAa-~A( zc=fdRpP!>mx#jlrmZV9apSkk61^x;OkX{>y{W&*Kk9uA2!W;JOYzo<}B|;H6c-qf1 z*sLP(Gl-+~Xl6U@vx<6+mtDOUmR_yH*FwcJE{wpJ4qujOUI9YXdI!Jw^VGZfz3gP! z!k&r-qbf@U0f+@4{u5~oM4SVnLaZz*tPq&;nsFQAg;k>##sG*BBCMNV4y;zHz{(h@ zTCUoXfgD_z0qbJPu-yhn|IK*WbC}KfyL#yaP zY^@YUMJuRPs91e~h^SSm_zDlGh>8m$f(m7k;`c-hE#RjrIV?gG0_zA$l|q8WqXbQo5+$H| zOaejrCRtFkRTXu@P~X(qm1cJSIeJ zK1;G@&bqd>RDJo!7uFj;y6cd4eVjw}@hAE9kG!AXpQ^msDztM*@rP$v*xK+@*Ilye z+j6Enb6dvb9d>~en6JW%55DNN_$4Qxu>79_P1H-<+S4s;*xE)G<&nO-+OBnYenL9Z zdOq!9TIN%m+(utZ{DAI|NxQ}E%*bi$qdGGn2$zBR`2`95{9dO6lGu~7-IHGxG&S?p z!A-}Gq|fHgqMur-4W3dHQca9-l4XR?ULqe%bF>m{+PuGYg|hoZM4~dG{%l|Ot{))(ay6P6pR<>8i}%nI{zl&F6Y)w&E)*Wvmn=j0w< zP`7!8zP^Fe8+?nW&(Yn^b1iHWn)P$YG8t17B5$`^&FxR zmkpi`VhWL9G||Lyh!Mgdf}cW#5}0HrnM&g6F)f|A$eiG%5=+=2T>nuB@Wvs=Xf#ST zg`(5x$T|jDp^{Q)EEbDGrBmp160jhtljIs$Pm-(W86ZY5xTqRYVM-0AkP{4;ut<@p z;Sh;HPk0@lOeqw;ftRaCSpa-c^stgbBU33d8D*@8TEo)fZ#)bXNHLkx=mp4r$5Mky z-jelBYzB=now0!c_cyrjSijEQXbh}`LN-@{BpSjKa5+T7`fRZR!NhFiBb6p*y0TCv zNkT^u5)*}4Bp8&3#6oB+L_!4`R5AuiAXjT(If5FX05}-~IH)@lff2-&ll|f}lJlyCKbPU8Y6$ZKzjvpJ90ZI&@=*D1 z7B+M$05HlyHf%o?3TqUqFohzXLo@_MFnGRE3&DmG!y1?iYfu16r8C)77MsQlqcPYt zI-9|Aq0-sZG4={ECQ15V)`smv@ER#PA5(+%lZ>K~Jr#;3jJ%D!#$(3KL?9Tq1sg_2 zQc%NMRBVhBV2!Ad7+5Yv!TcC)*w=FGFPedhuwXHjDj^{ZHwlT!pfO1vC`&{Vxzm^) zbeg+6Q^a@|U9FI4bg&9tECoCQu0Vqtxgt1?mdg2EdtD4_r~{ykL}ii2P)4MTCQC6) zjMv$EQT~GuFQdVj5d-{2WMFiGNl1A!3P<@e44uF6Gg^ngaRmVVVUhRZ_XAxY=z1>( z-plwycYUDiy%=~e;}6~Sf1}I%?O_U)gMUCea8z=+-s%93S!SY71GrF(;k*234-QBs zD*2IW2(qv-TsY{PJ=1{@uMr4&_(v11Ei4zbJYZ~wpz*;1?&2_gQ)i@uVwUIRy(#7| z7Iw;>4cv%Iduehda9?(I;rxa37nT#it-##*uy5dzwDYa=C%p`eTmN)=mx=D4{i<_V zV9TIjxPX6sZ*9}=0m*|GQR-wB6M_iD>4;C9RaPnQbb0F9;*PZ&Am}{%R^BQ}7LIF~ zYPZY%+CbwoA8vG!l{95==-gMkkJn`4plyAXL0rpP{gw?rTzFE_+^mPv>l{me3P#y{%^paoPCtHH|kuB@!dz z0`P*WCfj_O`^yj$3RyA!R@VdR+N`aIDPMNA4n5KTx+0zCSWx*= zr!b2|MAECdC~D*0lY;(-L=P ztJbtZZl%@2+NT-+a_CB*xw<%So+zr*qNA4*p0?NPl&|@+cD<5(^jNWCK|!Y^1=Rbv zKfl8?Z+70Zxt^_wbxpZeRi%pc9mmd6h8BC*p2+OrP5G&EQJDqgQ;7S#!PN9p9M`gB zt#o32Q;b=~jr)%&GcNS*+nICP?*5M;AB z5?42Q_byf4jyjeO*+X|+zV6V10F#q~PpTqk5WZ|V+F*}gxa($B)~T8WvE8iws+$Fk z2aXr8?d3(L5BIt;(u#UYu6O=1F;h7|=~|*sc%|d?HpY1yjdpKNhuE<@QR{8@>ed5E@{G_i%Kies;3ZVPCE~JC9`kYS1Y4?(l<}vYwK?7-r=f$Zg0Eo zYn7)C_szbpum&gLz?K8usxpQi*Vz08@4tSkU(I|qu013A*si0o55T;E1iYo(V&CYr Fe*;+i?yUd- diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_bois/small_cornes_bois.properties b/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_bois/small_cornes_bois.properties deleted file mode 100644 index 95a49fa4..00000000 --- a/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_bois/small_cornes_bois.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=bone -model=small_cornes_bois -components.custom_data.vetements=cornes_small_bois diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_noir/small_cornes_noir.png b/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_noir/small_cornes_noir.png deleted file mode 100644 index 97755f45f8ec25ea414e72ca2f40a46af11405e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5534 zcmeHKc~leU7N0zkO+j!4!8XKF5MP#=B!ol)2tlAF2#A7KDU->BjF5#SKmZ9;pasR< zDy3SaZZxeT3MyI!6@j)|(26LcSjCE3L_yqv_az|Wc|GqP&uRa2a%Q{B@4NSR@BL0D zFEk{;%5thD1VL6ofr4;w_c5I2rr@e460U*U>C}iQO*ooNR;m;dA|5AeQj|Cu*Afy4 z(zeJ#Ke0YV9{ZwUMv_Ul>)M-*6&sSWre&C(*Kd_rY^YghQQX&~JGb5MQvIgz1Gl$8 zYBgcLv{0JGy?mWC#^TwYklke08S<^f*>f2ep0Nrd{mK{T-(_a^(zHL4d+S`^JMXoQ zeCcHUsX*M)(Nw0JiI?7bo|8B?`9ey`hE2bx7ry*s!M(yU_Hh;D+mORx7nx+N9skbGs&(Ees0JZOC)6IzoOp zy&2!!<}qd3WUZvJe#akqSv8`vtXtL+XFum}oUCW)=REVhi0AZ7j;#pC_M~-BG3{>o zsPJBSt!>@-@qxbC`BQ%`srJoIS~YRP4BncQr*)1Q>lY)HKgYC3`Al;Apl)2hSygP@ z$CT8G1j<#FBb zDJw_id)-;@#9d#sDby9}ihU&H#U%)=Bi8Y)(ZaGF-81g!@_p59s|ipAj?vIvhQ zu5{8of6e^s|qOoWUs=t;g#z^CSMkY|Lg6sHTs_1B;DfG3m2{ZKpvz?RksfM|e-Z#03g|CA)Dd7%>EXCq zk*LCOFd%Zx^pOx^Y}j9!sERkHBgW`>JT3#KYOpH&#*zU+!q8z40|l{!OlkB2WWQml zAtbNKdLuT2#+c5?K!E!&?i<#xayJ?SE1{4lP+*CM@PY(LMumZJ-t5pIJ_VsMUQ0sbQH=yRfEgg< zVnwq0wJL&;;qx@8flru&xHDmd<-vv7Tm}rkHd=tI)Swp)s4#=ZWEnMv!tg*kfLheh zsQ|zz2ifraR5+?ps3H`Kcs|7t6xrZ8tQLZS5~CVafNF36%0O5=2A2o3B48%C@>txN z41~uRVXqJql9c~vZ5SW2=U~wT2{l+h#V8t_sd;$9;M?G9JYgIrGTAs5JQN#DL5(Ki zVq=^DYfyzrQF$y5_K%^4eI+OUq8S(%7Zo!Y5-P@Ymrz+um__x#xgx5F1G793n8RU- zm~W!16%tJ{s={Z-0v-WZph1mXkzI#MHRDbDWGQZ_1E7q`;8KSuLwHOsh5pZ{2Qxg_ zOpX|%a#$P|NDp_XdSGCBaFK|EGcXv1MT0#sOy1v;o}nXNrRPaEY>2Ol=}G^uat|7e z*g*j;gEFu)gN>d(yweZy1!DatkD)gECzl|T-!1Z1{Jx{>9bIq5z*`x=>#lcny%hs* zW&EzY{x-TSUw?rGdc7VTi$(EwMq|Ab{ zrA1{Wn;DI^H}BkW(J!?QBS8^Oj&8{1Dw(XwE34o{4Oz0dt+inL2Ea+@PhTVHf# z{Hi4Hvp0n(mS6TW;kpX{vk5}~Zqd85U_aCP9smECy?0_=$Cue1^ zw$~ThnM1*+bmPKEwpRI<7P~Z*cip&f&P<)TyOa|Wk-1sky}l;j=E$8aDIuj+jgeoA-!Zg>2#lFd;S4JGcxgWg|uS2PzmZaHzz zPQsWs(OcQtn6Y}9y$O3r6Xm+*;=5}dTS;E~cRh#^Y@gCQ{<)h)=X?_v zm-hhy+SKQH{>N&XZe4D1tL{D97wo^yrevu&*vHN!!g-vTmh|zr$*lnwDUvymPls=Q zsyV$x-)Vb)YpQ3*n0eh>esH}0X}*?mZC0)7GV`MPGityUaB*rzWma8VTMA}*WO{jag5)k+us$n2mih&xP?6- zfV%HMw#||DvDM$k-R-g$oJm-5ruc)}i7|KMjvR|HUs7tJFVWvDc|3zpO9BY}(e7M7*mD6tsV3qJV(^G2sbhF~hWGJ+`H^kPl z>d|3`*4T~B*?QixsSgV7O0?!n+8S+6U*u?LtIyG-E-Gb3?-z9pAy!)5~jl?!NPr za?Q_vF)nT3#N&a7&24$MaANC)+gn-D4Wk2uzilgwlopyME>ZBRt=$mYlUI&@@l|J= zy8hC*1vPoP{N@9w&y|CHv(0TI*gwgN{-v0f`KNwrWuk6^*@Z;DZRx}E$k6|JJgBPm YzU32~66L_{0NW50l?HDKk=JTR{#J2 diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_noir/small_cornes_noir.properties b/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_noir/small_cornes_noir.properties deleted file mode 100644 index 060ca2bd..00000000 --- a/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_noir/small_cornes_noir.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=bone -model=small_cornes_noir -components.custom_data.vetements=cornes_small_noir diff --git a/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_os/small_cornes_os.png b/assets/minecraft/optifine/cit/general/corps/cornes/small_cornes/small_cornes_os/small_cornes_os.png deleted file mode 100644 index a06b557167f598b1e5a1111e8ec691ad7cfd35fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5634 zcmeHKX;c&E8XnL>0NDhwis%r~f|`ASNr@nvLm{5 zyr4PerV~v805InS_y%KFFWm=cgnjQt6I!rKZ3;hB6%4CExk4sJ;}KAmEJr{@gNgw_ z(=6f5wm1ilsqV{V8?@QhD<3v<25Po>jzX^o9o2H$>b2Upeao}vT#@0Xou+>g|S{oSm@?Gh+pv+{3f8&MSv%U-MS@GH|I6eR0j?Y(W zYaaMN@Go$6c8lo?r-T!3lFCz0mi}hLDjCyrt=;YB*~b#IJgeJltS)B!W^iS-5#7i? zh{v49d|p}b{iC&V$HA8>aG61SX&4wZ{46;xkA0EfY=Y2<5A6wGad>e3%XPZ5^ zEBD~uOb6dd)MG(O3#{vcFW^I6Bw33b0;O+OOf%=?=9T`wME>+}Xresf#`T&ItI<=y z-zo@NC z=4##q&5fJv7YpwBY1XS-iy6Dyxkj&i+gz@h=V>xEN!PAIJvPQ+oZugtR(@lC0(|Cl z6WP$}KHkAjBfe6<^TEo@^Mb>f9TwuLK2x_jTDb1@f9-t($?CIT z^bHs!98l~!Rb5&Q02U!ACb3X%AWJBd5Mhx_fDknjIi@`T@bJ{gVPPDi0tHAkDrMt) zs!!uVRK&(FW^l<|xepS92BavEg(*RNVM?4365%~(nR;kg7=Q#(!JtMGFIBQMY`h+q zh5gosZr7Te) zMEsHvsmf_2gh==yU!JIl*S8}Ql8|^rf`uxvRVkk=IfujLeaO&J5RFRY`Yep>Pa;*Q z_#;`L)TZ<3+ZkC1mi__vlj!%o>w~cF6cXqN3=v>#JOoHcfrMf*=0U_Gpg2;c3YH2H9TWymL@^vUssKX7Vg`Z66hQ0#g}GvTy{%dC~C)21OgBBqQC8k9kDuqm>(e)nPU|3i? z7`3oYsThFXj&;NGQ6R8Nrr^tD@oc=VC{UOA!Og`sln7SAzOV|xK*>}(iwvSx1)a{2C@)>MP#y=Afz$H1UijEC%7Y!fFN+A z(A}vNH#fR~_9?njCRV9o1u{Dt;}PQu6R4gm&}Dd3uAj!MV-VdOFv=h0CJUGZ5h7$l6b4O17Y%9s19^W-dpbqDZ_k6II}qOw z(}VP1;~okaae`vB4B4=g89V4nA5QvVzOY*V$=9&V{>ddk@XI2f#qSrozR>kq418Ab z7j=E1>$4d6tl%%|`rGI-{rIeiNU=Y7YV1kSvwqxm>?zVnFmH}85TkpCls`AXEGF`R zFeLz(+2}q7K+%@3F{81H!}T+MXkuYz?Od5@K>&c!jU3!DIi?5}PuEr&dyZf_QWuVe3;HTcbaR=y=&;zu^(9T09?mG)|?_2P3 zDtn>88#lW;^=d;)V3Oy$7xc2ya z-o9`R!`J5ZOI+{sp4pM)4g2Ubz`rpphGTK(9+G%DpmTvvM4@wLe$uEE{3DtU6w zu1?S8gNcaKlFnv}*hI666JOojR*t*X$}abErO~vdWsBZW6{OKmbjmPDUOYV)esoz1ZKU;Ak>(1unCl9bIR(XeZ z#rz-48j{jV0O@V%zbrUw=w);}ci&t%GOG^$hn>zV*Jr0vXmSPJpF?U-?VYLh#3A=6>;F6(b zaP8qqj$x+o%+|p-eQq^RJ&Lc<5^^rRoF0Da(AfN4j+Z)0E~X@_fp;g>@?$rSbe7e* zUdK@*uMEDrGI?;1;gh+0R-JVGZb@Op?TW4WS#A|XSKdo7#KTt$9DIzH-;T{QE!eg{ zdq!nOipkBzYXdDa%I7_5I#o-SB;@fOr{-E6nn;YeV|_LD4TggD#`T zT(j%B+ksxjudGSWbg9U)OO?853YUMe&ptAzi}Y6Eqy*B+VhgnGbJv=I zEyDV4HPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0R>4!K~!i%?Uk_( z!ypVq*%;XvvhxQS^D+GYPo%oaCs`;{peezAQbY+B;_hM^eoc(=RMo8JbJ;gQmL=`n!GLnwt~q%kl=O4o$R>%<}aI1U>I z0G+%R&bgGWi%uTGwE_4oWovSkJV&fa*}7cyyeR|Po;PCv`~E6<6PF*vw!$$&xQWY8 z8^BMW$(!hXh}FV5E}uMU4KR~D(U&0q3T4R#G{Bs2$8j9TaUADyLihl0Uf;CA&OdAb O0000xN@jKg=A*%@la4=y6fxe{JiAh^LnV4 zFMv|&Qc6i#mQvTX=2ulEP1DG>ZFn7x`AO6CLINHDIHp5;4&z}Mv{rvu6(T13zAw`> znYayR4&3}qNRmX>bv1xEj;}BbWgJJxodbXf2^0rGAZ^>~0!2|=`@Rby%ryX1IF7@J z^E{VjSsXwVMbdShfv`ngffivKm9s39zV96X=jenjIu=>^4nQYt(Et$eJWp4?10Z&u zr_A%L9h!51g`)5;fZd*RssO>7+yM~h?wEsQ-v>hMByQ!W_$T1Mm+SFud;^~Q-w_Dn T+Ef4l002ovPDHLkV1fVuyGVvn diff --git a/assets/minecraft/optifine/cit/general/corps/wings/crow/icon.properties b/assets/minecraft/optifine/cit/general/corps/wings/crow/icon.properties deleted file mode 100644 index bd150585..00000000 --- a/assets/minecraft/optifine/cit/general/corps/wings/crow/icon.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=minecraft:elytra -texture=crow_elytra_icon -components.custom_data.wing=crow \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings.png b/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings.png deleted file mode 100644 index f8c7f2a103a34732d011cb2680172419e1d8e17f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3139 zcmeHJ`&(027QJ~Va3KK^lJKm&6*NI!S_+9GAXZH&RX~d2Ap$DUI+T-p-$$orNMJ zB8hjiwH?y-o_6)j^I&wcYqDV5(YqA(^6T@;o=G2<*y{;1BT7pe2!i@p00hO6kf}mf zsVUdR1PrySajStA78XbY0|R+ystVAn+kPvh8@Jd2NN2jJkwCpPw?&+DP-}_57A(71 z8bN(!@vrtf2Ry!esC$MOtvDN&BA&iC6*U?(>w2a%=F4DOXxC6wCG|qsE-YPK+ZXlF zvy2G;uu_!iHUG(|A1E0osk9@0bMIkJyehVSAZ~aNTNF7^HWh%^z*ivN|9Zbc3xyb1 zRaW-e+14RaJbAn3AMPj+dKK4=ah<9&vhe>Tl6S?e1#~<3_BXz%Z1m*ht z$qM<+M*vkJ<70}1jWCe`OFOaAejC1*^O?7|pelgF-G?G*dZkk7{rkw`zRrV{l>CAM z?&+N(qnTF^g9RJ6obw=(iMjpPuicfECfvip|wGo2%%Dg37q%dFAw= z&@$!hi+iBCxjFwvZTq^=YQQNdM8Y*iyIiIN;i%=sg$;wEr{WV92n!2metkZcFR8HF zopH(tA(~K(j>Zk#J!RSYhs8GH-!d{Vr>2iHnasB^-#iCO;RC+B(uUU@fBzVCVxoEa zG{y@~|42|>jpW}h+sUt~acjNUd5+Ym8jz_K%H0AWAOMZny*r&>QgtpZy%9zv5?3#s zj})2$;dT5hm@ovj$KPchT3k3wkBIn|TTp{L*T(*5}UW zNCS@tNd7sCp1wcB{t}6I{9u&_PjC*>X$`mPRL`1wr81dJ+H${z!qKq>Rn0k6`4$%n zTQ`deAKX58JKM6x__uPvv6zlqyVHKa0bsQ8ZgXw@B^bQMFZ)fYQoA${n(8%MdZRj? zUziWz?Yg?UJR%~aJlKmGlhj4wNd$#Lc}vO^`T{`PvqQ8QaD?~CORB3K_&grGwfs>X z$AP1V^(`gKXKhnR3(Otg7oVxMReOE5E5dxU?(NM9pwPhTN)@7^v*h_h!HW5k*O z2_#jkW!VA<(ovV8`IQ*lOPm&@T8d9S1CVluV|E>kMES8ho+Y1WslKo>9&H# z{LrELZcCq356Kr$rSi$#Bw0__GVJI9(W*& zM6D6J5~Q!lR-gOvfKXtI%_Xxcr>7O4!x;%aUOwBgI2?D}fcC6SJo!7f|Kp~tjP$HR zE*JJ6LZ?s!9PR8b8qxE4r>5A%>enk*t|;1o6e91({G$>!ZrYR=3Isa`qa#U?>iYWP z#y5)BX6xk02ZUm{aF4AJJH{Mm5;kr?)nN!5^s58h2;0>y&zF##5FF(Ycn_K{p47FJm8$ z^?>NbMMa=K8|rPd=@Yr@Ja7gFWIy)xAed}i=F8 zHKBFu5b%{#v+ob8CJBBeYmc~^9f)WKY-Ma45C0Hd238Ta4>QAWz-%n;8SR>eKiygBZ z?V=aUPrjPIGmd~iFwxDeuc)wMwc#7EW)0>*gJ$>9qj(9jMsocE_nSOS4ce26+zg|o z&=ItEGpFLzv#$e_0VhXi{s2Gz{oGaU_X8}z+v879NHe-}O!AW*?E&V|H?ZANSAt7Pa zg#U}{Q{jlUS(AhTinAl>572cx!%l3ZXBMjGajl7M_;aP^?gX7)XOg;AyrWhKDDxW=E;5kJ5&T z2?@uDL=uq{b0^1WD;<4ebo-kAEA`1Jwjcms;n)~F#6xGs+{r>+HKnz-2~&0**=IO7 zw_&3>%tuF?gM@3d4teEdfA+FmDwns}xw#=#!~9S<;}=?Vw3S~NHtHQWM^~J;iTMJ5 z$Naj}++q5j;}}!FsGBRl$@CVr_jYu5Nbk3RHk%HGg(WhN(UGnVy#cKCo|=y+5(e3b ztbsBeY6@3UQUa*pI-U02ge^OKe0*o=t#|DxW}B+G>oTW}3ki4HdYXaVbGuqv6sEMp zM=%ux7KzqMU`nIiT38)h~%7|OeT)%%Rl6sFJ8CuZ;q2<0WS z1-)c%M?vxmUlCgTgi)?30-KwNiDiYr|0mMrn4lxx_rXx+4l}S9sW- zhHF&Pe1B2+&26i%`@3fGF*6(6Ge2&x=ee|M6%TvA9MJaUe|x#VWZmX0!#g{Rr#CjvoZk5HZhV{d`FVyntSt;|YQN5^@&g(Gai3HPW5Jsj zj%;OSY;5Z8)os_;hf2J=v+wW&k(2`me!K)aZ~1wNcQ!lxk(?$qCGx@7+x7qN@2x$x zKJ3W0uQ>1UNRb)eBBO}m?|No^*G#?zi3{<_p_SA10%-C;qXYWU#qWSX=-n-iS@a5|8E1P=|dKf?amuEhF7Z^4%v2P{M$-Mx^VBPTq z`L}02e0j>>wwzzy=uYLoo~mhv@Yq_kDl>%Pc)xrK2WL?V%TpiEtp#oSbFz5+=i4Ms z`1xac_o-?ll%Ys&$D4&&Z3?iu<6Iqf(KW9*))S? z+1ljoQItnAusGagn8M`nK|3BZp z{#3#5bFysN($#I&-{p+{qy?q})f*n3YrS3KUyw07Jh=g*f`RG(KVySGzgS;=H8kj0 zeazs`-_r*Qp1+G_a}^C{W6QdBi-(5?9&rnnojCI2!$H}$jsW*#{_zSoAAFZ*W8-dD zS#{hF=tHO%r=&Xgv?xD*%l`l0{>r~o9zOkS&BIvN*CTJ=e2JC0l(`We=u?2cOK4R% zbNGI}fx(}j-cK3eiA!n=&}|DW{(oja)RxK`!0Tvw;J^W>Lx56R+z#_vw^pkhogv}a zs;D6vz>DzJ70m|^4_ot0Oziv6$G@i50ilzL-<4Oi=GmXc|3lvHHG;*X)Xf=i7tx-{ Z%rHm%LZ#h5nIe#HJYD@<);T3K0RVC5@sa=l diff --git a/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2.properties b/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2.properties deleted file mode 100644 index af263c9e..00000000 --- a/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=elytra -matchItems=minecraft:elytra -texture.elytra=white_wings2 -components.custom_data.wing=white2 \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2_icon.properties b/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2_icon.properties deleted file mode 100644 index 94136fbb..00000000 --- a/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings2_icon.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=minecraft:elytra -texture=white_wings_icon -components.custom_data.wing=white2 diff --git a/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings_icon.png b/assets/minecraft/optifine/cit/general/corps/wings/feathery/white_wings_icon.png deleted file mode 100644 index 72c9c77b377a4ee150c3920bd8d19997bd0742b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 461 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4(FKV4ULV;uvDlo3wz#z`y_~%<%vJ zA|7KHlj-sQ|Njqv>=xJm7r&?CV|_%#jsNH8+cz6_@Cq@XR9u~!kdOe;l++?w@bc2q z|BoI$N;o)OKi=rT4TA<9wxriDUm6+#0aR5JmqU+p(2s|Q*#*vW98xHpAmPF1dAFVo z2p}q$q#M>SxWw-+<2_n7AyL6F#Wdl-fdde^CTWIXhDA%4ERndkzn(vwC8_zygsTmV z%*@O{`Tzf!q!~6jdV6!P`*~)jvBXAZp=L>@Anr?t;rg8l8P7cHm$y%nU=VUHi=?!~Nz%AR&pwf6YEl1C?^p!{p&=80ln4}XD6A!Lfv&JXDm}kYRRZU-k zra%KOsgcu(^}$O3Q};>jql{+`6h1M2qKh%o1zFJbQ5gvLei@ zO-qv|Ilr7gX?uJ#gTbKIT64Kvde7QtvsrEL4~GNCKUyI5ClP8RTbCkm9i{f&S(1pT(4KA(<$rqy7l#`wkOb9 z|I>Keuix*}@AuJKBO=V_^Eyq_`fu-jm2VA!w+x5F8g3q-wI+%pLr?ydW`g?9qjgN!Ym7Au4e16Oz_0PtYs+dKfb6QL`-6afB|!h7;O zrzi?Wqmi?DemNV-0gJ_=23RhaXswCk7-I}smZ6klGMP9J0j~~1mLLdfV+_;jlq}0g zl7zA>A98@JLy>nOFc=K#s;U~}<2VLrjQ{av(7OI^wJs{6>!Y~Bfxj%U50dU*pBuUtAx6O`+VMtLFPD>zoD1g?w`TDcoU}Jwg9)I{p z$4Bu_fP2C)WWV17wDvjdT@C==?fR>KfiCb)0HstD_igQZM@L6TM@L6TM+f`{x76tO t_^Sqf0000EWmrjOO-%qQ00008000000002eQPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0XRuSK~y+T&63Ni zf>0EOmo^ckXJ{JeP_U_&#}>h%=tvAieT&l6Nb_H3x6|y5&g6Vxu8aF$mmU2TMZ7n- zt~&{n3B&N~x0|5jIFq7$*L^%56h+Z0DIL%AxMEqBGzn>^2Hzu(j0a3EDx zDF_12srbR+8N!3Zx7!Wj73k`6xv)Ksqa2Y1&{|OxFu5}P<;<|J*DIN($$pk)TnMlL z)HO|$BDQVwd&w(yKA%a~b=vKA?6Uyqx{fQSX-aV%i|8A~kVE?zaV3DI9FIp%K%{A! z)usVr$n||MM*;Ff-}fh|<4KZaBQm!=Ek}FpNREITsH%z=WLcJozQJMasIF@f`C%o1 z5$^Xp&-w{=(6%k-e+74oR)xC(xzE42>;T|8Pp6acw#;Mn!u&T7JpmKWu&N@Ovl9RS N002ovPDHLkV1nRtw^RTC diff --git a/assets/minecraft/optifine/cit/general/corps/wings/lizard/white/icon.properties b/assets/minecraft/optifine/cit/general/corps/wings/lizard/white/icon.properties deleted file mode 100644 index f8ed0d54..00000000 --- a/assets/minecraft/optifine/cit/general/corps/wings/lizard/white/icon.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=minecraft:elytra -texture=wings_white_icon -components.custom_data.drak=wings_white \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/corps/wings/lizard/white/wings_white.png b/assets/minecraft/optifine/cit/general/corps/wings/lizard/white/wings_white.png deleted file mode 100644 index 9415f0265360b3c9abc8065f3a361d742e5942c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 640 zcmV-`0)PF9P)4)h&7K-h6$Psv1pN&8bS?CtSwYF((oc}I(CkT3s~8zi zGpF?scS)KAYCB7ZvcJ>r&SPfYf9Ab;vuj*1hX+TwigNefowa4{yE}V%@!aV==GN_- z3wFCZd%3D2B0PPzwX~mA{FiZP3g<<2sbgp9M@0}-uHU$Js{Se$;M>=qxpxld9Sc&bE(e4vilWN_hX+TwwYGG=*ae02 zm;M-3QHG--&1REvHm1GaX5-OD*?#Fy0b>jzQYOIRXvkoHKxea4+Jw9lL?-}Di=S~e zrqyhfE8b80Y;V5^dIUm*0?5Bu_ugZSnT!1->7DDx$ugo7V3vN`XKU*TKxNnAsOo@% zldHb!UtkEL6Tn(q#(h<*UQ<(3Q&Uq@Q&R(f0c9ZcP$nWVLjV8(4rN$LW=%~1DgXcg a2mk;800000(o>TF0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T#Ac&y;0*r~olf)wl;n{#!NjyTrl{W|p9)P8KVPKZs!^TPmda9l3t{znSzNb&{ zr$CY(1n&3yK>aSNX&U*yF9`{OIF30u9*?xyY$(rjQ5D^|u1l}ii^{U3 zuInfaL(Zvq;IN`7goVSVX@Zu3LWjeFV^vj!MHWD7r_%``SH^zn8S#Fw_N#pz0&P=8`&A)kVE^hC<$OFMNx19 zBD>vgb!Fg?GYmsm0mLmtQPe{n%k#XI$k2Abv^LF1SilW9j>7|bKA$5y1BWpq+qOsM z8 Date: Fri, 24 Jan 2025 00:09:07 +0100 Subject: [PATCH 19/27] fix(atharine): malformed NBT --- .../optifine/cit/general/outils/pieces/atha/atharine.properties | 2 +- .../cit/general/outils/pieces/atha/atharine_2.properties | 2 +- .../cit/general/outils/pieces/atha/atharine_3.properties | 2 +- .../cit/general/outils/pieces/atha/atharine_4.properties | 2 +- .../cit/general/outils/pieces/atha/atharine_5.properties | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine.properties b/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine.properties index 00149b20..abfd2e84 100644 --- a/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine.properties +++ b/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine.properties @@ -2,7 +2,7 @@ type=item stackSize=1 matchItems=minecraft:emerald texture=atharine -components.custom_data={banque=atharine} +components.custom_data.banque=atharine # /give @p minecraft:emerald{display:{Name:'{"text":"Atharine","color":"yellow","italic":false}',Lore:['[custom_data."text"=Une gemme taill�e, d\'une teinte aurique. \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_2.properties b/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_2.properties index 6157fffb..c2250e82 100644 --- a/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_2.properties +++ b/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_2.properties @@ -2,7 +2,7 @@ type=item stackSize=2-16 matchItems=minecraft:emerald texture=atharine_2 -components.custom_data={banque=atharine} +components.custom_data.banque=atharine # /give @p minecraft:emerald{display:{Name:'{"text":"Atharine","color":"yellow","italic":false}',Lore:['[custom_data."text"=Une gemme taill�e, d\'une teinte aurique. \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_3.properties b/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_3.properties index 0764c633..a0e09b64 100644 --- a/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_3.properties +++ b/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_3.properties @@ -2,7 +2,7 @@ type=item stackSize=17-32 matchItems=minecraft:emerald texture=atharine_3 -components.custom_data={banque=atharine} +components.custom_data.banque=atharine # /give @p minecraft:emerald{display:{Name:'{"text":"Atharine","color":"yellow","italic":false}',Lore:['[custom_data."text"=Une gemme taill�e, d\'une teinte aurique. \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_4.properties b/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_4.properties index a7562582..7dd0a4b2 100644 --- a/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_4.properties +++ b/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_4.properties @@ -2,7 +2,7 @@ type=item stackSize=33-48 matchItems=minecraft:emerald texture=atharine_4 -components.custom_data={banque=atharine} +components.custom_data.banque=atharine # /give @p minecraft:emerald{display:{Name:'{"text":"Atharine","color":"yellow","italic":false}',Lore:['[custom_data."text"=Une gemme taill�e, d\'une teinte aurique. \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_5.properties b/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_5.properties index 616efa3c..511fa89b 100644 --- a/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_5.properties +++ b/assets/minecraft/optifine/cit/general/outils/pieces/atha/atharine_5.properties @@ -2,7 +2,7 @@ type=item stackSize=49-64 matchItems=minecraft:emerald texture=atharine_5 -components.custom_data={banque=atharine} +components.custom_data.banque=atharine # /give @p minecraft:emerald{display:{Name:'{"text":"Atharine","color":"yellow","italic":false}',Lore:['[custom_data."text"=Une gemme taill�e, d\'une teinte aurique. \ No newline at end of file From 281e5d494d9eb9c1dbd4bc8616c8eda09ccd7cff Mon Sep 17 00:00:00 2001 From: Yazor <89312042+Yaazor@users.noreply.github.com> Date: Tue, 28 Jan 2025 00:33:40 -0500 Subject: [PATCH 20/27] Modif GUI & Fixed chant --- assets/herobrine/font/gui.json | 88 ++++++---- .../cit/gui/green_check/green_check.png | Bin 0 -> 151 bytes .../gui/green_check/green_check.properties | 6 + assets/minecraft/sounds.json | 154 +++++++++++++----- 4 files changed, 175 insertions(+), 73 deletions(-) create mode 100644 assets/minecraft/optifine/cit/gui/green_check/green_check.png create mode 100644 assets/minecraft/optifine/cit/gui/green_check/green_check.properties diff --git a/assets/herobrine/font/gui.json b/assets/herobrine/font/gui.json index 909faf01..090a0891 100755 --- a/assets/herobrine/font/gui.json +++ b/assets/herobrine/font/gui.json @@ -1,30 +1,58 @@ -{"providers":[ - { - "file":"herobrine:gui/blank_menu.png", - "chars":[""], - "height":170, - "ascent":47, - "type":"bitmap" - }, - { - "file":"herobrine:icons/icon_right_blue.png", - "chars":["x"], - "height":16, - "ascent":-80, - "type":"bitmap" - }, - { - "file":"herobrine:icons/icon_left_blue.png", - "chars":["g"], - "height":16, - "ascent":-80, - "type":"bitmap" - }, - { - "file":"herobrine:icons/hb_logo.png", - "chars":["l"], - "height":16, - "ascent":-80, - "type":"bitmap" - } -]} \ No newline at end of file +{ + "providers": [ + { + "file": "herobrine:gui/blank_menu.png", + "chars": [ + "" + ], + "height": 170, + "ascent": 47, + "type": "bitmap" + }, + { + "file": "herobrine:gui/crafting.png", + "chars": [ + "c" + ], + "height": 170, + "ascent": 47, + "type": "bitmap" + }, + { + "file": "herobrine:gui/cooking.png", + "chars": [ + "s" + ], + "height": 170, + "ascent": 47, + "type": "bitmap" + }, + { + "file": "herobrine:icons/icon_right_blue.png", + "chars": [ + "x" + ], + "height": 16, + "ascent": -80, + "type": "bitmap" + }, + { + "file": "herobrine:icons/icon_left_blue.png", + "chars": [ + "g" + ], + "height": 16, + "ascent": -80, + "type": "bitmap" + }, + { + "file": "herobrine:icons/hb_logo.png", + "chars": [ + "l" + ], + "height": 16, + "ascent": -80, + "type": "bitmap" + } + ] +} \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/gui/green_check/green_check.png b/assets/minecraft/optifine/cit/gui/green_check/green_check.png new file mode 100644 index 0000000000000000000000000000000000000000..725eaa9cd5b846abcd5c6f317ffc7ec3af3c163e GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh<3?#J|q#XfLJOMr-uK)l4XSQT!u4882!OZ_# z Date: Tue, 28 Jan 2025 00:50:11 -0500 Subject: [PATCH 21/27] Ajout pomme cuite --- .../nourriture_tag/manger/fruits/baked_apple.png | Bin 0 -> 274 bytes .../manger/fruits/baked_apple.properties | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 assets/minecraft/optifine/cit/general/nourriture/nourriture_tag/manger/fruits/baked_apple.png create mode 100644 assets/minecraft/optifine/cit/general/nourriture/nourriture_tag/manger/fruits/baked_apple.properties diff --git a/assets/minecraft/optifine/cit/general/nourriture/nourriture_tag/manger/fruits/baked_apple.png b/assets/minecraft/optifine/cit/general/nourriture/nourriture_tag/manger/fruits/baked_apple.png new file mode 100644 index 0000000000000000000000000000000000000000..a92db47cfb7f6c09c44951c874c959c4ee5e9314 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}T0G|+7MOH2qHf~-f7CSB>A0F{!WusI9xhi3m96<#^W{@h)BPQQ~6n9CG zU+{l8VDR#1`~(!{EbxddW? Cms-;R literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/nourriture/nourriture_tag/manger/fruits/baked_apple.properties b/assets/minecraft/optifine/cit/general/nourriture/nourriture_tag/manger/fruits/baked_apple.properties new file mode 100644 index 00000000..0cb6d3b1 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/nourriture/nourriture_tag/manger/fruits/baked_apple.properties @@ -0,0 +1,6 @@ +type=item +matchItems=turtle_scute +texture=baked_apple +components.custom_data.nourriture=baked_apple + +# /give @s minecraft:turtle_scute[minecraft:custom_data={nourriture:baked_apple}] \ No newline at end of file From d480f6c3d7adb3925a6da3fb4713a9c78390b9a2 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Tue, 28 Jan 2025 18:00:51 +0100 Subject: [PATCH 22/27] patch general/creatures .properties --- .../animals/moineau/moineau_femelle.png | Bin 5099 -> 0 bytes .../animals/moineau/moineau_femelle.properties | 4 ---- .../creatures/animals/moineau/moineau_male.png | Bin 717 -> 0 bytes .../animals/moineau/moineau_male.properties | 4 ---- .../cit/general/creatures/animals/pie/pie.png | Bin 941 -> 0 bytes .../general/creatures/animals/pie/pie.properties | 4 ---- .../general/creatures/animals/raven/raven.png | Bin 814 -> 0 bytes .../creatures/animals/raven/raven_tag.properties | 4 ---- .../animals/rouge_gorge/rouge_gorge.png | Bin 4781 -> 0 bytes .../animals/rouge_gorge/rouge_gorge.properties | 4 ---- .../raven.json => animaux/corbeau/corbeau.json} | 6 +++--- .../creatures/animaux/corbeau/corbeau.png | Bin 0 -> 355 bytes .../creatures/animaux/corbeau/corbeau.properties | 6 ++++++ .../creatures/animaux/corbeau/raven.properties | 6 ++++++ .../moineau/moineau_femelle/moineau_f.properties | 6 ++++++ .../moineau_femelle}/moineau_femelle.json | 2 +- .../moineau/moineau_femelle/moineau_femelle.png | Bin 0 -> 339 bytes .../moineau_femelle/moineau_femelle.properties | 6 ++++++ .../moineau/moineau_male/moineau_m.properties | 6 ++++++ .../moineau/moineau_male}/moineau_male.json | 2 +- .../moineau/moineau_male/moineau_male.png | Bin 0 -> 332 bytes .../moineau/moineau_male/moineau_male.properties | 6 ++++++ .../creatures/{animals => animaux}/pie/pie.json | 2 +- .../cit/general/creatures/animaux/pie/pie.png | Bin 0 -> 407 bytes .../general/creatures/animaux/pie/pie.properties | 6 ++++++ .../rouge_gorge/rouge_gorge.json | 2 +- .../animaux/rouge_gorge/rouge_gorge.png | Bin 0 -> 300 bytes .../animaux/rouge_gorge/rouge_gorge.properties | 6 ++++++ .../ecureuil_cristal/ecureuil_cristal.png | Bin 812 -> 0 bytes .../monsters/man_spider/spiderman.properties | 5 ----- .../oiseau_cristal/oiseau_cristal.properties | 6 ------ .../ecureuil_cristal/ecureuil_cristal.json | 2 +- .../ecureuil_cristal/ecureuil_cristal.png | Bin 0 -> 350 bytes .../ecureuil_cristal/ecureuil_cristal.properties | 4 ++-- .../oiseau_cristal/oiseau_cristal.json | 2 +- .../oiseau_cristal/oiseau_cristal.png | Bin .../oiseau_cristal/oiseau_cristal.png.mcmeta | 0 .../oiseau_cristal/oiseau_cristal.properties | 6 ++++++ .../spiderman}/spiderman.json | 2 +- .../spiderman}/spiderman.png | Bin .../monstres/spiderman/spiderman.properties | 7 +++++++ 41 files changed, 73 insertions(+), 43 deletions(-) delete mode 100644 assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_femelle.png delete mode 100644 assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_femelle.properties delete mode 100644 assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_male.png delete mode 100644 assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_male.properties delete mode 100644 assets/minecraft/optifine/cit/general/creatures/animals/pie/pie.png delete mode 100644 assets/minecraft/optifine/cit/general/creatures/animals/pie/pie.properties delete mode 100644 assets/minecraft/optifine/cit/general/creatures/animals/raven/raven.png delete mode 100644 assets/minecraft/optifine/cit/general/creatures/animals/raven/raven_tag.properties delete mode 100644 assets/minecraft/optifine/cit/general/creatures/animals/rouge_gorge/rouge_gorge.png delete mode 100644 assets/minecraft/optifine/cit/general/creatures/animals/rouge_gorge/rouge_gorge.properties rename assets/minecraft/optifine/cit/general/creatures/{animals/raven/raven.json => animaux/corbeau/corbeau.json} (99%) create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/corbeau.png create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/corbeau.properties create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/raven.properties create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_f.properties rename assets/minecraft/optifine/cit/general/creatures/{animals/moineau => animaux/moineau/moineau_femelle}/moineau_femelle.json (99%) create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_femelle.png create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_femelle.properties create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_m.properties rename assets/minecraft/optifine/cit/general/creatures/{animals/moineau => animaux/moineau/moineau_male}/moineau_male.json (99%) create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_male.png create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_male.properties rename assets/minecraft/optifine/cit/general/creatures/{animals => animaux}/pie/pie.json (99%) create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/pie/pie.png create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/pie/pie.properties rename assets/minecraft/optifine/cit/general/creatures/{animals => animaux}/rouge_gorge/rouge_gorge.json (99%) create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/rouge_gorge/rouge_gorge.png create mode 100644 assets/minecraft/optifine/cit/general/creatures/animaux/rouge_gorge/rouge_gorge.properties delete mode 100644 assets/minecraft/optifine/cit/general/creatures/monsters/ecureuil_cristal/ecureuil_cristal.png delete mode 100644 assets/minecraft/optifine/cit/general/creatures/monsters/man_spider/spiderman.properties delete mode 100644 assets/minecraft/optifine/cit/general/creatures/monsters/oiseau_cristal/oiseau_cristal.properties rename assets/minecraft/optifine/cit/general/creatures/{monsters => monstres}/ecureuil_cristal/ecureuil_cristal.json (99%) create mode 100644 assets/minecraft/optifine/cit/general/creatures/monstres/ecureuil_cristal/ecureuil_cristal.png rename assets/minecraft/optifine/cit/general/creatures/{monsters => monstres}/ecureuil_cristal/ecureuil_cristal.properties (50%) rename assets/minecraft/optifine/cit/general/creatures/{monsters => monstres}/oiseau_cristal/oiseau_cristal.json (99%) rename assets/minecraft/optifine/cit/general/creatures/{monsters => monstres}/oiseau_cristal/oiseau_cristal.png (100%) rename assets/minecraft/optifine/cit/general/creatures/{monsters => monstres}/oiseau_cristal/oiseau_cristal.png.mcmeta (100%) create mode 100644 assets/minecraft/optifine/cit/general/creatures/monstres/oiseau_cristal/oiseau_cristal.properties rename assets/minecraft/optifine/cit/general/creatures/{monsters/man_spider => monstres/spiderman}/spiderman.json (99%) rename assets/minecraft/optifine/cit/general/creatures/{monsters/man_spider => monstres/spiderman}/spiderman.png (100%) create mode 100644 assets/minecraft/optifine/cit/general/creatures/monstres/spiderman/spiderman.properties diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_femelle.png b/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_femelle.png deleted file mode 100644 index e5f733583b2f894658e683254b82c297ea23f99f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5099 zcmeHKc~leU79ZSzxS?Q0+=kF%sDg3-0$AscYnWo z?{_lG&^e&roonbpsGHHpLQ%f91o9YDBPmA z3%sOKL-V37o5I7g$Ay#Y_=ir_xs!;$E~fEx+k+>xYs+bY*LaVGm1VR0y0_oV&rZ*5 zYPzK~c_ey}&N(CLkrQTIHjly2UKy4!e!!HyO_nvOVX^}UK0}x{2RcTKfa9U7a=&J% z(Q(IMXY$9Oa=$9)IY)mfGH3d>U6|?N&3$zhg6y)?0Ri%mfPlAz0F8pQY>Bka&vj|r zwrN2V7MqFlA0rZW&_)zyD5Yp-ssvH}%iW%Q#c6lU-Ff9pW*(C-kNu`@#rF}_t4%X6S2fJsc`D{k(aWsb zsvmN0U^^q~cW3s=adO|XlM6NxV%vLyPru%^}>jVQir`qt7; zKfTwMH{;Dh=-bVPJ-uHn0F5^2D>dk_7+EMr=rk;x)F~-el12|&4}yGrlk_+dPtmZF zidAbR%m2Dmd2A1t(9Z4B= zCIdkQnJF#p(G!9sy5sdGLxPPCNwBE|N&{StU{}t2TLy>7;4$2Bh(~j`za!nLZy&L zBB+S3LijjNAxaLHgHTGIw?NDnQ6!Js11dyoq;V}lS)l+pOAT;1Dvmcwa0rAF3&j9J zOd?8eZxm4qa7xML5u||Z2@!5kgRaCAdS+#XA^{X%EWk;wl8A=%R=8-q19X72xV2LO zfXxorU;zdSr*#H}PM08IS|MO-WcRWR3>1mecpy$w02I)}P#(q+DL7(`BftdW2`C3c zd-&@}wJQ1ld0WQ^_USCTRBZ(NC)-S&GZjT8c0P4JCa7)01jDwmz;L3If)O`Uq%BW? z)wx8(;o4XVoF82c`_``hlV(t%B9)l*Rw1~OCjb=`poj?PaS)Lh6{0*!Ork`mtlj8F zor<>L2FgDc=m@j|4QkU0{<5o7p6_R4iKDD_0Fogn53x!n!Z;jEz-O{QK0N_wLR3YF z5V1E38dOAb5L|_F5wVEGg_M9Nz`MrfFQnJi5pU`Fu&oE;+hY2#|EJuY4n0m#AWNqW zoXp^$XLq0UU3!6BKjx>a%|7N9F#Ktg57PIOT%Y9nAO$|i`BQg&lIw#M_#o#`-SwBr z#d!CwNNK?zJPUXeY;vAIAG}5OQ%(;Kgd(ATK(bj*IbOixsF%((LQsEa>tzS!6}SSU zJslzovcJ`P=+MEFHcwG3grHvgLjwI3F?ILWazdjbT$UbMM%}IyqOQ``j9j;3zffu3 zd}b53tlT~KQeexx+KhR_8#2n`h%1X%SG2^0kQ~h0EwrY-!QYJtj)M~(Odj9=8N^C!6J7PX>b zLoqLz(9W+PvTgYu&Clzrb{FJ5ew4L!$L{s{rlk)i3*#a)q@qxMisN)osMtyB>FQQ7 zt$g;>T>qS7c;odp$l;gbed&HBmHlfboZsUzk;010#<|(q?*f>cLfeG@0sNWd(Wkx!%L&jW;4vu4ay3 z;G7$>)3wZSJL6pc^Xn`79{$lW{Mop&y-ykwE60q^_ibvbuOB^e>o=JJfV9pfTYpOt z{>-apk4t6h7s|AQ>8A43%Rr(fI=7r) zVUdistb+WNQ+b7B!bK8^1kga&%;FSDiVTgxM_d?v&zw2rYK-z&)loQo+8i&&M}wZ>S3QDyJj+Peo3D^S5;9>WiEC U57*B10X+?c1ce2bPMNp(4@#A6A^-pY diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_femelle.properties b/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_femelle.properties deleted file mode 100644 index 666ba7d8..00000000 --- a/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_femelle.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=feather -model=moineau_femelle -components.custom_data.creature=moineau_f \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_male.png b/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_male.png deleted file mode 100644 index 1e1b51e880fe0a4b9dac605f68ffbe5934d01312..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 717 zcmV;;0y6!HP)p+$!^+}3wk43hLMb01ELL}RjmhCbErf+qKKVk)$V`lC&XE1|+1TIC>i+SJL6c~U zHkVQ&rNr|*W*3&j=5tFQP|62D2n*X12w?#reHA_czmAWa?R_dhDgQ$As0gKeUcFfY z2&+1$*N>sRO1` zK91vrA^_6qG>+q-l+ViIJR?sYva&c2Kzs(`Jh21$LdnRxZrufw!-G1?_bQT<`I|o{ zC&2kk1V}ss#bQwp^!4asv8aQFnTb&yG#0{QD)TlRy0!HjX3Au3JqKK#iNp?go=4xn zqi_ofVNt18!-nHCbJ(`c_{yLDIb?T!Zm8Q-D)3$A%jyxlkO4W2Ao^hPV9XLGt-t-|9I$+y&T?eB3 zy;hAo(B0LkP18&)sHp+NyJ%{IcIF5tsx@>H2UEtA6>N*1cIUe`->Bg(hVK&Nm zdTdBX{|9REXiX}(;S9uI8t3uIzV06+646%cevk6tPN-L-2iC1%dTdBvRd0&6{q3v< zDCXX2fH-foOM1HR-%Loo#sP1kg%(<9;kNM?BqR2vc?o$D00000NkvXXu0mjf7dus0 diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_male.properties b/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_male.properties deleted file mode 100644 index 782fe441..00000000 --- a/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_male.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=feather -model=moineau_male -components.custom_data.creature=moineau_m \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/pie/pie.png b/assets/minecraft/optifine/cit/general/creatures/animals/pie/pie.png deleted file mode 100644 index 8a26a626973ea5f97b8ff63d5d72d9ba7188fd6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 941 zcmV;e15*5nP)3xpwwBjGA`mFAB81J~T2asS7aXI!MP;t=o| zY}70S+z9RnSyBazuy)5RNiiwpH(9OG4_|VfzaZW|?d;5(@B7Z1N2}GcaU9z$%WRsa zHceBTWtolR*vh*oifkOm79ffuHx8gY2B6#RT7dQSXA}N3EEPq8=Xn4GK|l}$0C=8< zyi-cKF;x^rL6RgWr2sI-0HCk@gM)+G%m6&kqu1-9wISZnw$_?S?V?zc$b%qo3`iP`F=(wh zIyypY4ZzC%6>?)(xxWHT*FY3SR(`Vrs4Jxy4u=44kvz{C4u>eE+_NAz24iyPiw5F2 z2B6Vs05BK~X6D`nu)KVa?d=yRrRn!y*VfmcSz~gP(j-Yz+uYo=B1nKYZ~k(6X*QeJ zG;n!&2|&Buw#UcEbAzahTBli=Sgf!i_T=PbVi8fjh;eQJckliLz%*Mug1+y&RKZx3 zN@=uGPG(ddHF=)(O`^`|kgvC#phGhj@qx)z&YgnQ)m4;IL{VfPJbdIne(>;-{q#?NVnSiA+wIy$qru+Z z-poMi)t!qksj1p3WV~EF&1SO(^E)Ad(||-SR2D^nG3J_m|L!gC-@SDc$aoQ>~`XOUujmfNyI4{CUiXs8~9h-Q8WcGniEUxR#8?C``(@d8o_6 zGJ)8tilxzzoJ;4EB+1pd0q{)&i}nMK^5Wm$e@K&gV=PM5EpBm({|jFMeQ9EvF!e)9 P00000NkvXXu0mjfoJ7)a diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/pie/pie.properties b/assets/minecraft/optifine/cit/general/creatures/animals/pie/pie.properties deleted file mode 100644 index 29872858..00000000 --- a/assets/minecraft/optifine/cit/general/creatures/animals/pie/pie.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=feather -model=pie -components.custom_data.creature=pie \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/raven/raven.png b/assets/minecraft/optifine/cit/general/creatures/animals/raven/raven.png deleted file mode 100644 index d8b91bd0ea0d00c9ec5004e4ecf55fb9a8e11653..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0>eo}K~z{r?Uv7L z6G0TmXGQV3?um=x%5d=lBD0;I! z)Pog8TCuIBmmpeXsj;NNwcp8nr*AW}A)Ce@pdVOf-gIZ@yWjWrr9l)$sulWPyn9_$%At-)rZcM#+_~$Zjz4{Tt4hUbRb8t+IGfAs5nwN3j<6pBWE!jh*ey2$ zd3bStI#rS3g?KQm@96B(2Uos_D!+ZVnwh-q3eb}T(hBf_!bL531vJa)(eVhjPd&Mz zA8>i>akN-m(y8ED5)iOldZ%*v9c~IFu+L0m92z`lW;O2Lyc9st*6wZU+saqFh7pxs z4nN17^9k^N1>N~VY$SL~c{KvL_JJavo0+hpybiF*04OGD>VQQk_pmoC&Q02Logzfl z$~Q;%;@5y~CM|@`d{cBnJOlRt^a-SZG4?@>EOx|B3V0YBjrvY5yOX1QfD*%fz3x)Oa zZ|G_~;MLR}rzlY~0G$somY@h(8;%1!4Ee(q6J-jHBMKN7ziH{v``1scGXSxf#z@@> z8^M24a4^3T8RMQHsOdP+euXt^& z@1#C9&8#qy3Km9ZBVQadhkWa#{Q=*DslAl~T7#!^y$^RJ>UDcB5umjHa5 s$d?I!3xC{!wsyi+_+Nzox&Wnq0;l)gK}PhdRsaA107*qoM6N<$f;~NNaR2}S diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/raven/raven_tag.properties b/assets/minecraft/optifine/cit/general/creatures/animals/raven/raven_tag.properties deleted file mode 100644 index 12dd0307..00000000 --- a/assets/minecraft/optifine/cit/general/creatures/animals/raven/raven_tag.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=stick -model=raven -components.custom_data.creature=raven \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/rouge_gorge/rouge_gorge.png b/assets/minecraft/optifine/cit/general/creatures/animals/rouge_gorge/rouge_gorge.png deleted file mode 100644 index 80997499c5562c22eba2eb035b303245c5f8f2bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4781 zcmeHKdr(tn77rE?P!v#`J8| zh$!NNu`5=TrM6nJA_WzsiUO{!C@3mwVS$R30)o`n6x=TX5vQHmac27;nYoYeeCPbm zIlptxH@TVN%YvO8XFC!I1Seq#Uksj*<+8T}cSBOr0C-dLCmX)wF5CBJ2RgU z1xp<4mN!XAIdJ&m+VArh=PubB7SB$T&%d3$Gqi8$uxD86hN!ImOCbly$4U1^OVzxNk zoZudu!3a8X>2D2PTlSGUS`JLTHmlih<@BH_yUGXzn=}=V7cS)SUZ(?+*#F5+Zbp@K!56P$m^DPXU3cH7_`<-IwrVR_8W^BoQTF%3C|KS&q zYcttx>B4`pSfVl z8K`gGEj+JdfR_lzo-;Gg*Q2<{y~5ec{(ZF9NUPX-{SPcN?>coMWSxVs5DE;M<0e7phMo=Dnn};E<^FznyT5?EFWL>(dmprO%Wa?ZDz&AO zk<}Qf5yMjl&fR`m>+XDe;wq=RLw?_NH#xL!vO9iidsUO|13#hGc&g3?E_aHKHqjHO zmEW@oI$*q<<8e7`$-B;@m_68DsNo{|4x@@Z%-Pnr~W#}uAmb1U4jbqmsGTrjcL_nRIZibWV2ca8jnEW_?vYo7Kf3$f{zDiN($S_5%ri`^P7zGIcWF(+JwJ=D)m{P>JK^w2f za6tmDG0qzcA;(7Tb@BQ*YdUg_g2&-%plSeKk+)n13q|3h78VMWDz(mP1;~C&)2LFs zA?vN!EIZb8#s&h+M{(cMex18j8EA<_Y`zwYw}dC;bBPxJY`GRw$=TLd8ZP&tAvBnT zBR+Hz9cK8Dm6F_y1_L1Os&AS5~y^&!b*h=K&O zXuc@Sl+!S(+zKVf*g;yo8U^K4sZk|P(P@;{4GZDyfN&v~NF@(@wMxR{P@@7EfEiF} zDy0KI5IMPM?GZZ)?Qh7HmI)S{M7 z1prn#$cD|+pdL%lJT?;i8AA48VV)RWv+Pk@$w;)$lS-WgR96vW^8C#fDQbpb7Xe z#{g@13yVQDN*tUYBMtjnuKJT^V8~@u1e3E!3LiQPRFKLbu@H<-VxTMxqsr(^ABufoc zKk&h^DvUW|fZebR99`ffq>LVgBYc5a|H|J;9sWue5H#-Oo%kK6Yn-lkV&I*W$GdBs zu6JVKos`GB>;FcV|XF(I2ETIHO(2uK`sAuA08 z!sO|e%ZBjzes>_8WE6@7lODe3>dLmM*%X#UAWV=7`2iAXb@v`5#3Nuvdevg@?-EPW zyn-{b1-4#U63@cQ!V^w&zY(1f=SVX>&J*odN5|U+t`}sjb1Tk{R=Nb*^F!u)=zYqH z_h};QGzpzOZK4_Cj-dygNXg>f!B@$&J!Q#fzbf4ubbJ1FFT%DP52rk`4fv?4C72%` z)wcX>!@WDpqTE~xPM58{(<}|k>bl=peQIbxkme9k+T?0$lOHf=UTMRBnpW{Y>wMzx z>_U+2IenTXaZ4%vmuL2gE6w6w1vg@2cvRG}(qrBf*HHdK7q2T>(%6Wo+2|}t>2f*B z#{D6qfIns6rQ&|ZiU~AgVEbik8#3jGB?QmeylVUW`py^iyi7t&Pj_C&H&uRKm(Dr< zaAf_^PQ)(dec?5JM3mpgO(}K6q{Nci-|lrgXeWZGUCU~;4-a@2)wt)rKUY(_a`hwR zTJdL3Ts9OecsV%K^5J9EvxxPDL5Egwk`0I?;%W7^EgVzQh1E9mO7E>LhZb|X`Y)ol z3}p){-0bHQ*Zf29{O2_vM>yNQNZ0x&9~ttjzT5NZ)jO;o^Sf_|;^HRcl^hMpJy>$| z``U_rVjd@F^a|tT| diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/rouge_gorge/rouge_gorge.properties b/assets/minecraft/optifine/cit/general/creatures/animals/rouge_gorge/rouge_gorge.properties deleted file mode 100644 index 75d81e0c..00000000 --- a/assets/minecraft/optifine/cit/general/creatures/animals/rouge_gorge/rouge_gorge.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=item -matchItems=feather -model=rouge_gorge -components.custom_data.creature=rouge_gorge \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/raven/raven.json b/assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/corbeau.json similarity index 99% rename from assets/minecraft/optifine/cit/general/creatures/animals/raven/raven.json rename to assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/corbeau.json index 2643c706..afcb0de3 100644 --- a/assets/minecraft/optifine/cit/general/creatures/animals/raven/raven.json +++ b/assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/corbeau.json @@ -1,8 +1,8 @@ { "credit": "Adapté par Saynos !", "textures": { - "0": "./raven", - "particle": "./raven" + "0": "./corbeau", + "particle": "./corbeau" }, "elements": [ { @@ -291,4 +291,4 @@ "children": [14, 15, 16] } ] -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/corbeau.png b/assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/corbeau.png new file mode 100644 index 0000000000000000000000000000000000000000..4494a98b91b23b9975e451cf9ae5d159f09bb49f GIT binary patch literal 355 zcmV-p0i6DcP)HFFi9^uTRBB>Ph^`~aI0{FxMmVZ3;+NC0(4SNQvd*Vlg&5)008ev zL_t(|UaibAPs1<}hG7FrVf3}J_Z-AC)Jm9ZY=hWZDVaec-YbUAoe2MffuG6QiIJFK z;GIs7P9KA*Ue8B{K(NG@Z3IMufnbfg`-bk2z!5y+2jcDciq;qx;mR6>l(};)0a7q0 zBc$Hob049OP+I#i9^XgU%^bytfo;|ML-{ns)b&LU8t}kP(3Oo+f`@? zZX!5TUiKowY5YKgwU>n)+F^4>pb;;dh8NO#w_(o&y3<+%2qzpw$caG=z_uCqu?%GZ zc9MaemqGr33*PfSL5?r@A_1E$_ZKLhego>i;S0cgKk+UJ4sHMd002ovPDHLkV1h*U Bj9vf$ literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/corbeau.properties b/assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/corbeau.properties new file mode 100644 index 00000000..bc43bf03 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/corbeau.properties @@ -0,0 +1,6 @@ +type=item +items=stick +model=raven +components.custom_data.creature=corbeau + +# /give @s stick[custom_data={creature:corbeau}] diff --git a/assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/raven.properties b/assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/raven.properties new file mode 100644 index 00000000..0a955649 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/creatures/animaux/corbeau/raven.properties @@ -0,0 +1,6 @@ +# Duplicata de 'corbeau.properties' pour ne pas casser les items avec l'ancien tag 'raven' (en anglais) + +type=item +items=stick +model=raven +components.custom_data.creature=raven diff --git a/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_f.properties b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_f.properties new file mode 100644 index 00000000..b40e4785 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_f.properties @@ -0,0 +1,6 @@ +# Duplicata de 'moineau_femelle.properties' pour ne pas casser les items avec l'ancien tag 'moineau_f' (abrégé) + +type=item +items=feather +model=moineau_femelle +components.custom_data.creature=moineau_f diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_femelle.json b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_femelle.json similarity index 99% rename from assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_femelle.json rename to assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_femelle.json index 27847a10..16363b28 100644 --- a/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_femelle.json +++ b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_femelle.json @@ -875,4 +875,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_femelle.png b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_femelle.png new file mode 100644 index 0000000000000000000000000000000000000000..26c0ea62a452ee271a1e62a22ea17b79ca01c27d GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyP60k4u0Z<4&gs{VFWI%GtD`D< zVpG!8w)8dgY73K`>hk(2;?~OEy0{Zd8ygCPbaZsm!Y%U?oqFpN zjP0vJfTl2(1o;IsI6S+N2ITDbba4!+h!8NVR)y`hv#c6XBoke=~$xx%eo&7FA?&vx*$6(6<~UZi&T z?}7K0{<+mof9?d_d#OFA{P^+%=`OX;f23LbKXByah9sjepNreu${E6By{4;fO?`Ch iQQK2)J>B}V_VLr>I3&NGDzFB6g~8L+&t;ucLK6U(fsYgb literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_femelle.properties b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_femelle.properties new file mode 100644 index 00000000..41108120 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_femelle/moineau_femelle.properties @@ -0,0 +1,6 @@ +type=item +items=feather +model=moineau_femelle +components.custom_data.creature=moineau_femelle + +# /give @s feather[custom_data={creature:moineau_femelle}] diff --git a/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_m.properties b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_m.properties new file mode 100644 index 00000000..6e49126d --- /dev/null +++ b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_m.properties @@ -0,0 +1,6 @@ +# Duplicata de 'moineau_male.properties' pour ne pas casser les items avec l'ancien tag 'moineau_m' (abrégé) + +type=item +items=feather +model=moineau_male +components.custom_data.creature=moineau_m diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_male.json b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_male.json similarity index 99% rename from assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_male.json rename to assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_male.json index bd70b1b4..98f436db 100644 --- a/assets/minecraft/optifine/cit/general/creatures/animals/moineau/moineau_male.json +++ b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_male.json @@ -852,4 +852,4 @@ ] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_male.png b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_male.png new file mode 100644 index 0000000000000000000000000000000000000000..9b15cfc2e12eae84634215ae26fdf1a1a984e58c GIT binary patch literal 332 zcmV-S0ki&zP)MfBOx*_ zD^5;LwY9a7@4lq~0004WQchCmBUbnt}SxR!75oHz<21%x6R0 z@O%2)F%ZTTzGjzuMZFgY#I`boM++gm;0K;o22nlG*nsJNg6k{JYKA2`YvP8zg=bBl exSuV5%|9RW<^&4`NyRk)0000VUog literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_male.properties b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_male.properties new file mode 100644 index 00000000..de8fbf65 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/creatures/animaux/moineau/moineau_male/moineau_male.properties @@ -0,0 +1,6 @@ +type=item +items=feather +model=moineau_male +components.custom_data.creature=moineau_male + +# /give @s feather[custom_data={creature:moineau_male}] diff --git a/assets/minecraft/optifine/cit/general/creatures/animals/pie/pie.json b/assets/minecraft/optifine/cit/general/creatures/animaux/pie/pie.json similarity index 99% rename from assets/minecraft/optifine/cit/general/creatures/animals/pie/pie.json rename to assets/minecraft/optifine/cit/general/creatures/animaux/pie/pie.json index 69c99588..ba918c26 100644 --- a/assets/minecraft/optifine/cit/general/creatures/animals/pie/pie.json +++ b/assets/minecraft/optifine/cit/general/creatures/animaux/pie/pie.json @@ -903,4 +903,4 @@ ] } } -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/creatures/animaux/pie/pie.png b/assets/minecraft/optifine/cit/general/creatures/animaux/pie/pie.png new file mode 100644 index 0000000000000000000000000000000000000000..c14d3496878f97f02d3de7be19b50c566910b7c7 GIT binary patch literal 407 zcmV;I0cie-P)s->W}Gia^qBm{6@XQ+klL zga>jOq-n!ex62?R(_qoTsHUi?jt&PF;$;jA;ik)wF$ryqP+)2}>6q->9y1N8Zl0y= z=l&UU8&;l%v>KirlFr5RD?+bLU=Y4uFFc5Xri9}C#!9FuJPo_R{2+`IDlff`vSYPU zRK_x?jj{na*S0F7dEnS?S*-%r~(Ned1 zUjL3d)t#&79P73@wsYl`op9m`uKS(_+o(!@FOkCGTI8-m)XfHF4v;trL1*9x>5g z+?{B0$Rb2qU%k^=pujk-^+MZ}gM|-rHvHhdEY@(R>+jrsOoFw&=YA%Igt+Zlde1{I w@GG~*={WTF?|o?(K-{aNgM9%0Q!Kz)78&qol`;+0Mf91RsaA1 literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/creatures/animaux/rouge_gorge/rouge_gorge.properties b/assets/minecraft/optifine/cit/general/creatures/animaux/rouge_gorge/rouge_gorge.properties new file mode 100644 index 00000000..9832b9be --- /dev/null +++ b/assets/minecraft/optifine/cit/general/creatures/animaux/rouge_gorge/rouge_gorge.properties @@ -0,0 +1,6 @@ +type=item +items=feather +model=rouge_gorge +components.custom_data.creature=rouge_gorge + +# /give @s feather[custom_data={creature:rouge_gorge}] diff --git a/assets/minecraft/optifine/cit/general/creatures/monsters/ecureuil_cristal/ecureuil_cristal.png b/assets/minecraft/optifine/cit/general/creatures/monsters/ecureuil_cristal/ecureuil_cristal.png deleted file mode 100644 index 7460e6efa499c68764d0514e64092b3864b52c32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 812 zcmV+{1JnG8P)Px%=1D|BR9J=WSIutIKoFj-*0CKaws2{bAlgeJDnz8_6mjW=bDjX+ga_gYdPYcG z5T_!+0aOmq3aS9Dl1LUC-Zs^LZnH;rMV@<2Y3`gx4Rh z1Q-|(JG5akUs?B#dWmkg8gO!YS$H3@<65Y~WWJ)mG*iEWUjIkuxDUrRNb^A)dN5sN zPRGZGyP8)A0KoSo_)=O8P{-~=9$WsJHq)$f!VoWa)1-klvwTvj{uL%r3DfVj)xsRnXjO~*UT~8)&U44 zpsmDpk3jMld?{cX9Y^Ndz8z)E=b%o!c=u&SHy#Au2@qxLRmVX!N9Q=k`yLuFMaMLZ zI#QSY6acnYT?3{vBBDT6-X*L7R2eX(8b3-$2ayH<*iV`{^47VE=K|oRU4M!-FyXP? z30xP^vS-c!aKP_@992g$>LmpwEz^Ey09*~X!M3FP4*-CRr}y=XCp`_eOX*D@x$QxJ qJ^te#r+aK0iyy^%B{MS_KRAM3E8+*HB-i0^4`90D zuI6pN4Ve1_Dobl^TqIvN$s5^x)d5yiL^IbOl|)hm6Bk4U+fD!%T@V$Ro-o%NBGv40 zyt}_K;I4KwB(qFJI)UjrCUW?1=&d)*3(gtw-dZx1a{}B664;^<3kBE%#*&z&?H>U= w99a_Atpw0*EJYbWBmR?@uP1o@{(JG9ALPM1f7&|Ag8%>k07*qoM6N<$f`D^`asU7T literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/creatures/monsters/ecureuil_cristal/ecureuil_cristal.properties b/assets/minecraft/optifine/cit/general/creatures/monstres/ecureuil_cristal/ecureuil_cristal.properties similarity index 50% rename from assets/minecraft/optifine/cit/general/creatures/monsters/ecureuil_cristal/ecureuil_cristal.properties rename to assets/minecraft/optifine/cit/general/creatures/monstres/ecureuil_cristal/ecureuil_cristal.properties index 097e0be3..1c93c2fe 100644 --- a/assets/minecraft/optifine/cit/general/creatures/monsters/ecureuil_cristal/ecureuil_cristal.properties +++ b/assets/minecraft/optifine/cit/general/creatures/monstres/ecureuil_cristal/ecureuil_cristal.properties @@ -1,6 +1,6 @@ type=item -matchItems=rabbit_foot +items=rabbit_foot model=ecureuil_cristal components.custom_data.creature=ecureuil_cristal -# /give @p minecraft:rabbit_foot{creature:ecureuil_cristal} \ No newline at end of file +# /give @s rabbit_foot[custom_data={creature:ecureuil_cristal}] diff --git a/assets/minecraft/optifine/cit/general/creatures/monsters/oiseau_cristal/oiseau_cristal.json b/assets/minecraft/optifine/cit/general/creatures/monstres/oiseau_cristal/oiseau_cristal.json similarity index 99% rename from assets/minecraft/optifine/cit/general/creatures/monsters/oiseau_cristal/oiseau_cristal.json rename to assets/minecraft/optifine/cit/general/creatures/monstres/oiseau_cristal/oiseau_cristal.json index c08c1f5d..e68c1878 100644 --- a/assets/minecraft/optifine/cit/general/creatures/monsters/oiseau_cristal/oiseau_cristal.json +++ b/assets/minecraft/optifine/cit/general/creatures/monstres/oiseau_cristal/oiseau_cristal.json @@ -297,4 +297,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/creatures/monsters/oiseau_cristal/oiseau_cristal.png b/assets/minecraft/optifine/cit/general/creatures/monstres/oiseau_cristal/oiseau_cristal.png similarity index 100% rename from assets/minecraft/optifine/cit/general/creatures/monsters/oiseau_cristal/oiseau_cristal.png rename to assets/minecraft/optifine/cit/general/creatures/monstres/oiseau_cristal/oiseau_cristal.png diff --git a/assets/minecraft/optifine/cit/general/creatures/monsters/oiseau_cristal/oiseau_cristal.png.mcmeta b/assets/minecraft/optifine/cit/general/creatures/monstres/oiseau_cristal/oiseau_cristal.png.mcmeta similarity index 100% rename from assets/minecraft/optifine/cit/general/creatures/monsters/oiseau_cristal/oiseau_cristal.png.mcmeta rename to assets/minecraft/optifine/cit/general/creatures/monstres/oiseau_cristal/oiseau_cristal.png.mcmeta diff --git a/assets/minecraft/optifine/cit/general/creatures/monstres/oiseau_cristal/oiseau_cristal.properties b/assets/minecraft/optifine/cit/general/creatures/monstres/oiseau_cristal/oiseau_cristal.properties new file mode 100644 index 00000000..a8bd77f7 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/creatures/monstres/oiseau_cristal/oiseau_cristal.properties @@ -0,0 +1,6 @@ +type=item +items=feather +model=oiseau_cristal +components.custom_data.creature=oiseau_cristal + +# /give @s feather[custom_data={creature:oiseau_cristal}] diff --git a/assets/minecraft/optifine/cit/general/creatures/monsters/man_spider/spiderman.json b/assets/minecraft/optifine/cit/general/creatures/monstres/spiderman/spiderman.json similarity index 99% rename from assets/minecraft/optifine/cit/general/creatures/monsters/man_spider/spiderman.json rename to assets/minecraft/optifine/cit/general/creatures/monstres/spiderman/spiderman.json index c0e15b05..81d637e7 100644 --- a/assets/minecraft/optifine/cit/general/creatures/monsters/man_spider/spiderman.json +++ b/assets/minecraft/optifine/cit/general/creatures/monstres/spiderman/spiderman.json @@ -443,4 +443,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/minecraft/optifine/cit/general/creatures/monsters/man_spider/spiderman.png b/assets/minecraft/optifine/cit/general/creatures/monstres/spiderman/spiderman.png similarity index 100% rename from assets/minecraft/optifine/cit/general/creatures/monsters/man_spider/spiderman.png rename to assets/minecraft/optifine/cit/general/creatures/monstres/spiderman/spiderman.png diff --git a/assets/minecraft/optifine/cit/general/creatures/monstres/spiderman/spiderman.properties b/assets/minecraft/optifine/cit/general/creatures/monstres/spiderman/spiderman.properties new file mode 100644 index 00000000..a7bcc310 --- /dev/null +++ b/assets/minecraft/optifine/cit/general/creatures/monstres/spiderman/spiderman.properties @@ -0,0 +1,7 @@ +type=item +items=leather +texture=spiderman +model=spiderman +components.custom_data.creature=spiderman + +# /give @s leather[custom_data={creature:spiderman}] From 0d34270bdb0df60f20df73ac47421e314e1ae4b6 Mon Sep 17 00:00:00 2001 From: Mael382 Date: Tue, 28 Jan 2025 18:35:14 +0100 Subject: [PATCH 23/27] patch general/combat/armes .properties (quater) --- .../combat/armes/{ => corps_a_corps}/arme_hast.json | 0 .../baton_combat/baton_combat.png | Bin .../baton_combat/baton_combat.properties | 2 +- .../baton_combat/baton_combat_nbt.properties | 2 +- .../armes_hast/epieu/epieu.png | Bin .../armes_hast/epieu/epieu.properties | 2 +- .../armes_hast/epieu/epieu_nbt.properties | 2 +- .../armes_hast/epieu/epieux_nbt.properties | 2 +- .../guisarme/guisarme_acier/guisarme_acier.png | Bin .../guisarme_acier/guisarme_acier.properties | 2 +- .../guisarme_acier/guisarme_acier_nbt.properties | 2 +- .../guisarme_diamant/guisarme_adamantine.png | Bin .../guisarme_diamant/guisarme_adamantine.properties | 2 +- .../guisarme_adamantine_nbt.properties | 2 +- .../guisarme/guisarme_fer/guisarme_fer.png | Bin .../guisarme/guisarme_fer/guisarme_fer.properties | 2 +- .../guisarme_fer/guisarme_fer_nbt.properties | 2 +- .../hallebarde_acier/hallebarde_acier.png | Bin .../hallebarde_acier/hallebarde_acier.properties | 2 +- .../hallebarde_acier_nbt.properties | 2 +- .../hallebarde_diamant/hallebarde_adamantine.png | Bin .../hallebarde_adamantine.properties | 2 +- .../hallebarde_adamantine_nbt.properties | 2 +- .../hallebarde/hallebarde_fer/hallebarde_fer.png | Bin .../hallebarde_fer/hallebarde_fer.properties | 2 +- .../hallebarde_fer/hallebarde_fer_nbt.properties | 2 +- .../hampe_arret_acier/hampe_arret_acier.png | Bin .../hampe_arret_acier/hampe_arret_acier.properties | 2 +- .../hampe_arret_acier_nbt.properties | 2 +- .../hampe_arret_diamant/hampe_arret_adamantine.png | Bin .../hampe_arret_adamantine.properties | 2 +- .../hampe_arret_adamantine_nbt.properties | 2 +- .../hampe_arret/hampe_arret_fer/hampe_arret_fer.png | Bin .../hampe_arret_fer/hampe_arret_fer.properties | 2 +- .../hampe_arret_fer/hampe_arret_fer_nbt.properties | 2 +- .../hampe_arret_fer/hampe_arret_nbt.properties | 2 +- .../armes_hast/lance/lance_acier/lance_acier.png | Bin .../lance/lance_acier/lance_acier.properties | 2 +- .../lance/lance_acier/lance_acier_nbt.properties | 2 +- .../lance/lance_diamant/lance_adamantine.png | Bin .../lance/lance_diamant/lance_adamantine.properties | 2 +- .../lance_diamant/lance_adamantine_nbt.properties | 2 +- .../armes_hast/lance/lance_fer/lance_fer.png | Bin .../armes_hast/lance/lance_fer/lance_fer.properties | 2 +- .../lance/lance_fer/lance_fer_nbt.properties | 2 +- .../naginata/naginata_acier/naginata_acier.png | Bin .../naginata_acier/naginata_acier.properties | 2 +- .../naginata_acier/naginata_acier_nbt.properties | 2 +- .../naginata_diamant/naginata_adamantine.png | Bin .../naginata_diamant/naginata_adamantine.properties | 2 +- .../naginata_adamantine_nbt.properties | 2 +- .../naginata/naginata_fer/naginata_fer.png | Bin .../naginata/naginata_fer/naginata_fer.properties | 2 +- .../naginata_fer/naginata_fer_nbt.properties | 2 +- .../pertuisane_acier/pertuisane_acier.png | Bin .../pertuisane_acier/pertuisane_acier.properties | 2 +- .../pertuisane_acier_nbt.properties | 2 +- .../pertuisane_diamant/pertuisane_adamantine.png | Bin .../pertuisane_adamantine.properties | 2 +- .../pertuisane_adamantine_nbt.properties | 2 +- .../pertuisane/pertuisane_fer/pertuisane_fer.png | Bin .../pertuisane_fer/pertuisane_fer.properties | 2 +- .../pertuisane_fer/pertuisane_fer_nbt.properties | 2 +- .../couperet/couperet_acier/couperet_acier.png | Bin .../couperet_acier/couperet_acier.properties | 0 .../couperet_acier/couperet_acier_nbt.properties | 0 .../couperet_diamant/couperet_adamantin.png | Bin .../couperet_diamant/couperet_adamantin.properties | 0 .../couperet_adamantin_nbt.properties | 0 .../couteaux/couperet/couperet_fer/couperet_fer.png | Bin .../couperet/couperet_fer/couperet_fer.properties | 0 .../couperet_fer/couperet_fer_nbt.properties | 0 .../coutelas/coutelas_acier/coutelas_acier.png | Bin .../coutelas_acier/coutelas_acier.properties | 0 .../coutelas_acier/coutelas_acier_nbt.properties | 0 .../coutelas_diamant/coutelas_adamantin.png | Bin .../coutelas_diamant/coutelas_adamantin.properties | 0 .../coutelas_adamantin_nbt.properties | 0 .../couteaux/coutelas/coutelas_fer/coutelas_fer.png | Bin .../coutelas/coutelas_fer/coutelas_fer.properties | 0 .../coutelas_fer/coutelas_fer_nbt.properties | 0 .../couteaux/stylets/stylet_acier/stylet_acier.png | Bin .../stylets/stylet_acier/stylet_acier.properties | 0 .../stylet_acier/stylet_acier_nbt.properties | 0 .../stylets/stylet_diamant/stylet_adamantin.png | Bin .../stylet_diamant/stylet_adamantin.properties | 0 .../stylet_diamant/stylet_adamantin_nbt.properties | 0 .../couteaux/stylets/stylet_fer/stylet_fer.png | Bin .../stylets/stylet_fer/stylet_fer.properties | 0 .../stylets/stylet_fer/stylet_fer_nbt.properties | 0 .../dagues/dague_acier/dague_acier.png | Bin .../dagues/dague_acier/dague_acier.properties | 0 .../dagues/dague_acier/dague_acier_nbt.properties | 0 .../dague_ceremonielle/dague_ceremonielle.png | Bin .../dague_ceremonielle.properties | 0 .../dague_ceremonielle_nbt.properties | 0 .../dagues/dague_diamant/dague_adamantine.png | Bin .../dague_diamant/dague_adamantine.properties | 0 .../dague_diamant/dague_adamantine_nbt.properties | 0 .../dagues/dague_fer/dague_fer.png | Bin .../dagues/dague_fer/dague_fer.properties | 0 .../dagues/dague_fer/dague_fer_nbt.properties | 0 .../dagues/dague_fer/dague_nbt.properties | 0 .../dagues/dague_noire/dague_noire.png | Bin .../dagues/dague_noire/dague_noire.properties | 0 .../dagues/dague_noire/dague_noire_nbt.properties | 0 .../armes/{ => corps_a_corps}/epee_batarde.json | 0 .../armes/{ => corps_a_corps}/epee_longue.json | 0 .../claymore/claymore_acier/claymore_acier.png | Bin .../claymore_acier/claymore_acier.properties | 2 +- .../claymore_acier/claymore_acier_nbt.properties | 2 +- .../claymore_diamant/claymore_adamantine.png | Bin .../claymore_diamant/claymore_adamantine.properties | 2 +- .../claymore_adamantine_nbt.properties | 2 +- .../epees/claymore/claymore_fer/claymore_fer.png | Bin .../claymore/claymore_fer/claymore_fer.properties | 2 +- .../claymore_fer/claymore_fer_nbt.properties | 2 +- .../epees/epee_1m/epee_1m_acier.png | Bin .../epees/epee_1m/epee_1m_acier.properties | 0 .../epees/epee_1m/epee_1m_acier_nbt.properties | 0 .../epee_batarde_acier/epee_batarde_acier.png | Bin .../epee_batarde_acier.properties | 2 +- .../epee_batarde_acier_nbt.properties | 2 +- .../epee_batarde_adamantine.png | Bin .../epee_batarde_adamantine.properties} | 2 +- .../epee_batarde_adamantine_nbt.properties} | 2 +- .../epee_batarde_fer/epee_batarde_fer.png | Bin .../epee_batarde_fer/epee_batarde_fer.properties | 2 +- .../epee_batarde_fer_nbt.properties | 2 +- .../epees/epee_entrainement/epee_entrainement.png | Bin .../epee_entrainement/epee_entrainement.properties | 0 .../epee_entrainement_nbt.properties | 0 .../epee_longue_acier/epee_longue_acier.png | Bin .../epee_longue_acier/epee_longue_acier.properties | 2 +- .../epee_longue_acier_nbt.properties | 2 +- .../epee_longue_diamant/epee_longue_adamantine.png | Bin .../epee_longue_adamantine.properties | 2 +- .../epee_longue_adamantine_nbt.properties | 2 +- .../epee_longue/epee_longue_fer/epee_longue_fer.png | Bin .../epee_longue_fer/epee_longue_fer.properties | 2 +- .../epee_longue_fer/epee_longue_fer_nbt.properties | 2 +- .../epees/espadon/espadon_acier/espadon_acier.png | Bin .../espadon/espadon_acier/espadon_acier.properties | 2 +- .../espadon_acier/espadon_acier_nbt.properties | 2 +- .../espadon/espadon_diamant/espadon_adamantin.png | Bin .../espadon_diamant/espadon_adamantin.properties | 2 +- .../espadon_adamantin_nbt.properties | 2 +- .../epees/espadon/espadon_fer/espadon_fer.png | Bin .../espadon/espadon_fer/espadon_fer.properties | 2 +- .../espadon/espadon_fer/espadon_fer_nbt.properties | 2 +- .../epees/glaive/glaive_acier/glaive_acier.png | Bin .../glaive/glaive_acier/glaive_acier.properties | 0 .../glaive/glaive_acier/glaive_acier_nbt.properties | 0 .../glaive/glaive_diamant/glaive_adamantin.png | Bin .../glaive_diamant/glaive_adamantin.properties | 0 .../glaive_diamant/glaive_adamantin_nbt.properties | 0 .../epees/glaive/glaive_fer/glaive_fer.png | Bin .../epees/glaive/glaive_fer/glaive_fer.properties | 0 .../glaive/glaive_fer/glaive_fer_nbt.properties | 0 .../epees/rapiere/rapiere_acier/rapiere_acier.png | Bin .../rapiere/rapiere_acier/rapiere_acier.properties | 2 +- .../rapiere_acier/rapiere_acier_nbt.properties | 2 +- .../rapiere/rapiere_diamant/rapiere_adamantine.png | Bin .../rapiere_diamant/rapiere_adamantine.properties | 2 +- .../rapiere_adamantine_nbt.properties | 2 +- .../epees/rapiere/rapiere_fer/rapiere_fer.png | Bin .../rapiere/rapiere_fer/rapiere_fer.properties | 2 +- .../rapiere/rapiere_fer/rapiere_fer_nbt.properties | 2 +- .../armes/{ => corps_a_corps}/grande_epee.json | 0 .../grande_hache_acier/grande_hache_acier.png | Bin .../grande_hache_acier.properties | 2 +- .../grande_hache_acier_nbt.properties | 2 +- .../grande_hache_adamantine.png | Bin .../grande_hache_adamantine.properties | 2 +- .../grande_hache_adamantine_nbt.properties | 2 +- .../grande_hache_fer/grande_hache_fer.png | Bin .../grande_hache_fer/grande_hache_fer.properties | 2 +- .../grande_hache_fer_nbt.properties | 2 +- .../hache_bataille_fer/hache_bataille_fer.png | Bin .../hache_bataille_fer.properties | 0 .../hache_bataille_fer_nbt.properties | 0 .../iron_battle_axe_nbt.properties | 0 .../hache_combat_acier/hache_combat_acier.png | Bin .../hache_combat_acier.properties | 0 .../hache_combat_acier_nbt.properties | 0 .../hache_combat_adamantin.png | Bin .../hache_combat_adamantin.properties | 0 .../hache_combat_adamantin_nbt.properties | 0 .../hache_combat_fer/hache_combat_fer.png | Bin .../hache_combat_fer/hache_combat_fer.properties | 0 .../hache_combat_fer_nbt.properties | 0 .../bec_corbin_acier/bec_corbin_acier.png | Bin .../bec_corbin_acier/bec_corbin_acier.properties | 2 +- .../bec_corbin_acier_nbt.properties | 2 +- .../bec_corbin_acier/corbin_acier_nbt.properties | 2 +- .../bec_corbin_diamant/bec_corbin_adamantin.png | Bin .../bec_corbin_adamantin.properties | 2 +- .../bec_corbin_adamantin_nbt.properties | 2 +- .../corbin_adamantin_nbt.properties | 2 +- .../bec_corbin/bec_corbin_fer/bec_corbin_fer.png | Bin .../bec_corbin_fer/bec_corbin_fer.properties | 2 +- .../bec_corbin_fer/bec_corbin_fer_nbt.properties | 2 +- .../bec_corbin_fer/corbin_fer_nbt.properties | 2 +- .../marteaux/kanabo/kanabo.png | Bin .../marteaux/kanabo/kanabo.properties | 2 +- .../marteaux/kanabo/kanabo_nbt.properties | 2 +- .../marteau_deux_mains_acier.png | Bin .../marteau_deux_mains_acier.properties | 2 +- .../marteau_deux_mains_acier_nbt.properties | 2 +- .../marteau_deux_mains_adamantin.png | Bin .../marteau_deux_mains_adamantin.properties | 2 +- .../marteau_deux_mains_adamantin_nbt.properties | 2 +- .../marteau_deux_mains_fer.png | Bin .../marteau_deux_mains_fer.properties | 2 +- .../marteau_deux_mains_fer_nbt.properties | 2 +- .../marteaux/marteau_guerre/marteau_guerre.png | Bin .../marteau_guerre/marteau_guerre.properties | 0 .../marteau_guerre/marteau_guerre_nbt.properties | 0 .../marteau_une_main_acier.png | Bin .../marteau_une_main_acier.properties | 0 .../marteau_une_main_acier_nbt.properties | 0 .../marteau_une_main_adamantin.png | Bin .../marteau_une_main_adamantin.properties | 0 .../marteau_une_main_adamantin_nbt.properties | 0 .../marteau_une_main_fer/marteau_une_main_fer.png | Bin .../marteau_une_main_fer.properties | 0 .../marteau_une_main_fer_nbt.properties | 0 .../masse_ailettes_acier/masse_ailettes_acier.png | Bin .../masse_ailettes_acier.properties | 0 .../masse_ailettes_acier_nbt.properties | 0 .../masse_ailettes_adamantin.png | Bin .../masse_ailettes_adamantin.properties | 0 .../masse_ailettes_adamantin_nbt.properties | 0 .../masse_ailettes_fer/masse_ailettes_fer.png | Bin .../masse_ailettes_fer.properties | 0 .../masse_ailettes_fer_nbt.properties | 0 .../masse_deux_mains_acier.png | Bin .../masse_deux_mains_acier.properties | 2 +- .../masse_deux_mains_acier_nbt.properties | 2 +- .../masse_deux_mains_adamantin.png | Bin .../masse_deux_mains_adamantin.properties | 2 +- .../masse_deux_mains_adamantin_nbt.properties | 2 +- .../masse_deux_mains_fer/masse_deux_mains_fer.png | Bin .../masse_deux_mains_fer.properties | 2 +- .../masse_deux_mains_fer_nbt.properties | 2 +- .../tetsubo/tetsubo_acier/tetsubo_acier.png | Bin .../tetsubo/tetsubo_acier/tetsubo_acier.properties | 2 +- .../tetsubo_acier/tetsubo_acier_nbt.properties | 2 +- .../tetsubo/tetsubo_diamant/tetsubo_adamantin.png | Bin .../tetsubo_diamant/tetsubo_adamantin.properties | 2 +- .../tetsubo_adamantin_nbt.properties | 2 +- .../marteaux/tetsubo/tetsubo_fer/tetsubo_fer.png | Bin .../tetsubo/tetsubo_fer/tetsubo_fer.properties | 2 +- .../tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties | 2 +- .../sabres/katana/katana_acier/katana_acier.png | Bin .../katana/katana_acier/katana_acier.properties | 2 +- .../katana/katana_acier/katana_acier_nbt.properties | 2 +- .../katana/katana_diamant/katana_adamantin.png | Bin .../katana_diamant/katana_adamantin.properties | 2 +- .../katana_diamant/katana_adamantin_nbt.properties | 2 +- .../sabres/katana/katana_fer/katana_fer.png | Bin .../sabres/katana/katana_fer/katana_fer.properties | 2 +- .../katana/katana_fer/katana_fer_nbt.properties | 2 +- .../messer_1m/messer_1m_acier/messer_1m_acier.png | Bin .../messer_1m_acier/messer_1m_acier.properties | 2 +- .../messer_1m_acier/messer_1m_acier_nbt.properties | 2 +- .../messer_1m_acier/messer_acier_nbt.properties | 2 +- .../messer_1m_diamant/messer_1m_adamantin.png | Bin .../messer_1m_adamantin.properties | 2 +- .../messer_1m_adamantin_nbt.properties | 2 +- .../messer_adamantin_nbt.properties | 2 +- .../messer_1m/messer_1m_fer/messer_1m_fer.png | Bin .../messer_1m_fer/messer_1m_fer.properties | 2 +- .../messer_1m_fer/messer_1m_fer_nbt.properties | 2 +- .../messer_1m/messer_1m_fer/messer_nbt.properties | 2 +- .../messer_2m/messer_2m_acier/messer_2m_acier.png | Bin .../messer_2m_acier/messer_2m_acier.properties | 2 +- .../messer_2m_acier/messer_2m_acier_nbt.properties | 2 +- .../messer_2m_diamant/messer_2m_adamantin.png | Bin .../messer_2m_adamantin.properties | 2 +- .../messer_2m_adamantin_nbt.properties | 2 +- .../messer_2m/messer_2m_fer/messer_2m_fer.png | Bin .../messer_2m_fer/messer_2m_fer.properties | 2 +- .../messer_2m_fer/messer_2m_fer_nbt.properties | 2 +- .../messer_2m_fer/messer_2m_nbt.properties | 2 +- .../sabres/nodachi/nodachi_acier/nodachi_acier.png | Bin .../nodachi/nodachi_acier/nodachi_acier.properties | 2 +- .../nodachi_acier/nodachi_acier_nbt.properties | 2 +- .../nodachi/nodachi_diamant/nodachi_adamantin.png | Bin .../nodachi_diamant/nodachi_adamantin.properties | 2 +- .../nodachi_adamantin_nbt.properties | 2 +- .../sabres/nodachi/nodachi_fer/nodachi_fer.png | Bin .../nodachi/nodachi_fer/nodachi_fer.properties | 2 +- .../nodachi/nodachi_fer/nodachi_fer_nbt.properties | 2 +- .../sabres/sabre/sabre_acier/sabre_acier.png | Bin .../sabres/sabre/sabre_acier/sabre_acier.properties | 2 +- .../sabre/sabre_acier/sabre_acier_nbt.properties | 2 +- .../sabres/sabre/sabre_diamant/sabre_adamantin.png | Bin .../sabre/sabre_diamant/sabre_adamantin.properties | 2 +- .../sabre_diamant/sabre_adamantin_nbt.properties | 2 +- .../sabres/sabre/sabre_fer/sabre_fer.png | Bin .../sabres/sabre/sabre_fer/sabre_fer.properties | 2 +- .../sabres/sabre/sabre_fer/sabre_fer_nbt.properties | 2 +- 303 files changed, 141 insertions(+), 141 deletions(-) rename assets/minecraft/optifine/cit/general/combat/armes/{ => corps_a_corps}/arme_hast.json (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_contondantes/baton_combat/baton_combat.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_contondantes/baton_combat/baton_combat.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_contondantes/baton_combat/baton_combat_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/epieu/epieu.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/epieu/epieu.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/epieu/epieu_nbt.properties (68%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/epieu/epieux_nbt.properties (75%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/guisarme/guisarme_acier/guisarme_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/guisarme/guisarme_acier/guisarme_acier.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/guisarme/guisarme_acier/guisarme_acier_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine_nbt.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/guisarme/guisarme_fer/guisarme_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/guisarme/guisarme_fer/guisarme_fer.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/guisarme/guisarme_fer/guisarme_fer_nbt.properties (70%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine_nbt.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.properties (75%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier_nbt.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine_nbt.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.properties (75%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties (77%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/lance/lance_acier/lance_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/lance/lance_acier/lance_acier.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/lance/lance_acier/lance_acier_nbt.properties (69%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/lance/lance_diamant/lance_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/lance/lance_diamant/lance_adamantine.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/lance/lance_diamant/lance_adamantine_nbt.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/lance/lance_fer/lance_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/lance/lance_fer/lance_fer.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/lance/lance_fer/lance_fer_nbt.properties (68%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/naginata/naginata_acier/naginata_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/naginata/naginata_acier/naginata_acier.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/naginata/naginata_acier/naginata_acier_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/naginata/naginata_diamant/naginata_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/naginata/naginata_diamant/naginata_adamantine.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/naginata/naginata_diamant/naginata_adamantine_nbt.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/naginata/naginata_fer/naginata_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/naginata/naginata_fer/naginata_fer.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/naginata/naginata_fer/naginata_fer_nbt.properties (70%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine_nbt.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/couperet/couperet_acier/couperet_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/couperet/couperet_acier/couperet_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/couperet/couperet_acier/couperet_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/couperet/couperet_diamant/couperet_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/couperet/couperet_diamant/couperet_adamantin.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/couperet/couperet_diamant/couperet_adamantin_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/couperet/couperet_fer/couperet_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/couperet/couperet_fer/couperet_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/couperet/couperet_fer/couperet_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/coutelas/coutelas_acier/coutelas_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/coutelas/coutelas_acier/coutelas_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/coutelas/coutelas_acier/coutelas_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/coutelas/coutelas_diamant/coutelas_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/coutelas/coutelas_diamant/coutelas_adamantin.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/coutelas/coutelas_diamant/coutelas_adamantin_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/coutelas/coutelas_fer/coutelas_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/coutelas/coutelas_fer/coutelas_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/coutelas/coutelas_fer/coutelas_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/stylets/stylet_acier/stylet_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/stylets/stylet_acier/stylet_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/stylets/stylet_acier/stylet_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/stylets/stylet_diamant/stylet_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/stylets/stylet_diamant/stylet_adamantin.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/stylets/stylet_diamant/stylet_adamantin_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/stylets/stylet_fer/stylet_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/stylets/stylet_fer/stylet_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/couteaux/stylets/stylet_fer/stylet_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_acier/dague_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_acier/dague_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_acier/dague_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_ceremonielle/dague_ceremonielle.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_ceremonielle/dague_ceremonielle.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_ceremonielle/dague_ceremonielle_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_diamant/dague_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_diamant/dague_adamantine.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_diamant/dague_adamantine_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_fer/dague_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_fer/dague_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_fer/dague_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_fer/dague_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_noire/dague_noire.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_noire/dague_noire.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/dagues/dague_noire/dague_noire_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{ => corps_a_corps}/epee_batarde.json (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{ => corps_a_corps}/epee_longue.json (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/claymore/claymore_acier/claymore_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/claymore/claymore_acier/claymore_acier.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/claymore/claymore_acier/claymore_acier_nbt.properties (70%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/claymore/claymore_diamant/claymore_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/claymore/claymore_diamant/claymore_adamantine.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/claymore/claymore_diamant/claymore_adamantine_nbt.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/claymore/claymore_fer/claymore_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/claymore/claymore_fer/claymore_fer.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/claymore/claymore_fer/claymore_fer_nbt.properties (70%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_1m/epee_1m_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_1m/epee_1m_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_1m/epee_1m_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier_nbt.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantin.properties => corps_a_corps/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine.properties} (77%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantin_nbt.properties => corps_a_corps/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine_nbt.properties} (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_entrainement/epee_entrainement.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_entrainement/epee_entrainement.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_entrainement/epee_entrainement_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_longue/epee_longue_acier/epee_longue_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_longue/epee_longue_acier/epee_longue_acier.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_longue/epee_longue_acier/epee_longue_acier_nbt.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine_nbt.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_longue/epee_longue_fer/epee_longue_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_longue/epee_longue_fer/epee_longue_fer.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/epee_longue/epee_longue_fer/epee_longue_fer_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/espadon/espadon_acier/espadon_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/espadon/espadon_acier/espadon_acier.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/espadon/espadon_acier/espadon_acier_nbt.properties (70%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/espadon/espadon_diamant/espadon_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/espadon/espadon_diamant/espadon_adamantin.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/espadon/espadon_diamant/espadon_adamantin_nbt.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/espadon/espadon_fer/espadon_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/espadon/espadon_fer/espadon_fer.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/espadon/espadon_fer/espadon_fer_nbt.properties (69%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/glaive/glaive_acier/glaive_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/glaive/glaive_acier/glaive_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/glaive/glaive_acier/glaive_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/glaive/glaive_diamant/glaive_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/glaive/glaive_diamant/glaive_adamantin.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/glaive/glaive_diamant/glaive_adamantin_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/glaive/glaive_fer/glaive_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/glaive/glaive_fer/glaive_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/glaive/glaive_fer/glaive_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/rapiere/rapiere_acier/rapiere_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/rapiere/rapiere_acier/rapiere_acier.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/rapiere/rapiere_acier/rapiere_acier_nbt.properties (70%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/rapiere/rapiere_diamant/rapiere_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/rapiere/rapiere_diamant/rapiere_adamantine.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/rapiere/rapiere_fer/rapiere_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/rapiere/rapiere_fer/rapiere_fer.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/epees/rapiere/rapiere_fer/rapiere_fer_nbt.properties (69%) rename assets/minecraft/optifine/cit/general/combat/armes/{ => corps_a_corps}/grande_epee.json (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/grande_hache/grande_hache_acier/grande_hache_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/grande_hache/grande_hache_acier/grande_hache_acier.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/grande_hache/grande_hache_acier/grande_hache_acier_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine_nbt.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/grande_hache/grande_hache_fer/grande_hache_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/grande_hache/grande_hache_fer/grande_hache_fer.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/grande_hache/grande_hache_fer/grande_hache_fer_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_combat/hache_combat_acier/hache_combat_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_combat/hache_combat_acier/hache_combat_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_combat/hache_combat_acier/hache_combat_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_combat/hache_combat_fer/hache_combat_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_combat/hache_combat_fer/hache_combat_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/haches/hache_combat/hache_combat_fer/hache_combat_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_acier/corbin_acier_nbt.properties (81%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin_nbt.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_diamant/corbin_adamantin_nbt.properties (82%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/bec_corbin/bec_corbin_fer/corbin_fer_nbt.properties (80%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/kanabo/kanabo.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/kanabo/kanabo.properties (69%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/kanabo/kanabo_nbt.properties (66%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin_nbt.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_guerre/marteau_guerre.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_guerre/marteau_guerre.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_guerre/marteau_guerre_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer_nbt.properties (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.properties (75%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.properties (75%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin_nbt.properties (75%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.properties (75%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/tetsubo/tetsubo_acier/tetsubo_acier_nbt.properties (70%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin_nbt.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/marteaux/tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties (69%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/katana/katana_acier/katana_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/katana/katana_acier/katana_acier.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/katana/katana_acier/katana_acier_nbt.properties (70%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/katana/katana_diamant/katana_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/katana/katana_diamant/katana_adamantin.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/katana/katana_diamant/katana_adamantin_nbt.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/katana/katana_fer/katana_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/katana/katana_fer/katana_fer.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/katana/katana_fer/katana_fer_nbt.properties (69%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties (77%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin_nbt.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties (78%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer_nbt.properties (69%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties (74%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.properties (73%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer_nbt.properties (70%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties (76%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/nodachi/nodachi_acier/nodachi_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/nodachi/nodachi_acier/nodachi_acier.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/nodachi/nodachi_acier/nodachi_acier_nbt.properties (70%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/nodachi/nodachi_diamant/nodachi_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/nodachi/nodachi_diamant/nodachi_adamantin.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/nodachi/nodachi_diamant/nodachi_adamantin_nbt.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/nodachi/nodachi_fer/nodachi_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/nodachi/nodachi_fer/nodachi_fer.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/nodachi/nodachi_fer/nodachi_fer_nbt.properties (69%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/sabre/sabre_acier/sabre_acier.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/sabre/sabre_acier/sabre_acier.properties (71%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/sabre/sabre_acier/sabre_acier_nbt.properties (69%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/sabre/sabre_diamant/sabre_adamantin.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/sabre/sabre_diamant/sabre_adamantin.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/sabre/sabre_diamant/sabre_adamantin_nbt.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/sabre/sabre_fer/sabre_fer.png (100%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/sabre/sabre_fer/sabre_fer.properties (72%) rename assets/minecraft/optifine/cit/general/combat/armes/{cac => corps_a_corps}/sabres/sabre/sabre_fer/sabre_fer_nbt.properties (68%) diff --git a/assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/arme_hast.json similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/arme_hast.json rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/arme_hast.json diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_contondantes/baton_combat/baton_combat.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_contondantes/baton_combat/baton_combat.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_contondantes/baton_combat/baton_combat.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_contondantes/baton_combat/baton_combat.properties index 62b9f6dd..b76feabd 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_contondantes/baton_combat/baton_combat.properties @@ -1,7 +1,7 @@ type=item items=wooden_sword texture=baton_combat -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:.*?b[\u00e2a]ton.*?combat.* # /give @s wooden_sword[custom_name='{text:"Bâton de combat", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_contondantes/baton_combat/baton_combat_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_contondantes/baton_combat/baton_combat_nbt.properties index 114d43ab..3c04c14d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_contondantes/baton_combat/baton_combat_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_contondantes/baton_combat/baton_combat_nbt.properties @@ -1,7 +1,7 @@ type=item items=wooden_sword texture=baton_combat -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=baton_combat weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/epieu/epieu.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/epieu/epieu.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/epieu/epieu.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/epieu/epieu.properties index c40610ae..2b7defbd 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/epieu/epieu.properties @@ -1,7 +1,7 @@ type=item items=wooden_sword texture=epieux -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:.*?[\u00e9e]pieu.* # /give @s wooden_sword[custom_name='{text:"Épieu", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/epieu/epieu_nbt.properties similarity index 68% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/epieu/epieu_nbt.properties index e8b3e79f..76635174 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieu_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/epieu/epieu_nbt.properties @@ -1,7 +1,7 @@ type=item items=wooden_sword texture=epieu -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=epieu weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieux_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/epieu/epieux_nbt.properties similarity index 75% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieux_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/epieu/epieux_nbt.properties index 147a7629..98f33cab 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/epieu/epieux_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/epieu/epieux_nbt.properties @@ -3,6 +3,6 @@ type=item items=wooden_sword texture=epieu -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=epieux weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_acier/guisarme_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_acier/guisarme_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_acier/guisarme_acier.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_acier/guisarme_acier.properties index 5573db78..3f11b755 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_acier/guisarme_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=guisarme_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*guisarme*acier* # /give @s iron_axe[custom_name='{text:"Guisarme en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_acier/guisarme_acier_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_acier/guisarme_acier_nbt.properties index 1ec76426..3fd5c162 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_acier/guisarme_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_acier/guisarme_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=guisarme_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=guisarme_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.properties index 78181b95..c02b2bda 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=guisarme_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*guisarme* # /give @s diamond_axe[custom_name='{text:"Guisarme adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine_nbt.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine_nbt.properties index aa9ec034..4368b937 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_diamant/guisarme_adamantine_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=guisarme_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=guisarme_adamantine weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_fer/guisarme_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_fer/guisarme_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_fer/guisarme_fer.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_fer/guisarme_fer.properties index d0518527..93ef42ee 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_fer/guisarme_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=guisarme_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:(?!.*acier).*?guisarme.* # /give @s iron_axe[custom_name='{text:"Guisarme en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_fer/guisarme_fer_nbt.properties similarity index 70% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_fer/guisarme_fer_nbt.properties index 632024ca..fcfde5fe 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/guisarme/guisarme_fer/guisarme_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/guisarme/guisarme_fer/guisarme_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=guisarme_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=guisarme_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.properties index a9c8f0b4..379f3f27 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=hallebarde_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*hallebarde*acier* # /give @s iron_axe[custom_name='{text:"Hallebarde en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier_nbt.properties index a0168e19..7e73691a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_acier/hallebarde_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=hallebarde_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=hallebarde_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.properties index 1333501b..57b7be50 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=hallebarde_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*hallebarde* # /give @s diamond_axe[custom_name='{text:"Hallebarde adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine_nbt.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine_nbt.properties index a3be6423..5631d3d9 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_diamant/hallebarde_adamantine_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=hallebarde_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=hallebarde_adamantine weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.properties index 14d1dc8d..b5a08880 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=hallebarde_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:(?!.*acier).*?hallebarde.* # /give @s iron_axe[custom_name='{text:"Hallebarde en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer_nbt.properties index d36eb744..e421dede 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hallebarde/hallebarde_fer/hallebarde_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=hallebarde_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=hallebarde_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.properties similarity index 75% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.properties index 307bd59a..2cf0bc3a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=hampe_arret_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:.*?hampe.*?arr[\u00eae]t.*?acier.* # /give @s iron_axe[custom_name='{text:"Hampe d'arrêt en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier_nbt.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier_nbt.properties index 63c89b67..af171a7a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_acier/hampe_arret_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=hampe_arret_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=hampe_arret_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.properties index 71ff2440..5606dfaa 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=hampe_arret_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:.*?hampe.*?arr[\u00eae]t.* # /give @s diamond_axe[custom_name='{text:"Hampe d'arrêt adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine_nbt.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine_nbt.properties index f2f2ecc8..0dddb8ed 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_diamant/hampe_arret_adamantine_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=hampe_arret_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=hampe_arret_adamantine weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.properties similarity index 75% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.properties index 04829ca7..644d4f2d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=hampe_arret_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:(?!.*acier).*?hampe.*?arr[\u00eae]t.* # /give @s iron_axe[custom_name='{text:"Hampe d'arrêt en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer_nbt.properties index 3b354c83..2b3d8518 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=hampe_arret_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=hampe_arret_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties similarity index 77% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties index 3f21f9b9..f644f2a3 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/hampe_arret/hampe_arret_fer/hampe_arret_nbt.properties @@ -3,6 +3,6 @@ type=item items=iron_axe texture=hampe_arret_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=hampe_arret weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_acier/lance_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_acier/lance_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_acier/lance_acier.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_acier/lance_acier.properties index e8446b9f..cb7bdae2 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_acier/lance_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=lance_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*lance*acier* # /give @s iron_axe[custom_name='{text:"Lance en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_acier/lance_acier_nbt.properties similarity index 69% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_acier/lance_acier_nbt.properties index 926afb5a..87e918a3 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_acier/lance_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_acier/lance_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=lance_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=lance_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_diamant/lance_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_diamant/lance_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_diamant/lance_adamantine.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_diamant/lance_adamantine.properties index 3bcd0689..a733c316 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_diamant/lance_adamantine.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=lance_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*lance* # /give @s diamond_axe[custom_name='{text:"Lance adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_diamant/lance_adamantine_nbt.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_diamant/lance_adamantine_nbt.properties index 80c18560..779ae82c 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_diamant/lance_adamantine_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_diamant/lance_adamantine_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=lance_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=lance_adamantine weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_fer/lance_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_fer/lance_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_fer/lance_fer.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_fer/lance_fer.properties index 685e6280..3dfef458 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_fer/lance_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=lance_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:(?!.*acier).*?lance.* # /give @s iron_axe[custom_name='{text:"Lance en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_fer/lance_fer_nbt.properties similarity index 68% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_fer/lance_fer_nbt.properties index b2fefc5d..fb027e32 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/lance/lance_fer/lance_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/lance/lance_fer/lance_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=lance_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=lance_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_acier/naginata_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_acier/naginata_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_acier/naginata_acier.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_acier/naginata_acier.properties index af166d5d..ec42c619 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_acier/naginata_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=naginata_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*naginata*acier* # /give @s iron_axe[custom_name='{text:"Naginata en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_acier/naginata_acier_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_acier/naginata_acier_nbt.properties index 6c54a0dc..312f0020 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_acier/naginata_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_acier/naginata_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=naginata_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=naginata_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_diamant/naginata_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_diamant/naginata_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_diamant/naginata_adamantine.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_diamant/naginata_adamantine.properties index 15f7e5d6..aa08eb45 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_diamant/naginata_adamantine.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=naginata_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*naginata* # /give @s diamond_axe[custom_name='{text:"Naginata adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_diamant/naginata_adamantine_nbt.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_diamant/naginata_adamantine_nbt.properties index 78362dd8..a16a981d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_diamant/naginata_adamantine_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_diamant/naginata_adamantine_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=naginata_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=naginata_adamantine weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_fer/naginata_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_fer/naginata_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_fer/naginata_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_fer/naginata_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_fer/naginata_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_fer/naginata_fer.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_fer/naginata_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_fer/naginata_fer.properties index 49c9a15b..c922c2ac 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_fer/naginata_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_fer/naginata_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=naginata_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:(?!.*acier).*?naginata.* # /give @s iron_axe[custom_name='{text:"Naginata en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_fer/naginata_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_fer/naginata_fer_nbt.properties similarity index 70% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_fer/naginata_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_fer/naginata_fer_nbt.properties index f2171073..0e6a0823 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/naginata/naginata_fer/naginata_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/naginata/naginata_fer/naginata_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=naginata_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=naginata_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.properties index 8b2247f2..a269ef11 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=pertuisane_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*pertuisane*acier* # /give @s iron_axe[custom_name='{text:"Pertuisane en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier_nbt.properties index 5f78fb14..5e97101a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_acier/pertuisane_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=pertuisane_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=pertuisane_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.properties index 8c3e81f2..71b1f36a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=pertuisane_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*pertuisane* # /give @s diamond_axe[custom_name='{text:"Pertuisane adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine_nbt.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine_nbt.properties index 7cd868ca..5dfd4d63 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_diamant/pertuisane_adamantine_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=pertuisane_adamantine -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=pertuisane_adamantine weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.properties index 8d2ae681..115040da 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=pertuisane_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:(?!.*acier).*?pertuisane.* # /give @s iron_axe[custom_name='{text:"Pertuisane en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer_nbt.properties index 39f318f3..65c39207 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/armes_hast/pertuisane/pertuisane_fer/pertuisane_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=pertuisane_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=pertuisane_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_acier/couperet_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_acier/couperet_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_acier/couperet_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_acier/couperet_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_acier/couperet_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_acier/couperet_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_acier/couperet_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_acier/couperet_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_acier/couperet_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_acier/couperet_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_acier/couperet_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_acier/couperet_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_diamant/couperet_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_diamant/couperet_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_diamant/couperet_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_diamant/couperet_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_diamant/couperet_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_diamant/couperet_adamantin.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_diamant/couperet_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_diamant/couperet_adamantin.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_diamant/couperet_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_diamant/couperet_adamantin_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_diamant/couperet_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_diamant/couperet_adamantin_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_fer/couperet_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_fer/couperet_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_fer/couperet_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_fer/couperet_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_fer/couperet_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_fer/couperet_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_fer/couperet_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_fer/couperet_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_fer/couperet_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_fer/couperet_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/couperet/couperet_fer/couperet_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/couperet/couperet_fer/couperet_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_acier/coutelas_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_acier/coutelas_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_acier/coutelas_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_acier/coutelas_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_acier/coutelas_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_acier/coutelas_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_acier/coutelas_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_acier/coutelas_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_acier/coutelas_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_acier/coutelas_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_acier/coutelas_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_acier/coutelas_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_diamant/coutelas_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_diamant/coutelas_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_diamant/coutelas_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_diamant/coutelas_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_diamant/coutelas_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_diamant/coutelas_adamantin.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_diamant/coutelas_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_diamant/coutelas_adamantin.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_diamant/coutelas_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_diamant/coutelas_adamantin_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_diamant/coutelas_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_diamant/coutelas_adamantin_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_fer/coutelas_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_fer/coutelas_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_fer/coutelas_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_fer/coutelas_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_fer/coutelas_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_fer/coutelas_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_fer/coutelas_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_fer/coutelas_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_fer/coutelas_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_fer/coutelas_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/coutelas/coutelas_fer/coutelas_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/coutelas/coutelas_fer/coutelas_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_acier/stylet_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_acier/stylet_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_acier/stylet_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_acier/stylet_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_acier/stylet_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_acier/stylet_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_acier/stylet_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_acier/stylet_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_acier/stylet_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_acier/stylet_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_acier/stylet_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_acier/stylet_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_diamant/stylet_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_diamant/stylet_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_diamant/stylet_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_diamant/stylet_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_diamant/stylet_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_diamant/stylet_adamantin.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_diamant/stylet_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_diamant/stylet_adamantin.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_diamant/stylet_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_diamant/stylet_adamantin_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_diamant/stylet_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_diamant/stylet_adamantin_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_fer/stylet_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_fer/stylet_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_fer/stylet_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_fer/stylet_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_fer/stylet_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_fer/stylet_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_fer/stylet_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_fer/stylet_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_fer/stylet_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_fer/stylet_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/couteaux/stylets/stylet_fer/stylet_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/couteaux/stylets/stylet_fer/stylet_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_acier/dague_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_acier/dague_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_acier/dague_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_acier/dague_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_acier/dague_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_acier/dague_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_acier/dague_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_acier/dague_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_acier/dague_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_acier/dague_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_acier/dague_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_acier/dague_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_ceremonielle/dague_ceremonielle.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_ceremonielle/dague_ceremonielle.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_ceremonielle/dague_ceremonielle.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_ceremonielle/dague_ceremonielle.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_ceremonielle/dague_ceremonielle.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_ceremonielle/dague_ceremonielle.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_ceremonielle/dague_ceremonielle.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_ceremonielle/dague_ceremonielle.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_ceremonielle/dague_ceremonielle_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_ceremonielle/dague_ceremonielle_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_ceremonielle/dague_ceremonielle_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_ceremonielle/dague_ceremonielle_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_diamant/dague_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_diamant/dague_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_diamant/dague_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_diamant/dague_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_diamant/dague_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_diamant/dague_adamantine.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_diamant/dague_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_diamant/dague_adamantine.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_diamant/dague_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_diamant/dague_adamantine_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_diamant/dague_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_diamant/dague_adamantine_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_fer/dague_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_fer/dague_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_fer/dague_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_fer/dague_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_fer/dague_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_fer/dague_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_fer/dague_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_fer/dague_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_fer/dague_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_noire/dague_noire.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_noire/dague_noire.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_noire/dague_noire.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_noire/dague_noire.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_noire/dague_noire.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_noire/dague_noire.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_noire/dague_noire.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_noire/dague_noire.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_noire/dague_noire_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_noire/dague_noire_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/dagues/dague_noire/dague_noire_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/dagues/dague_noire/dague_noire_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/epee_batarde.json b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epee_batarde.json similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/epee_batarde.json rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epee_batarde.json diff --git a/assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epee_longue.json similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/epee_longue.json rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epee_longue.json diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_acier/claymore_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_acier/claymore_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_acier/claymore_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_acier/claymore_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_acier/claymore_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_acier/claymore_acier.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_acier/claymore_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_acier/claymore_acier.properties index ee8fa898..de2b4498 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_acier/claymore_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_acier/claymore_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=claymore_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*claymore*acier* # /give @s iron_sword[custom_name='{text:"Claymore en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_acier/claymore_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_acier/claymore_acier_nbt.properties similarity index 70% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_acier/claymore_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_acier/claymore_acier_nbt.properties index 68d73bc0..2176c2e0 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_acier/claymore_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_acier/claymore_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=claymore_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=claymore_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_diamant/claymore_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_diamant/claymore_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_diamant/claymore_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_diamant/claymore_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_diamant/claymore_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_diamant/claymore_adamantine.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_diamant/claymore_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_diamant/claymore_adamantine.properties index 4c86b69c..3c87bbd5 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_diamant/claymore_adamantine.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_diamant/claymore_adamantine.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=claymore_adamantine -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*claymore* # /give @s diamond_sword[custom_name='{text:"Claymore adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_diamant/claymore_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_diamant/claymore_adamantine_nbt.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_diamant/claymore_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_diamant/claymore_adamantine_nbt.properties index fc46514e..f89f2b9d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_diamant/claymore_adamantine_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_diamant/claymore_adamantine_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=claymore_adamantine -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=claymore_adamantine weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_fer/claymore_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_fer/claymore_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_fer/claymore_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_fer/claymore_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_fer/claymore_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_fer/claymore_fer.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_fer/claymore_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_fer/claymore_fer.properties index 1ea50fee..ec8776bc 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_fer/claymore_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_fer/claymore_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=claymore_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*acier).*?claymore.* # /give @s iron_sword[custom_name='{text:"Claymore en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_fer/claymore_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_fer/claymore_fer_nbt.properties similarity index 70% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_fer/claymore_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_fer/claymore_fer_nbt.properties index c5ad076a..aea13984 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/claymore/claymore_fer/claymore_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/claymore/claymore_fer/claymore_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=claymore_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=claymore_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_1m/epee_1m_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_1m/epee_1m_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_1m/epee_1m_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_1m/epee_1m_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_1m/epee_1m_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_1m/epee_1m_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_1m/epee_1m_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_1m/epee_1m_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_1m/epee_1m_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_1m/epee_1m_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_1m/epee_1m_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_1m/epee_1m_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.properties index 86ce34b5..8b528dd8 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=epee_batarde_acier -model=optifine/cit/general/combat/armes/epee_batarde +model=optifine/cit/general/combat/armes/corps_a_corps/epee_batarde components.custom_name=iregex:.*?[\u00e9e]p[\u00e9e]e.*?b[\u00e2a]tarde.*?acier.* # /give @s iron_sword[custom_name='{text:"Épée bâtarde en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier_nbt.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier_nbt.properties index e0ef987c..0dbb6b46 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_acier/epee_batarde_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=epee_batarde_acier -model=optifine/cit/general/combat/armes/epee_batarde +model=optifine/cit/general/combat/armes/corps_a_corps/epee_batarde components.custom_data.arme=epee_batarde_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine.properties similarity index 77% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine.properties index da611bc0..82d4530e 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=epee_batarde_adamantine -model=optifine/cit/general/combat/armes/epee_batarde +model=optifine/cit/general/combat/armes/corps_a_corps/epee_batarde components.custom_name=iregex:.*?[\u00e9e]p[\u00e9e]e.*?b[\u00e2a]tarde.* # /give @s diamond_sword[custom_name='{text:"Épée bâtarde adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine_nbt.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine_nbt.properties index 9241e348..da0cd17a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_diamant/epee_batarde_adamantine_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=epee_batarde_adamantine -model=optifine/cit/general/combat/armes/epee_batarde +model=optifine/cit/general/combat/armes/corps_a_corps/epee_batarde components.custom_data.arme=epee_batarde_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.properties index 31d3e505..c6160b13 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=epee_batarde_fer -model=optifine/cit/general/combat/armes/epee_batarde +model=optifine/cit/general/combat/armes/corps_a_corps/epee_batarde components.custom_name=iregex:(?!.*acier).*?[\u00e9e]p[\u00e9e]e.*?b[\u00e2a]tarde.* # /give @s iron_sword[custom_name='{text:"Épée bâtarde en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer_nbt.properties index 56babb7d..cecead47 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_batarde/epee_batarde_fer/epee_batarde_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=epee_batarde_fer -model=optifine/cit/general/combat/armes/epee_batarde +model=optifine/cit/general/combat/armes/corps_a_corps/epee_batarde components.custom_data.arme=epee_batarde_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_entrainement/epee_entrainement.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_entrainement/epee_entrainement.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_entrainement/epee_entrainement.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_entrainement/epee_entrainement.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_entrainement/epee_entrainement.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_entrainement/epee_entrainement.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_entrainement/epee_entrainement.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_entrainement/epee_entrainement.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_entrainement/epee_entrainement_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_entrainement/epee_entrainement_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_entrainement/epee_entrainement_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_entrainement/epee_entrainement_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_acier/epee_longue_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_acier/epee_longue_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_acier/epee_longue_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_acier/epee_longue_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_acier/epee_longue_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_acier/epee_longue_acier.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_acier/epee_longue_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_acier/epee_longue_acier.properties index bf1c1c89..cd00bf1b 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_acier/epee_longue_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_acier/epee_longue_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=epee_longue_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:.*?[\u00e9e]p[\u00e9e]e.*?longue.*?acier.* # /give @s iron_sword[custom_name='{text:"Épée longue en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_acier/epee_longue_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_acier/epee_longue_acier_nbt.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_acier/epee_longue_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_acier/epee_longue_acier_nbt.properties index a0a92160..c0bfd8f8 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_acier/epee_longue_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_acier/epee_longue_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=epee_longue_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=epee_longue_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.properties index e20b6b22..79ac57a9 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=epee_longue_adamantine -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:.*?[\u00e9e]p[\u00e9e]e.*?longue.* # /give @s diamond_sword[custom_name='{text:"Épée longue adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine_nbt.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine_nbt.properties index 1f6a6496..e7e5fa64 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_diamant/epee_longue_adamantine_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=epee_longue_adamantine -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=epee_longue_adamantine weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_fer/epee_longue_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_fer/epee_longue_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_fer/epee_longue_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_fer/epee_longue_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_fer/epee_longue_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_fer/epee_longue_fer.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_fer/epee_longue_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_fer/epee_longue_fer.properties index 73e559b9..1802ce90 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_fer/epee_longue_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_fer/epee_longue_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=epee_longue_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*acier).*?[\u00e9e]p[\u00e9e]e.*?longue.* # /give @s iron_sword[custom_name='{text:"Épée longue en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_fer/epee_longue_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_fer/epee_longue_fer_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_fer/epee_longue_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_fer/epee_longue_fer_nbt.properties index 270ee502..b79845f7 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/epee_longue/epee_longue_fer/epee_longue_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/epee_longue/epee_longue_fer/epee_longue_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=epee_longue_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=epee_longue_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_acier/espadon_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_acier/espadon_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_acier/espadon_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_acier/espadon_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_acier/espadon_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_acier/espadon_acier.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_acier/espadon_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_acier/espadon_acier.properties index f3063931..5e6b5abd 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_acier/espadon_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_acier/espadon_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=espadon_acier -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_name=ipattern:*espadon*acier* # /give @s iron_sword[custom_name='{text:"Espadon en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_acier/espadon_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_acier/espadon_acier_nbt.properties similarity index 70% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_acier/espadon_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_acier/espadon_acier_nbt.properties index 6dc50b83..1946da6d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_acier/espadon_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_acier/espadon_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=espadon_acier -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_data.arme=espadon_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_diamant/espadon_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_diamant/espadon_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_diamant/espadon_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_diamant/espadon_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_diamant/espadon_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_diamant/espadon_adamantin.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_diamant/espadon_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_diamant/espadon_adamantin.properties index 2a010a98..c726484e 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_diamant/espadon_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_diamant/espadon_adamantin.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=espadon_adamantin -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_name=ipattern:*espadon* # /give @s diamond_sword[custom_name='{text:"Espadon adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_diamant/espadon_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_diamant/espadon_adamantin_nbt.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_diamant/espadon_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_diamant/espadon_adamantin_nbt.properties index e18ff186..152a2d3d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_diamant/espadon_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_diamant/espadon_adamantin_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=espadon_adamantin -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_data.arme=espadon_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_fer/espadon_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_fer/espadon_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_fer/espadon_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_fer/espadon_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_fer/espadon_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_fer/espadon_fer.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_fer/espadon_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_fer/espadon_fer.properties index 696bde67..0976c653 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_fer/espadon_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_fer/espadon_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=espadon_fer -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_name=iregex:(?!.*acier).*?espadon.* # /give @s iron_sword[custom_name='{text:"Espadon en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_fer/espadon_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_fer/espadon_fer_nbt.properties similarity index 69% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_fer/espadon_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_fer/espadon_fer_nbt.properties index 2fdf3e00..2918019b 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/espadon/espadon_fer/espadon_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/espadon/espadon_fer/espadon_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=espadon_fer -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_data.arme=espadon_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_acier/glaive_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_acier/glaive_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_acier/glaive_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_acier/glaive_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_acier/glaive_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_acier/glaive_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_acier/glaive_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_acier/glaive_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_acier/glaive_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_acier/glaive_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_acier/glaive_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_acier/glaive_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_diamant/glaive_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_diamant/glaive_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_diamant/glaive_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_diamant/glaive_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_diamant/glaive_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_diamant/glaive_adamantin.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_diamant/glaive_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_diamant/glaive_adamantin.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_diamant/glaive_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_diamant/glaive_adamantin_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_diamant/glaive_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_diamant/glaive_adamantin_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_fer/glaive_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_fer/glaive_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_fer/glaive_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_fer/glaive_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_fer/glaive_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_fer/glaive_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_fer/glaive_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_fer/glaive_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_fer/glaive_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_fer/glaive_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/glaive/glaive_fer/glaive_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/glaive/glaive_fer/glaive_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_acier/rapiere_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_acier/rapiere_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_acier/rapiere_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_acier/rapiere_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_acier/rapiere_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_acier/rapiere_acier.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_acier/rapiere_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_acier/rapiere_acier.properties index 29af33f2..b804c2e3 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_acier/rapiere_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_acier/rapiere_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=rapiere_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:.*?rapi[\u00e8e]re.*?acier.* # /give @s iron_sword[custom_name='{text:"Rapière en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_acier/rapiere_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_acier/rapiere_acier_nbt.properties similarity index 70% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_acier/rapiere_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_acier/rapiere_acier_nbt.properties index ba4a81bb..071e8ff9 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_acier/rapiere_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_acier/rapiere_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=rapiere_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=rapiere_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_diamant/rapiere_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_diamant/rapiere_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_diamant/rapiere_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_diamant/rapiere_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_diamant/rapiere_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_diamant/rapiere_adamantine.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_diamant/rapiere_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_diamant/rapiere_adamantine.properties index ad94789b..66165268 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_diamant/rapiere_adamantine.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_diamant/rapiere_adamantine.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=rapiere_adamantine -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:.*?rapi[\u00e8e]re.* # /give @s diamond_sword[custom_name='{text:"Rapière adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties index d65fb234..791db1b1 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_diamant/rapiere_adamantine_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=rapiere_adamantine -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=rapiere_adamantine weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_fer/rapiere_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_fer/rapiere_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_fer/rapiere_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_fer/rapiere_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_fer/rapiere_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_fer/rapiere_fer.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_fer/rapiere_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_fer/rapiere_fer.properties index ea0368b5..244daade 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_fer/rapiere_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_fer/rapiere_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=rapiere_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*acier).*?rapi[\u00e8e]re.* # /give @s iron_sword[custom_name='{text:"Rapière en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_fer/rapiere_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_fer/rapiere_fer_nbt.properties similarity index 69% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_fer/rapiere_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_fer/rapiere_fer_nbt.properties index 9c5ae188..dbf68da7 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/epees/rapiere/rapiere_fer/rapiere_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/epees/rapiere/rapiere_fer/rapiere_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=rapiere_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=rapiere_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/grande_epee.json similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/grande_epee.json rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/grande_epee.json diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_acier/grande_hache_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_acier/grande_hache_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_acier/grande_hache_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_acier/grande_hache_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_acier/grande_hache_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_acier/grande_hache_acier.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_acier/grande_hache_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_acier/grande_hache_acier.properties index dbc0fbaa..2a5e6d74 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_acier/grande_hache_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_acier/grande_hache_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=grande_hache_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*grande*hache*acier* # /give @s iron_axe[custom_name='{text:"Grande hache en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_acier/grande_hache_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_acier/grande_hache_acier_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_acier/grande_hache_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_acier/grande_hache_acier_nbt.properties index 77b0b83f..0bd695fd 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_acier/grande_hache_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_acier/grande_hache_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=grande_hache_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=grande_hache_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.properties index c12ba521..e0536442 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=grande_hache_adamantine -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*grande*hache* # /give @s diamond_axe[custom_name='{text:"Grande hache adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine_nbt.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine_nbt.properties index 6ff89573..156ef074 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_adamantine/grande_hache_adamantine_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=grande_hache_adamantine -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=grande_hache_adamantine weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_fer/grande_hache_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_fer/grande_hache_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_fer/grande_hache_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_fer/grande_hache_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_fer/grande_hache_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_fer/grande_hache_fer.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_fer/grande_hache_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_fer/grande_hache_fer.properties index 3f13fd7e..d6654fb1 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_fer/grande_hache_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_fer/grande_hache_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=grande_hache_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*acier|acier).*?grande.*?hache.* # /give @s iron_axe[custom_name='{text:"Grande hache en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_fer/grande_hache_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_fer/grande_hache_fer_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_fer/grande_hache_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_fer/grande_hache_fer_nbt.properties index 2e74087e..8610f3d6 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/grande_hache/grande_hache_fer/grande_hache_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/grande_hache/grande_hache_fer/grande_hache_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=grande_hache_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=grande_hache_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_bataille/hache_bataille_fer/hache_bataille_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_bataille/hache_bataille_fer/iron_battle_axe_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_acier/hache_combat_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_acier/hache_combat_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_acier/hache_combat_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_acier/hache_combat_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_acier/hache_combat_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_acier/hache_combat_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_acier/hache_combat_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_adamantin/hache_combat_adamantin_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_fer/hache_combat_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_fer/hache_combat_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_fer/hache_combat_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_fer/hache_combat_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_fer/hache_combat_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/haches/hache_combat/hache_combat_fer/hache_combat_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/haches/hache_combat/hache_combat_fer/hache_combat_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.properties index cc407f4d..4f4887b5 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=bec_corbin_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*bec*corbin*acier* # /give @s iron_axe[custom_name='{text:"Bec de corbin en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier_nbt.properties index a6532e8d..73a37ab7 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_acier/bec_corbin_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=bec_corbin_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=bec_corbin_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/corbin_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_acier/corbin_acier_nbt.properties similarity index 81% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/corbin_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_acier/corbin_acier_nbt.properties index 20e013bc..b60d2a19 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_acier/corbin_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_acier/corbin_acier_nbt.properties @@ -3,7 +3,7 @@ type=item items=iron_axe texture=bec_corbin_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=corbin_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.properties index f054c5b3..6c7eebf4 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=bec_corbin_adamantin -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*bec*corbin* # /give @s diamond_axe[custom_name='{text:"Bec de corbin adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin_nbt.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin_nbt.properties index 7731c5e8..feb8d0e8 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_diamant/bec_corbin_adamantin_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=bec_corbin_adamantin -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=bec_corbin_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/corbin_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_diamant/corbin_adamantin_nbt.properties similarity index 82% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/corbin_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_diamant/corbin_adamantin_nbt.properties index ea13a7dd..39a6a720 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_diamant/corbin_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_diamant/corbin_adamantin_nbt.properties @@ -3,7 +3,7 @@ type=item items=diamond_axe texture=bec_corbin_adamantin -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=corbin_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.properties index a87c7c10..e8b2d255 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=bec_corbin_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:(?!.*acier).*?bec.*?corbin.* # /give @s iron_axe[custom_name='{text:"Bec de corbin en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer_nbt.properties index eab40e97..801e2467 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_fer/bec_corbin_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=bec_corbin_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=bec_corbin_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/corbin_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_fer/corbin_fer_nbt.properties similarity index 80% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/corbin_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_fer/corbin_fer_nbt.properties index 185c1338..fa4c6b3f 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/bec_corbin/bec_corbin_fer/corbin_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/bec_corbin/bec_corbin_fer/corbin_fer_nbt.properties @@ -3,7 +3,7 @@ type=item items=iron_axe texture=bec_corbin_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=corbin_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/kanabo/kanabo.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/kanabo/kanabo.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/kanabo/kanabo.properties similarity index 69% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/kanabo/kanabo.properties index 905484be..06f6fc72 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/kanabo/kanabo.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=kanabo -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_name=ipattern:*kanabo* # /give @s iron_axe[custom_name='{text:"Kanabo", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/kanabo/kanabo_nbt.properties similarity index 66% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/kanabo/kanabo_nbt.properties index 794e0bc4..5b9de42f 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/kanabo/kanabo_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/kanabo/kanabo_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=kanabo -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_data.arme=kanabo weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.properties index ba5756ce..af97104d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=marteau_deux_mains_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*marteau*deux*mains*acier* # /give @s iron_axe[custom_name='{text:"Marteau à deux mains en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties index 9de8d2ee..c65f17e0 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_acier/marteau_deux_mains_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=marteau_deux_mains_acier -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=marteau_deux_mains_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.properties index 1b4c6c45..9ce116fd 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=marteau_deux_mains_adamantin -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=ipattern:*marteau*deux*mains* # /give @s diamond_axe[custom_name='{text:"Marteau à deux mains adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin_nbt.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin_nbt.properties index b8cc6751..01fd4afd 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_diamant/marteau_deux_mains_adamantin_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=marteau_deux_mains_adamantin -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=marteau_deux_mains_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.properties index b6bac747..1de9e48d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=marteau_deux_mains_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_name=iregex:(?!.*acier).*?marteau.*?deux.*?mains.* # /give @s iron_axe[custom_name='{text:"Marteau à deux mains en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties index 4a0f54ab..83d0b4d1 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_deux_mains/marteau_deux_mains_fer/marteau_deux_mains_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=marteau_deux_mains_fer -model=optifine/cit/general/combat/armes/arme_hast +model=optifine/cit/general/combat/armes/corps_a_corps/arme_hast components.custom_data.arme=marteau_deux_mains_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_guerre/marteau_guerre.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_guerre/marteau_guerre.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_guerre/marteau_guerre.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_guerre/marteau_guerre.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_guerre/marteau_guerre.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_guerre/marteau_guerre.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_guerre/marteau_guerre.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_guerre/marteau_guerre.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_guerre/marteau_guerre_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_guerre/marteau_guerre_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_guerre/marteau_guerre_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_guerre/marteau_guerre_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_acier/marteau_une_main_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_diamant/marteau_une_main_adamantin_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/marteau_une_main/marteau_une_main_fer/marteau_une_main_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_acier/masse_ailettes_acier_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_diamant/masse_ailettes_adamantin_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer_nbt.properties similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_ailettes/masse_ailettes_fer/masse_ailettes_fer_nbt.properties diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.properties similarity index 75% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.properties index ae31663a..bcc20617 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=masse_deux_mains_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*masse*deux*main*acier* # /give @s iron_axe[custom_name='{text:"Masse à deux mains en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties index a6fa3a72..176efe20 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_acier/masse_deux_mains_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=masse_deux_mains_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=masse_deux_mains_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.properties similarity index 75% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.properties index 300c633a..695996cb 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=masse_deux_mains_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*masse*deux*main* # /give @s diamond_axe[custom_name='{text:"Masse à deux mains adamantine", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin_nbt.properties similarity index 75% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin_nbt.properties index 0f99143b..1b2f9bc4 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_diamant/masse_deux_mains_adamantin_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=masse_deux_mains_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=masse_deux_mains_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.properties similarity index 75% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.properties index b1977e64..a972eb68 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=masse_deux_mains_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*acier).*?masse.*?deux.*?main.* # /give @s iron_axe[custom_name='{text:"Masse à deux mains en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties index c849363f..21106264 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/masse_deux_mains/masse_deux_mains_fer/masse_deux_mains_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=masse_deux_mains_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=masse_deux_mains_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.properties index 7eb140f0..373612ab 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_acier/tetsubo_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=tetsubo_acier -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_name=ipattern:*tetsubo*acier* # /give @s iron_axe[custom_name='{text:"Tetsubo en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_acier/tetsubo_acier_nbt.properties similarity index 70% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_acier/tetsubo_acier_nbt.properties index 39d7ea6c..2efeb0b4 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_acier/tetsubo_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_acier/tetsubo_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=tetsubo_acier -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_data.arme=tetsubo_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.properties index 307a9dc6..3155f9e6 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=tetsubo_adamantin -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_name=ipattern:*tetsubo* # /give @s diamond_axe[custom_name='{text:"Tetsubo adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin_nbt.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin_nbt.properties index ce1ceb01..775b8b46 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_diamant/tetsubo_adamantin_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=tetsubo_adamantin -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_data.arme=tetsubo_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.properties index e41c0b1d..da8eea0f 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_fer/tetsubo_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=tetsubo_fer -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_name=iregex:(?!.*acier).*?tetsubo.* # /give @s iron_axe[custom_name='{text:"Tetsubo en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties similarity index 69% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties index c68d420a..ca7dceb2 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/marteaux/tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/marteaux/tetsubo/tetsubo_fer/tetsubo_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=tetsubo_fer -model=optifine/cit/general/combat/armes/grande_epee +model=optifine/cit/general/combat/armes/corps_a_corps/grande_epee components.custom_data.arme=tetsubo_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_acier/katana_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_acier/katana_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_acier/katana_acier.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_acier/katana_acier.properties index 446c165d..c6dab66b 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_acier/katana_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=katana_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*katana*acier* # /give @s iron_sword[custom_name='{text:"Katana en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_acier/katana_acier_nbt.properties similarity index 70% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_acier/katana_acier_nbt.properties index 221afca8..d169c8f0 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_acier/katana_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_acier/katana_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=katana_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=katana_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_diamant/katana_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_diamant/katana_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_diamant/katana_adamantin.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_diamant/katana_adamantin.properties index 1a2ea842..872254e0 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_diamant/katana_adamantin.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=katana_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*katana* # /give @s diamond_sword[custom_name='{text:"Katana adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_diamant/katana_adamantin_nbt.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_diamant/katana_adamantin_nbt.properties index ec7dddff..1894d1ec 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_diamant/katana_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_diamant/katana_adamantin_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=katana_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=katana_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_fer/katana_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_fer/katana_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_fer/katana_fer.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_fer/katana_fer.properties index a7f2008a..ab663f98 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_fer/katana_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=katana_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*acier).*?katana.* # /give @s iron_sword[custom_name='{text:"Katana en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_fer/katana_fer_nbt.properties similarity index 69% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_fer/katana_fer_nbt.properties index bb2efc71..1ddc9745 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/katana/katana_fer/katana_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/katana/katana_fer/katana_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=katana_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=katana_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.properties index 1b2b9f0e..ab93e971 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=messer_1m_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*grand).*?messer.*?acier.* # /give @s iron_sword[custom_name='{text:"Messer en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier_nbt.properties index 417f9385..78a55237 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_acier/messer_1m_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=messer_1m_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=messer_1m_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties similarity index 77% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties index c133eea5..c43f7459 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_acier/messer_acier_nbt.properties @@ -3,6 +3,6 @@ type=item items=iron_sword texture=messer_1m_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=messer_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.properties index b96a6d95..99fab8e7 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=messer_1m_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*grand).*?messer.* # /give @s diamond_sword[custom_name='{text:"Messer adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin_nbt.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin_nbt.properties index a9ece337..667373f5 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_diamant/messer_1m_adamantin_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=messer_1m_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=messer_1m_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties similarity index 78% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties index ea056134..5f4bd0f7 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_diamant/messer_adamantin_nbt.properties @@ -3,6 +3,6 @@ type=item items=diamond_sword texture=messer_1m_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=messer_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.properties index ada74cad..fcb25ef2 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=messer_1m_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*(?:grand|acier)).*?messer.* # /give @s iron_sword[custom_name='{text:"Messer en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer_nbt.properties similarity index 69% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer_nbt.properties index bc298b93..1a9a73d1 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_fer/messer_1m_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=messer_1m_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=messer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties index 3c999d48..828fa4a2 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_1m/messer_1m_fer/messer_nbt.properties @@ -3,6 +3,6 @@ type=item items=iron_sword texture=messer_1m_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=messer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.properties index 8c7c1dac..91a2015b 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=messer_2m_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*grand*messer*acier* # /give @s iron_sword[custom_name='{text:"Grand messer en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties index 48f8d53d..bf847f56 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_acier/messer_2m_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=messer_2m_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=messer_2m_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties similarity index 74% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties index 95918434..a834d12b 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=messer_2m_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*grand*messer* # /give @s diamond_sword[custom_name='{text:"Grand messer adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties index 94080464..b994a22c 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_diamant/messer_2m_adamantin_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=messer_2m_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=messer_2m_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.properties similarity index 73% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.properties index 1bbade15..a94fee63 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=messer_2m -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*acier).*?grand.*?messer.* # /give @s iron_sword[custom_name='{text:"Grand messer en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer_nbt.properties similarity index 70% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer_nbt.properties index 9d7cad70..e6952042 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_fer/messer_2m_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=messer_2m -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=messer_2m_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties similarity index 76% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties index 7fbb870d..03489c80 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/messer/messer_2m/messer_2m_fer/messer_2m_nbt.properties @@ -3,6 +3,6 @@ type=item items=iron_sword texture=messer_2m -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=messer_2m weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_acier/nodachi_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_acier/nodachi_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_acier/nodachi_acier.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_acier/nodachi_acier.properties index 55fa0f44..6b72b620 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_acier/nodachi_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=nodachi_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*nodachi*acier* # /give @s iron_axe[custom_name='{text:"Nodachi en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_acier/nodachi_acier_nbt.properties similarity index 70% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_acier/nodachi_acier_nbt.properties index a2c22f42..0e977c40 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_acier/nodachi_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_acier/nodachi_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=nodachi_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=nodachi_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_diamant/nodachi_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_diamant/nodachi_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_diamant/nodachi_adamantin.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_diamant/nodachi_adamantin.properties index 3298f059..de607cc8 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_diamant/nodachi_adamantin.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=nodachi_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*nodachi* # /give @s diamond_axe[custom_name='{text:"Nodachi adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_diamant/nodachi_adamantin_nbt.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_diamant/nodachi_adamantin_nbt.properties index 2fa6559a..8d2e1332 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_diamant/nodachi_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_diamant/nodachi_adamantin_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_axe texture=nodachi_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=nodachi_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_fer/nodachi_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_fer/nodachi_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_fer/nodachi_fer.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_fer/nodachi_fer.properties index b62898a0..bfcf390a 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_fer/nodachi_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=nodachi_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*acier).*?nodachi.* # /give @s iron_axe[custom_name='{text:"Nodachi en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_fer/nodachi_fer_nbt.properties similarity index 69% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_fer/nodachi_fer_nbt.properties index 3e36b30e..cecbd7fe 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/nodachi/nodachi_fer/nodachi_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/nodachi/nodachi_fer/nodachi_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_axe texture=nodachi_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=nodachi_fer weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_acier/sabre_acier.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_acier/sabre_acier.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_acier/sabre_acier.properties similarity index 71% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_acier/sabre_acier.properties index 20dd911d..842c11f8 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_acier/sabre_acier.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=sabre_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*sabre*acier* # /give @s iron_sword[custom_name='{text:"Sabre en acier", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_acier/sabre_acier_nbt.properties similarity index 69% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_acier/sabre_acier_nbt.properties index 217a1f1b..310ddf4d 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_acier/sabre_acier_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_acier/sabre_acier_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=sabre_acier -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=sabre_acier weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_diamant/sabre_adamantin.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_diamant/sabre_adamantin.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_diamant/sabre_adamantin.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_diamant/sabre_adamantin.properties index 24261855..e9e1bca2 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_diamant/sabre_adamantin.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=sabre_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=ipattern:*sabre* # /give @s diamond_sword[custom_name='{text:"Sabre adamantin", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_diamant/sabre_adamantin_nbt.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_diamant/sabre_adamantin_nbt.properties index 178c9740..e1bcb296 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_diamant/sabre_adamantin_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_diamant/sabre_adamantin_nbt.properties @@ -1,7 +1,7 @@ type=item items=diamond_sword texture=sabre_adamantin -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=sabre_adamantin weight=10 diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer.png b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_fer/sabre_fer.png similarity index 100% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer.png rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_fer/sabre_fer.png diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_fer/sabre_fer.properties similarity index 72% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_fer/sabre_fer.properties index 72a53245..e222273e 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_fer/sabre_fer.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=sabre_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_name=iregex:(?!.*acier).*?sabre.* # /give @s iron_sword[custom_name='{text:"Sabre en fer", italic:false}'] diff --git a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer_nbt.properties b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_fer/sabre_fer_nbt.properties similarity index 68% rename from assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer_nbt.properties rename to assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_fer/sabre_fer_nbt.properties index 0b86d8b0..0ad2f95b 100644 --- a/assets/minecraft/optifine/cit/general/combat/armes/cac/sabres/sabre/sabre_fer/sabre_fer_nbt.properties +++ b/assets/minecraft/optifine/cit/general/combat/armes/corps_a_corps/sabres/sabre/sabre_fer/sabre_fer_nbt.properties @@ -1,7 +1,7 @@ type=item items=iron_sword texture=sabre_fer -model=optifine/cit/general/combat/armes/epee_longue +model=optifine/cit/general/combat/armes/corps_a_corps/epee_longue components.custom_data.arme=sabre_fer weight=10 From 3cf63ca354436ba3decdf9be1a0974a56d885ec2 Mon Sep 17 00:00:00 2001 From: Inposa Date: Sat, 1 Feb 2025 14:56:20 +0100 Subject: [PATCH 24/27] Rename /sages to /staff and add custom item for Crepuscule --- .../cit/{sages => staff}/seberus/seberus.json | 0 .../cit/{sages => staff}/seberus/seberus.png | Bin .../cit/{sages => staff}/seberus/seberus.png.mcmeta | 0 .../cit/{sages => staff}/seberus/seberus.properties | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename assets/minecraft/optifine/cit/{sages => staff}/seberus/seberus.json (100%) rename assets/minecraft/optifine/cit/{sages => staff}/seberus/seberus.png (100%) rename assets/minecraft/optifine/cit/{sages => staff}/seberus/seberus.png.mcmeta (100%) rename assets/minecraft/optifine/cit/{sages => staff}/seberus/seberus.properties (100%) diff --git a/assets/minecraft/optifine/cit/sages/seberus/seberus.json b/assets/minecraft/optifine/cit/staff/seberus/seberus.json similarity index 100% rename from assets/minecraft/optifine/cit/sages/seberus/seberus.json rename to assets/minecraft/optifine/cit/staff/seberus/seberus.json diff --git a/assets/minecraft/optifine/cit/sages/seberus/seberus.png b/assets/minecraft/optifine/cit/staff/seberus/seberus.png similarity index 100% rename from assets/minecraft/optifine/cit/sages/seberus/seberus.png rename to assets/minecraft/optifine/cit/staff/seberus/seberus.png diff --git a/assets/minecraft/optifine/cit/sages/seberus/seberus.png.mcmeta b/assets/minecraft/optifine/cit/staff/seberus/seberus.png.mcmeta similarity index 100% rename from assets/minecraft/optifine/cit/sages/seberus/seberus.png.mcmeta rename to assets/minecraft/optifine/cit/staff/seberus/seberus.png.mcmeta diff --git a/assets/minecraft/optifine/cit/sages/seberus/seberus.properties b/assets/minecraft/optifine/cit/staff/seberus/seberus.properties similarity index 100% rename from assets/minecraft/optifine/cit/sages/seberus/seberus.properties rename to assets/minecraft/optifine/cit/staff/seberus/seberus.properties From 0b540585c04b7f701656ad8a4487d1498d8a9b04 Mon Sep 17 00:00:00 2001 From: Inposa Date: Sat, 1 Feb 2025 15:01:00 +0100 Subject: [PATCH 25/27] Add lys flower for Antanaclase --- .../cit/general/decoration/flower/lys.png | Bin 0 -> 710 bytes .../cit/general/decoration/flower/lys.properties | 4 ++++ 2 files changed, 4 insertions(+) create mode 100644 assets/minecraft/optifine/cit/general/decoration/flower/lys.png create mode 100644 assets/minecraft/optifine/cit/general/decoration/flower/lys.properties diff --git a/assets/minecraft/optifine/cit/general/decoration/flower/lys.png b/assets/minecraft/optifine/cit/general/decoration/flower/lys.png new file mode 100644 index 0000000000000000000000000000000000000000..53c1378c2e854ac9d29a831a86569d249901495e GIT binary patch literal 710 zcmV;%0y+JOP)NLRgSEFWQBoQL@cST{xPr?W6s>P~Y5;Jn&pR z=lp-?oab;JK@!K=xvnyvNKeL&U%~Ros)%Dq{`VALvrx9_37}cF>3RNM1rKvaLIth) z_PT~T$~HaAI?fV6;eNdebBl=uPLrBMN^JMmvyQaW0r_2TUk?WR2N6}G0Ptl$?2ZJZ za9(v{dTu)6_PLRi0835vj+U&G8r65HtO37lJN!2HUFa|7(q3yvp;QEGxi!f(zreT- zn(7^?qc27$5AM}97x1wAF;cZD`vU{a#(dP+YY}^y2Lu2Z8)crV)8OaF006-Ic3l8~ zC+GnHn9@yq34{=My)Z)(aDQ^cx8}t_|8oHV6}_e0UJSrHy9XyOo^;?`Sy_d-*o;g~ zCSr#~(O^`Cteqt^*ku~*vMLZHG5m6vpO;oqWG#jy3EXbKqgFFJO#B@PL0hRoaAgOf zKo}dYO%ay>0Pa5MqJPVeiIGV)XzeVa@^u%nNDSdn7(d?s16500V*t=q<&Y%GyR9@` zHd0rW!=tn$ArglI0J+sVW>;oGS=&WuJB-c6ts`~n5EE^~wJB1xDd3;uzxrR14pmh+ s7gj0&000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f{j%!{{R30 literal 0 HcmV?d00001 diff --git a/assets/minecraft/optifine/cit/general/decoration/flower/lys.properties b/assets/minecraft/optifine/cit/general/decoration/flower/lys.properties new file mode 100644 index 00000000..d565377a --- /dev/null +++ b/assets/minecraft/optifine/cit/general/decoration/flower/lys.properties @@ -0,0 +1,4 @@ +type=item +matchItems=minecraft:lily_of_the_valley +texture=lys +components.custom_data.fleur=lys \ No newline at end of file From c50db0c9b3e9bd14444432dec5f2e6552d2539e2 Mon Sep 17 00:00:00 2001 From: Inposa Date: Sat, 1 Feb 2025 15:01:14 +0100 Subject: [PATCH 26/27] Add bandeauEolh for Polyne --- .../guildes/thurges/bandeolh/bandeolh.json | 108 ++++++++++++++++++ .../thurges/bandeolh/bandeolh.properties | 4 + .../cit/guildes/thurges/bandeolh/eolh.png | Bin 0 -> 100 bytes 3 files changed, 112 insertions(+) create mode 100644 assets/minecraft/optifine/cit/guildes/thurges/bandeolh/bandeolh.json create mode 100644 assets/minecraft/optifine/cit/guildes/thurges/bandeolh/bandeolh.properties create mode 100644 assets/minecraft/optifine/cit/guildes/thurges/bandeolh/eolh.png diff --git a/assets/minecraft/optifine/cit/guildes/thurges/bandeolh/bandeolh.json b/assets/minecraft/optifine/cit/guildes/thurges/bandeolh/bandeolh.json new file mode 100644 index 00000000..3c21e331 --- /dev/null +++ b/assets/minecraft/optifine/cit/guildes/thurges/bandeolh/bandeolh.json @@ -0,0 +1,108 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/stripped_dark_oak_log", + "1": "../bandeolh/eolh", + "particle": "block/stripped_dark_oak_log" + }, + "elements": [ + { + "from": [2.25, 0, 2.25], + "to": [13.25, 2, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13.25, 0, 0.5]}, + "faces": { + "north": {"uv": [0, 1, 16, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 2], "texture": "#0"}, + "south": {"uv": [0, 1, 16, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 11], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 0.25, 11], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [2.25, 0, 13.25], + "to": [13.25, 2, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [13.25, 0, 11.5]}, + "faces": { + "north": {"uv": [0, 1, 16, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 2], "texture": "#0"}, + "south": {"uv": [0, 1, 16, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 2], "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 11], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 0.25, 11], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [13.125, 0, 2.375], + "to": [13.375, 2, 13.375], + "rotation": {"angle": 0, "axis": "y", "origin": [13.25, 1, 7.875]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#0"}, + "east": {"uv": [0, 1, 16, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 2], "texture": "#0"}, + "west": {"uv": [0, 1, 16, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 11], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0, 0.25, 11], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [2.125, 0, 2.375], + "to": [2.375, 2, 13.375], + "rotation": {"angle": 0, "axis": "y", "origin": [2.25, 1, 7.875]}, + "faces": { + "north": {"uv": [0, 0, 0.25, 2], "texture": "#0"}, + "east": {"uv": [0, 1, 16, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 2], "texture": "#0"}, + "west": {"uv": [0, 1, 16, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 11], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0, 0.25, 11], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [7.25, 0, 2], + "to": [8.75, 2, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [7.25, 0, 2]}, + "faces": { + "north": {"uv": [2, 1, 14, 15], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [90.25, -90, 0], + "translation": [0, -2, 3.5], + "scale": [0.38867, 0.38477, 0.38477] + }, + "thirdperson_lefthand": { + "rotation": [27.05, -89.22, -63.9], + "translation": [0, -2, 4], + "scale": [0.38281, 0.38281, 0.31641] + }, + "ground": { + "translation": [0, 3.75, 0], + "scale": [0.72656, 0.72656, 0.72656] + }, + "gui": { + "rotation": [-162.41, -13.45, -177.25], + "translation": [0, 7.75, 0], + "scale": [1.13477, 1.13477, 1.13477] + }, + "head": { + "translation": [0.25, 11.25, 0], + "scale": [1.18359, 1.18359, 1.18359] + }, + "fixed": { + "translation": [0.25, 11.5, 9.75], + "scale": [1.68555, 1.68555, 1.68555] + } + }, + "groups": [ + { + "name": "group", + "origin": [11, 0, 11.25], + "color": 0, + "children": [0, 1, 2, 3] + }, + 4 + ] +} \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/guildes/thurges/bandeolh/bandeolh.properties b/assets/minecraft/optifine/cit/guildes/thurges/bandeolh/bandeolh.properties new file mode 100644 index 00000000..e628cece --- /dev/null +++ b/assets/minecraft/optifine/cit/guildes/thurges/bandeolh/bandeolh.properties @@ -0,0 +1,4 @@ +type=item +matchItems=leather +model=bandeolh +components.custom_data.thurgie=bandeolh \ No newline at end of file diff --git a/assets/minecraft/optifine/cit/guildes/thurges/bandeolh/eolh.png b/assets/minecraft/optifine/cit/guildes/thurges/bandeolh/eolh.png new file mode 100644 index 0000000000000000000000000000000000000000..a9bde760824a67a12b29edbeba465a48bc75c4b2 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6v^`xMLn>}1EAahccaqUzd2Zj+ xs?)TR#qr Date: Sat, 1 Feb 2025 15:04:02 +0100 Subject: [PATCH 27/27] small fix to lys --- .../optifine/cit/general/decoration/flower/lys.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/minecraft/optifine/cit/general/decoration/flower/lys.properties b/assets/minecraft/optifine/cit/general/decoration/flower/lys.properties index d565377a..987bfd76 100644 --- a/assets/minecraft/optifine/cit/general/decoration/flower/lys.properties +++ b/assets/minecraft/optifine/cit/general/decoration/flower/lys.properties @@ -1,4 +1,4 @@ type=item matchItems=minecraft:lily_of_the_valley texture=lys -components.custom_data.fleur=lys \ No newline at end of file +components.custom_data.flower=lys \ No newline at end of file