Merge branch '2022.2' into 2022.3

Author: Earthcomputer

gradle.properties

@@ -14,7 +14,7 @@ kotlin.code.style=official
 ideaVersion = 2022.3
 ideaVersionName = 2022.3
 
-coreVersion = 1.6.2
+coreVersion = 1.6.3
 downloadIdeaSources = true
 
 pluginTomlVersion = 223.7571.59

readme.md

@@ -11,10 +11,6 @@ Minecraft Development for IntelliJ
         <td align="right"><b>Main Build</b></td>
         <td colspan="2"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Build"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Build)/statusIcon.svg" alt="Teamcity Build Status" /></a></td>
     </tr>
-    <tr>
-        <td align="left">2022.1</td>
-        <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20221"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20221)/statusIcon.svg" alt="2022.1 Nightly Status" /></a></td>
-    </tr>
     <tr>
         <td align="left">2022.2</td>
         <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20222"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20222)/statusIcon.svg" alt="2022.2 Nightly Status" /></a></td>
@@ -35,7 +31,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.6.2-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.6.3-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>

src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft

@@ -32,10 +32,14 @@ dependencies {
 
 processResources {
     inputs.property "version", project.version
+    inputs.property "minecraft_version", project.minecraft_version
+    inputs.property "loader_version", project.loader_version
     filteringCharset "UTF-8"
 
     filesMatching("fabric.mod.json") {
-        expand "version": project.version
+        expand "version": project.version,
+                "minecraft_version": project.minecraft_version,
+                "loader_version": project.loader_version
     }
 }
 

src/main/resources/fileTemplates/j2ee/fabric/fabric_mod.json.ft

@@ -22,10 +22,10 @@
     #end
 
   "depends": {
-    "fabricloader": ">=${LOADER_VERSION}",
+    "fabricloader": ">=${d}{loader_version}",
       #if (${API_VERSION})
         "fabric": "*",
       #end
-    "minecraft": "${MC_VERSION}"
+    "minecraft": "${d}{minecraft_version}"
   }
 }