From 42e4512781abf36b2f875e2ec08def935079cd4f Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Fri, 31 Dec 2021 03:47:36 +0100
Subject: [PATCH 01/12] fabric-1.18: remove incorrectly included DynmapCoreAPI
 depedency

---
 fabric-1.18/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fabric-1.18/build.gradle b/fabric-1.18/build.gradle
index 1597e68b..96cacd74 100644
--- a/fabric-1.18/build.gradle
+++ b/fabric-1.18/build.gradle
@@ -39,7 +39,6 @@ dependencies {
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     shadow project(path: ':DynmapCore', configuration: 'shadow')
-    shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
 
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
     // You may need to force-disable transitiveness on them.

From c56d868ba5a4a814b70ad8601a196467a5a8a2fd Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Fri, 31 Dec 2021 03:33:20 +0100
Subject: [PATCH 02/12] fabric-*: require Fabric Loader 0.12.12

This is the release that includes all current log4j mitigation.
Changes in fabric.mod.json ensure the mod will completely refuse to load
unless it's on a fully patched Fabric server.
---
 fabric-1.14.4/gradle.properties                  | 4 ++--
 fabric-1.14.4/src/main/resources/fabric.mod.json | 2 +-
 fabric-1.15.2/gradle.properties                  | 4 ++--
 fabric-1.15.2/src/main/resources/fabric.mod.json | 2 +-
 fabric-1.16.4/gradle.properties                  | 2 +-
 fabric-1.16.4/src/main/resources/fabric.mod.json | 2 +-
 fabric-1.17.1/gradle.properties                  | 2 +-
 fabric-1.17.1/src/main/resources/fabric.mod.json | 2 +-
 fabric-1.18/gradle.properties                    | 2 +-
 fabric-1.18/src/main/resources/fabric.mod.json   | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/fabric-1.14.4/gradle.properties b/fabric-1.14.4/gradle.properties
index 45df5839..d924bef3 100644
--- a/fabric-1.14.4/gradle.properties
+++ b/fabric-1.14.4/gradle.properties
@@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx1G
 # check these on https://fabricmc.net/use
 minecraft_version=1.14.4
 yarn_mappings=1.14.4+build.18
-loader_version=0.10.1+build.209
+loader_version=0.12.12
 # Mod Properties
 archives_base_name=Dynmap
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.28.5+1.14
\ No newline at end of file
+fabric_version=0.28.5+1.14
diff --git a/fabric-1.14.4/src/main/resources/fabric.mod.json b/fabric-1.14.4/src/main/resources/fabric.mod.json
index bbc17bcf..b20f558c 100644
--- a/fabric-1.14.4/src/main/resources/fabric.mod.json
+++ b/fabric-1.14.4/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.12.12",
     "fabric": ">=0.17.0",
     "minecraft": "1.14.4"
   }
diff --git a/fabric-1.15.2/gradle.properties b/fabric-1.15.2/gradle.properties
index 786a38a3..ac696add 100644
--- a/fabric-1.15.2/gradle.properties
+++ b/fabric-1.15.2/gradle.properties
@@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx1G
 # check these on https://fabricmc.net/use
 minecraft_version=1.15.2
 yarn_mappings=1.15.2+build.17
-loader_version=0.10.1+build.209
+loader_version=0.12.12
 # Mod Properties
 archives_base_name=Dynmap
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.23.0+build.328-1.15
\ No newline at end of file
+fabric_version=0.23.0+build.328-1.15
diff --git a/fabric-1.15.2/src/main/resources/fabric.mod.json b/fabric-1.15.2/src/main/resources/fabric.mod.json
index 3e405dfd..8c44af70 100644
--- a/fabric-1.15.2/src/main/resources/fabric.mod.json
+++ b/fabric-1.15.2/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.12.12",
     "fabric": ">=0.17.0",
     "minecraft": "1.15.2"
   }
diff --git a/fabric-1.16.4/gradle.properties b/fabric-1.16.4/gradle.properties
index 61030259..2cea6919 100644
--- a/fabric-1.16.4/gradle.properties
+++ b/fabric-1.16.4/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G
 # check these on https://fabricmc.net/use
 minecraft_version=1.16.4
 yarn_mappings=1.16.4+build.6
-loader_version=0.10.6+build.214
+loader_version=0.12.12
 # Mod Properties
 archives_base_name=Dynmap
 # Dependencies
