Moritz Ruth 6961762f4d Merge remote-tracking branch 'upstream/main' ... # Conflicts: # README.md # docs/mods.md # src/universal/config/global_data_and_resourcepacks.toml		2023-12-03 23:41:35 +01:00
..
mods.md	Merge remote-tracking branch 'upstream/main'	2023-12-03 23:41:35 +01:00