Merge branch 'dev'

Gaz492 · Gaz492 · commit 87fd3355bcbc · 2026-03-06T12:36:09.000Z
diff --git a/modloaders/forge.go b/modloaders/forge.go
@@ -285,7 +285,7 @@ func (s Forge) startScript(ownJava bool) error {
 
 		var re *regexp.Regexp
 		if mcVer.GreaterThan(preForgeJarVer) {
-			re = regexp.MustCompile(`^(minecraft)?forge(-universal)?-(\d+.\d+.\d+)-(\d+.\d+.\d+(.\d+)?)(-\d+.\d+.\d+)?(-[a-zA-Z]+)?.jar$`)
+			re = regexp.MustCompile(`^(minecraft)?forge(-universal)?-(\d+.\d+.\d+)-(\d+.\d+.\d+(.\d+)?)(-\d+.\d+.\d+)?(.+)?.jar$`)
 		} else {
 			re = regexp.MustCompile(`^minecraft_server.(\d+.\d+.\d+)?.jar$`)
 		}

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ func (s Forge) startScript(ownJava bool) error {`
`285`	`285`
`286`	`286`	`var re *regexp.Regexp`
`287`	`287`	`if mcVer.GreaterThan(preForgeJarVer) {`
`288`		- re = regexp.MustCompile(`^(minecraft)?forge(-universal)?-(\d+.\d+.\d+)-(\d+.\d+.\d+(.\d+)?)(-\d+.\d+.\d+)?(-[a-zA-Z]+)?.jar$`)
	`288`	+ re = regexp.MustCompile(`^(minecraft)?forge(-universal)?-(\d+.\d+.\d+)-(\d+.\d+.\d+(.\d+)?)(-\d+.\d+.\d+)?(.+)?.jar$`)
`289`	`289`	`} else {`
`290`	`290`	re = regexp.MustCompile(`^minecraft_server.(\d+.\d+.\d+)?.jar$`)
`291`	`291`	`}`