[Stoupy51]

Lang files (assets/<namespace>/lang/<locale>.json) went through the vanilla branch of ConflictsHandler: minecraft:en_us was replaced by the vanilla file, dropping the pack's own keys.

They are now merged key by key, the later pack winning on identical keys (same order as the other files).

Adds a regression test. test_base_equal_and_inactive_gaps_break_file_runs already fails on main, unrelated.

[Stoupy51]

Example

Two resource packs, each with assets/minecraft/lang/en_us.json.

pack_a:

{
  "a": "from A",
  "shared": "from A"
}

pack_b:

{
  "b": "from B",
  "shared": "from B"
}

Welded minecraft:en_us with pack_a then pack_b:

• Before: the vanilla en_us.json replaced the packs content, so a, b and shared were lost.
• After:

{
  "a": "from A",
  "shared": "from B",
  "b": "from B"
}

pack_b.zip
pack_a.zip