Skip to content

Commit 71db13f

Browse files
default.lang - Allow armour where armor is used (#7708)
* default.lang - Add u into Armor words * default.lang - Fix line 1000 * default.lang - Fix line 1000 again --------- Co-authored-by: Eren <67760502+erenkarakal@users.noreply.github.com>
1 parent fcf14e1 commit 71db13f

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

src/main/resources/lang/default.lang

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ entities:
759759
pattern: <age> [unemployed] villager(|1¦s)|(4¦)[[unemployed] villager] (kid(|1¦s)|child(|1¦ren))
760760
armorer:
761761
name: armorer¦s
762-
pattern: <age> armorer(|1¦s)|(4¦)armorer (kid(|1¦s)|child(|1¦ren))
762+
pattern: <age> armo[u]rer(|1¦s)|(4¦)armo[u]rer (kid(|1¦s)|child(|1¦ren))
763763
cartographer:
764764
name: cartographer¦s
765765
pattern: <age> cartographer(|1¦s)|(4¦)cartographer (kid(|1¦s)|child(|1¦ren))
@@ -947,7 +947,7 @@ entities:
947947
pattern: fish[ ]hook(|1¦s)
948948
armor stand:
949949
name: armor stand¦s
950-
pattern: armor stand(|1¦s)
950+
pattern: armo[u]r stand(|1¦s)
951951
endermite:
952952
name: endermite¦s
953953
pattern: endermite(|1¦s)
@@ -998,7 +998,7 @@ entities:
998998
pattern: <age> zombie nitwit(|1¦s)
999999
zombie armorer:
10001000
name: zombie armorer¦s
1001-
pattern: <age> zombie armorer(|1¦s)
1001+
pattern: <age> zombie armo[u]rer(|1¦s)
10021002
zombie cartographer:
10031003
name: zombie cartographer¦s
10041004
pattern: <age> zombie cartographer(|1¦s)
@@ -1502,7 +1502,7 @@ visual effects:
15021502
pattern: shield break
15031503
armor_stand_hit:
15041504
name: armor stand hit @a
1505-
pattern: armor stand hit
1505+
pattern: armo[u]r stand hit
15061506
thorns_hurt:
15071507
name: hurt by thorns @-
15081508
pattern: (hurt|damage) by thorns
@@ -2239,8 +2239,8 @@ genes:
22392239
# -- Attribute Types --
22402240
attribute types:
22412241
# Enum variation
2242-
generic_armor: generic armor, armor
2243-
generic_armor_toughness: generic armor toughness, armor toughness
2242+
generic_armor: generic armor, armor, generic armour, armour
2243+
generic_armor_toughness: generic armor toughness, armor toughness, generic armour toughness, armour toughness
22442244
generic_attack_damage: generic attack damage, attack damage
22452245
generic_attack_knockback: generic attack knockback, attack knockback
22462246
generic_attack_speed: generic attack speed, attack speed
@@ -2272,8 +2272,8 @@ attribute types:
22722272
player_sweeping_damage_ratio: player sweeping damage ratio, sweeping damage ratio
22732273
zombie_spawn_reinforcements: zombie spawn reinforcements
22742274
# Registry variation (minecraft keys)
2275-
generic.armor: generic armor, armor
2276-
generic.armor_toughness: generic armor toughness, armor toughness
2275+
generic.armor: generic armor, armor, generic armour, armour
2276+
generic.armor_toughness: generic armor toughness, armor toughness, generic armour toughness, armour toughness
22772277
generic.attack_damage: generic attack damage, attack damage
22782278
generic.attack_knockback: generic attack knockback, attack knockback
22792279
generic.attack_speed: generic attack speed, attack speed
@@ -2305,8 +2305,8 @@ attribute types:
23052305
player.sweeping_damage_ratio: player sweeping damage ratio, sweeping damage ratio
23062306
zombie.spawn_reinforcements: zombie spawn reinforcements
23072307
# 1.21.3 removes prefixes, adds tempt range
2308-
armor: generic armor, armor
2309-
armor_toughness: generic armor toughness, armor toughness
2308+
armor: generic armor, armor, generic armour, armour
2309+
armor_toughness: generic armor toughness, armor toughness, generic armour toughness, armour toughness
23102310
attack_damage: generic attack damage, attack damage
23112311
attack_knockback: generic attack knockback, attack knockback
23122312
attack_speed: generic attack speed, attack speed
@@ -2427,7 +2427,7 @@ unleash reasons:
24272427
# -- Item Flags --
24282428
item flags:
24292429
hide_additional_tooltip: hide additional tooltip, additional tooltip hidden, hidden additional tooltip
2430-
hide_armor_trim: hide armor trim, armor trim hidden, hidden armor trim
2430+
hide_armor_trim: hide armor trim, armor trim hidden, hidden armor trim, hide armour trim, armour trim hidden, hidden armour trim
24312431
hide_attributes: hide attributes, attributes hidden, hidden attributes
24322432
hide_destroys: hide destroys, hide destroyable blocks, hide breakable blocks, destroys hidden, hidden destroys
24332433
hide_dye: hide dye, hide dye color, dye hidden, dye color hidden, hidden dye, hidden dye color
@@ -2485,7 +2485,7 @@ villager professions:
24852485
cleric: cleric, cleric profession
24862486
nitwit: nitwit, nitwit profession
24872487
cartographer: cartographer, cartographer profession
2488-
armorer: armorer, armorer profession
2488+
armorer: armorer, armorer profession, armourer, armourer profession
24892489
butcher: butcher, butcher profession
24902490
none: no profession, none profession, unemployed
24912491
fisherman: fisherman, fisherman profession

0 commit comments

Comments
 (0)