Port to 25w14craftmine#26

Chocohead wants to merge 2 commits intoCommander07:masterCommander07/data-loader:masterfrom

Chocohead:masterChocohead/data-loader:masterCopy head branch name to clipboard