Merge remote-tracking branch 'upstream/main' into main

# Conflicts:
#	build.gradle
#	gradle.properties

build.gradle

@@ -1,6 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.3-SNAPSHOT'
-	id 'io.github.juuxel.loom-vineflower' version '1.11.0'
+	id 'fabric-loom' version '1.4-SNAPSHOT'
 	id 'maven-publish'
 	id "com.modrinth.minotaur" version "2.+"
 }
@@ -12,7 +11,9 @@ archivesBaseName = project.archives_base_name
 version = project.mod_version + "+polymerport." + project.port_version
 group = project.maven_group
 
-
+base {
+	archivesName = project.archives_base_name
+}
 
 repositories {
 	maven { url = "https://maven.terraformersmc.com" }
@@ -98,6 +99,9 @@ java {
 	// if it is present.
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
 }
 
 jar {

gradle.properties

@@ -1,22 +1,22 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
 
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.2
-loader_version=0.14.22
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.1
+loader_version=0.15.1
 
 mod_version = 3.8.0
 maven_group = eu.pb4.polyport
 archives_base_name = trinkets
 
-fabric_version=0.88.5+1.20.2
-cca_version=5.3.0
-mod_menu_version=8.0.0-beta.2
+fabric_version=0.91.2+1.20.4
+cca_version=5.4.0
+mod_menu_version=9.0.0-pre.1
 
 port_version=1
 
 
-polymer_version=0.6.2+1.20.2
-sgui_version=1.3.0+1.20.2
-translation_version=2.1.0+1.20.2-rc2
-pda_version=0.3.0+1.20.2
+polymer_version=0.7.4+1.20.4
+sgui_version=1.4.1+1.20.2
+translation_version=2.2.0+1.20.3-rc1
+pda_version=0.4.0+1.20.3

src/main/resources/fabric.mod.json

@@ -51,6 +51,6 @@
 		"fabricloader": ">=0.7.0",
 		"cardinal-components-base": ">=3.0.0-0",
 		"cardinal-components-entity": ">=3.0.0-0",
-		"fabric": ">=0.51.2"
+		"fabric-api": ">=0.51.2"
 	}
 }