Merge remote-tracking branch 'origin/1.20' into 1.21.1

Author: embeddedt

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -65,5 +65,5 @@ modId = "jei"
 type = "optional"
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
 versionRange = "[15.8.0.11,)"
-ordering = "BEFORE"
+ordering = "NONE"
 side = "CLIENT"