Merge pull request #19 from FTBTeam/dev

Dev

Author: desht

Diff for: CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.0]
+
+### Changed
+* Ported to Minecraft 1.20.6. Support for Fabric and NeoForge.
+  * Forge support may be re-added if/when Architectury adds support for Forge
+
 ## [3.0.3]
 
 ### Fixed

Diff for: fabric/build.gradle

@@ -65,7 +65,16 @@ processResources {
     inputs.property "version", project.version
 
     filesMatching("fabric.mod.json") {
-        expand "version": project.version
+        expand "version": project.version,
+                "archversion": project.architectury_version,
+                "neoforgeversion": project.neoforge_version,
+                "neoforgeloaderversion": project.neoforge_loader_version,
+                "mcversion": project.minecraft_version,
+                "ftblibraryversion": project.ftb_library_version,
+                "ftbquestsversion": project.ftb_quests_version,
+                "ftbchunksversion": project.ftb_chunks_version,
+                "ftbranksversion": project.ftb_ranks_version,
+                "ftbteamsversion": project.ftb_teams_version
     }
 }
 

Diff for: fabric/src/main/java/dev/ftb/mods/ftbxmodcompat/fabric/ftbchunks/waystones/WaystonesCompat.java

@@ -9,7 +9,6 @@
 import net.blay09.mods.waystones.api.WaystoneVisibility;
 import net.blay09.mods.waystones.api.event.WaystoneRemoveReceivedEvent;
 import net.blay09.mods.waystones.api.event.WaystoneUpdatedEvent;
-import net.blay09.mods.waystones.api.event.WaystonesLoadedEvent;
 
 public class WaystonesCompat {
 	public static void init() {

Diff for: fabric/src/main/resources/fabric.mod.json

@@ -23,9 +23,9 @@
   },
   "depends": {
     "fabric": "*",
-    "minecraft": ">=1.20.1",
-    "architectury": ">=9.0.8",
-    "ftblibrary": ">=2001.1.3"
+    "minecraft": ">=${mcversion}",
+    "architectury": ">=${archversion}",
+    "ftblibrary": ">=${ftblibraryversion}"
   },
   "breaks": {
     "ftbquests": "<2001.3.0",

Diff for: gradle.properties

@@ -10,32 +10,32 @@ maven_group=dev.ftb.mods
 curseforge_id=889915
 
 forge_version=50.0.9
-neoforge_version=20.6.49-beta
+neoforge_version=20.6.100-beta
 neoforge_loader_version=1
 fabric_loader_version=0.15.10
 fabric_api_version=0.97.8+1.20.6
 
-architectury_version=12.0.28
+architectury_version=12.1.3
 
-ftb_library_version=2006.1.0-SNAPSHOT
+ftb_library_version=2006.1.1
 ftb_quests_version=2006.1.0-SNAPSHOT
-ftb_chunks_version=2006.1.0-SNAPSHOT
-ftb_ranks_version=2006.1.0-SNAPSHOT
-ftb_essentials_version=2006.1.0-SNAPSHOT
-ftb_teams_version=2006.1.0-SNAPSHOT
-ftb_filter_system_version=2.1.0-SNAPSHOT
+ftb_chunks_version=2006.1.0
+ftb_ranks_version=2006.1.0
+ftb_essentials_version=2006.1.0
+ftb_teams_version=2006.1.0
+ftb_filter_system_version=2.1.0
 
 rei_version=15.0.728
 common_prot_api_version=1.0.0
 luckperms_api_version=5.4
-waystones_neoforge_version=5140919
-waystones_forge_version=5140917
-waystones_fabric_version=5140907
-balm_neoforge_version=5139962
-balm_forge_version=5139960
-balm_fabric_version=5139958
-jei_version=17.3.0.49
+waystones_neoforge_version=5389804
+waystones_forge_version=5389798
+waystones_fabric_version=5389793
+balm_neoforge_version=5389055
+balm_forge_version=5389054
+balm_fabric_version=5389051
 
 # TODO compiling against 1.20.4 version for now
+jei_version=17.3.0.49
 kubejs_version=2004.7.0-build.16
 gamestages_version=15.0.1

Diff for: neoforge/build.gradle

@@ -143,7 +143,7 @@ if (ENV.CURSEFORGE_KEY) {
         project {
             id = project.curseforge_id
             releaseType = ftbPublishing.relType
-            addGameVersion "Forge"
+            addGameVersion "NeoForge"
             addGameVersion project.minecraft_version
             mainArtifact(remapJar.archiveFile)
             relations {