diff --git a/fabric-1.16.4/src/main/resources/fabric.mod.json b/fabric-1.16.4/src/main/resources/fabric.mod.json
index 9c610f4b..24d80f15 100644
--- a/fabric-1.16.4/src/main/resources/fabric.mod.json
+++ b/fabric-1.16.4/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.12.12",
     "fabric": ">=0.17.0",
     "minecraft": "1.16.x"
   }
diff --git a/fabric-1.17.1/gradle.properties b/fabric-1.17.1/gradle.properties
index 185a372c..3e1c141c 100644
--- a/fabric-1.17.1/gradle.properties
+++ b/fabric-1.17.1/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G
 # check these on https://fabricmc.net/use
 minecraft_version=1.17.1
 yarn_mappings=1.17.1+build.1
-loader_version=0.11.6
+loader_version=0.12.12
 # Mod Properties
 archives_base_name=Dynmap
 # Dependencies
diff --git a/fabric-1.17.1/src/main/resources/fabric.mod.json b/fabric-1.17.1/src/main/resources/fabric.mod.json
index bcc8a43d..940cdba4 100644
--- a/fabric-1.17.1/src/main/resources/fabric.mod.json
+++ b/fabric-1.17.1/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.12.12",
     "fabric": ">=0.17.0",
     "minecraft": "1.17.1"
   }
diff --git a/fabric-1.18/gradle.properties b/fabric-1.18/gradle.properties
index d64c6a50..477d0215 100644
--- a/fabric-1.18/gradle.properties
+++ b/fabric-1.18/gradle.properties
@@ -8,7 +8,7 @@ archives_base_name=Dynmap
 # check these on https://fabricmc.net/versions.html
 minecraft_version=1.18
 yarn_mappings=1.18+build.1
-loader_version=0.12.6
+loader_version=0.12.12
 
 #Fabric api
 fabric_version=0.43.1+1.18
diff --git a/fabric-1.18/src/main/resources/fabric.mod.json b/fabric-1.18/src/main/resources/fabric.mod.json
index 7d13f85e..37ce5fee 100644
--- a/fabric-1.18/src/main/resources/fabric.mod.json
+++ b/fabric-1.18/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.12.6",
+    "fabricloader": ">=0.12.12",
     "fabric": ">=0.43.1",
     "minecraft": "1.18.x"
   }

From ff08210162bf736fb3048c74fc601d18ea4f524a Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Fri, 31 Dec 2021 03:54:44 +0100
Subject: [PATCH 03/12] fabric-*: use modern, performant sourcesJar declaration

---
 fabric-1.14.4/build.gradle | 11 +++++------
 fabric-1.15.2/build.gradle | 11 +++++------
 fabric-1.16.4/build.gradle | 11 +++++------
 fabric-1.17.1/build.gradle | 11 +++++------
 fabric-1.18/build.gradle   | 11 +++++------
 5 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle
