Moritz Ruth 30c21978de Merge remote-tracking branch 'upstream/main' ... # Conflicts: # docs/mods.md # src/client/mods/emiffect.hm.json # src/client/mods/indium.hm.json # src/client/mods/iris.hm.json # src/client/mods/sodium.hm.json # src/universal/mods/emi.hm.json # src/universal/mods/wilder-wild.hm.json		2023-12-03 18:09:40 +01:00
..
mods.md	Merge remote-tracking branch 'upstream/main'	2023-12-03 18:09:40 +01:00