Armor Trims Backport

"Fixes":

Upgrading now works properly.

Added an option to Modpack Maketh Mode that allows to condense the materials into one list, further shortening the recipe count. (However, this doesn't seem to speed anything up.)