Fix conflicts caused by `MappingsMerger`#1171

Merged

modmuss50 merged 3 commits intoFabricMC:exp/1.8from SpaceWalkerRS:fix-completed-mappings

Sep 24, 2024

Commits on Sep 11, 2024

Commits on Sep 20, 2024

add MappingsMergerTest
SpaceWalkerRS
committed