index 7551ab23..4f2628ce 100644
--- a/fabric-1.14.4/build.gradle
+++ b/fabric-1.14.4/build.gradle
@@ -52,12 +52,11 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle
index 7551ab23..4f2628ce 100644
--- a/fabric-1.15.2/build.gradle
+++ b/fabric-1.15.2/build.gradle
@@ -52,12 +52,11 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle
index 7551ab23..4f2628ce 100644
--- a/fabric-1.16.4/build.gradle
+++ b/fabric-1.16.4/build.gradle
@@ -52,12 +52,11 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
diff --git a/fabric-1.17.1/build.gradle b/fabric-1.17.1/build.gradle
index 2ad1772e..08cbedac 100644
--- a/fabric-1.17.1/build.gradle
+++ b/fabric-1.17.1/build.gradle
@@ -52,12 +52,11 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
diff --git a/fabric-1.18/build.gradle b/fabric-1.18/build.gradle
index 96cacd74..4e59ae9b 100644
--- a/fabric-1.18/build.gradle
+++ b/fabric-1.18/build.gradle
@@ -57,12 +57,11 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {

From 5e8fa5153837b19941d7879c691936c8a5d23893 Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Fri, 31 Dec 2021 03:56:46 +0100
Subject: [PATCH 04/12] fabric-*: remove redundant declarations already present
 in root build.gradle

---
 fabric-1.14.4/build.gradle | 10 ----------
 fabric-1.15.2/build.gradle | 10 ----------
 fabric-1.16.4/build.gradle | 10 ----------
 fabric-1.17.1/build.gradle | 10 ----------
 fabric-1.18/build.gradle   | 10 ----------
 5 files changed, 50 deletions(-)

diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle
index 4f2628ce..28245a63 100644
--- a/fabric-1.14.4/build.gradle
+++ b/fabric-1.14.4/build.gradle
@@ -10,9 +10,6 @@ buildscript {
 }
 apply plugin: 'fabric-loom'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
 archivesBaseName = project.archives_base_name
 version = parent.version
 group = parent.group
@@ -45,13 +42,6 @@ processResources {
     }
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
-}
-
 java {
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle
index 4f2628ce..28245a63 100644
--- a/fabric-1.15.2/build.gradle
+++ b/fabric-1.15.2/build.gradle
@@ -10,9 +10,6 @@ buildscript {
 }
 apply plugin: 'fabric-loom'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
 archivesBaseName = project.archives_base_name
 version = parent.version
 group = parent.group
@@ -45,13 +42,6 @@ processResources {
     }
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
-}
-
 java {
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle
index 4f2628ce..28245a63 100644
--- a/fabric-1.16.4/build.gradle
+++ b/fabric-1.16.4/build.gradle
@@ -10,9 +10,6 @@ buildscript {
 }
 apply plugin: 'fabric-loom'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
 archivesBaseName = project.archives_base_name
 version = parent.version
 group = parent.group
@@ -45,13 +42,6 @@ processResources {
     }
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
-}
-
 java {
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
diff --git a/fabric-1.17.1/build.gradle b/fabric-1.17.1/build.gradle
index 08cbedac..4ae31fab 100644
--- a/fabric-1.17.1/build.gradle
+++ b/fabric-1.17.1/build.gradle
@@ -10,9 +10,6 @@ buildscript {
 }
 apply plugin: 'fabric-loom'
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
-
 archivesBaseName = project.archives_base_name
 version = parent.version
 group = parent.group
@@ -45,13 +42,6 @@ processResources {
     }
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
-}
-
 java {
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
diff --git a/fabric-1.18/build.gradle b/fabric-1.18/build.gradle
index 4e59ae9b..6781d7b0 100644
--- a/fabric-1.18/build.gradle
+++ b/fabric-1.18/build.gradle
@@ -15,9 +15,6 @@ loom {
     }
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
 archivesBaseName = project.archives_base_name
 version = parent.version
 group = parent.group
@@ -50,13 +47,6 @@ processResources {
     }
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
-}
-
 java {
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.

From 3ae48275a8de8a94792a0d5496b1b62c25bc3fdc Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Fri, 31 Dec 2021 04:02:41 +0100
Subject: [PATCH 05/12] fabric-*: use modern plugins{} declaration

---
 fabric-1.14.4/build.gradle | 12 ++----------
 fabric-1.15.2/build.gradle | 12 ++----------
 fabric-1.16.4/build.gradle | 12 ++----------
 fabric-1.17.1/build.gradle | 12 ++----------
 fabric-1.18/build.gradle   | 17 ++---------------
 settings.gradle            |  1 +
 6 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle
index 28245a63..61d150ed 100644
--- a/fabric-1.14.4/build.gradle
+++ b/fabric-1.14.4/build.gradle
@@ -1,14 +1,6 @@
-buildscript {
-    repositories {
-        maven { url = 'https://maven.fabricmc.net/' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
-    }
+plugins {
+	id 'fabric-loom' version '0.6-SNAPSHOT'
 }
-apply plugin: 'fabric-loom'
 
 archivesBaseName = project.archives_base_name
 version = parent.version
diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle
index 28245a63..61d150ed 100644
--- a/fabric-1.15.2/build.gradle
+++ b/fabric-1.15.2/build.gradle
@@ -1,14 +1,6 @@
-buildscript {
-    repositories {
-        maven { url = 'https://maven.fabricmc.net/' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
-    }
+plugins {
+	id 'fabric-loom' version '0.6-SNAPSHOT'
 }
-apply plugin: 'fabric-loom'
 
 archivesBaseName = project.archives_base_name
 version = parent.version
diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle
index 28245a63..61d150ed 100644
--- a/fabric-1.16.4/build.gradle
+++ b/fabric-1.16.4/build.gradle
@@ -1,14 +1,6 @@
-buildscript {
-    repositories {
-        maven { url = 'https://maven.fabricmc.net/' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
-    }
+plugins {
+	id 'fabric-loom' version '0.6-SNAPSHOT'
 }
-apply plugin: 'fabric-loom'
 
 archivesBaseName = project.archives_base_name
 version = parent.version
diff --git a/fabric-1.17.1/build.gradle b/fabric-1.17.1/build.gradle
index 4ae31fab..996226c1 100644
--- a/fabric-1.17.1/build.gradle
+++ b/fabric-1.17.1/build.gradle
@@ -1,14 +1,6 @@
-buildscript {
-    repositories {
-        maven { url = 'https://maven.fabricmc.net/' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.8-SNAPSHOT'
-    }
+plugins {
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 }
-apply plugin: 'fabric-loom'
 
 archivesBaseName = project.archives_base_name
 version = parent.version
diff --git a/fabric-1.18/build.gradle b/fabric-1.18/build.gradle
index 6781d7b0..17925b83 100644
--- a/fabric-1.18/build.gradle
+++ b/fabric-1.18/build.gradle
@@ -1,18 +1,5 @@
-buildscript {
-    repositories {
-        maven { url = 'https://maven.fabricmc.net/' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.10-SNAPSHOT'
-    }
-}
-apply plugin: 'fabric-loom'
-loom {
-    runConfigs.configureEach {
-        ideConfigGenerated = true
-    }
+plugins {
+	id 'fabric-loom' version '0.10-SNAPSHOT'
 }
 
 archivesBaseName = project.archives_base_name
diff --git a/settings.gradle b/settings.gradle
index 67e2f72b..78cb1070 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,6 +2,7 @@ pluginManagement {
   repositories {
     gradlePluginPortal()
     maven { url "https://papermc.io/repo/repository/maven-public/" }
+    maven { url "https://maven.fabricmc.net/" }
   }
 }
 

From 47df7cb402ff660a11924857bb0ffbde30f9bbf7 Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Tue, 4 Jan 2022 22:56:24 +0100
Subject: [PATCH 06/12] fabric-*: update Loom to 0.10.65

This fixes three issues:
- Gradle compatibility
- IDE compatibility
- Builds breaking because we were running on SNAPSHOT
---
 fabric-1.14.4/build.gradle | 2 +-
 fabric-1.15.2/build.gradle | 2 +-
 fabric-1.16.4/build.gradle | 2 +-
 fabric-1.17.1/build.gradle | 2 +-
 fabric-1.18/build.gradle   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle
index 61d150ed..f352f9bb 100644
--- a/fabric-1.14.4/build.gradle
+++ b/fabric-1.14.4/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.6-SNAPSHOT'
+	id 'fabric-loom' version '0.10.65'
 }
 
 archivesBaseName = project.archives_base_name
diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle
index 61d150ed..f352f9bb 100644
--- a/fabric-1.15.2/build.gradle
+++ b/fabric-1.15.2/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.6-SNAPSHOT'
+	id 'fabric-loom' version '0.10.65'
 }
 
 archivesBaseName = project.archives_base_name
diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle
index 61d150ed..f352f9bb 100644
--- a/fabric-1.16.4/build.gradle
+++ b/fabric-1.16.4/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.6-SNAPSHOT'
+	id 'fabric-loom' version '0.10.65'
 }
 
 archivesBaseName = project.archives_base_name
diff --git a/fabric-1.17.1/build.gradle b/fabric-1.17.1/build.gradle
index 996226c1..fabaaf39 100644
--- a/fabric-1.17.1/build.gradle
+++ b/fabric-1.17.1/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.8-SNAPSHOT'
+	id 'fabric-loom' version '0.10.65'
 }
 
 archivesBaseName = project.archives_base_name
diff --git a/fabric-1.18/build.gradle b/fabric-1.18/build.gradle
index 17925b83..fabaaf39 100644
--- a/fabric-1.18/build.gradle
+++ b/fabric-1.18/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.10-SNAPSHOT'
+	id 'fabric-loom' version '0.10.65'
 }
 
 archivesBaseName = project.archives_base_name

From c0abc6b0e398fa9156955cb27078cfe75fcbba29 Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Fri, 31 Dec 2021 04:05:00 +0100
Subject: [PATCH 07/12] fabric-*: remove stale comment cruft

---
 fabric-1.14.4/build.gradle | 6 ------
 fabric-1.15.2/build.gradle | 6 ------
 fabric-1.16.4/build.gradle | 6 ------
 fabric-1.17.1/build.gradle | 6 ------
 fabric-1.18/build.gradle   | 6 ------
 5 files changed, 30 deletions(-)

diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle
index f352f9bb..9c50335b 100644
--- a/fabric-1.14.4/build.gradle
+++ b/fabric-1.14.4/build.gradle
@@ -12,20 +12,14 @@ configurations {
 }
 
 dependencies {
-    //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     shadow project(path: ':DynmapCore', configuration: 'shadow')
-
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
 }
 
 processResources {
diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle
index f352f9bb..9c50335b 100644
--- a/fabric-1.15.2/build.gradle
+++ b/fabric-1.15.2/build.gradle
@@ -12,20 +12,14 @@ configurations {
 }
 
 dependencies {
-    //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     shadow project(path: ':DynmapCore', configuration: 'shadow')
-
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
 }
 
 processResources {
diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle
index f352f9bb..9c50335b 100644
--- a/fabric-1.16.4/build.gradle
+++ b/fabric-1.16.4/build.gradle
@@ -12,20 +12,14 @@ configurations {
 }
 
 dependencies {
-    //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     shadow project(path: ':DynmapCore', configuration: 'shadow')
-
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
 }
 
 processResources {
diff --git a/fabric-1.17.1/build.gradle b/fabric-1.17.1/build.gradle
index fabaaf39..dd3fafaf 100644
--- a/fabric-1.17.1/build.gradle
+++ b/fabric-1.17.1/build.gradle
@@ -12,20 +12,14 @@ configurations {
 }
 
 dependencies {
-    //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     shadow project(path: ':DynmapCore', configuration: 'shadow')
-
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
 }
 
 processResources {
diff --git a/fabric-1.18/build.gradle b/fabric-1.18/build.gradle
index fabaaf39..dd3fafaf 100644
--- a/fabric-1.18/build.gradle
+++ b/fabric-1.18/build.gradle
@@ -12,20 +12,14 @@ configurations {
 }
 
 dependencies {
-    //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     shadow project(path: ':DynmapCore', configuration: 'shadow')
-
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
 }
 
 processResources {

From 785798bf4e181ad4b0e63fcc0acdf825ecfad46d Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Fri, 31 Dec 2021 04:13:30 +0100
Subject: [PATCH 08/12] fabric-*: remove stale duplicateStrategy

---
 fabric-1.17.1/build.gradle | 1 -
 fabric-1.18/build.gradle   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/fabric-1.17.1/build.gradle b/fabric-1.17.1/build.gradle
index dd3fafaf..9c50335b 100644
--- a/fabric-1.17.1/build.gradle
+++ b/fabric-1.17.1/build.gradle
@@ -36,7 +36,6 @@ java {
 }
 
 jar {
-    duplicatesStrategy = 'include'
     from "LICENSE"
     from {
         configurations.shadow.collect { it.toString().contains("guava") ? null : it.isDirectory() ? it : zipTree(it) }
diff --git a/fabric-1.18/build.gradle b/fabric-1.18/build.gradle
index dd3fafaf..9c50335b 100644
--- a/fabric-1.18/build.gradle
+++ b/fabric-1.18/build.gradle
@@ -36,7 +36,6 @@ java {
 }
 
 jar {
-    duplicatesStrategy = 'include'
     from "LICENSE"
     from {
         configurations.shadow.collect { it.toString().contains("guava") ? null : it.isDirectory() ? it : zipTree(it) }

From 29c287d4b34053318d3f61b0462aa85528c2b64e Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Fri, 31 Dec 2021 04:20:47 +0100
Subject: [PATCH 09/12] fabric-*: use new directives for output jar file path

The old ones are deprecated+replaced.
---
 fabric-1.14.4/build.gradle | 4 ++--
 fabric-1.15.2/build.gradle | 4 ++--
 fabric-1.16.4/build.gradle | 4 ++--
 fabric-1.17.1/build.gradle | 4 ++--
 fabric-1.18/build.gradle   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle
index 9c50335b..b9651169 100644
--- a/fabric-1.14.4/build.gradle
+++ b/fabric-1.14.4/build.gradle
@@ -43,8 +43,8 @@ jar {
 }
 
 remapJar {
-    archiveName = "${archivesBaseName}-${version}-fabric-${project.minecraft_version}.jar"
-    destinationDir = file '../target'
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
+    destinationDirectory = file '../target'
 }
 
 remapJar.doLast {
diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle
index 9c50335b..b9651169 100644
--- a/fabric-1.15.2/build.gradle
+++ b/fabric-1.15.2/build.gradle
@@ -43,8 +43,8 @@ jar {
 }
 
 remapJar {
-    archiveName = "${archivesBaseName}-${version}-fabric-${project.minecraft_version}.jar"
-    destinationDir = file '../target'
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
+    destinationDirectory = file '../target'
 }
 
 remapJar.doLast {
diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle
index 9c50335b..b9651169 100644
--- a/fabric-1.16.4/build.gradle
+++ b/fabric-1.16.4/build.gradle
@@ -43,8 +43,8 @@ jar {
 }
 
 remapJar {
-    archiveName = "${archivesBaseName}-${version}-fabric-${project.minecraft_version}.jar"
-    destinationDir = file '../target'
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
+    destinationDirectory = file '../target'
 }
 
 remapJar.doLast {
diff --git a/fabric-1.17.1/build.gradle b/fabric-1.17.1/build.gradle
index 9c50335b..b9651169 100644
--- a/fabric-1.17.1/build.gradle
+++ b/fabric-1.17.1/build.gradle
@@ -43,8 +43,8 @@ jar {
 }
 
 remapJar {
-    archiveName = "${archivesBaseName}-${version}-fabric-${project.minecraft_version}.jar"
-    destinationDir = file '../target'
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
+    destinationDirectory = file '../target'
 }
 
 remapJar.doLast {
diff --git a/fabric-1.18/build.gradle b/fabric-1.18/build.gradle
index 9c50335b..b9651169 100644
--- a/fabric-1.18/build.gradle
+++ b/fabric-1.18/build.gradle
@@ -43,8 +43,8 @@ jar {
 }
 
 remapJar {
-    archiveName = "${archivesBaseName}-${version}-fabric-${project.minecraft_version}.jar"
-    destinationDir = file '../target'
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
+    destinationDirectory = file '../target'
 }
 
 remapJar.doLast {

From 0596d3e4326508ea577e855052eb7b9b4ee95e0f Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Tue, 4 Jan 2022 23:50:58 +0100
Subject: [PATCH 10/12] fabric-*: remove archives_base_name from
 gradle.properties

---
 fabric-1.14.4/build.gradle      | 2 +-
 fabric-1.14.4/gradle.properties | 1 -
 fabric-1.15.2/build.gradle      | 2 +-
 fabric-1.15.2/gradle.properties | 1 -
 fabric-1.16.4/build.gradle      | 2 +-
 fabric-1.16.4/gradle.properties | 1 -
 fabric-1.17.1/build.gradle      | 2 +-
 fabric-1.17.1/gradle.properties | 1 -
 fabric-1.18/build.gradle        | 2 +-
 fabric-1.18/gradle.properties   | 1 -
 10 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle
index b9651169..29c32122 100644
--- a/fabric-1.14.4/build.gradle
+++ b/fabric-1.14.4/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	id 'fabric-loom' version '0.10.65'
 }
 
-archivesBaseName = project.archives_base_name
+archivesBaseName = "Dynmap"
 version = parent.version
 group = parent.group
 
diff --git a/fabric-1.14.4/gradle.properties b/fabric-1.14.4/gradle.properties
index d924bef3..9bc4998a 100644
--- a/fabric-1.14.4/gradle.properties
+++ b/fabric-1.14.4/gradle.properties
@@ -6,7 +6,6 @@ minecraft_version=1.14.4
 yarn_mappings=1.14.4+build.18
 loader_version=0.12.12
 # Mod Properties
-archives_base_name=Dynmap
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 fabric_version=0.28.5+1.14
diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle
index b9651169..29c32122 100644
--- a/fabric-1.15.2/build.gradle
+++ b/fabric-1.15.2/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	id 'fabric-loom' version '0.10.65'
 }
 
-archivesBaseName = project.archives_base_name
+archivesBaseName = "Dynmap"
 version = parent.version
 group = parent.group
 
diff --git a/fabric-1.15.2/gradle.properties b/fabric-1.15.2/gradle.properties
index ac696add..0e7cbb60 100644
--- a/fabric-1.15.2/gradle.properties
+++ b/fabric-1.15.2/gradle.properties
@@ -6,7 +6,6 @@ minecraft_version=1.15.2
 yarn_mappings=1.15.2+build.17
 loader_version=0.12.12
 # Mod Properties
-archives_base_name=Dynmap
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 fabric_version=0.23.0+build.328-1.15
diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle
index b9651169..29c32122 100644
--- a/fabric-1.16.4/build.gradle
+++ b/fabric-1.16.4/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	id 'fabric-loom' version '0.10.65'
 }
 
-archivesBaseName = project.archives_base_name
+archivesBaseName = "Dynmap"
 version = parent.version
 group = parent.group
 
diff --git a/fabric-1.16.4/gradle.properties b/fabric-1.16.4/gradle.properties
index 2cea6919..a7ca250e 100644
--- a/fabric-1.16.4/gradle.properties
+++ b/fabric-1.16.4/gradle.properties
@@ -6,7 +6,6 @@ minecraft_version=1.16.4
 yarn_mappings=1.16.4+build.6
 loader_version=0.12.12
 # Mod Properties
-archives_base_name=Dynmap
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 fabric_version=0.25.1+build.416-1.16
diff --git a/fabric-1.17.1/build.gradle b/fabric-1.17.1/build.gradle
index b9651169..29c32122 100644
--- a/fabric-1.17.1/build.gradle
+++ b/fabric-1.17.1/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	id 'fabric-loom' version '0.10.65'
 }
 
-archivesBaseName = project.archives_base_name
+archivesBaseName = "Dynmap"
 version = parent.version
 group = parent.group
 
diff --git a/fabric-1.17.1/gradle.properties b/fabric-1.17.1/gradle.properties
index 3e1c141c..8ce52291 100644
--- a/fabric-1.17.1/gradle.properties
+++ b/fabric-1.17.1/gradle.properties
@@ -6,7 +6,6 @@ minecraft_version=1.17.1
 yarn_mappings=1.17.1+build.1
 loader_version=0.12.12
 # Mod Properties
-archives_base_name=Dynmap
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 fabric_version=0.36.1+1.17
diff --git a/fabric-1.18/build.gradle b/fabric-1.18/build.gradle
index b9651169..29c32122 100644
--- a/fabric-1.18/build.gradle
+++ b/fabric-1.18/build.gradle
@@ -2,7 +2,7 @@ plugins {
 	id 'fabric-loom' version '0.10.65'
 }
 
-archivesBaseName = project.archives_base_name
+archivesBaseName = "Dynmap"
 version = parent.version
 group = parent.group
 
diff --git a/fabric-1.18/gradle.properties b/fabric-1.18/gradle.properties
index 477d0215..d56ca2b5 100644
--- a/fabric-1.18/gradle.properties
+++ b/fabric-1.18/gradle.properties
@@ -2,7 +2,6 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Mod Properties
-archives_base_name=Dynmap
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html

From b34aedeb51c2c8ce46d242512f00dd88c9a55ec1 Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Tue, 4 Jan 2022 23:51:47 +0100
Subject: [PATCH 11/12] fabric-*: remove comment cruft from gradle.properties

---
 fabric-1.14.4/gradle.properties | 7 -------
 fabric-1.15.2/gradle.properties | 7 -------
 fabric-1.16.4/gradle.properties | 7 -------
 fabric-1.17.1/gradle.properties | 7 -------
 fabric-1.18/gradle.properties   | 9 ---------
 5 files changed, 37 deletions(-)

diff --git a/fabric-1.14.4/gradle.properties b/fabric-1.14.4/gradle.properties
index 9bc4998a..a4cfd00c 100644
--- a/fabric-1.14.4/gradle.properties
+++ b/fabric-1.14.4/gradle.properties
@@ -1,11 +1,4 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-# Fabric Properties
-# check these on https://fabricmc.net/use
 minecraft_version=1.14.4
 yarn_mappings=1.14.4+build.18
 loader_version=0.12.12
-# Mod Properties
-# Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 fabric_version=0.28.5+1.14
diff --git a/fabric-1.15.2/gradle.properties b/fabric-1.15.2/gradle.properties
index 0e7cbb60..8f43334d 100644
--- a/fabric-1.15.2/gradle.properties
+++ b/fabric-1.15.2/gradle.properties
@@ -1,11 +1,4 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-# Fabric Properties
-# check these on https://fabricmc.net/use
 minecraft_version=1.15.2
 yarn_mappings=1.15.2+build.17
 loader_version=0.12.12
-# Mod Properties
-# Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 fabric_version=0.23.0+build.328-1.15
diff --git a/fabric-1.16.4/gradle.properties b/fabric-1.16.4/gradle.properties
index a7ca250e..b798377d 100644
--- a/fabric-1.16.4/gradle.properties
+++ b/fabric-1.16.4/gradle.properties
@@ -1,11 +1,4 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-# Fabric Properties
-# check these on https://fabricmc.net/use
 minecraft_version=1.16.4
 yarn_mappings=1.16.4+build.6
 loader_version=0.12.12
-# Mod Properties
-# Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 fabric_version=0.25.1+build.416-1.16
diff --git a/fabric-1.17.1/gradle.properties b/fabric-1.17.1/gradle.properties
index 8ce52291..6fc6e282 100644
--- a/fabric-1.17.1/gradle.properties
+++ b/fabric-1.17.1/gradle.properties
@@ -1,11 +1,4 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-# Fabric Properties
-# check these on https://fabricmc.net/use
 minecraft_version=1.17.1
 yarn_mappings=1.17.1+build.1
 loader_version=0.12.12
-# Mod Properties
-# Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 fabric_version=0.36.1+1.17
diff --git a/fabric-1.18/gradle.properties b/fabric-1.18/gradle.properties
index d56ca2b5..19114182 100644
--- a/fabric-1.18/gradle.properties
+++ b/fabric-1.18/gradle.properties
@@ -1,13 +1,4 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-
-# Mod Properties
-
-# Fabric Properties
-# check these on https://fabricmc.net/versions.html
 minecraft_version=1.18
 yarn_mappings=1.18+build.1
 loader_version=0.12.12
-
-#Fabric api
 fabric_version=0.43.1+1.18

From 93abdad4487474a75c5c3a87e581775b2bbfcd5a Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Wed, 5 Jan 2022 00:04:44 +0100
Subject: [PATCH 12/12] fabric-*: update Fabric API to newest version for each
 release

---
 fabric-1.15.2/gradle.properties | 2 +-
 fabric-1.16.4/gradle.properties | 2 +-
 fabric-1.17.1/gradle.properties | 2 +-
 fabric-1.18/gradle.properties   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fabric-1.15.2/gradle.properties b/fabric-1.15.2/gradle.properties
index 8f43334d..dafc7dda 100644
--- a/fabric-1.15.2/gradle.properties
+++ b/fabric-1.15.2/gradle.properties
@@ -1,4 +1,4 @@
 minecraft_version=1.15.2
 yarn_mappings=1.15.2+build.17
 loader_version=0.12.12
-fabric_version=0.23.0+build.328-1.15
+fabric_version=0.28.5+1.15
diff --git a/fabric-1.16.4/gradle.properties b/fabric-1.16.4/gradle.properties
index b798377d..04b22b82 100644
--- a/fabric-1.16.4/gradle.properties
+++ b/fabric-1.16.4/gradle.properties
@@ -1,4 +1,4 @@
 minecraft_version=1.16.4
 yarn_mappings=1.16.4+build.6
 loader_version=0.12.12
-fabric_version=0.25.1+build.416-1.16
+fabric_version=0.42.0+1.16
diff --git a/fabric-1.17.1/gradle.properties b/fabric-1.17.1/gradle.properties
index 6fc6e282..7b6f2454 100644
--- a/fabric-1.17.1/gradle.properties
+++ b/fabric-1.17.1/gradle.properties
@@ -1,4 +1,4 @@
 minecraft_version=1.17.1
 yarn_mappings=1.17.1+build.1
 loader_version=0.12.12
-fabric_version=0.36.1+1.17
+fabric_version=0.45.1+1.17
diff --git a/fabric-1.18/gradle.properties b/fabric-1.18/gradle.properties
index 19114182..a57d572d 100644
--- a/fabric-1.18/gradle.properties
+++ b/fabric-1.18/gradle.properties
@@ -1,4 +1,4 @@
 minecraft_version=1.18
 yarn_mappings=1.18+build.1
 loader_version=0.12.12
-fabric_version=0.43.1+1.18
+fabric_version=0.45.1+1.18