Skip to content

default.lang - Allow armour where armor is used #7708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erenkarakal merged 6 commits into from
Mar 31, 2025
Merged

default.lang - Allow armour where armor is used #7708

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f467e2
default.lang - Add u into Armor words
Fusezion Mar 16, 2025
669c8a0
default.lang - Fix line 1000
Fusezion Mar 16, 2025
4bfd387
default.lang - Fix line 1000 again
Fusezion Mar 16, 2025
5de49da
Merge branch 'dev/feature' into enhancement/more-spelling-options
Fusezion Mar 23, 2025
b8f2fbd
Merge branch 'dev/feature' into enhancement/more-spelling-options
Fusezion Mar 30, 2025
8b08380
Merge branch 'dev/feature' into enhancement/more-spelling-options
erenkarakal Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/main/resources/lang/default.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ entities:
pattern: <age> [unemployed] villager(|1¦s)|(4¦)[[unemployed] villager] (kid(|1¦s)|child(|1¦ren))
armorer:
name: armorer¦s
pattern: <age> armorer(|1¦s)|(4¦)armorer (kid(|1¦s)|child(|1¦ren))
pattern: <age> armo[u]rer(|1¦s)|(4¦)armo[u]rer (kid(|1¦s)|child(|1¦ren))
cartographer:
name: cartographer¦s
pattern: <age> cartographer(|1¦s)|(4¦)cartographer (kid(|1¦s)|child(|1¦ren))
Expand Down Expand Up @@ -947,7 +947,7 @@ entities:
pattern: fish[ ]hook(|1¦s)
armor stand:
name: armor stand¦s
pattern: armor stand(|1¦s)
pattern: armo[u]r stand(|1¦s)
endermite:
name: endermite¦s
pattern: endermite(|1¦s)
Expand Down Expand Up @@ -998,7 +998,7 @@ entities:
pattern: <age> zombie nitwit(|1¦s)
zombie armorer:
name: zombie armorer¦s
pattern: <age> zombie armorer(|1¦s)
pattern: <age> zombie armo[u]rer(|1¦s)
zombie cartographer:
name: zombie cartographer¦s
pattern: <age> zombie cartographer(|1¦s)
Expand Down Expand Up @@ -1502,7 +1502,7 @@ visual effects:
pattern: shield break
armor_stand_hit:
name: armor stand hit @a
pattern: armor stand hit
pattern: armo[u]r stand hit
thorns_hurt:
name: hurt by thorns @-
pattern: (hurt|damage) by thorns
Expand Down Expand Up @@ -2239,8 +2239,8 @@ genes:
# -- Attribute Types --
attribute types:
# Enum variation
generic_armor: generic armor, armor
generic_armor_toughness: generic armor toughness, armor toughness
generic_armor: generic armor, armor, generic armour, armour
generic_armor_toughness: generic armor toughness, armor toughness, generic armour toughness, armour toughness
generic_attack_damage: generic attack damage, attack damage
generic_attack_knockback: generic attack knockback, attack knockback
generic_attack_speed: generic attack speed, attack speed
Expand Down Expand Up @@ -2272,8 +2272,8 @@ attribute types:
player_sweeping_damage_ratio: player sweeping damage ratio, sweeping damage ratio
zombie_spawn_reinforcements: zombie spawn reinforcements
# Registry variation (minecraft keys)
generic.armor: generic armor, armor
generic.armor_toughness: generic armor toughness, armor toughness
generic.armor: generic armor, armor, generic armour, armour
generic.armor_toughness: generic armor toughness, armor toughness, generic armour toughness, armour toughness
generic.attack_damage: generic attack damage, attack damage
generic.attack_knockback: generic attack knockback, attack knockback
generic.attack_speed: generic attack speed, attack speed
Expand Down Expand Up @@ -2305,8 +2305,8 @@ attribute types:
player.sweeping_damage_ratio: player sweeping damage ratio, sweeping damage ratio
zombie.spawn_reinforcements: zombie spawn reinforcements
# 1.21.3 removes prefixes, adds tempt range
armor: generic armor, armor
armor_toughness: generic armor toughness, armor toughness
armor: generic armor, armor, generic armour, armour
armor_toughness: generic armor toughness, armor toughness, generic armour toughness, armour toughness
attack_damage: generic attack damage, attack damage
attack_knockback: generic attack knockback, attack knockback
attack_speed: generic attack speed, attack speed
Expand Down Expand Up @@ -2427,7 +2427,7 @@ unleash reasons:
# -- Item Flags --
item flags:
hide_additional_tooltip: hide additional tooltip, additional tooltip hidden, hidden additional tooltip
hide_armor_trim: hide armor trim, armor trim hidden, hidden armor trim
hide_armor_trim: hide armor trim, armor trim hidden, hidden armor trim, hide armour trim, armour trim hidden, hidden armour trim
hide_attributes: hide attributes, attributes hidden, hidden attributes
hide_destroys: hide destroys, hide destroyable blocks, hide breakable blocks, destroys hidden, hidden destroys
hide_dye: hide dye, hide dye color, dye hidden, dye color hidden, hidden dye, hidden dye color
Expand Down Expand Up @@ -2485,7 +2485,7 @@ villager professions:
cleric: cleric, cleric profession
nitwit: nitwit, nitwit profession
cartographer: cartographer, cartographer profession
armorer: armorer, armorer profession
armorer: armorer, armorer profession, armourer, armourer profession
butcher: butcher, butcher profession
none: no profession, none profession, unemployed
fisherman: fisherman, fisherman profession
Expand Down